@storm-software/workspace-tools 1.296.81 → 1.296.85

package/dist/{chunk-2UJDNCR7.mjs → chunk-HU2ZYTZL.mjs}

@@ -1,7 +1,11 @@
+import {
+  getLockFileName
+} from "./chunk-VQYZG5YE.mjs";
 import {
   nodeVersion,
+  packageManagerVersions,
   pnpmVersion
-} from "./chunk-QC5ON3X4.mjs";
+} from "./chunk-DEHA5C77.mjs";
 import {
   withRunGenerator
 } from "./chunk-Y5BPWYHW.mjs";
@@ -15,12 +19,17 @@ import {
   addProjectConfiguration,
   formatFiles,
   generateFiles,
+  getPackageManagerCommand,
   joinPathFragments,
   updateJson
 } from "@nx/devkit";
 import * as path from "node:path";
 async function presetGeneratorFn(tree, options) {
   const projectRoot = ".";
+  const packageManager = options.packageManager ?? "pnpm";
+  const packageManagerVersion = packageManagerVersions[packageManager];
+  const pmc = getPackageManagerCommand(packageManager);
+  const lockFileName = getLockFileName(packageManager);
   options.description ??= `\u26A1The ${options.namespace ? options.namespace : options.name} monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.`;
   options.namespace ??= options.organization;
   addProjectConfiguration(tree, `@${options.namespace}/${options.name}`, {
@@ -88,11 +97,6 @@ async function presetGeneratorFn(tree, options) {
       type: "github",
       url: `${options.repositoryUrl}.git`
     };
-    json.packageManager ??= "pnpm@10.3.0";
-    json.engines ??= {
-      node: ">=20.11.0",
-      pnpm: ">=10.3.0"
-    };
     json.prettier = "@storm-software/prettier/config.json";
     json.nx ??= {
       includedScripts: [
@@ -109,14 +113,14 @@ async function presetGeneratorFn(tree, options) {
         "release"
       ]
     };
-    json.scripts.adr = "pnpm log4brains adr new";
-    json.scripts["adr-preview"] = "pnpm log4brains preview";
-    json.scripts.prepare = "pnpm add lefthook -w && pnpm lefthook install";
-    json.scripts.preinstall = "npx -y only-allow pnpm";
-    json.scripts["install-csb"] = "corepack enable && pnpm install --no-frozen-lockfile";
+    json.scripts.adr = pmc.run("log4brains", "adr new");
+    json.scripts["adr-preview"] = pmc.run("log4brains", "preview");
+    json.scripts.prepare = `${pmc.addDev} lefthook && ${packageManager} lefthook install`;
+    json.scripts.preinstall = `npx -y only-allow ${packageManager}`;
+    json.scripts["install-csb"] = packageManager === "bun" ? "bun install" : `corepack enable && ${pmc.install}`;
     json.scripts.clean = "rimraf dist && rimraf --glob packages/**/dist && rimraf --glob tools/**/dist && rimraf --glob docs/**/dist && rimraf --glob apps/**/dist && rimraf --glob libs/**/dist";
-    json.scripts.nuke = "nx clear-cache && rimraf .nx/cache && rimraf .nx/workspace-data && pnpm clean && rimraf pnpm-lock.yaml && rimraf --glob packages/**/node_modules && rimraf --glob tools/**/node_modules && rimraf node_modules";
-    json.scripts.prebuild = "pnpm clean";
+    json.scripts.nuke = `nx clear-cache && rimraf .nx/cache && rimraf .nx/workspace-data && ${packageManager} clean && rimraf ${lockFileName} && rimraf --glob packages/**/node_modules && rimraf --glob tools/**/node_modules && rimraf node_modules`;
+    json.scripts.prebuild = `${packageManager} clean`;
     json.scripts.build = "nx affected -t build --parallel=5";
     json.scripts["build-all"] = "nx run-many -t build --all --parallel=5";
     json.scripts["build-prod"] = "nx run-many -t build --all --prod --parallel=5";
@@ -131,45 +135,53 @@ async function presetGeneratorFn(tree, options) {
     }
     json.scripts.nx = "nx";
     json.scripts.graph = "nx graph";
-    json.scripts.lint = "pnpm storm-lint all --skip-cspell --skip-alex";
     if (options.includeApps) {
       json.scripts.start = "nx serve";
-      json.scripts.storybook = "pnpm storybook dev -p 6006";
+      json.scripts.storybook = pmc.run("storybook", "dev -p 6006");
     }
     json.scripts.help = "nx help";
     json.scripts["dep-graph"] = "nx dep-graph";
     json.scripts["local-registry"] = `nx local-registry @${options.namespace}/${options.name}`;
     json.scripts.e2e = "nx e2e";
     if (options.includeApps) {
-      json.scripts.test = "nx test && pnpm test-storybook";
-      json.scripts["test-storybook"] = "pnpm test-storybook";
+      json.scripts.test = `nx test && ${packageManager} test-storybook`;
+      json.scripts["test-storybook"] = `${packageManager} test-storybook`;
     } else {
       json.scripts.test = "nx test";
     }
-    json.scripts.lint = "pnpm storm-lint all --skip-cspell --skip-alex";
-    json.scripts.commit = "pnpm storm-git commit";
-    json.scripts["api-extractor"] = 'pnpm storm-docs api-extractor --outputPath="docs/api-reference" --clean';
-    json.scripts.release = "pnpm storm-git release";
+    json.scripts.commit = pmc.run("storm-git", "commit");
+    json.scripts["api-extractor"] = pmc.run(
+      "storm-docs",
+      'api-extractor --outputPath="docs/api-reference" --clean'
+    );
+    json.scripts.release = pmc.run("storm-git", "release");
     json.scripts.format = "nx format:write";
-    json.scripts["format-sherif"] = "pnpm exec sherif -f -i typescript -i react -i react-dom";
-    json.scripts["format-toml"] = 'pnpm exec taplo format --config="./node_modules/@storm-software/linting-tools/taplo/config.toml" --cache-path="./node_modules/.cache/storm/taplo"';
-    json.scripts["format-readme"] = 'pnpm storm-git readme --templates="tools/readme-templates"';
-    json.scripts["format-prettier"] = "pnpm exec prettier --write --ignore-unknown --no-error-on-unmatched-pattern --cache && git update-index";
-    json.scripts.lint = "pnpm storm-lint all --skip-cspell";
-    json.scripts["lint-knip"] = "pnpm exec knip";
-    json.scripts["lint-sherif"] = "pnpm exec sherif -i typescript -i react -i react-dom";
-    json.scripts["lint-ls"] = 'pnpm exec ls-lint --config="./node_modules/@storm-software/linting-tools/ls-lint/ls-lint.yml"';
-    json.packageManager ??= `pnpm@${pnpmVersion}`;
+    json.scripts["format-sherif"] = `${pmc.exec} sherif -f -i typescript -i react -i react-dom`;
+    json.scripts["format-toml"] = `${pmc.exec} taplo format --config="./node_modules/@storm-software/linting-tools/taplo/config.toml" --cache-path="./node_modules/.cache/storm/taplo"`;
+    json.scripts["format-readme"] = pmc.run(
+      "storm-git",
+      'readme --templates="tools/readme-templates"'
+    );
+    json.scripts["format-prettier"] = `${pmc.exec} prettier --write --ignore-unknown --no-error-on-unmatched-pattern --cache && git update-index`;
+    json.scripts.lint = pmc.run("storm-lint", "all --skip-cspell");
+    json.scripts["lint-knip"] = `${pmc.exec} knip`;
+    json.scripts["lint-sherif"] = `${pmc.exec} sherif -i typescript -i react -i react-dom`;
+    json.scripts["lint-ls"] = `${pmc.exec} ls-lint --config="./node_modules/@storm-software/linting-tools/ls-lint/ls-lint.yml"`;
+    json.packageManager ??= `${packageManager}@${packageManagerVersion}`;
     json.engines = {
       node: `>=${nodeVersion}`,
-      pnpm: `>=${pnpmVersion}`
+      [packageManager]: `>=${packageManagerVersion}`
     };
     return json;
   });
   generateFiles(tree, path.join(__dirname, "files"), projectRoot, {
     ...options,
+    packageManager,
+    packageManagerVersion,
     pnpmVersion,
-    nodeVersion
+    nodeVersion,
+    lockFileName,
+    exec: pmc.exec
   });
   await formatFiles(tree);
   let dependencies = {

package/dist/{chunk-2F7AZHRH.js → chunk-ILSI74FW.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkSZWM7COVjs = require('./chunk-SZWM7COV.js');
+var _chunk3G7PNDZ5js = require('./chunk-3G7PNDZ5.js');
 
 
 
@@ -155,16 +155,45 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
     });
   }
   if (tree.exists("package.json") && normalized.importPath) {
-    _devkit.updateJson.call(void 0, tree, "package.json", (json) => ({
-      ...json,
-      pnpm: {
-        ..._optionalChain([json, 'optionalAccess', _10 => _10.pnpm]),
-        overrides: {
-          ..._optionalChain([json, 'optionalAccess', _11 => _11.pnpm, 'optionalAccess', _12 => _12.overrides]),
-          [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
-        }
+    _devkit.updateJson.call(void 0, tree, "package.json", (json) => {
+      if (_optionalChain([config, 'optionalAccess', _10 => _10.packageManager]) === "yarn") {
+        return {
+          ...json,
+          resolutions: {
+            ..._optionalChain([json, 'optionalAccess', _11 => _11.resolutions]),
+            [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
+          }
+        };
+      }
+      if (_optionalChain([config, 'optionalAccess', _12 => _12.packageManager]) === "npm") {
+        return {
+          ...json,
+          overrides: {
+            ..._optionalChain([json, 'optionalAccess', _13 => _13.overrides]),
+            [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
+          }
+        };
+      }
+      if (_optionalChain([config, 'optionalAccess', _14 => _14.packageManager]) === "bun") {
+        return {
+          ...json,
+          overrides: {
+            ..._optionalChain([json, 'optionalAccess', _15 => _15.overrides]),
+            [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
+          }
+        };
       }
-    }));
+      return {
+        ...json,
+        pnpm: {
+          ..._optionalChain([json, 'optionalAccess', _16 => _16.pnpm]),
+          overrides: {
+            ..._optionalChain([json, 'optionalAccess', _17 => _17.pnpm, 'optionalAccess', _18 => _18.overrides]),
+            [_nullishCoalesce(normalized.importPath, () => ( ""))]: "workspace:*"
+          }
+        }
+      };
+    });
   }
   _js.addTsConfigPath.call(void 0, tree, normalized.importPath, [
     _chunkCQDBLKPFjs.joinPaths.call(void 0, 
@@ -178,10 +207,10 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
   ]);
   if (tree.exists("package.json")) {
     const packageJson = _devkit.readJson.call(void 0, tree, "package.json");
-    if (_optionalChain([packageJson, 'optionalAccess', _13 => _13.repository])) {
+    if (_optionalChain([packageJson, 'optionalAccess', _19 => _19.repository])) {
       repository = packageJson.repository;
     }
-    if (_optionalChain([packageJson, 'optionalAccess', _14 => _14.description])) {
+    if (_optionalChain([packageJson, 'optionalAccess', _20 => _20.description])) {
       description = packageJson.description;
     }
   }
@@ -218,22 +247,22 @@ function getOutputPath(options) {
 function createProjectTsConfigJson(tree, options) {
   const tsconfig = {
     extends: options.rootProject ? void 0 : _js.getRelativePathToRootTsConfig.call(void 0, tree, options.projectRoot),
-    ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _15 => _15.tsconfigOptions]), () => ( {})),
+    ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _21 => _21.tsconfigOptions]), () => ( {})),
     compilerOptions: {
       ...options.rootProject ? _js.tsConfigBaseOptions : {},
       outDir: _chunkCQDBLKPFjs.joinPaths.call(void 0, _devkit.offsetFromRoot.call(void 0, options.projectRoot), "dist/out-tsc"),
       noEmit: true,
-      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _16 => _16.tsconfigOptions, 'optionalAccess', _17 => _17.compilerOptions]), () => ( {}))
+      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _22 => _22.tsconfigOptions, 'optionalAccess', _23 => _23.compilerOptions]), () => ( {}))
     },
