From 8e907b28cefa7102122149b703d43d3ed264f679 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Sun, 22 Feb 2026 22:34:35 +0100 Subject: [PATCH] use pnpm workspace for local packages --- apps/fixtures/bare/package.json | 1 + apps/fixtures/bare/vite.config.ts | 4 ++-- apps/fixtures/basic/package.json | 1 + apps/fixtures/basic/vite.config.ts | 4 ++-- apps/fixtures/css/package.json | 1 + apps/fixtures/css/vite.config.ts | 4 ++-- apps/fixtures/experiments/package.json | 1 + apps/fixtures/experiments/vite.config.ts | 4 ++-- apps/fixtures/hackernews/package.json | 1 + apps/fixtures/hackernews/vite.config.ts | 4 ++-- apps/fixtures/notes/package.json | 1 + apps/fixtures/notes/vite.config.ts | 4 ++-- apps/fixtures/todomvc/package.json | 1 + apps/fixtures/todomvc/vite.config.ts | 4 ++-- apps/landing-page/package.json | 1 + apps/landing-page/vite.config.ts | 4 ++-- apps/tests/package.json | 1 + apps/tests/vite.config.ts | 4 ++-- pnpm-lock.yaml | 28 ++++++++++++++++++++++++ 19 files changed, 55 insertions(+), 18 deletions(-) diff --git a/apps/fixtures/bare/package.json b/apps/fixtures/bare/package.json index 4d5664501..deea62f86 100644 --- a/apps/fixtures/bare/package.json +++ b/apps/fixtures/bare/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "solid-js": "^1.9.9", "vite": "7.1.10" }, diff --git a/apps/fixtures/bare/vite.config.ts b/apps/fixtures/bare/vite.config.ts index 27a23708d..e8b7eadd0 100644 --- a/apps/fixtures/bare/vite.config.ts +++ b/apps/fixtures/bare/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart(), nitroV2Plugin()], diff --git a/apps/fixtures/basic/package.json b/apps/fixtures/basic/package.json index 8f2c43cf8..de770efcd 100644 --- a/apps/fixtures/basic/package.json +++ b/apps/fixtures/basic/package.json @@ -10,6 +10,7 @@ "@solidjs/meta": "^0.29.4", "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "solid-js": "^1.9.9", "vite": "7.1.10" }, diff --git a/apps/fixtures/basic/vite.config.ts b/apps/fixtures/basic/vite.config.ts index 27a23708d..e8b7eadd0 100644 --- a/apps/fixtures/basic/vite.config.ts +++ b/apps/fixtures/basic/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart(), nitroV2Plugin()], diff --git a/apps/fixtures/css/package.json b/apps/fixtures/css/package.json index ae34f4939..88ae04c0b 100644 --- a/apps/fixtures/css/package.json +++ b/apps/fixtures/css/package.json @@ -11,6 +11,7 @@ "@solidjs/meta": "^0.29.4", "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "solid-js": "^1.9.9", "vite": "7.1.10" }, diff --git a/apps/fixtures/css/vite.config.ts b/apps/fixtures/css/vite.config.ts index 976e4a84d..14a493bdb 100644 --- a/apps/fixtures/css/vite.config.ts +++ b/apps/fixtures/css/vite.config.ts @@ -1,7 +1,7 @@ import tailwindcss from "@tailwindcss/vite"; import { defineConfig } from "vite"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; -import { solidStart } from "../../../packages/start/src/config"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; import virtualCSS from "./src/virtualCssPlugin"; export default defineConfig({ diff --git a/apps/fixtures/experiments/package.json b/apps/fixtures/experiments/package.json index 21b3ff171..cae93b317 100644 --- a/apps/fixtures/experiments/package.json +++ b/apps/fixtures/experiments/package.json @@ -10,6 +10,7 @@ "@solidjs/meta": "^0.29.4", "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "solid-js": "^1.9.9", "vite": "7.1.10" }, diff --git a/apps/fixtures/experiments/vite.config.ts b/apps/fixtures/experiments/vite.config.ts index 57596416d..1635ac49c 100644 --- a/apps/fixtures/experiments/vite.config.ts +++ b/apps/fixtures/experiments/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart({ middleware: "./src/middleware.ts" }), nitroV2Plugin()], diff --git a/apps/fixtures/hackernews/package.json b/apps/fixtures/hackernews/package.json index 2c6455e7d..8b9c495a2 100644 --- a/apps/fixtures/hackernews/package.json +++ b/apps/fixtures/hackernews/package.json @@ -9,6 +9,7 @@ "dependencies": { "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "nitro": "3.0.1-alpha.0", "solid-js": "^1.9.9", "vite": "7.1.10" diff --git a/apps/fixtures/hackernews/vite.config.ts b/apps/fixtures/hackernews/vite.config.ts index 96aa23a3c..d2b50d322 100644 --- a/apps/fixtures/hackernews/vite.config.ts +++ b/apps/fixtures/hackernews/vite.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart()], diff --git a/apps/fixtures/notes/package.json b/apps/fixtures/notes/package.json index 33c492e3b..408fe8f0c 100644 --- a/apps/fixtures/notes/package.json +++ b/apps/fixtures/notes/package.json @@ -9,6 +9,7 @@ "dependencies": { "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "date-fns": "^3.6.0", "marked": "^12.0.1", "solid-js": "^1.9.9", diff --git a/apps/fixtures/notes/vite.config.ts b/apps/fixtures/notes/vite.config.ts index 27a23708d..e8b7eadd0 100644 --- a/apps/fixtures/notes/vite.config.ts +++ b/apps/fixtures/notes/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart(), nitroV2Plugin()], diff --git a/apps/fixtures/todomvc/package.json b/apps/fixtures/todomvc/package.json index ce55b4346..417dc3a17 100644 --- a/apps/fixtures/todomvc/package.json +++ b/apps/fixtures/todomvc/package.json @@ -10,6 +10,7 @@ "dependencies": { "@solidjs/router": "^0.15.0", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "nitro": "3.0.1-alpha.0", "solid-js": "^1.9.9", "unstorage": "1.10.2", diff --git a/apps/fixtures/todomvc/vite.config.ts b/apps/fixtures/todomvc/vite.config.ts index 1ce8d96d1..e83b1e1c4 100644 --- a/apps/fixtures/todomvc/vite.config.ts +++ b/apps/fixtures/todomvc/vite.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../../packages/start/src/config"; -import { nitroV2Plugin } from "../../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ plugins: [solidStart(), nitroV2Plugin()], diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json index 6f61add5e..ad5b5b93e 100644 --- a/apps/landing-page/package.json +++ b/apps/landing-page/package.json @@ -24,6 +24,7 @@ "@solidjs/meta": "^0.29.4", "@solidjs/router": "^0.15.3", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "solid-js": "^1.9.9", diff --git a/apps/landing-page/vite.config.ts b/apps/landing-page/vite.config.ts index 0bb91c7bb..c4210c2d1 100644 --- a/apps/landing-page/vite.config.ts +++ b/apps/landing-page/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { nitroV2Plugin } from "../../packages/start-nitro-v2-vite-plugin/src"; -import { solidStart } from "../../packages/start/src/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; +import { solidStart } from "@solidjs/start/config"; export default defineConfig({ plugins: [ diff --git a/apps/tests/package.json b/apps/tests/package.json index 97483d6b5..354dadf4c 100644 --- a/apps/tests/package.json +++ b/apps/tests/package.json @@ -17,6 +17,7 @@ "@solidjs/meta": "^0.29.4", "@solidjs/router": "^0.15.3", "@solidjs/start": "workspace:*", + "@solidjs/vite-plugin-nitro-2": "workspace:*", "@solidjs/testing-library": "^0.8.10", "@testing-library/jest-dom": "^6.6.2", "@testing-library/user-event": "^14.5.2", diff --git a/apps/tests/vite.config.ts b/apps/tests/vite.config.ts index 4149be667..f68f88371 100644 --- a/apps/tests/vite.config.ts +++ b/apps/tests/vite.config.ts @@ -1,6 +1,6 @@ import { defineConfig } from "vite"; -import { solidStart } from "../../packages/start/src/config"; -import { nitroV2Plugin } from "../../packages/start-nitro-v2-vite-plugin/src"; +import { solidStart } from "@solidjs/start/config"; +import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2"; export default defineConfig({ server: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d00c64b91..9716dff3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,6 +37,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin solid-js: specifier: ^1.9.9 version: 1.9.9 @@ -55,6 +58,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin solid-js: specifier: ^1.9.9 version: 1.9.9 @@ -73,6 +79,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin solid-js: specifier: ^1.9.9 version: 1.9.9 @@ -98,6 +107,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin solid-js: specifier: ^1.9.9 version: 1.9.9 @@ -113,6 +125,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin nitro: specifier: 3.0.1-alpha.0 version: 3.0.1-alpha.0(@netlify/blobs@10.4.1)(better-sqlite3@11.8.1)(chokidar@4.0.3)(drizzle-orm@0.31.4(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@5.22.0))(@types/better-sqlite3@7.6.12)(better-sqlite3@11.8.1)(prisma@5.22.0))(ioredis@5.6.1)(vite@7.1.10(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.19.2)(yaml@2.8.1)) @@ -152,6 +167,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin date-fns: specifier: ^3.6.0 version: 3.6.0 @@ -176,6 +194,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../../packages/start-nitro-v2-vite-plugin nitro: specifier: 3.0.1-alpha.0 version: 3.0.1-alpha.0(@netlify/blobs@10.4.1)(better-sqlite3@11.8.1)(chokidar@4.0.3)(drizzle-orm@0.31.4(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@5.22.0))(@types/better-sqlite3@7.6.12)(better-sqlite3@11.8.1)(prisma@5.22.0))(ioredis@5.6.1)(vite@7.1.10(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.19.2)(yaml@2.8.1)) @@ -200,6 +221,9 @@ importers: '@solidjs/start': specifier: workspace:* version: link:../../packages/start + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../packages/start-nitro-v2-vite-plugin class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -264,6 +288,9 @@ importers: '@solidjs/testing-library': specifier: ^0.8.10 version: 0.8.10(@solidjs/router@0.15.3(solid-js@1.9.9))(solid-js@1.9.9) + '@solidjs/vite-plugin-nitro-2': + specifier: workspace:* + version: link:../../packages/start-nitro-v2-vite-plugin '@testing-library/jest-dom': specifier: ^6.6.2 version: 6.6.2 @@ -4577,6 +4604,7 @@ packages: prebuild-install@7.1.3: resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==} engines: {node: '>=10'} + deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available. hasBin: true precinct@11.0.5: