fix: fix workspace deps when loading root.config.ts (#445)

blinkk · Nov 5, 2024 · 8022259 · 8022259
1 parent 2cdb8e9
commit 8022259
Show file tree

Hide file tree

Showing 20 changed files with 438 additions and 161 deletions.
diff --git a/.changeset/fuzzy-cougars-unite.md b/.changeset/fuzzy-cougars-unite.md
@@ -0,0 +1,5 @@
+---
+'@blinkk/root': patch
+---
+
+fix: fix workspace deps when loading root.config.ts
diff --git a/.changeset/happy-candles-sniff.md b/.changeset/happy-candles-sniff.md
@@ -0,0 +1,5 @@
+---
+'@blinkk/root': patch
+---
+
+chore: remove devDependencies from prod package.json
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,24 @@
+{
+  "mode": "exit",
+  "tag": "debug",
+  "initialVersions": {
+    "@private/docs": "0.0.0",
+    "@examples/basepath": "0.0.0",
+    "@examples/blog": "0.0.0",
+    "@examples/cms": "0.0.0",
+    "@examples/minimal": "0.0.0",
+    "@examples/starter": "0.0.0",
+    "@blinkk/create-root": "1.3.12",
+    "@blinkk/eslint-config-root": "0.1.0",
+    "@blinkk/rds": "1.3.12",
+    "@blinkk/root": "1.3.12",
+    "@blinkk/root-cms": "1.3.12",
+    "@blinkk/root-password-protect": "1.3.12"
+  },
+  "changesets": [
+    "fuzzy-cougars-unite",
+    "happy-candles-sniff",
+    "small-dryers-grow",
+    "wise-eyes-grab"
+  ]
+}
diff --git a/packages/create-root/CHANGELOG.md b/packages/create-root/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @blinkk/create-root
 
+## 1.3.13-debug.3
+
+## 1.3.13-debug.2
+
+## 1.3.13-debug.1
+
+## 1.3.13-debug.0
+
 ## 1.3.12
 
 ## 1.3.11

diff --git a/packages/create-root/package.json b/packages/create-root/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blinkk/create-root",
-  "version": "1.3.12",
+  "version": "1.3.13-debug.3",
   "description": "",
   "author": "[email protected]",
   "license": "MIT",

diff --git a/packages/create-root/src/root-version.ts b/packages/create-root/src/root-version.ts
@@ -1,2 +1,2 @@
 // This file is autogenerated by update-root-version.mjs.
-export const ROOT_VERSION = '1.3.2';
+export const ROOT_VERSION = '1.3.13-debug.3';
diff --git a/packages/rds/CHANGELOG.md b/packages/rds/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @blinkk/rds
 
+## 1.3.13-debug.3
+
+### Patch Changes
+
+- Updated dependencies [cf9b8c2]
+  - @blinkk/root@1.3.13-debug.3
+
+## 1.3.13-debug.2
+
+### Patch Changes
+
+- Updated dependencies [30adc8c]
+  - @blinkk/root@1.3.13-debug.2
+
+## 1.3.13-debug.1
+
+### Patch Changes
+
+- Updated dependencies [edada31]
+  - @blinkk/root@1.3.13-debug.1
+
+## 1.3.13-debug.0
+
+### Patch Changes
+
+- Updated dependencies [84ff15d]
+  - @blinkk/root@1.3.13-debug.0
+
 ## 1.3.12
 
 ### Patch Changes

diff --git a/packages/rds/package.json b/packages/rds/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@blinkk/rds",
   "description": "Root.js Design System",
-  "version": "1.3.12",
+  "version": "1.3.13-debug.3",
   "author": "[email protected]",
   "license": "MIT",
   "engines": {
@@ -32,7 +32,7 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@blinkk/root": "1.3.12",
+    "@blinkk/root": "1.3.13-debug.3",
     "preact": "*"
   },
   "dependencies": {

diff --git a/packages/root-cms/CHANGELOG.md b/packages/root-cms/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @blinkk/root-cms
 
+## 1.3.13-debug.3
+
+### Patch Changes
+
+- Updated dependencies [cf9b8c2]
+  - @blinkk/root@1.3.13-debug.3
+
+## 1.3.13-debug.2
+
+### Patch Changes
+
+- Updated dependencies [30adc8c]
+  - @blinkk/root@1.3.13-debug.2
+
+## 1.3.13-debug.1
+
+### Patch Changes
+
+- Updated dependencies [edada31]
+  - @blinkk/root@1.3.13-debug.1
+
+## 1.3.13-debug.0
+
+### Patch Changes
+
+- Updated dependencies [84ff15d]
+  - @blinkk/root@1.3.13-debug.0
+
 ## 1.3.12
 
 ### Patch Changes

diff --git a/packages/root-cms/package.json b/packages/root-cms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blinkk/root-cms",
-  "version": "1.3.12",
+  "version": "1.3.13-debug.3",
   "author": "[email protected]",
   "license": "MIT",
   "engines": {
@@ -131,7 +131,7 @@
     "vitest": "0.34.6"
   },
   "peerDependencies": {
-    "@blinkk/root": "1.3.12",
+    "@blinkk/root": "1.3.13-debug.3",
     "firebase-admin": ">=11",
     "firebase-functions": ">=4",
     "preact": ">=10",

diff --git a/packages/root-password-protect/CHANGELOG.md b/packages/root-password-protect/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @blinkk/root-password-protect
 
+## 1.3.13-debug.3
+
+### Patch Changes
+
+- Updated dependencies [cf9b8c2]
+  - @blinkk/root@1.3.13-debug.3
+
+## 1.3.13-debug.2
+
+### Patch Changes
+
+- Updated dependencies [30adc8c]
+  - @blinkk/root@1.3.13-debug.2
+
+## 1.3.13-debug.1
+
+### Patch Changes
+
+- Updated dependencies [edada31]
+  - @blinkk/root@1.3.13-debug.1
+
+## 1.3.13-debug.0
+
+### Patch Changes
+
+- Updated dependencies [84ff15d]
+  - @blinkk/root@1.3.13-debug.0
+
 ## 1.3.12
 
 ### Patch Changes

diff --git a/packages/root-password-protect/package.json b/packages/root-password-protect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blinkk/root-password-protect",
-  "version": "1.3.12",
+  "version": "1.3.13-debug.3",
   "author": "[email protected]",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "micromatch": "4.0.5"
   },
   "peerDependencies": {
-    "@blinkk/root": "1.3.12",
+    "@blinkk/root": "1.3.13-debug.3",
     "preact": ">=10",
     "preact-render-to-string": ">=5"
   },

diff --git a/packages/root/CHANGELOG.md b/packages/root/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @blinkk/root
 
+## 1.3.13-debug.3
+
+### Patch Changes
+
+- cf9b8c2: chore: add debug statements
+
+## 1.3.13-debug.2
+
+### Patch Changes
+
+- 30adc8c: chore: remove devDependencies from prod package.json
+
+## 1.3.13-debug.1
+
+### Patch Changes
+
+- edada31: chore: update wildcard deps from top-level package
+
+## 1.3.13-debug.0
+
+### Patch Changes
+
+- 84ff15d: fix: fix workspace deps when loading root.config.ts
+
 ## 1.3.12
 
 ### Patch Changes

diff --git a/packages/root/package.json b/packages/root/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blinkk/root",
-  "version": "1.3.12",
+  "version": "1.3.13-debug.3",
   "author": "[email protected]",
   "license": "MIT",
   "engines": {
@@ -78,7 +78,8 @@
     "sirv": "2.0.3",
     "source-map-support": "0.5.21",
     "tiny-glob": "0.2.9",
-    "vite": "5.0.8"
+    "vite": "5.0.8",
+    "workspace-tools": "0.37.0"
   },
   "peerDependencies": {
     "firebase-admin": ">=11",

diff --git a/packages/root/src/cli/create-package.ts b/packages/root/src/cli/create-package.ts
@@ -1,6 +1,7 @@
 import {promises as fs} from 'node:fs';
 import path from 'node:path';
 import {build as esbuild} from 'esbuild';
+import {flattenPackageDepsFromMonorepo} from '../node/monorepo.js';
 import {
   copyDir,
   dirExists,
@@ -114,94 +115,23 @@ async function generatePackageJson(rootDir: string): Promise<PackageJson> {
     path.resolve(rootDir, 'package.json')
   );
 
-  // If the package.json has any peer deps, check the workspace root for any
-  // matching versions and move the peer deps to prod deps.
-  if (packageJson.peerDependencies) {
-    await updatePeerDepsFromWorkspace(rootDir, packageJson);
-  }
-
-  return packageJson;
-}
-
-async function updatePeerDepsFromWorkspace(
-  rootDir: string,
-  packageJson: PackageJson
-) {
-  const requiredPeerDeps = getRequiredPeerDeps(packageJson);
-  if (requiredPeerDeps.length === 0) {
-    return;
-  }
-
-  const workspaceRoot = await findWorkspaceRoot(rootDir);
-  if (!workspaceRoot) {
-    return;
-  }
-
-  const workspacePackageJsonPath = path.resolve(workspaceRoot, 'package.json');
-  const workspacePackageJson = await loadJson<PackageJson>(
-    workspacePackageJsonPath
-  );
-  const workspaceDeps = workspacePackageJson.dependencies || {};
-
-  function setDep(name: string, value: string) {
-    if (!packageJson.dependencies) {
-      packageJson.dependencies = {};
-    }
-    packageJson.dependencies[name] = value;
-  }
-
-  for (const peerDep of requiredPeerDeps) {
-    const workspaceDepVersion = workspaceDeps[peerDep];
-    if (workspaceDepVersion) {
-      setDep(peerDep, workspaceDepVersion);
-    } else {
-      console.warn(
-        `could not find peer dep "${peerDep}" in workspace "${workspacePackageJsonPath}"`
-      );
+  // Flatten any deps from the monorepo, and remove peerDependencies and
+  // devDependencies.
+  const allDeps = flattenPackageDepsFromMonorepo(rootDir);
+  packageJson.dependencies ??= {};
+  for (const depName in allDeps) {
+    if (!packageJson.dependencies[depName]) {
+      packageJson.dependencies[depName] = allDeps[depName];
     }
   }
-}
-
-async function findWorkspaceRoot(rootDir: string): Promise<string | null> {
-  const parentDir = path.dirname(rootDir);
-
-  if (parentDir === '/') {
-    return null;
-  }
-
-  // PNPM uses `pnpm-workspace.yaml` for its workspace root.
-  const pnpmWorkspaceFile = path.resolve(parentDir, 'pnpm-workspace.yaml');
-  if (await fileExists(pnpmWorkspaceFile)) {
-    return parentDir;
+  if (packageJson.peerDependencies) {
+    delete packageJson.peerDependencies;
   }
-
-  // YARN uses the "workspaces" key in package.json.
-  const packageJsonPath = path.resolve(parentDir, 'package.json');
-  if (await fileExists(packageJsonPath)) {
-    const parentPackageJson = await loadJson<PackageJson>(packageJsonPath);
-    if (parentPackageJson && parentPackageJson.workspaces) {
-      return parentDir;
-    }
+  if (packageJson.devDependencies) {
+    delete packageJson.devDependencies;
   }
 
-  return findWorkspaceRoot(parentDir);
-}
-
-/**
- * Returns all the `peerDependencies` that are not marked as
- * `{"optional": true}` in `peerDependenciesMeta`.
- */
-function getRequiredPeerDeps(packageJson: PackageJson) {
-  const requiredPeerDeps: string[] = [];
-  const peerDeps = packageJson.peerDependencies || {};
-  const peerDepsMeta = packageJson.peerDependenciesMeta || {};
-  for (const key in peerDeps) {
-    const meta = peerDepsMeta[key];
-    if (!meta?.optional) {
-      requiredPeerDeps.push(key);
-    }
-  }
-  return requiredPeerDeps;
+  return packageJson;
 }
 
 /**