Merge branch 'main' into allow-for-vite-5

.vscode/settings.json

@@ -1,21 +1,21 @@
 {
-  "cSpell.words": [
-    "Carniato",
-    "codeql",
-    "crxjs",
-    "Demaine",
-    "dgraph",
-    "otonashixav",
-    "outin",
-    "sarif",
-    "stefanzweifel",
-    "taze",
-    "todomvc",
-    "twind",
-    "undici"
-  ],
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": false
-  }
+    "cSpell.words": [
+        "Carniato",
+        "codeql",
+        "crxjs",
+        "Demaine",
+        "dgraph",
+        "otonashixav",
+        "outin",
+        "sarif",
+        "stefanzweifel",
+        "taze",
+        "todomvc",
+        "twind",
+        "undici"
+    ],
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "never"
+    }
 }

package.json

@@ -38,7 +38,7 @@
         "@typescript-eslint/parser": "^6.11.0",
         "babel-preset-solid": "^1.8.4",
         "cross-env": "^7.0.3",
-        "esbuild": "^0.19.5",
+        "esbuild": "^0.19.11",
         "esbuild-plugin-solid": "^0.5.0",
         "eslint": "^8.53.0",
         "eslint-plugin-eslint-comments": "^3.2.0",
@@ -49,17 +49,17 @@
         "solid-js": "^1.8.5",
         "tsup": "^7.2.0",
         "tsup-preset-solid": "^2.1.0",
-        "tsx": "^4.1.2",
+        "tsx": "^4.7.0",
         "turbo": "^1.10.16",
         "typescript": "^5.2.2",
         "unocss": "^0.57.4",
         "vite": "4.5.0",
         "vite-plugin-solid": "^2.8.0",
         "vitest": "^0.34.6"
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "engines": {
         "node": ">=18",
-        "pnpm": ">=8.6.0"
+        "pnpm": ">=8.14.0"
     }
 }

packages/debugger/package.json

@@ -90,7 +90,7 @@
     "devDependencies": {
         "solid-js": "^1.8.5"
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "keywords": [
         "solid",
         "devtools",

packages/extension/package.json

@@ -30,5 +30,5 @@
             "vite": "^4"
         }
     },
-    "packageManager": "pnpm@8.9.0"
+    "packageManager": "pnpm@8.14.0"
 }

packages/frontend/package.json

@@ -69,5 +69,5 @@
     "peerDependencies": {
         "solid-js": "^1.8.0"
     },
-    "packageManager": "pnpm@8.9.0"
+    "packageManager": "pnpm@8.14.0"
 }

packages/logger/package.json

@@ -60,7 +60,7 @@
     "peerDependencies": {
         "solid-js": "^1.8.0"
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "keywords": [
         "solid",
         "devtools",

packages/main/package.json

@@ -129,7 +129,7 @@
             "optional": true
         }
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "keywords": [
         "solid",
         "devtools",

packages/overlay/package.json

@@ -59,12 +59,11 @@
     "peerDependencies": {
         "solid-js": "^1.8.0"
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "devDependencies": {
         "@types/clean-css": "^4.2.10",
         "chokidar": "^3.5.3",
         "clean-css": "^5.3.2",
-        "solid-js": "^1.8.5",
-        "tsx": "^4.1.2"
+        "solid-js": "^1.8.5"
     }
 }

packages/overlay/scripts/build.ts

@@ -80,9 +80,8 @@ if (!isDev) {
 
 // generate type declarations
 {
-    const worker = new Worker(path.resolve(__dirname, `./dts_worker.ts`), {
-        argv: isDev ? ['--watch'] : [],
-    })
+    const filepath = path.resolve(__dirname, `dts_worker.js`)
+    const worker = new Worker(filepath, {argv: isDev ? ['--watch'] : []})
 
     if (isDev) {
         chokidar.watch(path.resolve(cwd, `src`)).on('change', () => {

packages/overlay/scripts/dts.ts → packages/overlay/scripts/dts_worker.js

@@ -1,6 +1,29 @@
+// @ts-check
+
+import path from 'path'
 import ts from 'typescript'
+import * as worker_threads from 'worker_threads'
+
+const isDev = process.argv.includes('--watch')
+const entryFile = path.resolve(process.cwd(), `src/index.tsx`)
+
+const options = getTscOptions()
+
+if (isDev) {
+    /** @type {ts.Program | undefined} */
+    let old_program
+    worker_threads.parentPort?.on('message', () => {
+        old_program = emitDts(entryFile, options, old_program)
+    })
+} else {
+    emitDts(entryFile, options)
+    process.exit()
+}
 
-export function getTscOptions(): ts.CompilerOptions {
+/**
+ * @returns {ts.CompilerOptions}
+ */
+export function getTscOptions() {
     const configFile = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json')
     if (!configFile) throw Error('tsconfig.json not found')
     const {config} = ts.readConfigFile(configFile, ts.sys.readFile)
@@ -18,7 +41,13 @@ export function getTscOptions(): ts.CompilerOptions {
     }
 }
 
-export function emitDts(entryFile: string, options: ts.CompilerOptions, oldProgram?: ts.Program) {
+/**
+ * @param {string} entryFile
+ * @param {ts.CompilerOptions} options
+ * @param {ts.Program} [oldProgram]
+ * @returns {ts.Program}
+ */
+export function emitDts(entryFile, options, oldProgram) {
     const timestamp = Date.now()
     const program = ts.createProgram([entryFile], options, undefined, oldProgram)
     program.emit()

packages/theme/package.json

@@ -36,7 +36,7 @@
     "dependencies": {
         "@nothing-but/utils": "~0.12.0"
     },
-    "packageManager": "pnpm@8.9.0",
+    "packageManager": "pnpm@8.14.0",
     "keywords": [
         "solid",
         "devtools",