-    files: [..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _18 => _18.tsconfigOptions, 'optionalAccess', _19 => _19.files]), () => ( []))],
+    files: [..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _24 => _24.tsconfigOptions, 'optionalAccess', _25 => _25.files]), () => ( []))],
     include: [
-      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _20 => _20.tsconfigOptions, 'optionalAccess', _21 => _21.include]), () => ( [])),
+      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _26 => _26.tsconfigOptions, 'optionalAccess', _27 => _27.include]), () => ( [])),
       "src/**/*.ts",
       "src/**/*.js",
       "bin/**/*"
     ],
     exclude: [
-      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _22 => _22.tsconfigOptions, 'optionalAccess', _23 => _23.exclude]), () => ( [])),
+      ..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _28 => _28.tsconfigOptions, 'optionalAccess', _29 => _29.exclude]), () => ( [])),
       "jest.config.ts",
       "src/**/*.spec.ts",
       "src/**/*.test.ts"
@@ -243,8 +272,8 @@ function createProjectTsConfigJson(tree, options) {
 }
 async function normalizeOptions(tree, options, config) {
   let importPath = options.importPath;
-  if (!importPath && _optionalChain([config, 'optionalAccess', _24 => _24.namespace])) {
-    importPath = `@${_optionalChain([config, 'optionalAccess', _25 => _25.namespace])}/${options.name}`;
+  if (!importPath && _optionalChain([config, 'optionalAccess', _30 => _30.namespace])) {
+    importPath = `@${_optionalChain([config, 'optionalAccess', _31 => _31.namespace])}/${options.name}`;
   }
   if (options.publishable) {
     if (!importPath) {
@@ -257,7 +286,7 @@ async function normalizeOptions(tree, options, config) {
   if (options.publishable === false && options.buildable === false) {
     bundler = "none";
   }
-  const { Linter } = _devkit.ensurePackage.call(void 0, "@nx/eslint", _chunkSZWM7COVjs.nxVersion);
+  const { Linter } = _devkit.ensurePackage.call(void 0, "@nx/eslint", _chunk3G7PNDZ5js.nxVersion);
   const rootProject = false;
   const {
     projectName,

package/dist/{chunk-NNDVMJGY.mjs → chunk-KMTNXFZA.mjs}

@@ -6,15 +6,12 @@ var recommended_default = {
     allProjectFiles: ["sharedGlobals", "{projectRoot}/**/*"],
     default: ["sharedGlobals", "{projectRoot}/**/*"],
     sharedGlobals: [
-      "{workspaceRoot}/.github/workflows/*.yml",
-      "{workspaceRoot}/assets/**/*",
       "{workspaceRoot}/tsconfig.json",
-      "{workspaceRoot}/tsconfig.base.json",
+      "{workspaceRoot}/tsconfig.*.json",
       "{workspaceRoot}/.npm@(rc|ignore)",
       "{workspaceRoot}/package.json",
       "{workspaceRoot}/{pnpm-workspace,pnpm-lock,package-lock,yarn-lock}.@(yaml|yml)",
-      "{workspaceRoot}/bun.lockb",
-      "{workspaceRoot}/LICENSE",
+      "{workspaceRoot}/bun.lock{,b}",
       "{workspaceRoot}/.git@(attributes|ignore)",
       "{workspaceRoot}/{nx.json,.nxignore}",
       "{workspaceRoot}/storm-workspace{,.*}.@(json|yaml|toml)",
@@ -22,7 +19,6 @@ var recommended_default = {
       "{workspaceRoot}/storm-workspace.config.[jt]s",
       "{workspaceRoot}/.storm-workspace/config{,.*}.[jt]s",
       "{workspaceRoot}/devenv.@(lock|nix|yaml)",
-      "{workspaceRoot}/{flake,shell,devShell}.nix",
       "{workspaceRoot}/.envrc",
       "{workspaceRoot}/.env{,.local,.*}"
     ],
@@ -129,14 +125,12 @@ var recommended_default = {
       "{workspaceRoot}/Cargo.lock",
       "{workspaceRoot}/.cargo/config.toml",
       "{workspaceRoot}/rust-toolchain",
-      "{workspaceRoot}/rustfmt.toml",
-      "{workspaceRoot}/deny.toml",
       "{projectRoot}/Cargo.toml",
       "{projectRoot}/.cargo/config.toml",
       {
         runtime: "node -p '`${process.platform}_${process.arch}`'"
       },
-      "{projectRoot}/{project.json,CHANGELOG.md}",
+      "{projectRoot}/project.json",
       "{projectRoot}/.env{,.local}",
       "{projectRoot}/**/*.rs",
       "{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
@@ -155,14 +149,22 @@ var recommended_default = {
       "{projectRoot}/package.json",
       "{projectRoot}/tsconfig.json",
       "{projectRoot}/tsconfig.*.json",
-      "{projectRoot}/{project.json,README.md,CHANGELOG.md}",
+      "{projectRoot}/project.json",
       "{projectRoot}/.env{,.*}",
-      "{projectRoot}/docs/**/*",
-      "{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
+      "!{projectRoot}/docs/**/*",
+      "!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
       "{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
       "{projectRoot}/src/**/*.@(cts|mts|ts|tsx|graphql|gql|js|cjs|mjs|jsx|json|jsonc|yaml|yml|toml|md|mdx)",
       "{projectRoot}/{build,tsup,tsdown,vite,contentlayer,powerlines,shell-shock,earthquake}.*.[jt]s?(x)",
       "{projectRoot}/{bin,tools,helpers,scripts}/**/*"
+    ],
+    ci: [
+      "sharedGlobals",
+      "{workspaceRoot}/.github/workflows/*.yml",
+      "{workspaceRoot}/assets/**/*",
+      "{workspaceRoot}/devenv.@(lock|nix|yaml)",
+      "{workspaceRoot}/.devenv{,.flake.nix}",
+      "{workspaceRoot}/.direnv"
     ]
   },
   targetDefaults: {
@@ -173,8 +175,8 @@ var recommended_default = {
       executor: "nx:run-commands",
       options: {
         commands: [
-          "pnpm exec rimraf --glob {projectRoot}/dist",
-          "pnpm exec rimraf dist/{projectRoot}"
+          "pnpm rimraf --glob {projectRoot}/dist",
+          "pnpm rimraf dist/{projectRoot}"
         ]
       }
     },
@@ -194,7 +196,7 @@ var recommended_default = {
         version: {
           currentVersionResolver: "git-tag",
           specifierSource: "conventional-commits",
-          groupPreVersionCommand: "pnpm build",
+          groupPreVersionCommand: "build",
           manifestRootsToUpdate: [
             "{projectRoot}",
             {