@storm-software/workspace-tools 1.21.19 → 1.22.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.21.19](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.21.18...workspace-tools-v1.21.19) (2023-12-05)
+
+
+### Bug Fixes
+
+* **git-tools:** Resolved issue in `semantic-release` patch with module directory ([a04aa3a](https://github.com/storm-software/storm-ops/commit/a04aa3add212abc781392d1227122a790b2f004e))
+* **git-tools:** Resolved issue with patched semantic-release bundled path ([93b4e43](https://github.com/storm-software/storm-ops/commit/93b4e439bf19a888db1b35554b32b9aec3cc3acd))
+* **git-tools:** Update the env used by packages to match new config updates ([d3b7dac](https://github.com/storm-software/storm-ops/commit/d3b7dac057a04aff9e0170d89cedc4cb47c584e5))
+* **git-tools:** Updated `semantic-release` patch to properly check for plugins ([4e3db96](https://github.com/storm-software/storm-ops/commit/4e3db96814e8abb5cb22d9bfb5c747f042c43157))
+
 ## [1.21.18](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.21.17...workspace-tools-v1.21.18) (2023-12-05)
 
 

package/generators.json

@@ -18,12 +18,17 @@
       "schema": "./src/generators/node-library/schema.json",
       "aliases": ["node-lib"],
       "x-type": "library",
-      "description": "Generate a new node library project in the Storm workspace"
+      "description": "Create a new NodeJs TypeScript library package in the Storm workspace"
     },
     "config-schema": {
       "factory": "./src/generators/config-schema/generator",
       "schema": "./src/generators/config-schema/schema.json",
       "description": "Create a Storm JSON schema based on the workspaces project configurations"
+    },
+    "neutral-library": {
+      "factory": "./src/generators/neutral-library/generator",
+      "schema": "./src/generators/neutral-library/schema.json",
+      "description": "Create a new Neutral TypeScript library package in the Storm workspace"
     }
   }
 }

package/index.js

@@ -8862,7 +8862,7 @@ var require_format_files = __commonJS({
     var nx_1 = require_nx();
     var { updateJson: updateJson3, readJson: readJson2, sortObjectByKeys } = (0, nx_1.requireNx)();
     sortObjectByKeys = sortObjectByKeys ?? require("nx/src/utils/object-sort").sortObjectByKeys;
-    async function formatFiles5(tree) {
+    async function formatFiles6(tree) {
       let prettier;
       try {
         prettier = await Promise.resolve().then(() => require("prettier"));
@@ -8901,7 +8901,7 @@ var require_format_files = __commonJS({
         }
       }));
     }
-    exports.formatFiles = formatFiles5;
+    exports.formatFiles = formatFiles6;
     function sortTsConfig(tree) {
       try {
         const tsConfigPath = getRootTsConfigPath(tree);
@@ -12458,12 +12458,12 @@ var require_install_packages_task = __commonJS({
     var child_process_1 = require("child_process");
     var path_1 = require("path");
     var nx_1 = require_nx();
-    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments4 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments5 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments4(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments5(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments4(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments5(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -15658,7 +15658,7 @@ var require_package_json = __commonJS({
       return needsDepsUpdate || needsDevDepsUpdate;
     }
     var packageMapCache = /* @__PURE__ */ new Map();
-    function ensurePackage3(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion, _) {
+    function ensurePackage2(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion, _) {
       let pkg;
       let requiredVersion;
       if (typeof pkgOrTree === "string") {
@@ -15722,7 +15722,7 @@ var require_package_json = __commonJS({
         throw e;
       }
     }
-    exports.ensurePackage = ensurePackage3;
+    exports.ensurePackage = ensurePackage2;
     function generatePackageManagerFiles(root, packageManager = detectPackageManager()) {
       const [pmMajor] = getPackageManagerVersion(packageManager).split(".");
       switch (packageManager) {
@@ -16496,7 +16496,7 @@ var require_offset_from_root = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.offsetFromRoot = void 0;
     var path_1 = require("path");
-    function offsetFromRoot2(fullPathToDir) {
+    function offsetFromRoot3(fullPathToDir) {
       if (fullPathToDir === ".")
         return "./";
       const parts = (0, path_1.normalize)(fullPathToDir).split(path_1.sep);
@@ -16508,7 +16508,7 @@ var require_offset_from_root = __commonJS({
       }
       return offset;
     }
-    exports.offsetFromRoot = offsetFromRoot2;
+    exports.offsetFromRoot = offsetFromRoot3;
   }
 });
 
@@ -41606,7 +41606,7 @@ var require_project_name_and_root_utils = __commonJS({
     var nx_1 = require_nx();
     var get_workspace_layout_1 = require_get_workspace_layout();
     var names_1 = require_names();
-    var { joinPathFragments: joinPathFragments4, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments5, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
     var deprecationWarning = stripIndents`
     In Nx 18, generating projects will no longer derive the name and root.
     Please provide the exact project name and root in the future.`;
@@ -41682,14 +41682,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments4(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments5(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments4(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments5(relativeCwd, asProvidedProjectName);
         }
       }
       if (asProvidedProjectName.startsWith("@")) {
@@ -41722,7 +41722,7 @@ var require_project_name_and_root_utils = __commonJS({
       const derivedSimpleProjectName = name;
       let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
       if (derivedProjectDirectoryWithoutLayout !== ".") {
-        derivedProjectDirectory = joinPathFragments4(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments5(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -117387,70 +117387,14 @@ async function stormInitGenerator(tree, schema) {
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
 var import_devkit5 = __toESM(require_devkit());
-var import_js2 = __toESM(require_src2());
-var import_init = __toESM(require_init());
-var import_generator = __toESM(require_generator());
 
-// packages/workspace-tools/src/generators/node-library/normalize-options.ts
+// packages/workspace-tools/src/base/typescript-library-generator.ts
 var import_devkit4 = __toESM(require_devkit());
 var import_project_name_and_root_utils = __toESM(require_project_name_and_root_utils());
-async function normalizeOptions2(tree, options) {
-  if (options.publishable) {
-    if (!options.importPath) {
-      throw new Error(
-        `For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`
-      );
-    }
-  }
-  let bundler = "tsc";
-  if (options.publishable === false && options.buildable === false) {
-    bundler = "none";
-  }
-  const { Linter } = (0, import_devkit4.ensurePackage)("@nx/eslint", nxVersion);
-  const {
-    projectName,
-    names: projectNames,
-    projectRoot,
-    importPath
-  } = await (0, import_project_name_and_root_utils.determineProjectNameAndRootOptions)(tree, {
-    name: options.name,
-    projectType: "library",
-    directory: options.directory,
-    importPath: options.importPath,
-    projectNameAndRootFormat: options.projectNameAndRootFormat,
-    rootProject: options.rootProject,
-    callingGenerator: "@nx/js:library"
-  });
-  options.rootProject = projectRoot === ".";
-  const normalized = (0, import_devkit4.names)(projectNames.projectFileName);
-  const fileName = normalized.fileName;
-  return {
-    js: false,
-    pascalCaseFiles: false,
-    skipFormat: false,
-    skipTsConfig: false,
-    includeBabelRc: false,
-    unitTestRunner: "jest",
-    linter: Linter.EsLint,
-    testEnvironment: "node",
-    config: "project",
-    compiler: "tsc",
-    bundler,
-    skipTypeCheck: false,
-    minimal: false,
-    ...options,
-    fileName,
-    name: projectName,
-    projectNames,
-    projectRoot,
-    parsedTags: options.tags ? options.tags.split(",").map((s) => s.trim()) : [],
-    importPath
-  };
-}
-
-// packages/workspace-tools/src/generators/node-library/generator.ts
-async function nodeLibraryGeneratorFn(tree, schema) {
-  const filesDir = (0, import_devkit5.joinPathFragments)(__dirname, "./files");
+var import_js2 = __toESM(require_src2());
+var import_init = __toESM(require_init());
+var import_generator = __toESM(require_generator());
+async function typeScriptLibraryGeneratorFn(tree, schema) {
   const options = await normalizeOptions2(tree, { ...schema });
   const tasks = [];
   tasks.push(
@@ -117460,37 +117404,45 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     })
   );
   tasks.push(
-    (0, import_devkit5.addDependenciesToPackageJson)(
+    (0, import_devkit4.addDependenciesToPackageJson)(
       tree,
       {},
       {
         "@storm-software/workspace-tools": "latest",
         "@storm-software/testing-tools": "latest",
-        "@types/node": typesNodeVersion
+        ...schema.devDependencies ?? {}
       }
     )
   );
   if (options.publishable) {
     tasks.push(await (0, import_generator.default)(tree, { ...options, skipFormat: true }));
   }
-  const { className, name, propertyName } = (0, import_devkit5.names)(
-    options.projectNames.projectFileName
-  );
-  createProjectTsConfigJson(tree, options);
-  (0, import_devkit5.addProjectConfiguration)(tree, options.name, {
+  const projectConfig = {
     root: options.directory,
     projectType: "library",
-    sourceRoot: (0, import_devkit5.joinPathFragments)(options.directory, "src"),
+    sourceRoot: (0, import_devkit4.joinPathFragments)(options.directory, "src"),
     targets: {
       build: {
-        executor: "@storm-software/workspace-tools:tsup",
+        executor: schema.buildExecutor,
         outputs: ["{options.outputPath}"],
         options: {
+          entry: (0, import_devkit4.joinPathFragments)(options.projectRoot, "src", "index.ts"),
           outputPath: getOutputPath(options),
-          tsConfig: (0, import_devkit5.joinPathFragments)(options.projectRoot, "tsconfig.json"),
-          project: (0, import_devkit5.joinPathFragments)(options.projectRoot, "package.json"),
+          tsConfig: (0, import_devkit4.joinPathFragments)(options.projectRoot, "tsconfig.json"),
+          project: (0, import_devkit4.joinPathFragments)(options.projectRoot, "package.json"),
           defaultConfiguration: "production",
-          platform: "node"
+          assets: [
+            {
+              "input": options.projectRoot,
+              "glob": "*.md",
+              "output": "/"
+            },
+            {
+              "input": "",
+              "glob": "LICENSE",
+              "output": "/"
+            }
+          ]
         },
         configurations: {
           production: {
@@ -117506,39 +117458,26 @@ async function nodeLibraryGeneratorFn(tree, schema) {
       lint: {},
       test: {}
     }
-  });
-  (0, import_devkit5.generateFiles)(tree, filesDir, options.projectRoot, {
-    ...options,
-    dot: ".",
-    className,
-    name,
-    namespace: process.env.STORM_NAMESPACE ?? "storm-software",
-    description: schema.description ?? "",
-    propertyName,
-    js: !!options.js,
-    cliCommand: "nx",
-    strict: void 0,
-    tmpl: "",
-    offsetFromRoot: (0, import_devkit5.offsetFromRoot)(options.projectRoot),
-    buildable: options.bundler && options.bundler !== "none",
-    hasUnitTestRunner: options.unitTestRunner !== "none"
-  });
+  };
+  schema.platform && (projectConfig.targets.build.options.platform = schema.platform);
+  createProjectTsConfigJson(tree, options);
+  (0, import_devkit4.addProjectConfiguration)(tree, options.name, projectConfig);
   let repository = {
     type: "github",
     url: "https://github.com/storm-software/storm-stack.git"
   };
   let description = schema.description ?? "\u26A1 A Storm package used to create modern, scalable web applications.";
   if (tree.exists("package.json")) {
-    const packageJson = (0, import_devkit5.readJson)(tree, "package.json");
+    const packageJson = (0, import_devkit4.readJson)(tree, "package.json");
     packageJson?.repository && (repository = packageJson.repository);
     packageJson?.description && (description = packageJson.description);
   }
-  const packageJsonPath = (0, import_devkit5.joinPathFragments)(
+  const packageJsonPath = (0, import_devkit4.joinPathFragments)(
     options.projectRoot,
     "package.json"
   );
   if (tree.exists(packageJsonPath)) {
-    (0, import_devkit5.updateJson)(tree, packageJsonPath, (json) => {
+    (0, import_devkit4.updateJson)(tree, packageJsonPath, (json) => {
       json.name = options.importPath;
       json.version = "0.0.1";
       if (json.private && (options.publishable || options.rootProject)) {
@@ -117562,7 +117501,7 @@ async function nodeLibraryGeneratorFn(tree, schema) {
       };
     });
   } else {
-    (0, import_devkit5.writeJson)(tree, packageJsonPath, {
+    (0, import_devkit4.writeJson)(tree, packageJsonPath, {
       name: options.importPath,
       version: "0.0.1",
       description,
@@ -117578,7 +117517,7 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     });
   }
   if (tree.exists("package.json")) {
-    (0, import_devkit5.updateJson)(tree, "package.json", (json) => ({
+    (0, import_devkit4.updateJson)(tree, "package.json", (json) => ({
       ...json,
       pnpm: {
         ...json?.pnpm,
@@ -117590,32 +117529,32 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     }));
   }
   (0, import_js2.addTsConfigPath)(tree, options.importPath, [
-    (0, import_devkit5.joinPathFragments)(
+    (0, import_devkit4.joinPathFragments)(
       options.projectRoot,
       "./src",
       "index." + (options.js ? "js" : "ts")
     )
   ]);
-  (0, import_js2.addTsConfigPath)(tree, (0, import_devkit5.joinPathFragments)(options.importPath, "/*"), [
-    (0, import_devkit5.joinPathFragments)(options.projectRoot, "./src", "/*")
+  (0, import_js2.addTsConfigPath)(tree, (0, import_devkit4.joinPathFragments)(options.importPath, "/*"), [
+    (0, import_devkit4.joinPathFragments)(options.projectRoot, "./src", "/*")
   ]);
   if (tree.exists("package.json")) {
-    const packageJson = (0, import_devkit5.readJson)(tree, "package.json");
+    const packageJson = (0, import_devkit4.readJson)(tree, "package.json");
     packageJson?.repository && (repository = packageJson.repository);
     packageJson?.description && (description = packageJson.description);
   }
-  const tsconfigPath = (0, import_devkit5.joinPathFragments)(options.projectRoot, "tsconfig.json");
+  const tsconfigPath = (0, import_devkit4.joinPathFragments)(options.projectRoot, "tsconfig.json");
   if (tree.exists(tsconfigPath)) {
-    (0, import_devkit5.updateJson)(tree, tsconfigPath, (json) => {
+    (0, import_devkit4.updateJson)(tree, tsconfigPath, (json) => {
       json.composite ??= true;
       return json;
     });
   } else {
-    (0, import_devkit5.writeJson)(tree, tsconfigPath, {
-      extends: `${(0, import_devkit5.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
+    (0, import_devkit4.writeJson)(tree, tsconfigPath, {
+      extends: `${(0, import_devkit4.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
       composite: true,
       compilerOptions: {
-        outDir: `${(0, import_devkit5.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
+        outDir: `${(0, import_devkit4.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
       },
       files: [],
       include: ["src/**/*.ts", "src/**/*.js"],
@@ -117624,21 +117563,21 @@ async function nodeLibraryGeneratorFn(tree, schema) {
   }
   const lintCallback = await addLint(tree, options);
   tasks.push(lintCallback);
-  await (0, import_devkit5.formatFiles)(tree);
+  await (0, import_devkit4.formatFiles)(tree);
   return null;
 }
 async function addLint(tree, options) {
-  const { lintProjectGenerator } = (0, import_devkit5.ensurePackage)("@nx/eslint", nxVersion);
+  const { lintProjectGenerator } = (0, import_devkit4.ensurePackage)("@nx/eslint", nxVersion);
   const { mapLintPattern } = (
     // nx-ignore-next-line
     require_lint_project()
   );
-  const projectConfiguration = (0, import_devkit5.readProjectConfiguration)(tree, options.name);
+  const projectConfiguration = (0, import_devkit4.readProjectConfiguration)(tree, options.name);
   const task = lintProjectGenerator(tree, {
     project: options.name,
     linter: options.linter,
     skipFormat: true,
-    tsConfigPaths: [(0, import_devkit5.joinPathFragments)(options.projectRoot, "tsconfig.json")],
+    tsConfigPaths: [(0, import_devkit4.joinPathFragments)(options.projectRoot, "tsconfig.json")],
     unitTestRunner: options.unitTestRunner,
     eslintFilePatterns: [
       mapLintPattern(
@@ -117709,15 +117648,15 @@ function getOutputPath(options) {
   } else {
     parts.push(options.projectRoot);
   }
-  return (0, import_devkit5.joinPathFragments)(...parts);
+  return (0, import_devkit4.joinPathFragments)(...parts);
 }
 function createProjectTsConfigJson(tree, options) {
   const tsconfig = {
     extends: options.rootProject ? void 0 : (0, import_js2.getRelativePathToRootTsConfig)(tree, options.projectRoot),
     compilerOptions: {
       ...options.rootProject ? import_js2.tsConfigBaseOptions : {},
-      outDir: (0, import_devkit5.joinPathFragments)(
-        (0, import_devkit5.offsetFromRoot)(options.projectRoot),
+      outDir: (0, import_devkit4.joinPathFragments)(
+        (0, import_devkit4.offsetFromRoot)(options.projectRoot),
         "dist/out-tsc"
       ),
       noEmit: true
@@ -117726,12 +117665,101 @@ function createProjectTsConfigJson(tree, options) {
     include: ["src/**/*.ts", "src/**/*.js", "bin/**/*"],
     exclude: ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
   };
-  (0, import_devkit5.writeJson)(
+  (0, import_devkit4.writeJson)(
     tree,
-    (0, import_devkit5.joinPathFragments)(options.projectRoot, "tsconfig.json"),
+    (0, import_devkit4.joinPathFragments)(options.projectRoot, "tsconfig.json"),
     tsconfig
   );
 }
+async function normalizeOptions2(tree, options) {
+  if (options.publishable) {
+    if (!options.importPath) {
+      throw new Error(
+        `For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`
+      );
+    }
+  }
+  let bundler = "tsc";
+  if (options.publishable === false && options.buildable === false) {
+    bundler = "none";
+  }
+  const { Linter } = (0, import_devkit4.ensurePackage)("@nx/eslint", nxVersion);
+  const {
+    projectName,
+    names: projectNames,
+    projectRoot,
+    importPath
+  } = await (0, import_project_name_and_root_utils.determineProjectNameAndRootOptions)(tree, {
+    name: options.name,
+    projectType: "library",
+    directory: options.directory,
+    importPath: options.importPath,
+    projectNameAndRootFormat: options.projectNameAndRootFormat,
+    rootProject: options.rootProject,
+    callingGenerator: "@nx/js:library"
+  });
+  options.rootProject = projectRoot === ".";
+  const normalized = (0, import_devkit4.names)(projectNames.projectFileName);
+  const fileName = normalized.fileName;
+  return {
+    js: false,
+    pascalCaseFiles: false,
+    skipFormat: false,
+    skipTsConfig: false,
+    includeBabelRc: false,
+    unitTestRunner: "jest",
+    linter: Linter.EsLint,
+    testEnvironment: "node",
+    config: "project",
+    compiler: "tsc",
+    bundler,
+    skipTypeCheck: false,
+    minimal: false,
+    ...options,
+    fileName,
+    name: projectName,
+    projectNames,
+    projectRoot,
+    parsedTags: options.tags ? options.tags.split(",").map((s) => s.trim()) : [],
+    importPath
+  };
+}
+
+// packages/workspace-tools/src/generators/node-library/generator.ts
+async function nodeLibraryGeneratorFn(tree, schema) {
+  const filesDir = (0, import_devkit5.joinPathFragments)(__dirname, "./files");
+  const tsLibraryGeneratorOptions = {
+    ...schema,
+    platform: "node",
+    devDependencies: {
+      "@types/node": typesNodeVersion
+    },
+    buildExecutor: "@storm-software/workspace-tools:tsup-node"
+  };
+  const options = await normalizeOptions2(tree, tsLibraryGeneratorOptions);
+  const { className, name, propertyName } = (0, import_devkit5.names)(
+    options.projectNames.projectFileName
+  );
+  (0, import_devkit5.generateFiles)(tree, filesDir, options.projectRoot, {
+    ...schema,
+    dot: ".",
+    className,
+    name,
+    namespace: process.env.STORM_NAMESPACE ?? "storm-software",
+    description: schema.description ?? "",
+    propertyName,
+    js: !!options.js,
+    cliCommand: "nx",
+    strict: void 0,
+    tmpl: "",
+    offsetFromRoot: (0, import_devkit5.offsetFromRoot)(options.projectRoot),
+    buildable: options.bundler && options.bundler !== "none",
+    hasUnitTestRunner: options.unitTestRunner !== "none"
+  });
+  await typeScriptLibraryGeneratorFn(tree, tsLibraryGeneratorOptions);
+  await (0, import_devkit5.formatFiles)(tree);
+  return null;
+}
 var generator_default2 = withRunGenerator(
   "TypeScript Build (NodeJs Platform)",
   nodeLibraryGeneratorFn