chore: take examples out of pnpm workspace (#1770)

birkskyum · web-flow · commit 07c53eea14f9 · 2025-02-04T17:59:26.000+01:00
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -7,23 +7,5 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": [
-    "example-bare",
-    "example-basic",
-    "example-experiments",
-    "example-hackernews",
-    "example-todomvc",
-    "example-notes",
-    "example-with-auth",
-    "example-with-authjs",
-    "example-with-mdx",
-    "example-with-prisma",
-    "example-with-solid-styled",
-    "example-with-tailwindcss",
-    "example-with-trpc",
-    "example-with-unocss",
-    "example-with-vitest",
-    "landing-page",
-    "server-function-test"
-  ]
+  "ignore": ["landing-page", "server-function-test"]
 }
diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml
diff --git a/examples/pnpm-workspace.yaml b/examples/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  # all packages in subdirs of packages/ and examples/
+  - "./*"
diff --git a/examples/with-authjs/package.json b/examples/with-authjs/package.json
@@ -36,4 +36,4 @@
   "engines": {
     "node": ">=16"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "cypress": "^14.0.0",
     "tinyglobby": "^0.2.2",
     "tippy.js": "^6.3.7",
-    "typescript": "catalog:"
+    "typescript": "^5.7.0"
   },
   "dependencies": {},
   "engines": {
diff --git a/packages/landing-page/package.json b/packages/landing-page/package.json
@@ -18,17 +18,18 @@
     "tailwindcss-animate": "^1.0.7",
     "tinyglobby": "^0.2.2",
     "tippy.js": "^6.3.7",
-    "typescript": "catalog:",
-    "vinxi": "catalog:",
-    "vite": "catalog:"
+    "vinxi": "^0.4.3"
+  },
+  "overrides": {
+    "vite": "^5.4.10"
   },
   "dependencies": {
-    "@solidjs/meta": "catalog:",
-    "@solidjs/router": "catalog:",
-    "@solidjs/start": "latest",
+    "@solidjs/meta": "^0.29.4",
+    "@solidjs/router": "^0.15.3",
+    "@solidjs/start": "^1.0.11",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "solid-js": "catalog:",
+    "solid-js": "^1.9.4",
     "solid-transition-group": "^0.2.3"
   }
 }
diff --git a/packages/start/package.json b/packages/start/package.json
@@ -59,9 +59,8 @@
     }
   },
   "devDependencies": {
-    "solid-js": "catalog:",
-    "typescript": "catalog:",
-    "vinxi": "catalog:"
+    "solid-js": "^1.9.4",
+    "vinxi": "^0.4.3"
   },
   "dependencies": {
     "@vinxi/plugin-directives": "^0.4.3",
@@ -77,6 +76,6 @@
     "source-map-js": "^1.0.2",
     "terracotta": "^1.0.4",
     "tinyglobby": "^0.2.2",
-    "vite-plugin-solid": "catalog:"
+    "vite-plugin-solid": "^2.11.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,14 +1,5 @@
 packages:
-  # all packages in subdirs of packages/ and examples/
+  # all packages in subdirs of packages/
   - "packages/*"
-  - "examples/*"
   - "tests/*"
   - "!**/.tmp/**"
-catalog:
-  vite: ^5.4.10
-  typescript: ^5.7.0
-  vinxi: ^0.4.3
-  "vite-plugin-solid": ^2.11.1
-  "@solidjs/router": ^0.15.3
-  "@solidjs/meta": ^0.29.4
-  "solid-js": ^1.9.4
diff --git a/tests/server-function/package.json b/tests/server-function/package.json
@@ -22,13 +22,13 @@
     "@vitest/ui": "^2.1.4",
     "jsdom": "^25.0.1",
     "lodash": "^4.17.21",
-    "solid-js": "catalog:",
-    "vinxi": "catalog:",
-    "vite-plugin-solid": "catalog:",
+    "solid-js": "^1.9.4",
+    "vinxi": "^0.4.3",
+    "vite-plugin-solid": "^2.11.1",
     "vitest": "^3.0.0"
   },
   "overrides": {
-    "vite": "catalog:"
+    "vite": "^5.4.10"
   },
   "engines": {
     "node": ">=18"
diff --git a/util/use-workspace-package-in-examples.js b/util/use-workspace-package-in-examples.js
@@ -1,34 +1,31 @@
-import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { existsSync, readFileSync, readdirSync, statSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-
 const examplesDir = join(__dirname, '../examples');
-
 // Get all directories in examples folder
 const examples = readdirSync(examplesDir)
   .filter(file => statSync(join(examplesDir, file)).isDirectory());
 
 // Process each example's package.json
-examples.forEach(example => {
+for (const example of examples) {
   const packagePath = join(examplesDir, example, 'package.json');
-  
+
   if (existsSync(packagePath)) {
     const packageJson = JSON.parse(readFileSync(packagePath, 'utf8'));
-    
-    if (packageJson.dependencies && packageJson.dependencies['@solidjs/start']) {
-      packageJson.dependencies['@solidjs/start'] = 'workspace:*';
-      
+
+    if (packageJson.dependencies?.['@solidjs/start']) {
+      packageJson.dependencies['@solidjs/start'] = 'file:../../packages/start';
+
       writeFileSync(
-        packagePath, 
-        JSON.stringify(packageJson, null, 2) + '\n',
+        packagePath,
+        `${JSON.stringify(packageJson, null, 2)}\n`,
         'utf8'
       );
-      
+
       console.log(`Updated ${packagePath}`);
     }
   }
-});
-
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+packages:`
	`2`	`+ # all packages in subdirs of packages/ and examples/`
	`3`	`+ - "./*"`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,4 @@`
`36`	`36`	`"engines": {`
`37`	`37`	`"node": ">=16"`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,8 @@`
`59`	`59`	`}`
`60`	`60`	`},`
`61`	`61`	`"devDependencies": {`
`62`		`- "solid-js": "catalog:",`
`63`		`- "typescript": "catalog:",`
`64`		`- "vinxi": "catalog:"`
	`62`	`+ "solid-js": "^1.9.4",`
	`63`	`+ "vinxi": "^0.4.3"`
`65`	`64`	`},`
`66`	`65`	`"dependencies": {`
`67`	`66`	`"@vinxi/plugin-directives": "^0.4.3",`
`@@ -77,6 +76,6 @@`
`77`	`76`	`"source-map-js": "^1.0.2",`
`78`	`77`	`"terracotta": "^1.0.4",`
`79`	`78`	`"tinyglobby": "^0.2.2",`
`80`		`- "vite-plugin-solid": "catalog:"`
	`79`	`+ "vite-plugin-solid": "^2.11.1"`
`81`	`80`	`}`
`82`	`81`	`}`