@storm-software/workspace-tools 1.36.4 → 1.36.5

package/src/executors/tsup-node/executor.js

@@ -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: joinPathFragments2 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments4 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments2(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments4(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments2(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments4(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -39538,7 +39538,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_utils8();
+    var { isPrimitive, hasColor } = require_utils8();
     var BooleanPrompt = class extends Prompt {
       constructor(options) {
         super(options);
@@ -39569,7 +39569,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") {
@@ -39744,11 +39744,11 @@ var require_string2 = __commonJS({
     "use strict";
     var Prompt = require_prompt();
     var placeholder = require_placeholder();
-    var { isPrimitive: isPrimitive2 } = require_utils8();
+    var { isPrimitive } = require_utils8();
     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;
@@ -41382,7 +41382,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: joinPathFragments2, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments4, normalizePath, logger, readJson, 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.`;
@@ -41458,14 +41458,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments2(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments4(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments2(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments4(relativeCwd, asProvidedProjectName);
         }
       }
       if (asProvidedProjectName.startsWith("@")) {
@@ -41498,7 +41498,7 @@ var require_project_name_and_root_utils = __commonJS({
       const derivedSimpleProjectName = name;
       let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
       if (derivedProjectDirectoryWithoutLayout !== ".") {
-        derivedProjectDirectory = joinPathFragments2(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments4(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -110474,7 +110474,7 @@ ${commentStart} ----------------------------------------------------------------
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_esbuild_decorators = __toESM(require_src());
-var import_devkit = __toESM(require_devkit());
+var import_devkit2 = __toESM(require_devkit());
 var import_js = __toESM(require_src2());
 var import_normalize_options = __toESM(require_normalize_options());
 var import_tsc = __toESM(require_tsc_impl());
@@ -116708,6 +116708,7 @@ var import_tsup = __toESM(require_dist6());
 var ts = __toESM(require("typescript"));
 
 // packages/workspace-tools/src/base/get-tsup-config.ts
+var import_devkit = __toESM(require_devkit());
 function defaultConfig({
   entry,
   outDir,
@@ -116752,7 +116753,7 @@ function defaultConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir,
+    outDir: (0, import_devkit.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile: true,
     shims,
@@ -116768,7 +116769,7 @@ function defaultConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir
+          outDir: (0, import_devkit.joinPathFragments)(outDir, "dist")
         }
       }
     },
@@ -116856,7 +116857,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")}
 `
     );
@@ -116905,8 +116906,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_devkit.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-    const workspacePackageJson = (0, import_devkit.readJsonFile)(
+    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)(
       (0, import_path4.join)(workspaceRoot, "package.json")
     );
     options.external = options.external || [];
@@ -116945,7 +116946,7 @@ ${Object.keys(options).map(
           console.log(`\u26A1 Adding implicit dependency: ${key}`);
           const projectConfig = projectConfigs[key];
           if (projectConfig?.targets?.build) {
-            const projectPackageJson = (0, import_devkit.readJsonFile)(
+            const projectPackageJson = (0, import_devkit2.readJsonFile)(
               projectConfig.targets?.build.options.project
             );
             if (projectPackageJson?.name && !options.external.includes(projectPackageJson.name)) {
@@ -116995,7 +116996,7 @@ ${externalDependencies.map((dep) => {
       entryPoints.push(options.entry);
     }
     if (options.emitOnAll === true) {
-      entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
+      entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
     }
     if (options.additionalEntryPoints) {
       entryPoints.push(...options.additionalEntryPoints);
@@ -117007,7 +117008,7 @@ ${externalDependencies.map((dep) => {
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit.joinPathFragments)(
+      let propertyKey = (0, import_devkit2.joinPathFragments)(
         filePath.path,
         removeExtension(filePath.name)
       ).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
@@ -117016,19 +117017,19 @@ ${externalDependencies.map((dep) => {
           propertyKey = propertyKey.substring(1);
         }
         console.debug(
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!(propertyKey in ret)) {
-          ret[propertyKey] = (0, import_devkit.joinPathFragments)(filePath.path, filePath.name);
+          ret[propertyKey] = (0, import_devkit2.joinPathFragments)(filePath.path, filePath.name);
         }
       }
       return ret;
     }, {});
     if (options.generatePackageJson !== false) {
-      const projectGraph = (0, import_devkit.readCachedProjectGraph)();
+      const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
       delete packageJson.dependencies;
       externalDependencies.forEach((externalDependency) => {
         const packageConfig = externalDependency.node.data;
@@ -117048,7 +117049,7 @@ ${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 > 0) {
         packageJson.exports ??= {
@@ -117156,10 +117157,10 @@ ${externalDependencies.map((dep) => {
     }
     if (options.includeSrc === true) {
       const files = globSync([
-        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
-        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
-        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
-        (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
+        (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")
       ]);
       await Promise.allSettled(
         files.map(
@@ -117282,7 +117283,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
   );
   tsConfig.options.pathsBasePath = workspaceRoot;
   if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
-    tsConfig.options.tsBuildInfoFile = (0, import_devkit.joinPathFragments)(
+    tsConfig.options.tsBuildInfoFile = (0, import_devkit2.joinPathFragments)(
       outputPath,
       "tsconfig.tsbuildinfo"
     );
@@ -117297,13 +117298,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}";
@@ -117329,7 +117323,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(
@@ -117342,6 +117336,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);
@@ -117351,6 +117352,7 @@ var _isFunction = (value) => {
 };
 
 // packages/workspace-tools/src/executors/tsup-node/get-config.ts
+var import_devkit3 = __toESM(require_devkit());
 function nodeConfig({
   entry,
   outDir,
@@ -117387,7 +117389,7 @@ function nodeConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir,
+    outDir: (0, import_devkit3.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile: true,
     shims,
@@ -117403,7 +117405,7 @@ function nodeConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir
+          outDir: (0, import_devkit3.joinPathFragments)(outDir, "dist")
         }
       }
     },