@storm-software/workspace-tools 1.62.29 → 1.62.31

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.62.31 (2024-03-01)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Enhance collecting compiler options and logging ([a1c4d41f](https://github.com/storm-software/storm-ops/commit/a1c4d41f))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.62.30 (2024-03-01)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Update tsup build to use `readConfigFile` function for tsconfig loader ([66186de6](https://github.com/storm-software/storm-ops/commit/66186de6))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.62.29 (2024-03-01)
 
 

package/index.js

@@ -122127,12 +122127,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: joinPathFragments12 } = (0, nx_1.requireNx)();
+    var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments11 } = (0, nx_1.requireNx)();
     function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
-      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments12(cwd, "package.json")) && !alwaysRun) {
+      if (!tree.listChanges().find((f7) => f7.path === joinPathFragments11(cwd, "package.json")) && !alwaysRun) {
         return;
       }
-      const packageJsonValue = tree.read(joinPathFragments12(cwd, "package.json"), "utf-8");
+      const packageJsonValue = tree.read(joinPathFragments11(cwd, "package.json"), "utf-8");
       let storedPackageJsonValue = global["__packageJsonInstallCache__"];
       if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -176562,7 +176562,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: joinPathFragments12, logger, normalizePath, output, readJson: readJson4, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
+    var { joinPathFragments: joinPathFragments11, logger, normalizePath, output, readJson: readJson4, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
     async function determineProjectNameAndRootOptions2(tree, options8) {
       if (!options8.projectNameAndRootFormat && (process.env.NX_INTERACTIVE !== "true" || !isTTY())) {
         options8.projectNameAndRootFormat = "derived";
@@ -176689,14 +176689,14 @@ var require_project_name_and_root_utils = __commonJS({
         if (options8.directory === relativeCwd || options8.directory.startsWith(`${relativeCwd}/`)) {
           projectRoot = options8.directory;
         } else {
-          projectRoot = joinPathFragments12(relativeCwd, options8.directory);
+          projectRoot = joinPathFragments11(relativeCwd, options8.directory);
         }
       } else if (options8.rootProject) {
         projectRoot = ".";
       } else {
         projectRoot = relativeCwd;
         if (!relativeCwd.endsWith(options8.name)) {
-          projectRoot = joinPathFragments12(relativeCwd, options8.name);
+          projectRoot = joinPathFragments11(relativeCwd, options8.name);
         }
       }
       let importPath = void 0;
@@ -176729,7 +176729,7 @@ var require_project_name_and_root_utils = __commonJS({
       const projectSimpleName = name;
       let projectRoot = projectDirectoryWithoutLayout;
       if (projectDirectoryWithoutLayout !== ".") {
-        projectRoot = joinPathFragments12(layoutDirectory, projectRoot);
+        projectRoot = joinPathFragments11(layoutDirectory, projectRoot);
       }
       let importPath;
       if (options8.projectType === "library") {
@@ -474571,7 +474571,6 @@ ${commentStart} ----------------------------------------------------------------
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var import_node_path2 = require("node:path");
 var import_esbuild_decorators = __toESM(require_src6());
-var import_devkit3 = __toESM(require_devkit());
 var import_get_custom_transformers_factory = __toESM(require_get_custom_transformers_factory());
 var import_normalize_options = __toESM(require_normalize_options());
 
@@ -474671,7 +474670,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const { writeInfo, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
+  const { writeInfo, writeTrace, writeWarning, findWorkspaceRoot } = await import("@storm-software/config-tools");
   const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
@@ -474684,6 +474683,32 @@ var runTsupBuild = async (context, config, options8) => {
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
+  const dtsTsConfig = getNormalizedTsConfig(
+    workspaceRoot,
+    options8.outputPath,
+    createTypeScriptCompilationOptions(
+      (0, import_normalize_options.normalizeOptions)(
+        {
+          ...options8,
+          watch: false,
+          main: context.main,
+          transformers: []
+        },
+        workspaceRoot,
+        context.sourceRoot,
+        workspaceRoot
+      ),
+      context.projectName
+    )
+  );
+  writeTrace(
+    config,
+    `\u2699\uFE0F  TSC (Type Declarations) Build options:
+${Object.keys(dtsTsConfig.options).map(
+      (key2) => `${key2}: ${!dtsTsConfig.options[key2] || _isPrimitive(dtsTsConfig.options[key2]) ? dtsTsConfig.options[key2] : JSON.stringify(dtsTsConfig.options[key2])}`
+    ).join("\n")}
+`
+  );
   const getConfigOptions = {
     ...options8,
     entry: {
@@ -474701,24 +474726,7 @@ var runTsupBuild = async (context, config, options8) => {
         return ret;
       }, {})
     },
-    dtsTsConfig: getNormalizedTsConfig(
-      workspaceRoot,
-      options8.outputPath,
-      createTypeScriptCompilationOptions(
-        (0, import_normalize_options.normalizeOptions)(
-          {
-            ...options8,
-            watch: false,
-            main: context.main,
-            transformers: []
-          },
-          workspaceRoot,
-          context.sourceRoot,
-          workspaceRoot
-        ),
-        context.projectName
-      )
-    ),
+    dtsTsConfig,
     banner: options8.banner ? {
       js: `
 
@@ -474769,19 +474777,36 @@ Error: ${rawTsconfig.error.messageText}` : ""}`
       ...rawTsconfig.config,
       compilerOptions: {
         ...rawTsconfig.config?.compilerOptions,
-        tsBuildInfoFile: rawTsconfig.config?.compilerOptions?.incremental ? (0, import_devkit3.joinPathFragments)(outputPath, "tsconfig.tsbuildinfo") : void 0,
+        rootDir: workspaceRoot.replaceAll("\\", "/"),
+        baseUrl: workspaceRoot.replaceAll("\\", "/"),
         outDir: outputPath,
         noEmit: false,
         emitDeclarationOnly: true,
         declaration: true,
         declarationMap: true,
-        declarationDir: (0, import_node_path2.join)(workspaceRoot, "tmp", ".tsup", "declaration")
+        declarationDir: (0, import_node_path2.join)(workspaceRoot.replaceAll("\\", "/"), "tmp", ".tsup", "declaration")
       }
     },
     import_typescript.sys,
     (0, import_node_path2.dirname)(options8.tsConfig)
   );
-  parsedTsconfig.options.pathsBasePath = workspaceRoot;
+  parsedTsconfig.options.pathsBasePath = workspaceRoot.replaceAll("\\", "/");
+  if (parsedTsconfig.options.paths) {
+    parsedTsconfig.options.paths = Object.keys(parsedTsconfig.options.paths).reduce(
+      (ret, key2) => {
+        if (parsedTsconfig.options.paths?.[key2]) {
+          ret[key2] = parsedTsconfig.options.paths[key2]?.map(
+            (path15) => (0, import_node_path2.join)(workspaceRoot.replaceAll("\\", "/"), path15)
+          );
+        }
+        return ret;
+      },
+      {}
+    );
+  }
+  if (parsedTsconfig.options.incremental) {
+    parsedTsconfig.options.tsBuildInfoFile = (0, import_node_path2.join)(outputPath, "tsconfig.tsbuildinfo");
+  }
   return parsedTsconfig;
 }
 var build = async (options8, config) => {
@@ -474833,7 +474858,7 @@ var createTypeScriptCompilationOptions = (normalizedOptions, projectName) => {
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_node_fs = require("node:fs");
-var import_devkit4 = __toESM(require_devkit());
+var import_devkit3 = __toESM(require_devkit());
 var import_js2 = __toESM(require_src5());
 var import_fs_extra = __toESM(require_lib4());
 
@@ -481142,9 +481167,9 @@ ${Object.keys(options8).map(
   if (!result.success) {
     throw new Error("The Build process failed trying to copy assets");
   }
-  const pathToPackageJson = (0, import_devkit4.joinPathFragments)(context.root, projectRoot, "package.json");
-  const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit4.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-  const workspacePackageJson = (0, import_devkit4.readJsonFile)((0, import_devkit4.joinPathFragments)(workspaceRoot, "package.json"));
+  const pathToPackageJson = (0, import_devkit3.joinPathFragments)(context.root, projectRoot, "package.json");
+  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_devkit3.joinPathFragments)(workspaceRoot, "package.json"));
   options8.external = options8.external || [];
   if (workspacePackageJson?.dependencies) {
     options8.external = Object.keys(workspacePackageJson?.dependencies).reduce(
@@ -481185,7 +481210,7 @@ ${Object.keys(options8).map(
       writeDebug(config, `\u26A1 Adding implicit dependency: ${key2}`);
       const projectConfig = projectConfigs[key2];
       if (projectConfig?.targets?.build) {
-        const projectPackageJson = (0, import_devkit4.readJsonFile)(projectConfig.targets?.build.options.project);
+        const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
         if (projectPackageJson?.name && !options8.external?.includes(projectPackageJson.name)) {
           ret.push(projectPackageJson.name);
           internalDependencies.push(projectPackageJson.name);
@@ -481222,34 +481247,34 @@ ${externalDependencies.map((dep) => {
     entryPoints.push(...options8.additionalEntryPoints);
   }
   if (options8.emitOnAll === true) {
-    entryPoints = globSync((0, import_devkit4.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
+    entryPoints = globSync((0, import_devkit3.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"), {
       withFileTypes: true
     }).reduce((ret, filePath) => {
       let formattedPath = workspaceRoot.replaceAll("\\", "/");
       if (formattedPath.toUpperCase().startsWith("C:")) {
         formattedPath = formattedPath.substring(2);
       }
-      let propertyKey = (0, import_devkit4.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
+      let propertyKey = (0, import_devkit3.joinPathFragments)(filePath.path, removeExtension(filePath.name)).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
       if (propertyKey) {
         while (propertyKey.startsWith("/")) {
           propertyKey = propertyKey.substring(1);
         }
         writeDebug(
           config,
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit4.joinPathFragments)(
+          `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
             filePath.path,
             filePath.name
           )}"`
         );
         if (!ret.includes(propertyKey)) {
-          ret.push((0, import_devkit4.joinPathFragments)(filePath.path, filePath.name));
+          ret.push((0, import_devkit3.joinPathFragments)(filePath.path, filePath.name));
         }
       }
       return ret;
     }, entryPoints);
   }
   if (options8.generatePackageJson !== false) {
-    const projectGraph = (0, import_devkit4.readCachedProjectGraph)();
+    const projectGraph = (0, import_devkit3.readCachedProjectGraph)();
     if (options8.bundle === false) {
       packageJson.dependencies = void 0;
       for (const externalDependency of externalDependencies) {
@@ -481302,16 +481327,16 @@ ${externalDependencies.map((dep) => {
         }
         packageJson.exports[`./${formattedEntryPoint}`] = {
           import: {
-            types: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           },
           require: {
-            types: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
-            default: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
+            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.cts`,
+            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.cjs`
           },
           default: {
-            types: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
-            default: `./${(0, import_devkit4.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
+            types: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.d.ts`,
+            default: `./${(0, import_devkit3.joinPathFragments)(distPaths[0] ?? "./", formattedEntryPoint)}.js`
           }
         };
       }
@@ -481335,7 +481360,7 @@ ${externalDependencies.map((dep) => {
         if (distSrc.startsWith("/")) {
           distSrc = distSrc.substring(1);
         }
-        packageJson.source ??= `${(0, import_devkit4.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
+        packageJson.source ??= `${(0, import_devkit3.joinPathFragments)(distSrc, "index.ts").replaceAll("\\", "/")}`;
       }
       packageJson.files ??= ["dist/**/*"];
       if (options8.includeSrc === true && !packageJson.files.includes("src")) {
@@ -481352,8 +481377,8 @@ ${externalDependencies.map((dep) => {
     packageJson.license ??= workspacePackageJson.license;
     packageJson.keywords ??= workspacePackageJson.keywords;
     packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit4.joinPathFragments)("packages", context.projectName);
-    const packageJsonPath = (0, import_devkit4.joinPathFragments)(context.root, options8.outputPath, "package.json");
+    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit3.joinPathFragments)("packages", context.projectName);
+    const packageJsonPath = (0, import_devkit3.joinPathFragments)(context.root, options8.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs.writeFileSync)(packageJsonPath, JSON.stringify(packageJson));
   } else {
@@ -481361,10 +481386,10 @@ ${externalDependencies.map((dep) => {
   }
   if (options8.includeSrc === true) {
     const files = globSync([
-      (0, import_devkit4.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
-      (0, import_devkit4.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
-      (0, import_devkit4.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
-      (0, import_devkit4.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
+      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.ts"),
+      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.tsx"),
+      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.js"),
+      (0, import_devkit3.joinPathFragments)(workspaceRoot, options8.outputPath, "src/**/*.jsx")
     ]);
     options8.verbose = options8.verbose || getLogLevel(config?.logLevel) >= LogLevel.DEBUG;
     await Promise.allSettled(
@@ -481421,7 +481446,7 @@ var _isFunction3 = (value) => {
 };
 
 // packages/workspace-tools/src/executors/tsup-neutral/get-config.ts
-var import_devkit5 = __toESM(require_devkit());
+var import_devkit4 = __toESM(require_devkit());
 var neutralConfig = ({
   entry,
   outDir,
@@ -481449,7 +481474,7 @@ var neutralConfig = ({
   minify = false,
   getTransform
 }) => {
-  const outputPath = (0, import_devkit5.joinPathFragments)(outDir, "dist");
+  const outputPath = (0, import_devkit4.joinPathFragments)(outDir, "dist");
   const options8 = {
     name: "neutral",
     entry,
@@ -481551,7 +481576,7 @@ var executor_default2 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/executors/tsup-node/get-config.ts
-var import_devkit6 = __toESM(require_devkit());
+var import_devkit5 = __toESM(require_devkit());
 function nodeConfig({
   entry,
   outDir,
@@ -481592,7 +481617,7 @@ function nodeConfig({
     } : false,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_devkit6.joinPathFragments)(outDir, "dist"),
+    outDir: (0, import_devkit5.joinPathFragments)(outDir, "dist"),
     silent: !verbose,
     metafile,
     shims,
@@ -481609,7 +481634,7 @@ function nodeConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: (0, import_devkit6.joinPathFragments)(outDir, "dist")
+          outDir: (0, import_devkit5.joinPathFragments)(outDir, "dist")
         }
       }
     },
@@ -481680,7 +481705,7 @@ var executor_default3 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/executors/tsup-browser/get-config.ts
-var import_devkit7 = __toESM(require_devkit());
+var import_devkit6 = __toESM(require_devkit());
 var browserConfig = ({
   entry,
   outDir,
@@ -481705,7 +481730,7 @@ var browserConfig = ({
   minify = false,
   getTransform
 }) => {
-  const outputPath = (0, import_devkit7.joinPathFragments)(outDir, "dist");
+  const outputPath = (0, import_devkit6.joinPathFragments)(outDir, "dist");
   const options8 = {
     name: "modern",
     entry,
@@ -481841,11 +481866,11 @@ var executor_default5 = withRunExecutor(
 );
 
 // packages/workspace-tools/src/executors/npm-publish/executor.ts
-var import_devkit8 = __toESM(require_devkit());
+var import_devkit7 = __toESM(require_devkit());
 var LARGE_BUFFER = 1024 * 1e6;
 
 // packages/workspace-tools/src/generators/config-schema/generator.ts
-var import_devkit9 = __toESM(require_devkit());
+var import_devkit8 = __toESM(require_devkit());
 var import_config = require("@storm-software/config");
 var import_node_fs2 = require("node:fs");
 var import_node_path3 = require("node:path");
@@ -486466,12 +486491,12 @@ async function configSchemaGeneratorFn(tree, options8, config) {
   const ModulesSchema = unionType([workspaceSchema, import_config.StormConfigSchema]).describe(
     "The values set in the Storm config file. This file is expected to be named `storm.json`, `storm.config.ts`, or `storm.config.js` and be located in the root of the workspace"
   );
-  (0, import_devkit9.writeJson)(
+  (0, import_devkit8.writeJson)(
     tree,
     options8.outputFile ? (0, import_node_path3.join)(workspaceRoot, options8.outputFile) : (0, import_node_path3.join)(workspaceRoot, "storm.schema.json"),
     zodToJsonSchema(ModulesSchema, "StormConfig")
   );
-  await (0, import_devkit9.formatFiles)(tree);
+  await (0, import_devkit8.formatFiles)(tree);
   return {
     success: true
   };
@@ -486482,9 +486507,9 @@ var generator_default = withRunGenerator(
 );
 
 // packages/workspace-tools/src/generators/init/init.ts
-var import_devkit10 = __toESM(require_devkit());
+var import_devkit9 = __toESM(require_devkit());
 async function stormInitGenerator(tree, schema2) {
-  const task = (0, import_devkit10.addDependenciesToPackageJson)(
+  const task = (0, import_devkit9.addDependenciesToPackageJson)(
     tree,
     {
       "nx": nxVersion,
@@ -486497,15 +486522,15 @@ async function stormInitGenerator(tree, schema2) {
     {}
   );
   if (!schema2.skipFormat) {
-    await (0, import_devkit10.formatFiles)(tree);
+    await (0, import_devkit9.formatFiles)(tree);
   }
   return task;
 }
 
 // packages/workspace-tools/src/generators/node-library/generator.ts
-var import_devkit11 = __toESM(require_devkit());
+var import_devkit10 = __toESM(require_devkit());
 async function nodeLibraryGeneratorFn(tree, schema2) {
-  const filesDir = (0, import_devkit11.joinPathFragments)(__dirname, "./files");
+  const filesDir = (0, import_devkit10.joinPathFragments)(__dirname, "./files");
   const tsLibraryGeneratorOptions = {
     ...schema2,
     platform: "node",
@@ -486515,8 +486540,8 @@ async function nodeLibraryGeneratorFn(tree, schema2) {
     buildExecutor: "@storm-software/workspace-tools:tsup-node"
   };
   const options8 = await normalizeOptions2(tree, tsLibraryGeneratorOptions);
-  const { className, name, propertyName } = (0, import_devkit11.names)(options8.projectNames.projectFileName);
-  (0, import_devkit11.generateFiles)(tree, filesDir, options8.projectRoot, {
+  const { className, name, propertyName } = (0, import_devkit10.names)(options8.projectNames.projectFileName);
+  (0, import_devkit10.generateFiles)(tree, filesDir, options8.projectRoot, {
     ...schema2,
     dot: ".",
     className,
@@ -486528,12 +486553,12 @@ async function nodeLibraryGeneratorFn(tree, schema2) {
     cliCommand: "nx",
     strict: void 0,
     tmpl: "",
-    offsetFromRoot: (0, import_devkit11.offsetFromRoot)(options8.projectRoot),
+    offsetFromRoot: (0, import_devkit10.offsetFromRoot)(options8.projectRoot),
     buildable: options8.bundler && options8.bundler !== "none",
     hasUnitTestRunner: options8.unitTestRunner !== "none"
   });
   await typeScriptLibraryGeneratorFn(tree, tsLibraryGeneratorOptions);
-  await (0, import_devkit11.formatFiles)(tree);
+  await (0, import_devkit10.formatFiles)(tree);
   return null;
 }
 var generator_default2 = withRunGenerator(
@@ -486543,12 +486568,12 @@ var generator_default2 = withRunGenerator(
 
 // packages/workspace-tools/src/generators/preset/generator.ts
 var path14 = __toESM(require("node:path"));
-var import_devkit12 = __toESM(require_devkit());
+var import_devkit11 = __toESM(require_devkit());
 async function presetGeneratorFn(tree, options8) {
   const projectRoot = ".";
   options8.description ??= `\u26A1The ${options8.namespace ? options8.namespace : options8.name} monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.`;
   options8.namespace ??= options8.organization;
-  (0, import_devkit12.addProjectConfiguration)(tree, `@${options8.namespace}/${options8.name}`, {
+  (0, import_devkit11.addProjectConfiguration)(tree, `@${options8.namespace}/${options8.name}`, {
     root: projectRoot,
     projectType: "application",
     targets: {
@@ -486562,7 +486587,7 @@ async function presetGeneratorFn(tree, options8) {
       }
     }
   });
-  (0, import_devkit12.updateJson)(tree, "package.json", (json2) => {
+  (0, import_devkit11.updateJson)(tree, "package.json", (json2) => {
     json2.scripts = json2.scripts || {};
     json2.version = "0.0.0";
     json2.triggerEmptyDevReleaseByIncrementingThisNumber = 0;
@@ -486686,12 +486711,12 @@ async function presetGeneratorFn(tree, options8) {
     };
     return json2;
   });
-  (0, import_devkit12.generateFiles)(tree, path14.join(__dirname, "files"), projectRoot, {
+  (0, import_devkit11.generateFiles)(tree, path14.join(__dirname, "files"), projectRoot, {
     ...options8,
     pnpmVersion,
     nodeVersion
   });
-  await (0, import_devkit12.formatFiles)(tree);
+  await (0, import_devkit11.formatFiles)(tree);
   let dependencies = {
     "@nx/devkit": "^18.0.4",
     "@nx/jest": "^18.0.4",
@@ -486748,11 +486773,11 @@ async function presetGeneratorFn(tree, options8) {
     };
   }
   await Promise.resolve(
-    (0, import_devkit12.addDependenciesToPackageJson)(
+    (0, import_devkit11.addDependenciesToPackageJson)(
       tree,
       dependencies,
       {},
-      (0, import_devkit12.joinPathFragments)(projectRoot, "package.json")
+      (0, import_devkit11.joinPathFragments)(projectRoot, "package.json")
     )
   );
   return null;
@@ -486763,7 +486788,7 @@ var generator_default3 = withRunGenerator(
 );
 
 // packages/workspace-tools/src/generators/release-version/generator.ts
-var import_devkit13 = __toESM(require_devkit());
+var import_devkit12 = __toESM(require_devkit());
 var import_version = require("nx/src/command-line/release/version");
 var import_utils2 = require("nx/src/tasks-runner/utils");
 var import_semver = require("nx/src/command-line/release/utils/semver");
@@ -486822,7 +486847,7 @@ Valid values are: ${import_version.validReleaseVersionPrefixes.map((s) => `"${s}
   for (const project of projects) {
     const projectName = project.name;
     const packageRoot = projectNameToPackageRootMap.get(projectName);
-    const packageJsonPath = (0, import_devkit13.joinPathFragments)(packageRoot ?? "./", "package.json");
+    const packageJsonPath = (0, import_devkit12.joinPathFragments)(packageRoot ?? "./", "package.json");
     const workspaceRelativePackageJsonPath = (0, import_node_path4.relative)(
       config?.workspaceRoot ?? findWorkspaceRoot(),
       packageJsonPath
@@ -486838,7 +486863,7 @@ To fix this you will either need to add a package.json file at that location, or
       );
     }
     writeInfo(config, `Running release version for project: ${project.name}`);
-    const projectPackageJson = (0, import_devkit13.readJson)(tree, packageJsonPath);
+    const projectPackageJson = (0, import_devkit12.readJson)(tree, packageJsonPath);
     log(
       `\u{1F50D} Reading data for package "${projectPackageJson.name}" from ${workspaceRelativePackageJsonPath}`
     );
@@ -487049,7 +487074,7 @@ To fix this you will either need to add a package.json file at that location, or
     if (versionData[projectName]) {
       versionData[projectName].newVersion = newVersion;
     }
-    (0, import_devkit13.writeJson)(tree, packageJsonPath, {
+    (0, import_devkit12.writeJson)(tree, packageJsonPath, {
       ...projectPackageJson,
       version: newVersion
     });
@@ -487060,9 +487085,9 @@ To fix this you will either need to add a package.json file at that location, or
       );
     }
     for (const dependentProject of dependentProjects) {
-      (0, import_devkit13.updateJson)(
+      (0, import_devkit12.updateJson)(
         tree,
-        (0, import_devkit13.joinPathFragments)(
+        (0, import_devkit12.joinPathFragments)(
           projectNameToPackageRootMap.get(dependentProject.source) ?? "./",
           "package.json"
         ),
@@ -487086,7 +487111,7 @@ To fix this you will either need to add a package.json file at that location, or
       );
     }
   }
-  await (0, import_devkit13.formatFiles)(tree);
+  await (0, import_devkit12.formatFiles)(tree);
   return {
     data: versionData,
     callback: async (tree2, opts) => {