@storm-software/workspace-tools 1.10.13 → 1.10.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.10.13",
+  "version": "1.10.14",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/src/executors/tsup/executor.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: joinPathFragments3 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f) => f.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f) => f.path === joinPathFragments(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -20380,7 +20380,7 @@ var require_util2 = __commonJS({
       return path2;
     }
     exports.normalize = normalize2;
-    function join2(aRoot, aPath) {
+    function join3(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -20412,7 +20412,7 @@ var require_util2 = __commonJS({
       }
       return joined;
     }
-    exports.join = join2;
+    exports.join = join3;
     exports.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -20585,7 +20585,7 @@ var require_util2 = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join2(urlGenerate(parsed), sourceURL);
+        sourceURL = join3(urlGenerate(parsed), sourceURL);
       }
       return normalize2(sourceURL);
     }
@@ -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: joinPathFragments3, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments, 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.`;
@@ -222884,14 +222884,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
           asProvidedProjectDirectory = directory;
         } else {
-          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, directory);
+          asProvidedProjectDirectory = joinPathFragments(relativeCwd, directory);
         }
       } else if (options.rootProject) {
         asProvidedProjectDirectory = ".";
       } else {
         asProvidedProjectDirectory = relativeCwd;
         if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
-          asProvidedProjectDirectory = joinPathFragments3(relativeCwd, asProvidedProjectName);
+          asProvidedProjectDirectory = joinPathFragments(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 = joinPathFragments3(layoutDirectory, derivedProjectDirectory);
+        derivedProjectDirectory = joinPathFragments(layoutDirectory, derivedProjectDirectory);
       }
       let derivedImportPath;
       if (options.projectType === "library") {
@@ -410815,7 +410815,7 @@ var require_dist = __commonJS({
       loadTsConfig: () => loadTsConfig2
     });
     module2.exports = __toCommonJS2(src_exports);
-    var import_path3 = __toESM2(require("path"), 1);
+    var import_path4 = __toESM2(require("path"), 1);
     var import_fs3 = __toESM2(require("fs"), 1);
     var singleComment = Symbol("singleComment");
     var multiComment = Symbol("multiComment");
@@ -410911,10 +410911,10 @@ var require_dist = __commonJS({
       }
     }
     var req = false ? createRequire(import_meta.url) : require;
-    var findUp = (name, startDir, stopDir = import_path3.default.parse(startDir).root) => {
+    var findUp = (name, startDir, stopDir = import_path4.default.parse(startDir).root) => {
       let dir = startDir;
       while (dir !== stopDir) {
-        const file = import_path3.default.join(dir, name);
+        const file = import_path4.default.join(dir, name);
         if (import_fs3.default.existsSync(file))
           return file;
         if (!file.endsWith(".json")) {
@@ -410922,17 +410922,17 @@ var require_dist = __commonJS({
           if (import_fs3.default.existsSync(fileWithExt))
             return fileWithExt;
         }
-        dir = import_path3.default.dirname(dir);
+        dir = import_path4.default.dirname(dir);
       }
       return null;
     };
     var resolveTsConfigFromFile = (cwd, filename) => {
-      if (import_path3.default.isAbsolute(filename))
+      if (import_path4.default.isAbsolute(filename))
         return import_fs3.default.existsSync(filename) ? filename : null;
       return findUp(filename, cwd);
     };
     var resolveTsConfigFromExtends = (cwd, name) => {
-      if (import_path3.default.isAbsolute(name))
+      if (import_path4.default.isAbsolute(name))
         return import_fs3.default.existsSync(name) ? name : null;
       if (name.startsWith("."))
         return findUp(name, cwd);
@@ -410941,14 +410941,14 @@ var require_dist = __commonJS({
     };
     var loadTsConfigInternal = (dir = process.cwd(), name = "tsconfig.json", isExtends = false) => {
       var _a, _b;
-      dir = import_path3.default.resolve(dir);
+      dir = import_path4.default.resolve(dir);
       const id = isExtends ? resolveTsConfigFromExtends(dir, name) : resolveTsConfigFromFile(dir, name);
       if (!id)
         return null;
       const data = jsoncParse(import_fs3.default.readFileSync(id, "utf-8"));
-      const configDir = import_path3.default.dirname(id);
+      const configDir = import_path4.default.dirname(id);
       if ((_a = data.compilerOptions) == null ? void 0 : _a.baseUrl) {
-        data.compilerOptions.baseUrl = import_path3.default.join(
+        data.compilerOptions.baseUrl = import_path4.default.join(
           configDir,
           data.compilerOptions.baseUrl
         );
@@ -411031,11 +411031,11 @@ var require_dist2 = __commonJS({
     var import_esbuild = require("esbuild");
     var import_load_tsconfig = require_dist();
     var import_fs3 = __toESM2(require("fs"), 1);
-    var import_path3 = __toESM2(require("path"), 1);
+    var import_path4 = __toESM2(require("path"), 1);
     var getPkgType = () => {
       try {
         const pkg = JSON.parse(
-          import_fs3.default.readFileSync(import_path3.default.resolve("package.json"), "utf-8")
+          import_fs3.default.readFileSync(import_path4.default.resolve("package.json"), "utf-8")
         );
         return pkg.type;
       } catch (error) {
@@ -411044,7 +411044,7 @@ var require_dist2 = __commonJS({
     function guessFormat(inputFile) {
       if (!usingDynamicImport)
         return "cjs";
-      const ext2 = import_path3.default.extname(inputFile);
+      const ext2 = import_path4.default.extname(inputFile);
       const type = getPkgType();
       if (ext2 === ".js") {
         return type === "module" ? "esm" : "cjs";
@@ -436851,7 +436851,7 @@ var require_util5 = __commonJS({
     var normalize2 = createSafeHandler((url) => {
     });
     exports.normalize = normalize2;
-    function join2(aRoot, aPath) {
+    function join3(aRoot, aPath) {
       const pathType = getURLType(aPath);
       const rootType = getURLType(aRoot);
       aRoot = ensureDirectory(aRoot);
@@ -436877,7 +436877,7 @@ var require_util5 = __commonJS({
       const newPath = withBase(aPath, withBase(aRoot, base));
       return computeRelativeURL(base, newPath);
     }
-    exports.join = join2;
+    exports.join = join3;
     function relative(rootURL, targetURL) {
       const result = relativeIfPossible(rootURL, targetURL);
       return typeof result === "string" ? result : normalize2(targetURL);
@@ -436907,9 +436907,9 @@ var require_util5 = __commonJS({
       }
       let url = normalize2(sourceURL || "");
       if (sourceRoot)
-        url = join2(sourceRoot, url);
+        url = join3(sourceRoot, url);
       if (sourceMapURL)
-        url = join2(trimFilename(sourceMapURL), url);
+        url = join3(trimFilename(sourceMapURL), url);
       return url;
     }
     exports.computeSourceURL = computeSourceURL;
@@ -438675,7 +438675,7 @@ var require_source_map2 = __commonJS({
 var require_native = __commonJS({
   "node_modules/.pnpm/rollup@4.5.0/node_modules/rollup/dist/native.js"(exports, module2) {
     var { existsSync } = require("node:fs");
-    var { join: join2 } = require("node:path");
+    var { join: join3 } = require("node:path");
     var { platform, arch, report } = require("node:process");
     var isMusl = () => !report.getReport().header.glibcVersionRuntime;
     var bindingsByPlatformAndArch = {
@@ -438725,7 +438725,7 @@ If this is important to you, please consider supporting Rollup to make a native
       return imported.base;
     }
     var localName = `./rollup.${packageBase}.node`;
-    var { parse, parseAsync, xxhashBase64Url } = existsSync(join2(__dirname, localName)) ? require(localName) : require(`@rollup/rollup-${packageBase}`);
+    var { parse, parseAsync, xxhashBase64Url } = existsSync(join3(__dirname, localName)) ? require(localName) : require(`@rollup/rollup-${packageBase}`);
     module2.exports.parse = parse;
     module2.exports.parseAsync = parseAsync;
     module2.exports.xxhashBase64Url = xxhashBase64Url;
@@ -468001,7 +468001,7 @@ __export(executor_exports, {
   default: () => runExecutor
 });
 module.exports = __toCommonJS(executor_exports);
-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());
 var import_fs2 = require("fs");
@@ -474186,7 +474186,7 @@ glob.glob = glob;
 var import_node_events = require("node:events");
 var import_project_graph = require("nx/src/project-graph/project-graph");
 var import_fileutils = require("nx/src/utils/fileutils");
-var import_path2 = require("path");
+var import_path3 = require("path");
 var import_prettier = require("prettier");
 var import_tsup2 = __toESM(require_dist5());
 
@@ -474241,7 +474241,7 @@ var removeExtension = (filePath) => {
 };
 
 // packages/workspace-tools/src/executors/tsup/get-config.ts
-var import_devkit = __toESM(require_devkit());
+var import_path2 = require("path");
 var import_tsup = __toESM(require_dist5());
 function modernConfig({
   entry,
@@ -474277,7 +474277,7 @@ function modernConfig({
     tsconfig,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "modern"),
+    outDir: (0, import_path2.join)(outDir, "dist", "modern"),
     silent: !verbose,
     metafile: true,
     shims: true,
@@ -474325,7 +474325,7 @@ function legacyConfig({
     tsconfig,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy"),
+    outDir: (0, import_path2.join)(outDir, "dist", "legacy"),
     silent: !verbose,
     metafile: true,
     shims: true,
@@ -474367,11 +474367,16 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   verbose,
   ...rest
 }) {
-  const entry = [
-    rest.entry ? rest.entry : (0, import_devkit.joinPathFragments)(sourceRoot, "index.ts"),
-    ...additionalEntryPoints ?? []
-  ].reduce((ret, filePath) => {
-    ret[removeExtension(filePath).replaceAll("/", "-").replaceAll("\\", "-").replaceAll("*", "")] = filePath;
+  const entry = globSync(
+    [
+      rest.entry ? rest.entry : (0, import_path2.join)(sourceRoot, "index.ts"),
+      ...additionalEntryPoints ?? []
+    ],
+    {
+      withFileTypes: true
+    }
+  ).reduce((ret, filePath) => {
+    ret[removeExtension(filePath.name)] = (0, import_path2.join)(filePath.path, filePath.name);
     return ret;
   }, {});
   return (0, import_tsup.defineConfig)([
@@ -474470,7 +474475,7 @@ ${Object.keys(options).map(
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
     const outputPath = applyWorkspaceTokens(
-      options.outputPath ? options.outputPath : (0, import_path2.join)(workspaceRoot, "dist", projectRoot),
+      options.outputPath ? options.outputPath : (0, import_path3.join)(workspaceRoot, "dist", projectRoot),
       context
     );
     if (options.clean !== false) {
@@ -474529,10 +474534,10 @@ ${externalDependencies.map((dep) => {
       }
     }
     const projectGraph = await (0, import_project_graph.buildProjectGraphWithoutDaemon)();
-    const pathToPackageJson = (0, import_path2.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)(
-      (0, import_devkit2.joinPathFragments)(workspaceRoot, "package.json")
+    const pathToPackageJson = (0, import_path3.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)(
+      (0, import_path3.join)(workspaceRoot, "package.json")
     );
     externalDependencies.forEach((entry) => {
       const packageConfig = entry.node.data;
@@ -474561,11 +474566,11 @@ ${externalDependencies.map((dep) => {
         },
         ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
           [removeExtension(entryPoint).replace(sourceRoot, "")]: {
-            types: (0, import_devkit2.joinPathFragments)(
+            types: (0, import_path3.join)(
               "./dist/modern",
               `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
             ),
-            default: (0, import_devkit2.joinPathFragments)(
+            default: (0, import_path3.join)(
               "./dist/modern",
               `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
             )
@@ -474591,12 +474596,8 @@ ${externalDependencies.map((dep) => {
     packageJson.license ??= workspacePackageJson.license;
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit2.joinPathFragments)("packages", context.projectName);
-    const packageJsonPath = (0, import_devkit2.joinPathFragments)(
-      context.root,
-      outputPath,
-      "package.json"
-    );
+    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path3.join)("packages", context.projectName);
+    const packageJsonPath = (0, import_path3.join)(context.root, outputPath, "package.json");
     console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_fs2.writeFileSync)(
       packageJsonPath,
@@ -474618,10 +474619,10 @@ ${externalDependencies.map((dep) => {
     );
     if (options.banner) {
       const files = globSync([
-        (0, import_devkit2.joinPathFragments)(context.root, outputPath, "src/**/*.ts"),
-        (0, import_devkit2.joinPathFragments)(context.root, outputPath, "src/**/*.tsx"),
-        (0, import_devkit2.joinPathFragments)(context.root, outputPath, "src/**/*.js"),
-        (0, import_devkit2.joinPathFragments)(context.root, outputPath, "src/**/*.jsx")
+        (0, import_path3.join)(context.root, outputPath, "src/**/*.ts"),
+        (0, import_path3.join)(context.root, outputPath, "src/**/*.tsx"),
+        (0, import_path3.join)(context.root, outputPath, "src/**/*.js"),
+        (0, import_path3.join)(context.root, outputPath, "src/**/*.jsx")
       ]);
       await Promise.allSettled(
         files.map(