feat(wip): pnpm

.github/workflows/release.yml

@@ -43,7 +43,6 @@ jobs:
         shell: bash
         env:
           KIT: ${{ env.kit_path }}
-          KNODE: ${{ env.knode_path }}
         run: |
           npm run build-kit
 
@@ -56,7 +55,6 @@ jobs:
             npm run test
         env:
           KIT: ${{ env.kit_path }}
-          KNODE: ${{ env.knode_path }}
 
 
   test-mac-and-ubuntu:
@@ -78,26 +76,30 @@ jobs:
       - name: Checkout kit
         uses: actions/checkout@master
 
-      - name: Install Node
-        run: |
-          mkdir -p ./.knode
-          ./build/install-node.sh -v 20.16.0 -P ./.knode -y
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 9.9.0
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
 
       - name: Build Kit
         run: |
-          PATH="./.knode/bin:$PATH" npm i && PATH="./.knode/bin:$PATH" npm dedupe
-          PATH="./.knode/bin:$PATH" KIT=./.kit node ./build/build-ci.js
+          pnpm i
+          pnpm run build-kit
 
       - name: Set env vars
         run: |
           echo "wd_path=$PWD" >> $GITHUB_ENV
           echo "kit_path=$PWD/.kit" >> $GITHUB_ENV
-          echo "knode_path=$PWD/.knode" >> $GITHUB_ENV
           echo "release_channel=${{ env.GITHUB_REF_SLUG_URL }}" >> $GITHUB_ENV
 
       - name: Add node and kit to PATH
         run: |
-          echo "${{ env.knode_path }}/bin" >> $GITHUB_PATH
           echo "${{ env.kit_path }}/bin" >> $GITHUB_PATH
           echo "---"
           echo "$GITHUB_PATH"
@@ -126,7 +128,6 @@ jobs:
           npm run test
         env:
           KIT: ${{ env.kit_path }}
-          KNODE: ${{ env.knode_path }}
 
   release:
     runs-on: macos-latest
@@ -145,26 +146,31 @@ jobs:
       - name: Checkout kit
         uses: actions/checkout@master
 
-      - name: Install Node
-        run: |
-          mkdir -p ./.knode
-          ./build/install-node.sh -v 20.16.0 -P ./.knode -y
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 9.9.0
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'pnpm'
+
 
       - name: Build Kit
         run: |
-          PATH="./.knode/bin:$PATH" npm i && PATH="./.knode/bin:$PATH" npm dedupe
-          PATH="./.knode/bin:$PATH" KIT=./.kit node ./build/build-ci.js
+          pnpm i
+          pnpm run build-kit
 
       - name: Set env vars
         run: |
           echo "wd_path=$PWD" >> $GITHUB_ENV
           echo "kit_path=$PWD/.kit" >> $GITHUB_ENV
-          echo "knode_path=$PWD/.knode" >> $GITHUB_ENV
           echo "release_channel=${{ env.GITHUB_REF_SLUG_URL }}" >> $GITHUB_ENV
 
       - name: Add node and kit to PATH
         run: |
-          echo "${{ env.knode_path }}/bin" >> $GITHUB_PATH
           echo "${{ env.kit_path }}/bin" >> $GITHUB_PATH
           echo "---"
           echo "$GITHUB_PATH"

README.md

@@ -33,18 +33,6 @@
 
 Requirements: npm
 
-### Using node 20.16.0 from ~/.knode
-
-Installing `Kit.app` already installed node 20.16.0 to ~/.knode. You'll want to use this node version for all build/run steps:
-
-`PATH=~/.knode/bin:$PATH`
-
-This will use 20.16.0's node/npm when working with Kit. (Alternatively, you can use nvm/n/whatever, but I don't)
-
-- Use `volta` to manage node versions.
-    1. Install [volta](https://volta.sh/)
-    2. Volta will automatically switch node version to 20.16.0 when working with kit.
-
 ### Clone Kit SDK
 
 Clone:

build/build-ci.sh

@@ -2,7 +2,6 @@ set -e
 
 export WD=$(cd "$(dirname ${BASH_SOURCE[0]})"/.. &>/dev/null && pwd)
 export KIT="$WD/.kit"
-export KNODE="$WD/.knode"
 export PATH="$KNODE:$PATH"
 
 cd $WD

root/bin/kit

@@ -13,7 +13,7 @@ KIT=$(cd "$(dirname $(readlink -f ${BASH_SOURCE[0]}))/.." &>/dev/null && pwd)
         pwd
     )"
 
-KIT_NODE="${KIT_NODE:=$KIT/../.knode/bin/node}"
+KIT_NODE="${KIT_NODE:=$KIT/../.kenv/bin/pnpm node}"
 # Default to system node if KIT_NODE doesn't exist
 [ ! -f $KIT_NODE ] && KIT_NODE=$(which node)
 

root/bin/kit.bat

