@storm-software/workspace-tools 1.36.3 → 1.36.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.36.4](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.36.3...workspace-tools-v1.36.4) (2024-01-05)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved entry point issue in package.json files ([7d2c178](https://github.com/storm-software/storm-ops/commit/7d2c1780cb398f04d5937b556e7bacc76cd1bf52))
+
+## [1.36.3](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.36.2...workspace-tools-v1.36.3) (2024-01-05)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Cleaned up the logic around running `getConfig` functions ([bcc3304](https://github.com/storm-software/storm-ops/commit/bcc3304cb976e01a55030221cd5c5f4f1c22f150))
+
 ## [1.36.2](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.36.1...workspace-tools-v1.36.2) (2024-01-05)
 
 

package/index.js

@@ -12226,12 +12226,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: joinPathFragments6 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments8 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments6(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments8(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments6(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments8(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -29020,7 +29020,7 @@ var require_boolean = __commonJS({
   "node_modules/.pnpm/enquirer@2.3.6/node_modules/enquirer/lib/types/boolean.js"(exports, module2) {
     "use strict";
     var Prompt = require_prompt();
-    var { isPrimitive: isPrimitive2, hasColor } = require_utils2();
+    var { isPrimitive, hasColor } = require_utils2();
     var BooleanPrompt = class extends Prompt {
       constructor(options) {
         super(options);
@@ -29051,7 +29051,7 @@ var require_boolean = __commonJS({
         return /^[fn0]/i.test(input);
       }
       isValue(value) {
-        return isPrimitive2(value) && (this.isTrue(value) || this.isFalse(value));
+        return isPrimitive(value) && (this.isTrue(value) || this.isFalse(value));
       }
       async hint() {
         if (this.state.status === "pending") {
@@ -29226,11 +29226,11 @@ var require_string = __commonJS({
     "use strict";
     var Prompt = require_prompt();
     var placeholder = require_placeholder();
-    var { isPrimitive: isPrimitive2 } = require_utils2();
+    var { isPrimitive } = require_utils2();
     var StringPrompt = class extends Prompt {
       constructor(options) {
         super(options);
-        this.initial = isPrimitive2(this.initial) ? String(this.initial) : "";
+        this.initial = isPrimitive(this.initial) ? String(this.initial) : "";
         if (this.initial)
           this.cursorHide();
         this.state.prevCursor = 0;
@@ -30864,7 +30864,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: joinPathFragments6, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments8, 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.`;
@@ -30940,14 +30940,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments6(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments8(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments6(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments8(relativeCwd, asProvidedProjectName);
         }
       }
       if (asProvidedProjectName.startsWith("@")) {
@@ -30980,7 +30980,7 @@ var require_project_name_and_root_utils = __commonJS({
       const derivedSimpleProjectName = name;
       let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
       if (derivedProjectDirectoryWithoutLayout !== ".") {
-        derivedProjectDirectory = joinPathFragments6(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments8(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -110611,6 +110611,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
 };
 
 // packages/workspace-tools/src/base/get-tsup-config.ts
+var import_devkit = __toESM(require_devkit());
 function defaultConfig({
   entry,
   outDir,
@@ -110655,7 +110656,7 @@ function defaultConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir,
+    outDir: (0, import_devkit.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile: true,
     shims,
@@ -110671,7 +110672,7 @@ function defaultConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir
+          outDir: (0, import_devkit.joinPathFragments)(outDir, "dist")
         }
       }
     },
@@ -110729,7 +110730,7 @@ var outExtension = ({ format: format2 }) => {
 };
 
 // packages/workspace-tools/src/base/typescript-library-generator.ts
-var import_devkit = __toESM(require_devkit());
+var import_devkit2 = __toESM(require_devkit());
 var import_project_name_and_root_utils = __toESM(require_project_name_and_root_utils());
 var import_js = __toESM(require_src());
 var import_init = __toESM(require_init());
@@ -110766,7 +110767,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
     })
   );
   tasks.push(
-    (0, import_devkit.addDependenciesToPackageJson)(
+    (0, import_devkit2.addDependenciesToPackageJson)(
       tree,
       {},
       {
@@ -110782,16 +110783,16 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
   const projectConfig = {
     root: options.directory,
     projectType: "library",
-    sourceRoot: (0, import_devkit.joinPathFragments)(options.directory, "src"),
+    sourceRoot: (0, import_devkit2.joinPathFragments)(options.directory, "src"),
     targets: {
       build: {
         executor: schema.buildExecutor,
         outputs: ["{options.outputPath}"],
         options: {
-          entry: (0, import_devkit.joinPathFragments)(options.projectRoot, "src", "index.ts"),
+          entry: (0, import_devkit2.joinPathFragments)(options.projectRoot, "src", "index.ts"),
           outputPath: getOutputPath(options),
-          tsConfig: (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
-          project: (0, import_devkit.joinPathFragments)(options.projectRoot, "package.json"),
+          tsConfig: (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json"),
+          project: (0, import_devkit2.joinPathFragments)(options.projectRoot, "package.json"),
           defaultConfiguration: "production",
           assets: [
             {
@@ -110823,23 +110824,23 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
   };
   schema.platform && (projectConfig.targets.build.options.platform = schema.platform);
   createProjectTsConfigJson(tree, options);
-  (0, import_devkit.addProjectConfiguration)(tree, options.name, projectConfig);
+  (0, import_devkit2.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_devkit.readJson)(tree, "package.json");
+    const packageJson = (0, import_devkit2.readJson)(tree, "package.json");
     packageJson?.repository && (repository = packageJson.repository);
     packageJson?.description && (description = packageJson.description);
   }
-  const packageJsonPath = (0, import_devkit.joinPathFragments)(
+  const packageJsonPath = (0, import_devkit2.joinPathFragments)(
     options.projectRoot,
     "package.json"
   );
   if (tree.exists(packageJsonPath)) {
-    (0, import_devkit.updateJson)(tree, packageJsonPath, (json) => {
+    (0, import_devkit2.updateJson)(tree, packageJsonPath, (json) => {
       json.name = options.importPath;
       json.version = "0.0.1";
       if (json.private && (options.publishable || options.rootProject)) {
@@ -110863,7 +110864,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
       };
     });
   } else {
-    (0, import_devkit.writeJson)(tree, packageJsonPath, {
+    (0, import_devkit2.writeJson)(tree, packageJsonPath, {
       name: options.importPath,
       version: "0.0.1",
       description,
@@ -110879,7 +110880,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
     });
   }
   if (tree.exists("package.json")) {
-    (0, import_devkit.updateJson)(tree, "package.json", (json) => ({
+    (0, import_devkit2.updateJson)(tree, "package.json", (json) => ({
       ...json,
       pnpm: {
         ...json?.pnpm,
@@ -110891,32 +110892,32 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
     }));
   }
   (0, import_js.addTsConfigPath)(tree, options.importPath, [
-    (0, import_devkit.joinPathFragments)(
+    (0, import_devkit2.joinPathFragments)(
       options.projectRoot,
       "./src",
       "index." + (options.js ? "js" : "ts")
     )
   ]);
-  (0, import_js.addTsConfigPath)(tree, (0, import_devkit.joinPathFragments)(options.importPath, "/*"), [
-    (0, import_devkit.joinPathFragments)(options.projectRoot, "./src", "/*")
+  (0, import_js.addTsConfigPath)(tree, (0, import_devkit2.joinPathFragments)(options.importPath, "/*"), [
+    (0, import_devkit2.joinPathFragments)(options.projectRoot, "./src", "/*")
   ]);
   if (tree.exists("package.json")) {
-    const packageJson = (0, import_devkit.readJson)(tree, "package.json");
+    const packageJson = (0, import_devkit2.readJson)(tree, "package.json");
     packageJson?.repository && (repository = packageJson.repository);
     packageJson?.description && (description = packageJson.description);
   }
-  const tsconfigPath = (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json");
+  const tsconfigPath = (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json");
   if (tree.exists(tsconfigPath)) {
-    (0, import_devkit.updateJson)(tree, tsconfigPath, (json) => {
+    (0, import_devkit2.updateJson)(tree, tsconfigPath, (json) => {
       json.composite ??= true;
       return json;
     });
   } else {
-    (0, import_devkit.writeJson)(tree, tsconfigPath, {
-      extends: `${(0, import_devkit.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
+    (0, import_devkit2.writeJson)(tree, tsconfigPath, {
+      extends: `${(0, import_devkit2.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
       composite: true,
       compilerOptions: {
-        outDir: `${(0, import_devkit.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
+        outDir: `${(0, import_devkit2.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
       },
       files: [],
       include: ["src/**/*.ts", "src/**/*.js"],
@@ -110925,21 +110926,21 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
   }
   const lintCallback = await addLint(tree, options);
   tasks.push(lintCallback);
-  await (0, import_devkit.formatFiles)(tree);
+  await (0, import_devkit2.formatFiles)(tree);
   return null;
 }
 async function addLint(tree, options) {
-  const { lintProjectGenerator } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
+  const { lintProjectGenerator } = (0, import_devkit2.ensurePackage)("@nx/eslint", nxVersion);
   const { mapLintPattern } = (
     // nx-ignore-next-line
     require_lint_project()
   );
-  const projectConfiguration = (0, import_devkit.readProjectConfiguration)(tree, options.name);
+  const projectConfiguration = (0, import_devkit2.readProjectConfiguration)(tree, options.name);
   const task = lintProjectGenerator(tree, {
     project: options.name,
     linter: options.linter,
     skipFormat: true,
-    tsConfigPaths: [(0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json")],
+    tsConfigPaths: [(0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json")],
     unitTestRunner: options.unitTestRunner,
     eslintFilePatterns: [
       mapLintPattern(
@@ -111010,7 +111011,7 @@ function getOutputPath(options) {
   } else {
     parts.push(options.projectRoot);
   }
-  return (0, import_devkit.joinPathFragments)(...parts);
+  return (0, import_devkit2.joinPathFragments)(...parts);
 }
 function createProjectTsConfigJson(tree, options) {
   const tsconfig = {
@@ -111018,8 +111019,8 @@ function createProjectTsConfigJson(tree, options) {
     ...options?.tsConfigOptions ?? {},
     compilerOptions: {
       ...options.rootProject ? import_js.tsConfigBaseOptions : {},
-      outDir: (0, import_devkit.joinPathFragments)(
-        (0, import_devkit.offsetFromRoot)(options.projectRoot),
+      outDir: (0, import_devkit2.joinPathFragments)(
+        (0, import_devkit2.offsetFromRoot)(options.projectRoot),
         "dist/out-tsc"
       ),
       noEmit: true,
@@ -111039,9 +111040,9 @@ function createProjectTsConfigJson(tree, options) {
       "src/**/*.test.ts"
     ]
   };
-  (0, import_devkit.writeJson)(
+  (0, import_devkit2.writeJson)(
     tree,
-    (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
+    (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json"),
     tsconfig
   );
 }
@@ -111057,7 +111058,7 @@ async function normalizeOptions(tree, options) {
   if (options.publishable === false && options.buildable === false) {
     bundler = "none";
   }
-  const { Linter } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
+  const { Linter } = (0, import_devkit2.ensurePackage)("@nx/eslint", nxVersion);
   const {
     projectName,
     names: projectNames,
@@ -111073,7 +111074,7 @@ async function normalizeOptions(tree, options) {
     callingGenerator: "@nx/js:library"
   });
   options.rootProject = projectRoot === ".";
-  const normalized = (0, import_devkit.names)(projectNames.projectFileName);
+  const normalized = (0, import_devkit2.names)(projectNames.projectFileName);
   const fileName = normalized.fileName;
   return {
     js: false,
@@ -111131,7 +111132,7 @@ ${commentStart} ----------------------------------------------------------------
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_esbuild_decorators = __toESM(require_src2());
-var import_devkit2 = __toESM(require_devkit());
+var import_devkit3 = __toESM(require_devkit());
 var import_js2 = __toESM(require_src());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -117443,7 +117444,7 @@ async function tsupExecutorFn(options, context) {
     options.verbose && console.log(
       `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
-        (key) => `${key}: ${!options[key] || isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
+        (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
       ).join("\n")}
 `
     );
@@ -117492,8 +117493,8 @@ ${Object.keys(options).map(
       throw new Error("The Build process failed trying to copy assets");
     }
     const pathToPackageJson = (0, import_path4.join)(context.root, projectRoot, "package.json");
-    const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-    const workspacePackageJson = (0, import_devkit2.readJsonFile)(
+    const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit3.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
+    const workspacePackageJson = (0, import_devkit3.readJsonFile)(
       (0, import_path4.join)(workspaceRoot, "package.json")
     );
     options.external = options.external || [];
@@ -117532,7 +117533,7 @@ ${Object.keys(options).map(
           console.log(`\u26A1 Adding implicit dependency: ${key}`);
           const projectConfig = projectConfigs[key];
           if (projectConfig?.targets?.build) {
-            const projectPackageJson = (0, import_devkit2.readJsonFile)(
+            const projectPackageJson = (0, import_devkit3.readJsonFile)(
               projectConfig.targets?.build.options.project
             );
             if (projectPackageJson?.name && !options.external.includes(projectPackageJson.name)) {
@@ -117582,7 +117583,7 @@ ${externalDependencies.map((dep) => {
       entryPoints.push(options.entry);
     }
     if (options.emitOnAll === true) {
-      entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+      entryPoints.push((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
       entryPoints.push(...options.additionalEntryPoints);
@@ -117594,7 +117595,7 @@ ${externalDependencies.map((dep) => {
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit2.joinPathFragments)(
+      let propertyKey = (0, import_devkit3.joinPathFragments)(
         filePath.path,
         removeExtension(filePath.name)
       ).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
@@ -117603,19 +117604,19 @@ ${externalDependencies.map((dep) => {
           propertyKey = propertyKey.substring(1);
         }
         console.debug(
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!(propertyKey in ret)) {
-          ret[propertyKey] = (0, import_devkit2.joinPathFragments)(filePath.path, filePath.name);
+          ret[propertyKey] = (0, import_devkit3.joinPathFragments)(filePath.path, filePath.name);
         }
       }
       return ret;
     }, {});
     if (options.generatePackageJson !== false) {
-      const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
+      const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
       delete packageJson.dependencies;
       externalDependencies.forEach((externalDependency) => {
         const packageConfig = externalDependency.node.data;
@@ -117635,9 +117636,9 @@ ${externalDependencies.map((dep) => {
         }
       });
       console.log(JSON.stringify(options.getConfig));
-      const distPaths = !options?.getConfig || _isFunction(options.getConfig) ? [""] : Object.keys(options.getConfig).map((key) => `${key}/`);
+      const distPaths = !options?.getConfig || _isFunction(options.getConfig) ? ["dist/"] : Object.keys(options.getConfig).map((key) => `${key}/`);
       packageJson.type = "module";
-      if (distPaths.length > 1) {
+      if (distPaths.length > 0) {
         packageJson.exports ??= {
           ".": {
             import: {
@@ -117743,10 +117744,10 @@ ${externalDependencies.map((dep) => {
     }
     if (options.includeSrc === true) {
       const files = globSync([
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
-        (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
+        (0, import_devkit3.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
+        (0, import_devkit3.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
+        (0, import_devkit3.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
+        (0, import_devkit3.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
       ]);
       await Promise.allSettled(
         files.map(
@@ -117869,7 +117870,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
   );
   tsConfig.options.pathsBasePath = workspaceRoot;
   if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
-    tsConfig.options.tsBuildInfoFile = (0, import_devkit2.joinPathFragments)(
+    tsConfig.options.tsBuildInfoFile = (0, import_devkit3.joinPathFragments)(
       outputPath,
       "tsconfig.tsbuildinfo"
     );
@@ -117884,13 +117885,6 @@ var build = async (options) => {
     await (0, import_tsup.build)(options);
   }
 };
-var isPrimitive = (value) => {
-  try {
-    return value === void 0 || value === null || typeof value !== "object" && typeof value !== "function";
-  } catch (e) {
-    return false;
-  }
-};
 var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
   options.outputPath ??= "dist/{projectRoot}";
@@ -117916,7 +117910,7 @@ var applyDefaultOptions = (options) => {
   options.define ??= {};
   options.env ??= {};
   options.verbose ??= !!process.env.CI;
-  options.getConfig ??= defaultConfig;
+  options.getConfig ??= { "dist": defaultConfig };
   return options;
 };
 var executor_default = withRunExecutor(
@@ -117929,6 +117923,13 @@ var executor_default = withRunExecutor(
     }
   }
 );
+var _isPrimitive = (value) => {
+  try {
+    return value === void 0 || value === null || typeof value !== "object" && typeof value !== "function";
+  } catch (e) {
+    return false;
+  }
+};
 var _isFunction = (value) => {
   try {
     return value instanceof Function || typeof value === "function" || !!(value && value.constructor && value?.call && value?.apply);
@@ -117938,7 +117939,7 @@ var _isFunction = (value) => {
 };
 
 // packages/workspace-tools/src/executors/tsup-neutral/get-config.ts
-var import_devkit3 = __toESM(require_devkit());
+var import_devkit4 = __toESM(require_devkit());
 function modernNeutralConfig({
   entry,
   outDir,
@@ -117962,7 +117963,7 @@ function modernNeutralConfig({
   generatePackageJson,
   dtsTsConfig
 }) {
-  let outputPath = (0, import_devkit3.joinPathFragments)(outDir, "dist", "modern");
+  let outputPath = (0, import_devkit4.joinPathFragments)(outDir, "dist", "modern");
   return {
     name: "modern",
     entry,
@@ -118041,7 +118042,7 @@ function legacyNeutralConfig({
   generatePackageJson,
   dtsTsConfig
 }) {
-  let outputPath = (0, import_devkit3.joinPathFragments)(outDir, "dist", "legacy");
+  let outputPath = (0, import_devkit4.joinPathFragments)(outDir, "dist", "legacy");
   return {
     name: "legacy",
     entry,
@@ -118142,6 +118143,7 @@ var executor_default2 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/executors/tsup-node/get-config.ts
+var import_devkit5 = __toESM(require_devkit());
 function nodeConfig({
   entry,
   outDir,
@@ -118178,7 +118180,7 @@ function nodeConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir,
+    outDir: (0, import_devkit5.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile: true,
     shims,
@@ -118194,7 +118196,7 @@ function nodeConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir
+          outDir: (0, import_devkit5.joinPathFragments)(outDir, "dist")
         }
       }
     },
@@ -118258,7 +118260,7 @@ var executor_default3 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/generators/config-schema/generator.ts
-var import_devkit4 = __toESM(require_devkit());
+var import_devkit6 = __toESM(require_devkit());
 var import_fs5 = require("fs");
 var import_path5 = require("path");
 
@@ -119310,12 +119312,12 @@ async function configSchemaGeneratorFn(tree, options) {
   const ModulesSchema = unionType([workspaceSchema, StormConfigSchema]).describe(
     "The values set in the Storm config file. This file is expected to be named `storm.config.js` and be located in the root of the workspace"
   );
-  (0, import_devkit4.writeJson)(
+  (0, import_devkit6.writeJson)(
     tree,
     options.outputFile ? (0, import_path5.join)(workspaceRoot, options.outputFile) : (0, import_path5.join)(workspaceRoot, "storm.schema.json"),
     zodToJsonSchema(ModulesSchema, "StormConfig")
   );
-  await (0, import_devkit4.formatFiles)(tree);
+  await (0, import_devkit6.formatFiles)(tree);
   return null;
 }
 var generator_default = withRunGenerator(
@@ -119324,9 +119326,9 @@ var generator_default = withRunGenerator(
 );
 
 // packages/workspace-tools/src/generators/init/init.ts
-var import_devkit5 = __toESM(require_devkit());
+var import_devkit7 = __toESM(require_devkit());
 async function stormInitGenerator(tree, schema) {
-  const task = (0, import_devkit5.addDependenciesToPackageJson)(
+  const task = (0, import_devkit7.addDependenciesToPackageJson)(
     tree,
     {
       "nx": nxVersion,
@@ -119339,15 +119341,15 @@ async function stormInitGenerator(tree, schema) {
     {}
   );
   if (!schema.skipFormat) {
-    await (0, import_devkit5.formatFiles)(tree);
+    await (0, import_devkit7.formatFiles)(tree);
   }
   return task;
 }
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
-var import_devkit6 = __toESM(require_devkit());
+var import_devkit8 = __toESM(require_devkit());
 async function nodeLibraryGeneratorFn(tree, schema) {
-  const filesDir = (0, import_devkit6.joinPathFragments)(__dirname, "./files");
+  const filesDir = (0, import_devkit8.joinPathFragments)(__dirname, "./files");
   const tsLibraryGeneratorOptions = {
     ...schema,
     platform: "node",
@@ -119357,10 +119359,10 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     buildExecutor: "@storm-software/workspace-tools:tsup-node"
   };
   const options = await normalizeOptions(tree, tsLibraryGeneratorOptions);
-  const { className, name, propertyName } = (0, import_devkit6.names)(
+  const { className, name, propertyName } = (0, import_devkit8.names)(
     options.projectNames.projectFileName
   );
-  (0, import_devkit6.generateFiles)(tree, filesDir, options.projectRoot, {
+  (0, import_devkit8.generateFiles)(tree, filesDir, options.projectRoot, {
     ...schema,
     dot: ".",
     className,
@@ -119372,12 +119374,12 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     cliCommand: "nx",
     strict: void 0,
     tmpl: "",
-    offsetFromRoot: (0, import_devkit6.offsetFromRoot)(options.projectRoot),
+    offsetFromRoot: (0, import_devkit8.offsetFromRoot)(options.projectRoot),
     buildable: options.bundler && options.bundler !== "none",
     hasUnitTestRunner: options.unitTestRunner !== "none"
   });
   await typeScriptLibraryGeneratorFn(tree, tsLibraryGeneratorOptions);
-  await (0, import_devkit6.formatFiles)(tree);
+  await (0, import_devkit8.formatFiles)(tree);
   return null;
 }
 var generator_default2 = withRunGenerator(
@@ -119386,13 +119388,13 @@ var generator_default2 = withRunGenerator(
 );
 
 // packages/workspace-tools/src/generators/preset/generator.ts
-var import_devkit7 = __toESM(require_devkit());
+var import_devkit9 = __toESM(require_devkit());
 var path2 = __toESM(require("path"));
 async function presetGeneratorFn(tree, options) {
   const projectRoot = `.`;
   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;
-  (0, import_devkit7.addProjectConfiguration)(tree, `@${options.namespace}/${options.name}`, {
+  (0, import_devkit9.addProjectConfiguration)(tree, `@${options.namespace}/${options.name}`, {
     root: projectRoot,
     projectType: "application",
     targets: {
@@ -119406,7 +119408,7 @@ async function presetGeneratorFn(tree, options) {
       }
     }
   });
-  (0, import_devkit7.updateJson)(tree, "package.json", (json) => {
+  (0, import_devkit9.updateJson)(tree, "package.json", (json) => {
     json.scripts = json.scripts || {};
     json.version = "0.0.0";
     json.triggerEmptyDevReleaseByIncrementingThisNumber = 0;
@@ -119530,12 +119532,12 @@ async function presetGeneratorFn(tree, options) {
     };
     return json;
   });
-  (0, import_devkit7.generateFiles)(tree, path2.join(__dirname, "files"), projectRoot, {
+  (0, import_devkit9.generateFiles)(tree, path2.join(__dirname, "files"), projectRoot, {
     ...options,
     pnpmVersion,
     nodeVersion
   });
-  await (0, import_devkit7.formatFiles)(tree);
+  await (0, import_devkit9.formatFiles)(tree);
   let dependencies = {
     "@eslint/eslintrc": "^2.1.3",
     "@nx/devkit": "^17.0.3",
@@ -119601,11 +119603,11 @@ async function presetGeneratorFn(tree, options) {
     };
   }
   await Promise.resolve(
-    (0, import_devkit7.addDependenciesToPackageJson)(
+    (0, import_devkit9.addDependenciesToPackageJson)(
       tree,
       dependencies,
       {},
-      (0, import_devkit7.joinPathFragments)(projectRoot, "package.json")
+      (0, import_devkit9.joinPathFragments)(projectRoot, "package.json")
     )
   );
   return null;