@storm-software/workspace-tools 1.31.9 → 1.31.11

package/src/generators/node-library/generator.js

@@ -43504,7 +43504,7 @@ module.exports = __toCommonJS(generator_exports);
 var import_devkit2 = __toESM(require_devkit());
 
 // packages/config-tools/src/config-file/get-config-file.ts
-var import_cosmiconfig = __toESM(require_dist());
+var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
 var getConfigFileName = (fileName) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search();
 var getConfigFile = async () => {
@@ -47232,7 +47232,10 @@ var getDefaultConfig = (config = {}) => {
   let repository = "https://github.com/storm-software/storm-stack";
   let license = DefaultStormConfig.license;
   let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = getWorkspaceRoot() ?? process.cwd();
+  const workspaceRoot = (0, import_find_workspace_root.findWorkspaceRoot)(process.cwd());
+  if (typeof workspaceRoot !== "string") {
+    throw new Error("Could not find workspace root");
+  }
   if ((0, import_fs.existsSync)((0, import_path.join)(workspaceRoot, "package.json"))) {
     const file = (0, import_fs.readFileSync)((0, import_path.join)(workspaceRoot, "package.json"), {
       encoding: "utf-8"
@@ -47260,12 +47263,6 @@ var getDefaultConfig = (config = {}) => {
     })
   );
 };
-var getWorkspaceRoot = () => {
-  const root = (0, import_find_workspace_root.findWorkspaceRoot)(process.cwd());
-  process.env.STORM_WORKSPACE_ROOT ??= root?.dir;
-  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
-  return root?.dir;
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -47451,7 +47448,7 @@ var chalk = __toESM(require_source());
 
 // packages/workspace-tools/src/utils/get-workspace-root.ts
 var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
-var getWorkspaceRoot2 = () => {
+var getWorkspaceRoot = () => {
   const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
   process.env.STORM_WORKSPACE_ROOT ??= root?.dir;
   process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
@@ -47480,7 +47477,7 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot()
     );
   }
   return result;

package/src/generators/preset/generator.js

@@ -26263,7 +26263,7 @@ var import_devkit = __toESM(require_devkit());
 var path = __toESM(require("path"));
 
 // packages/config-tools/src/config-file/get-config-file.ts
-var import_cosmiconfig = __toESM(require_dist());
+var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
 var getConfigFileName = (fileName) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search();
 var getConfigFile = async () => {
@@ -29991,7 +29991,10 @@ var getDefaultConfig = (config = {}) => {
   let repository = "https://github.com/storm-software/storm-stack";
   let license = DefaultStormConfig.license;
   let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = getWorkspaceRoot() ?? process.cwd();
+  const workspaceRoot = (0, import_find_workspace_root.findWorkspaceRoot)(process.cwd());
+  if (typeof workspaceRoot !== "string") {
+    throw new Error("Could not find workspace root");
+  }
   if ((0, import_fs.existsSync)((0, import_path.join)(workspaceRoot, "package.json"))) {
     const file = (0, import_fs.readFileSync)((0, import_path.join)(workspaceRoot, "package.json"), {
       encoding: "utf-8"
@@ -30019,12 +30022,6 @@ var getDefaultConfig = (config = {}) => {
     })
   );
 };
-var getWorkspaceRoot = () => {
-  const root = (0, import_find_workspace_root.findWorkspaceRoot)(process.cwd());
-  process.env.STORM_WORKSPACE_ROOT ??= root?.dir;
-  process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
-  return root?.dir;
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -30210,7 +30207,7 @@ var chalk = __toESM(require_source());
 
 // packages/workspace-tools/src/utils/get-workspace-root.ts
 var import_find_workspace_root2 = require("nx/src/utils/find-workspace-root.js");
-var getWorkspaceRoot2 = () => {
+var getWorkspaceRoot = () => {
   const root = (0, import_find_workspace_root2.findWorkspaceRoot)(process.cwd());
   process.env.STORM_WORKSPACE_ROOT ??= root?.dir;
   process.env.NX_WORKSPACE_ROOT_PATH ??= root?.dir;
@@ -30239,7 +30236,7 @@ var applyWorkspaceGeneratorTokens = (option, tokenizerOptions) => {
   if (result.includes("{workspaceRoot}")) {
     result = result.replaceAll(
       "{workspaceRoot}",
-      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot2()
+      tokenizerOptions.workspaceRoot ?? tokenizerOptions.config.workspaceRoot ?? getWorkspaceRoot()
     );
   }
   return result;