@@ -16,7 +16,7 @@ if %errorlevel%==0 (
 
 REM Set the default KIT_NODE variable to the custom node binary
 if not defined KIT_NODE (
-    set "KIT_NODE=%KIT%/../.knode/bin/node"
+    set "KIT_NODE=%KIT%/../.kenv/bin/pnpm node"
 )
 
 REM Check if the custom node binary exists, if not, use the system's node binary

root/script

@@ -2,7 +2,7 @@
 # ../../ of this script
 
 KIT=$(cd "$(dirname ${BASH_SOURCE[0]})" &> /dev/null && pwd)
-KIT_NODE="${KIT_NODE:=$KIT/../.knode/bin/node}"
+KIT_NODE="${KIT_NODE:=$KIT/../.kenv/bin/pnpm node}"
 
 NODE_NO_WARNINGS=1 \
 "$KIT_NODE" \

src/api/global.ts

@@ -7,7 +7,6 @@ import {
 	kitPath,
 	kenvPath,
 	wait,
-	knodePath,
 	getLogFromScriptPath,
 	createPathResolver
 } from "../core/utils.js"
@@ -79,7 +78,6 @@ assignPropsTo(process.env, global.env)
 global.wait = wait
 global.kitPath = kitPath
 global.kenvPath = kenvPath
-global.knodePath = knodePath
 global.isBin = isBin
 global.isDir = isDir
 global.createPathResolver = createPathResolver

src/cli/lib/utils.ts

@@ -1,6 +1,6 @@
-import path from "path"
+import path from "node:path"
 import shelljs from "shelljs"
-import { kitPath, knodePath, home } from "../../core/utils.js"
+import { kitPath, home } from "../../core/utils.js"
 import { compile } from "@johnlindquist/globals"
 import {
 	ensureDir,

src/core/constants.ts

@@ -1,5 +1,5 @@
-import { home, kenvPath, kitPath, knodePath } from "./resolvers.js"
-import { isMac, isWin } from "./is.js"
+import { home, kenvPath, kitPath } from "./resolvers.js"
+import { isMac } from "./is.js"
 
 export let cmd = isMac ? "cmd" : "ctrl"
 export let returnOrEnter = isMac ? "return" : "enter"

src/core/resolvers.test.ts

@@ -6,8 +6,7 @@ import {
 	home,
 	kitPath,
 	kenvPath,
-	kitDotEnvPath,
-	knodePath
+	kitDotEnvPath
 } from "./resolvers"
 
 // Helper function to set up environment variables

src/core/resolvers.ts

@@ -39,8 +39,3 @@ export let kitDotEnvPath = () => {
 		getEnvOrDefault(process.env.KIT_DOTENV_PATH, kenvPath(".env"))
 	)()
 }
-
-export let knodePath = (...parts: string[]) => {
-	const knodeDir = getEnvOrDefault(process.env.KNODE, home(".knode"))
-	return createPathResolver(knodeDir)(...parts.filter(Boolean))
-}

src/core/utils.ts

@@ -9,7 +9,6 @@ import type {
 	Scriptlet,
 	Snippet
 } from "../types/core"
-import { platform } from "node:os"
 import { lstatSync, realpathSync } from "node:fs"
 import { lstat, readdir } from "node:fs/promises"
 import { execSync } from "node:child_process"
@@ -26,7 +25,7 @@ import tsPlugin from "acorn-typescript"
 import type { Stamp } from "./db"
 import { pathToFileURL } from "node:url"
 import { parseScript } from "./parser.js"
-import { kitPath, kenvPath, knodePath } from "./resolvers.js"
+import { kitPath, kenvPath } from "./resolvers.js"
 import { cmd } from "./constants.js"
 import { isBin, isJsh, isDir, isWin, isMac } from "./is.js"
 
@@ -1411,8 +1410,7 @@ export {
 	home,
 	kitPath,
 	kenvPath,
-	kitDotEnvPath,
-	knodePath
+	kitDotEnvPath
 } from "./resolvers.js"
 
 export { isBin, isFile, isJsh, isDir, isLinux, isMac, isWin } from "./is.js"

src/index.ts

@@ -2,62 +2,51 @@ import { homedir } from "os"
 import path from "path"
 import { URL, fileURLToPath } from "url"
 
-let kitRun = async (
-  command?: string,
-  ..._args: string[]
-) => {
-  process.env.KIT =
-    process.env.KIT ||
-    path.dirname(fileURLToPath(new URL(import.meta.url)))
-
-  process.env.KNODE =
-    process.env.KNODE || path.resolve(homedir(), ".knode")
-
-  await import("./api/global.js")
-  await import("./api/kit.js")
-  await import("./api/lib.js")
-  await import("./target/terminal.js")
-
-  if (command) {
-    return await global.run(command, ..._args)
-  }
+let kitRun = async (command?: string, ..._args: string[]) => {
+	process.env.KIT =
+		process.env.KIT || path.dirname(fileURLToPath(new URL(import.meta.url)))
+
+	await import("./api/global.js")
+	await import("./api/kit.js")
+	await import("./api/lib.js")
+	await import("./target/terminal.js")
+
+	if (command) {
+		return await global.run(command, ..._args)
+	}
 }
 
 if (!process?.env?.KIT_TARGET) {
-  await kitRun()
+	await kitRun()
 }
 
 export * from "./api/kit.js"
 export * from "./core/utils.js"
 
 let dirs = ["cli", "main"]
 
-let kitGet = (
-  _target: any,
-  key: string,
-  _receiver: any
-) => {
-  if ((global as any)[key] && !dirs.includes(key)) {
-    return (global as any)[key]
-  }
-
-  try {
-    return new Proxy(
-      {},
-      {
-        get: async (_target, module: string, _receiver) => {
-          let modulePath = `../${key}/${module}.js?${global.uuid()}`
-          return await import(modulePath)
-        },
-      }
-    )
-  } catch (error) {
-    console.warn(error)
-  }
+let kitGet = (_target: any, key: string, _receiver: any) => {
+	if ((global as any)[key] && !dirs.includes(key)) {
+		return (global as any)[key]
+	}
+
+	try {
+		return new Proxy(
+			{},
+			{
+				get: async (_target, module: string, _receiver) => {
+					let modulePath = `../${key}/${module}.js?${global.uuid()}`
+					return await import(modulePath)
+				}
+			}
+		)
+	} catch (error) {
+		console.warn(error)
+	}
 }
 
 let kitDefault = new Proxy(kitRun, {
-  get: kitGet,
+	get: kitGet
 })
 
 global.kit = kitDefault