@storm-software/workspace-tools 1.10.13 → 1.10.14

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.10.13](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.10.12...workspace-tools-v1.10.13) (2023-11-24)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Update entry creation code in tsup build ([6c8b12f](https://github.com/storm-software/storm-ops/commit/6c8b12fd6ae01659f004525cc4dfdbab484e3096))
+
 ## [1.10.12](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.10.11...workspace-tools-v1.10.12) (2023-11-24)
 
 

package/index.js

@@ -4206,12 +4206,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: joinPathFragments5 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments3 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments5(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments5(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -222808,7 +222808,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: joinPathFragments5, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments3, 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.`;
@@ -222884,14 +222884,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments5(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments5(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, asProvidedProjectName);
         }
       }
       if (asProvidedProjectName.startsWith("@")) {
@@ -222924,7 +222924,7 @@ var require_project_name_and_root_utils = __commonJS({
       const derivedSimpleProjectName = name;
       let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
       if (derivedProjectDirectoryWithoutLayout !== ".") {
-        derivedProjectDirectory = joinPathFragments5(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments3(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -468022,7 +468022,7 @@ __export(workspace_tools_exports, {
 module.exports = __toCommonJS(workspace_tools_exports);
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-var import_devkit2 = __toESM(require_devkit());
+var import_devkit = __toESM(require_devkit());
 var import_get_extra_dependencies = __toESM(require_get_extra_dependencies());
 var import_js = __toESM(require_src());
 
@@ -474210,11 +474210,10 @@ var import_tsup2 = __toESM(require_dist5());
 var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
 
 // packages/workspace-tools/src/executors/tsup/get-config.ts
-var import_devkit = __toESM(require_devkit());
 var import_tsup = __toESM(require_dist5());
 
 // packages/workspace-tools/src/generators/init/init.ts
-var import_devkit3 = __toESM(require_devkit());
+var import_devkit2 = __toESM(require_devkit());
 
 // packages/workspace-tools/src/utils/versions.ts
 var tsupVersion = "^7.2.0";
@@ -474238,7 +474237,7 @@ var pnpmVersion = "8.10.2";
 
 // packages/workspace-tools/src/generators/init/init.ts
 async function stormInitGenerator(tree, schema) {
-  const task = (0, import_devkit3.addDependenciesToPackageJson)(
+  const task = (0, import_devkit2.addDependenciesToPackageJson)(
     tree,
     {
       "nx": nxVersion,
@@ -474250,19 +474249,19 @@ async function stormInitGenerator(tree, schema) {
     {}
   );
   if (!schema.skipFormat) {
-    await (0, import_devkit3.formatFiles)(tree);
+    await (0, import_devkit2.formatFiles)(tree);
   }
   return task;
 }
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
-var import_devkit5 = __toESM(require_devkit());
+var import_devkit4 = __toESM(require_devkit());
 var import_js2 = __toESM(require_src());
 var import_init = __toESM(require_init());
 var import_generator = __toESM(require_generator());
 
 // packages/workspace-tools/src/generators/node-library/normalize-options.ts
-var import_devkit4 = __toESM(require_devkit());
+var import_devkit3 = __toESM(require_devkit());
 var import_project_name_and_root_utils = __toESM(require_project_name_and_root_utils());
 async function normalizeOptions(tree, options) {
   if (options.publishable) {
@@ -474276,7 +474275,7 @@ async function normalizeOptions(tree, options) {
   if (options.publishable === false && options.buildable === false) {
     bundler = "none";
   }
-  const { Linter } = (0, import_devkit4.ensurePackage)("@nx/eslint", nxVersion);
+  const { Linter } = (0, import_devkit3.ensurePackage)("@nx/eslint", nxVersion);
   const {
     projectName,
     names: projectNames,
@@ -474292,7 +474291,7 @@ async function normalizeOptions(tree, options) {
     callingGenerator: "@nx/js:library"
   });
   options.rootProject = projectRoot === ".";
-  const normalized = (0, import_devkit4.names)(projectNames.projectFileName);
+  const normalized = (0, import_devkit3.names)(projectNames.projectFileName);
   const fileName = normalized.fileName;
   return {
     js: false,
@@ -474320,7 +474319,7 @@ async function normalizeOptions(tree, options) {
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
 async function nodeLibraryGenerator(tree, schema) {
-  const filesDir = (0, import_devkit5.joinPathFragments)(__dirname, "./files");
+  const filesDir = (0, import_devkit4.joinPathFragments)(__dirname, "./files");
   const options = await normalizeOptions(tree, schema);
   const tasks = [];
   tasks.push(
@@ -474330,7 +474329,7 @@ async function nodeLibraryGenerator(tree, schema) {
     })
   );
   tasks.push(
-    (0, import_devkit5.addDependenciesToPackageJson)(
+    (0, import_devkit4.addDependenciesToPackageJson)(
       tree,
       {},
       {
@@ -474343,22 +474342,22 @@ async function nodeLibraryGenerator(tree, schema) {
   if (options.publishable) {
     tasks.push(await (0, import_generator.default)(tree, { ...options, skipFormat: true }));
   }
-  const { className, name, propertyName } = (0, import_devkit5.names)(
+  const { className, name, propertyName } = (0, import_devkit4.names)(
     options.projectNames.projectFileName
   );
   createProjectTsConfigJson(tree, options);
-  (0, import_devkit5.addProjectConfiguration)(tree, options.name, {
+  (0, import_devkit4.addProjectConfiguration)(tree, options.name, {
     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",
         outputs: ["{options.outputPath}"],
         options: {
           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"
         },
@@ -474377,7 +474376,7 @@ async function nodeLibraryGenerator(tree, schema) {
       test: {}
     }
   });
-  (0, import_devkit5.generateFiles)(tree, filesDir, options.projectRoot, {
+  (0, import_devkit4.generateFiles)(tree, filesDir, options.projectRoot, {
     ...options,
     dot: ".",
     className,
@@ -474387,7 +474386,7 @@ async function nodeLibraryGenerator(tree, schema) {
     cliCommand: "nx",
     strict: void 0,
     tmpl: "",
-    offsetFromRoot: (0, import_devkit5.offsetFromRoot)(options.projectRoot),
+    offsetFromRoot: (0, import_devkit4.offsetFromRoot)(options.projectRoot),
     buildable: options.bundler && options.bundler !== "none",
     hasUnitTestRunner: options.unitTestRunner !== "none"
   });
@@ -474397,16 +474396,16 @@ async function nodeLibraryGenerator(tree, schema) {
   };
   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)) {
@@ -474430,7 +474429,7 @@ async function nodeLibraryGenerator(tree, schema) {
       };
     });
   } else {
-    (0, import_devkit5.writeJson)(tree, packageJsonPath, {
+    (0, import_devkit4.writeJson)(tree, packageJsonPath, {
       name: options.importPath,
       version: "0.0.1",
       description,
@@ -474446,7 +474445,7 @@ async function nodeLibraryGenerator(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,
@@ -474458,32 +474457,32 @@ async function nodeLibraryGenerator(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"],
@@ -474492,20 +474491,20 @@ async function nodeLibraryGenerator(tree, schema) {
   }
   const lintCallback = await addLint(tree, options);
   tasks.push(lintCallback);
-  await (0, import_devkit5.formatFiles)(tree);
+  await (0, import_devkit4.formatFiles)(tree);
 }
 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(
@@ -474576,15 +474575,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
@@ -474593,15 +474592,15 @@ 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
   );
 }
 
 // packages/workspace-tools/src/generators/preset/generator.ts
-var import_devkit6 = __toESM(require_devkit());
+var import_devkit5 = __toESM(require_devkit());
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   eslintVersion,