Move theme to shared package

thetarnav · Dec 15, 2024 · d41c4a7 · d41c4a7
1 parent e6055b5
commit d41c4a7
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 83 deletions.
diff --git a/.changeset/many-books-taste.md b/.changeset/many-books-taste.md
@@ -0,0 +1,6 @@
+---
+"@solid-devtools/shared": minor
+"@solid-devtools/frontend": patch
+---
+
+Move theme to shared package
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
         "@changesets/cli": "^2.27.10",
         "@nothing-but/eslint-plugin": "^0.2.3",
         "@playwright/test": "^1.49.0",
-        "@solid-devtools/theme": "file:packages/theme",
+        "@solid-devtools/shared": "file:packages/shared",
         "@total-typescript/ts-reset": "^0.6.1",
         "@types/node": "^22.10.1",
         "@typescript-eslint/eslint-plugin": "^8.17.0",

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -38,7 +38,6 @@
         "@nothing-but/utils": "~0.17.0",
         "@solid-devtools/debugger": "workspace:^",
         "@solid-devtools/shared": "workspace:^",
-        "@solid-devtools/theme": "workspace:^",
         "@solid-primitives/context": "^0.2.3",
         "@solid-primitives/cursor": "^0.0.115",
         "@solid-primitives/date": "^2.0.24",

diff --git a/packages/frontend/src/ui/index.ts b/packages/frontend/src/ui/index.ts
@@ -1,4 +1,4 @@
-export * from '@solid-devtools/theme'
+export * from '@solid-devtools/shared/theme'
 export * from './styles.tsx'
 
 export * from './badge.tsx'

diff --git a/packages/frontend/src/ui/styles.tsx b/packages/frontend/src/ui/styles.tsx
@@ -1,5 +1,5 @@
 import * as s from 'solid-js'
-import {make_var_styles} from '@solid-devtools/theme'
+import {make_var_styles} from '@solid-devtools/shared/theme'
 import {value_node_styles} from '../inspector.tsx'
 import {owner_path_styles} from '../structure.tsx'
 import * as ui from '../ui/index.ts'

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -52,6 +52,12 @@
                 "types": "./dist/utils.d.ts",
                 "default": "./dist/utils.js"
             }
+        },
+        "./theme": {
+            "import": {
+                "types": "./dist/theme.d.ts",
+                "default": "./dist/theme.js"
+            }
         }
     },
     "peerDependencies": {
@@ -66,10 +72,10 @@
         "@solid-primitives/scheduled": "^1.4.4",
         "@solid-primitives/static-store": "^0.0.8",
         "@solid-primitives/styles": "^0.0.114",
-        "@solid-primitives/utils": "^6.2.3"
+        "@solid-primitives/utils": "^6.2.3",
+        "@nothing-but/utils": "~0.17.0"
     },
     "devDependencies": {
         "solid-js": "^1.9.3"
-    },
-    "browser": {}
+    }
 }
diff --git a/packages/theme/theme.ts → packages/shared/src/theme.ts b/packages/theme/theme.ts → packages/shared/src/theme.ts
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "extends": "../../tsconfig.json",
-    "include": ["src/**/*", "../../env.d.ts"]
+    "include": ["src/**/*"]
 }
diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md
diff --git a/packages/theme/package.json b/packages/theme/package.json
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/uno.config.ts b/uno.config.ts
@@ -1,4 +1,4 @@
-import * as theme  from '@solid-devtools/theme'
+import * as theme  from '@solid-devtools/shared/theme'
 import * as unocss from '@unocss/core'
 import presetUno   from '@unocss/preset-uno'