Merge pull request #278 from thetarnav/firefox-ext

.changeset/large-donuts-perform.md

@@ -0,0 +1,5 @@
+---
+'@solid-devtools/extension': minor
+---
+
+Support firefox (minor changes to background script)

.changeset/young-baboons-compare.md

@@ -0,0 +1,6 @@
+---
+'@solid-devtools/frontend': patch
+'@solid-devtools/overlay': patch
+---
+
+Add missing dependencies

.gitignore

@@ -35,7 +35,6 @@ Thumbs.db
 # chrome extension private key file
 *.pem
 
-packages/extension/dist.zip
 **/vite.config.ts.timestamp-*.*
 
 /test-results/

CONTRIBUTING.md

@@ -74,7 +74,7 @@ This project uses [changesets](https://github.com/changesets/changesets) to mana
 
 ![image](https://user-images.githubusercontent.com/24491503/191084587-e53b1743-39ac-40e0-b3a6-cf6bcaca9d5d.png)
 
-4. Click on the "Load unpacked" button and select the `packages/extension/dist` folder
+4. Click on the "Load unpacked" button and select the `packages/extension/dist/chrome` directory (or `packages/extension/dist/firefox` if you are using firefox)
 
 ![image](https://user-images.githubusercontent.com/24491503/191084770-84577eb0-1c90-44a7-afa2-a2d03f728a66.png)
 

configs/tsconfig.base.json

@@ -1,17 +1,16 @@
 {
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noUncheckedIndexedAccess": true,
-    "types": ["@total-typescript/ts-reset"]
-  }
+    "compilerOptions": {
+        "strict": true,
+        "target": "ESNext",
+        "module": "ESNext",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "resolveJsonModule": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "noPropertyAccessFromIndexSignature": true,
+        "noUncheckedIndexedAccess": true,
+        "types": ["@total-typescript/ts-reset"]
+    }
 }

e2e/fixtures.ts

@@ -18,7 +18,7 @@ export const test = pw.test.extend<{
             return
         }
 
-        const path_to_extension = path.resolve(__dirname, '../packages/extension/dist/')
+        const path_to_extension = path.resolve(__dirname, '../packages/extension/dist/chrome')
         const context = await pw.chromium.launchPersistentContext('', {
             args: [
                 '--headless=new',

playwright.config.ts → e2e/playwright.config.ts

@@ -6,7 +6,7 @@ const is_ci = !!process.env['CI']
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-    testDir: './e2e',
+    testDir: '.',
     /* Run tests in files in parallel */
     fullyParallel: true,
     /* Fail the build on CI if you accidentally left test.only in the source code. */

examples/sandbox/vite.config.ts

@@ -5,10 +5,10 @@ import { defineConfig } from 'vite'
 import Inspect from 'vite-plugin-inspect'
 import solid from 'vite-plugin-solid'
 
-const usingExtension = process.env['EXT'] === 'true' || process.env['EXT'] === '1'
+const is_ext = process.env['EXT'] === 'true' || process.env['EXT'] === '1'
 
 export default defineConfig(mode => {
-    const isBuild = mode.command === 'build'
+    const is_build = mode.command === 'build'
 
     return {
         plugins: [
@@ -27,8 +27,8 @@ export default defineConfig(mode => {
             Inspect(),
         ],
         define: {
-            'process.env.EXT': JSON.stringify(usingExtension),
-            'process.env.BUILD': JSON.stringify(isBuild),
+            'process.env.EXT': JSON.stringify(is_ext),
+            'process.env.BUILD': JSON.stringify(is_build),
         },
         mode: 'development',
         build: {

package.json

@@ -16,9 +16,9 @@
         "build": "turbo run build --filter=./packages/*",
         "----------------------TEST----------------------": "",
         "test:unit": "turbo run test --filter=./packages/*",
-        "test:types": "turbo run typecheck --filter=./packages/*",
+        "test:types": "turbo run test:types --filter=./packages/*",
         "test:lint": "eslint --ignore-path .gitignore --max-warnings 0 packages/**/*.{js,ts,tsx,jsx} --rule \"@typescript-eslint/no-unnecessary-type-assertion: off\"",
-        "test:e2e": "cross-env PW_CHROMIUM_ATTACH_TO_OTHER=1 playwright test -c playwright.config.ts",
+        "test:e2e": "cross-env PW_CHROMIUM_ATTACH_TO_OTHER=1 playwright test -c e2e/playwright.config.ts",
         "----------------------UTILS----------------------": "",
         "build-test:packages": "turbo run build test:unit test:types --filter=./packages/*",
         "build-test": "pnpm run build-test:packages && pnpm run test:lint && pnpm run test:e2e",
@@ -28,8 +28,8 @@
         "publish": "pnpm run build && pnpm run changeset publish"
     },
     "devDependencies": {
+        "@solid-devtools/theme": "file:packages/theme",
         "@changesets/cli": "^2.26.2",
-        "@nothing-but/utils": "~0.11.1",
         "@playwright/test": "^1.39.0",
         "@total-typescript/ts-reset": "^0.5.1",
         "@types/node": "^20.8.10",
@@ -48,6 +48,7 @@
         "solid-js": "^1.8.5",
         "tsup": "^7.2.0",
         "tsup-preset-solid": "^2.1.0",
+        "tsx": "^3.14.0",
         "turbo": "^1.10.16",
         "typescript": "^5.2.2",
         "unocss": "^0.57.1",

packages/debugger/src/main/types.ts

@@ -74,14 +74,15 @@ export const getValueItemId = <T extends ValueItemType>(
 export type ValueUpdateListener = (newValue: unknown, oldValue: unknown) => void
 
 export namespace Solid {
-    export type OwnerBase = import('solid-js/types/reactive/signal').Owner
-    export type SourceMapValue = import('solid-js/types/reactive/signal').SourceMapValue
-    export type Signal = import('solid-js/types/reactive/signal').SignalState<unknown>
-    export type Computation = import('solid-js/types/reactive/signal').Computation<unknown>
-    export type Memo = import('solid-js/types/reactive/signal').Memo<unknown>
-    export type RootFunction<T> = import('solid-js/types/reactive/signal').RootFunction<T>
-    export type EffectFunction = import('solid-js/types/reactive/signal').EffectFunction<unknown>
-    export type Component = import('solid-js/types/reactive/signal').DevComponent<{
+    export type OwnerBase = import('solid-js').Owner
+    export type SourceMapValue = import('solid-js/types/reactive/signal.d.ts').SourceMapValue
+    export type Signal = import('solid-js/types/reactive/signal.d.ts').SignalState<unknown>
+    export type Computation = import('solid-js/types/reactive/signal.d.ts').Computation<unknown>
+    export type Memo = import('solid-js/types/reactive/signal.d.ts').Memo<unknown>
+    export type RootFunction<T> = import('solid-js/types/reactive/signal.d.ts').RootFunction<T>
+    export type EffectFunction =
+        import('solid-js/types/reactive/signal.d.ts').EffectFunction<unknown>
+    export type Component = import('solid-js/types/reactive/signal.d.ts').DevComponent<{
         [key: string]: unknown
     }>
 
@@ -109,12 +110,12 @@ export namespace Solid {
     //
 
     export type StoreNode = import('solid-js/store').StoreNode
-    export type NotWrappable = import('solid-js/store/types/store').NotWrappable
-    export type OnStoreNodeUpdate = import('solid-js/store/types/store').OnStoreNodeUpdate
+    export type NotWrappable = import('solid-js/store').NotWrappable
+    export type OnStoreNodeUpdate = import('solid-js/store/types/store.d.ts').OnStoreNodeUpdate
     export type Store = SourceMapValue & { value: StoreNode }
 }
 
-declare module 'solid-js/types/reactive/signal' {
+declare module 'solid-js/types/reactive/signal.d.ts' {
     interface Owner {
         sdtType?: NodeType
         sdtSubRoots?: Solid.Owner[] | null