pob 40.3.1 → 40.3.3

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -7,8 +7,11 @@ import * as packageUtils from "../../utils/package.js";
 import { packageManagerRun } from "../../utils/packageManagerUtils.js";
 import {
   workspacesRun,
+  workspacesRunExcluding,
+  workspacesRunOnly,
   workspacesRunSequential,
 } from "../../utils/packageManagerWorkspacesUtils.js";
+import { getRollupConfigDependencies } from "../../utils/rollupConfigDependencies.js";
 import {
   detectStorybook,
   detectStorybookReactNative,
@@ -453,6 +456,7 @@ export default class PobMonorepoGenerator extends Generator {
       });
 
       const rollupConfigs = [];
+      const rollupConfigContents = [];
       this.packageLocations.forEach((location) => {
         const rollupPath = `${location}/rollup.config.mjs`;
         const rollupConfig = this.fs.read(this.destinationPath(rollupPath), {
@@ -460,9 +464,21 @@ export default class PobMonorepoGenerator extends Generator {
         });
         if (rollupConfig) {
           rollupConfigs.push(rollupPath);
+          rollupConfigContents.push(rollupConfig);
         }
       });
 
+      // built before the root rollup config loads them, and kept out of
+      // clean:build which runs in between
+      const rollupConfigDependencies = getRollupConfigDependencies(
+        this.packages,
+        rollupConfigContents,
+      );
+      const buildRollupConfigDependencies =
+        rollupConfigDependencies.length > 0
+          ? `${workspacesRunOnly(this.options.packageManager, "build", ...rollupConfigDependencies)} && `
+          : "";
+
       if (rollupConfigs.length > 0) {
         await copyAndFormatTpl(
           this.fs,
@@ -476,12 +492,16 @@ export default class PobMonorepoGenerator extends Generator {
         this.fs.delete("rollup.config.mjs");
       }
       packageUtils.addOrRemoveScripts(pkg, rollupConfigs.length > 0, {
-        "clean:build": workspacesRun(
-          this.options.packageManager,
-          "clean:build",
-        ),
-        build: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs`,
-        watch: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs --watch`,
+        "clean:build":
+          rollupConfigDependencies.length > 0
+            ? workspacesRunExcluding(
+                this.options.packageManager,
+                "clean:build",
+                ...rollupConfigDependencies,
+              )
+            : workspacesRun(this.options.packageManager, "clean:build"),
+        build: `${buildRollupConfigDependencies}${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs`,
+        watch: `${buildRollupConfigDependencies}${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs --watch`,
       });
 
       const hasExpoApp = this.packageConfigs.some(

package/lib/utils/packageManagerWorkspacesUtils.js

@@ -58,6 +58,42 @@ export const workspacesRunSequential = (packageManager, script) => {
   }
 };
 
+/**
+ * Run a script in the given workspaces only, in topological dependency order.
+ * Use to build packages other builds depend on first.
+ */
+export const workspacesRunOnly = (packageManager, script, ...packageNames) => {
+  switch (packageManager) {
+    case undefined:
+    case "yarn": {
+      const includeArgs = packageNames
+        .map((name) => `--include "${name}"`)
+        .join(" ");
+      return `yarn workspaces foreach --topological-dev ${includeArgs} -Av run ${script}`;
+    }
+    case "pnpm": {
+      const filterArgs = packageNames
+        .map((name) => `--filter "${name}"`)
+        .join(" ");
+      return `pnpm ${filterArgs} run ${script}`;
+    }
+    case "npm": {
+      const workspaceArgs = packageNames
+        .map((name) => `--workspace "${name}"`)
+        .join(" ");
+      return `npm run ${script} ${workspaceArgs}`;
+    }
+    case "bun": {
+      const filterArgs = packageNames
+        .map((name) => `--filter '${name}'`)
+        .join(" ");
+      return `bun ${filterArgs} run ${script}`;
+    }
+    default:
+      throw new Error(`Unsupported package manager: ${packageManager}`);
+  }
+};
+
 /**
  * Run a script in all workspaces in parallel, excluding packages matching the given patterns.
  * Use for watch commands where example/demo packages should be skipped.

package/lib/utils/rollupConfigDependencies.js

@@ -0,0 +1,17 @@
+const escapeRegExp = (value) => value.replaceAll(/[$()*+.?[\\\]^{|}]/g, "\\$&");
+
+/**
+ * Names of the workspace packages imported by a rollup config (e.g. a rollup
+ * plugin): the root rollup config loads them from their build output, so
+ * they must be built before it runs. Only packages with a build script.
+ */
+export const getRollupConfigDependencies = (packages, rollupConfigContents) =>
+  packages
+    .filter((pkg) => {
+      if (!pkg.scripts?.build) return false;
+      const importRegex = new RegExp(
+        `from\\s+["']${escapeRegExp(pkg.name)}(?:/[^"']*)?["']`,
+      );
+      return rollupConfigContents.some((content) => importRegex.test(content));
+    })
+    .map((pkg) => pkg.name);

package/lib/utils/rollupConfigDependencies.test.js

@@ -0,0 +1,48 @@
+import { describe, expect, it } from "vitest";
+import { getRollupConfigDependencies } from "./rollupConfigDependencies.js";
+
+const plugin = {
+  name: "alp-rollup-plugin-config",
+  scripts: { build: "rollup --config rollup.config.mjs" },
+};
+const lib = { name: "alp-node", scripts: { build: "rollup" } };
+
+const appConfig = `import createRollupConfig from "@pob/rollup-esbuild/createRollupConfig.js";
+import config from "alp-rollup-plugin-config";
+`;
+
+describe("getRollupConfigDependencies", () => {
+  it("returns workspace packages imported by a rollup config", () => {
+    expect(getRollupConfigDependencies([lib, plugin], [appConfig])).toEqual([
+      "alp-rollup-plugin-config",
+    ]);
+  });
+
+  it("detects single quotes and subpath imports", () => {
+    expect(
+      getRollupConfigDependencies(
+        [plugin],
+        ["import config from 'alp-rollup-plugin-config/plugin.js';"],
+      ),
+    ).toEqual(["alp-rollup-plugin-config"]);
+  });
+
+  it("ignores packages whose name is only a prefix of the import", () => {
+    expect(
+      getRollupConfigDependencies(
+        [{ name: "alp", scripts: { build: "rollup" } }],
+        [appConfig],
+      ),
+    ).toEqual([]);
+  });
+
+  it("ignores packages without build script", () => {
+    expect(
+      getRollupConfigDependencies([{ name: plugin.name }], [appConfig]),
+    ).toEqual([]);
+  });
+
+  it("returns nothing without rollup configs", () => {
+    expect(getRollupConfigDependencies([plugin], [])).toEqual([]);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "40.3.1",
+  "version": "40.3.3",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
@@ -31,7 +31,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@pob/codemods": "0.18.1",
+    "@pob/codemods": "0.18.2",
     "@pob/eslint-config": "68.0.0",
     "@pob/eslint-config-typescript-react": "68.0.0",
     "@pob/sort-object": "11.2.0",
@@ -59,7 +59,7 @@
     "yeoman-generator": "10.3.0"
   },
   "devDependencies": {
-    "@pob/root": "28.2.1",
+    "@pob/root": "28.2.2",
     "@types/node": "24.19.1",
     "@typescript/native": "npm:typescript@7.0.2",
     "@yeoman/types": "1.13.1",