@storm-software/workspace-tools 1.43.6 → 1.43.8

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

@@ -34308,7 +34308,7 @@ var require_jsonfile = __commonJS({
       return obj;
     }
     var readFile = universalify.fromPromise(_readFile);
-    function readFileSync2(file, options = {}) {
+    function readFileSync(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
       }
@@ -34340,7 +34340,7 @@ var require_jsonfile = __commonJS({
     }
     var jsonfile = {
       readFile,
-      readFileSync: readFileSync2,
+      readFileSync,
       writeFile,
       writeFileSync
     };
@@ -43478,7 +43478,7 @@ var import_devkit2 = __toESM(require_devkit());
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -43606,10 +43606,6 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
   return result;
 }
 
-// packages/config-tools/src/utilities/get-default-config.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -47270,51 +47266,6 @@ var DefaultStormConfig = {
   colors: { ...DefaultColorConfig },
   extensions: {}
 };
-var getDefaultConfig = (config = {}, root) => {
-  let name = "storm-workspace";
-  let namespace = "storm-software";
-  let repository = "https://github.com/storm-software/storm-ops";
-  let license = DefaultStormConfig.license;
-  let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
-      encoding: "utf-8"
-    });
-    if (file) {
-      const packageJson = JSON.parse(file);
-      if (packageJson.name) {
-        name = packageJson.name;
-      }
-      if (packageJson.namespace) {
-        namespace = packageJson.namespace;
-      }
-      if (packageJson.repository?.url) {
-        repository = packageJson.repository?.url;
-      }
-      if (packageJson.license) {
-        license = packageJson.license;
-      }
-      if (packageJson.homepage) {
-        homepage = packageJson.homepage;
-      }
-    }
-  }
-  return StormConfigSchema.parse({
-    ...config,
-    ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
-    workspaceRoot,
-    name,
-    namespace,
-    repository,
-    license: license ?? DefaultStormConfig.license,
-    homepage: homepage ?? DefaultStormConfig.homepage,
-    extensions: {
-      ...config.extensions
-    }
-  });
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -47494,7 +47445,6 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
 };
 var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
 var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
-var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
 var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
 var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
 var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
@@ -47716,26 +47666,15 @@ var getConfigEnv = () => {
 
 // packages/config-tools/src/create-storm-config.ts
 var loadStormConfig = async (workspaceRoot) => {
-  let config = {};
   let _workspaceRoot = workspaceRoot;
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = await getDefaultConfig(
-    {
-      ...await getConfigFile(_workspaceRoot),
-      ...getConfigEnv()
-    },
-    _workspaceRoot
-  );
-  if (configFile) {
-    config = StormConfigSchema.parse(configFile);
-  } else {
-    writeWarning(
-      config,
-      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
-    );
-  }
+  const configFile = {
+    ...await getConfigFile(_workspaceRoot),
+    ...getConfigEnv()
+  };
+  const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   return config;
 };

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

@@ -34308,7 +34308,7 @@ var require_jsonfile = __commonJS({
       return obj;
     }
     var readFile = universalify.fromPromise(_readFile);
-    function readFileSync2(file, options = {}) {
+    function readFileSync(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
       }
@@ -34340,7 +34340,7 @@ var require_jsonfile = __commonJS({
     }
     var jsonfile = {
       readFile,
-      readFileSync: readFileSync2,
+      readFileSync,
       writeFile,
       writeFileSync
     };
@@ -43478,7 +43478,7 @@ var import_devkit2 = __toESM(require_devkit());
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -43606,10 +43606,6 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
   return result;
 }
 
-// packages/config-tools/src/utilities/get-default-config.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -47270,51 +47266,6 @@ var DefaultStormConfig = {
   colors: { ...DefaultColorConfig },
   extensions: {}
 };
-var getDefaultConfig = (config = {}, root) => {
-  let name = "storm-workspace";
-  let namespace = "storm-software";
-  let repository = "https://github.com/storm-software/storm-ops";
-  let license = DefaultStormConfig.license;
-  let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
-      encoding: "utf-8"
-    });
-    if (file) {
-      const packageJson = JSON.parse(file);
-      if (packageJson.name) {
-        name = packageJson.name;
-      }
-      if (packageJson.namespace) {
-        namespace = packageJson.namespace;
-      }
-      if (packageJson.repository?.url) {
-        repository = packageJson.repository?.url;
-      }
-      if (packageJson.license) {
-        license = packageJson.license;
-      }
-      if (packageJson.homepage) {
-        homepage = packageJson.homepage;
-      }
-    }
-  }
-  return StormConfigSchema.parse({
-    ...config,
-    ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
-    workspaceRoot,
-    name,
-    namespace,
-    repository,
-    license: license ?? DefaultStormConfig.license,
-    homepage: homepage ?? DefaultStormConfig.homepage,
-    extensions: {
-      ...config.extensions
-    }
-  });
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -47494,7 +47445,6 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
 };
 var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
 var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
-var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
 var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
 var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
 var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
@@ -47716,26 +47666,15 @@ var getConfigEnv = () => {
 
 // packages/config-tools/src/create-storm-config.ts
 var loadStormConfig = async (workspaceRoot) => {
-  let config = {};
   let _workspaceRoot = workspaceRoot;
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = await getDefaultConfig(
-    {
-      ...await getConfigFile(_workspaceRoot),
-      ...getConfigEnv()
-    },
-    _workspaceRoot
-  );
-  if (configFile) {
-    config = StormConfigSchema.parse(configFile);
-  } else {
-    writeWarning(
-      config,
-      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
-    );
-  }
+  const configFile = {
+    ...await getConfigFile(_workspaceRoot),
+    ...getConfigEnv()
+  };
+  const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   return config;
 };

package/src/generators/preset/generator.js

@@ -26237,7 +26237,7 @@ var import_devkit = __toESM(require_devkit());
 // packages/config-tools/src/config-file/get-config-file.ts
 var import_cosmiconfig = __toESM(require_dist(), 1);
 var _static_cache = void 0;
-var getConfigFileName = (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
+var getConfigFileName = async (fileName, filePath) => (0, import_cosmiconfig.cosmiconfig)(fileName, { cache: true }).search(filePath);
 var getConfigFile = async (filePath) => {
   if (_static_cache) {
     return _static_cache;
@@ -26365,10 +26365,6 @@ Path: ${pathInsideMonorepo ? pathInsideMonorepo : process.cwd()}`
   return result;
 }
 
-// packages/config-tools/src/utilities/get-default-config.ts
-var import_node_fs2 = require("node:fs");
-var import_node_path2 = require("node:path");
-
 // node_modules/.pnpm/zod@3.22.4/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
@@ -30029,51 +30025,6 @@ var DefaultStormConfig = {
   colors: { ...DefaultColorConfig },
   extensions: {}
 };
-var getDefaultConfig = (config = {}, root) => {
-  let name = "storm-workspace";
-  let namespace = "storm-software";
-  let repository = "https://github.com/storm-software/storm-ops";
-  let license = DefaultStormConfig.license;
-  let homepage = DefaultStormConfig.homepage;
-  const workspaceRoot = findWorkspaceRoot(root);
-  if ((0, import_node_fs2.existsSync)((0, import_node_path2.join)(workspaceRoot, "package.json"))) {
-    const file = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(workspaceRoot, "package.json"), {
-      encoding: "utf-8"
-    });
-    if (file) {
-      const packageJson = JSON.parse(file);
-      if (packageJson.name) {
-        name = packageJson.name;
-      }
-      if (packageJson.namespace) {
-        namespace = packageJson.namespace;
-      }
-      if (packageJson.repository?.url) {
-        repository = packageJson.repository?.url;
-      }
-      if (packageJson.license) {
-        license = packageJson.license;
-      }
-      if (packageJson.homepage) {
-        homepage = packageJson.homepage;
-      }
-    }
-  }
-  return StormConfigSchema.parse({
-    ...config,
-    ...DefaultStormConfig,
-    colors: { ...config.colors, ...DefaultColorConfig },
-    workspaceRoot,
-    name,
-    namespace,
-    repository,
-    license: license ?? DefaultStormConfig.license,
-    homepage: homepage ?? DefaultStormConfig.homepage,
-    extensions: {
-      ...config.extensions
-    }
-  });
-};
 
 // packages/config-tools/src/utilities/get-log-level.ts
 var getLogLevel = (label) => {
@@ -30253,7 +30204,6 @@ var getLogFn = (config = {}, logLevel = LogLevel.INFO) => {
 };
 var writeFatal = (config, message) => getLogFn(config, LogLevel.FATAL)(message);
 var writeError = (config, message) => getLogFn(config, LogLevel.ERROR)(message);
-var writeWarning = (config, message) => getLogFn(config, LogLevel.WARN)(message);
 var writeInfo = (config, message) => getLogFn(config, LogLevel.INFO)(message);
 var writeSuccess = (config, message) => getLogFn(config, LogLevel.SUCCESS)(message);
 var writeDebug = (config, message) => getLogFn(config, LogLevel.DEBUG)(message);
@@ -30475,26 +30425,15 @@ var getConfigEnv = () => {
 
 // packages/config-tools/src/create-storm-config.ts
 var loadStormConfig = async (workspaceRoot) => {
-  let config = {};
   let _workspaceRoot = workspaceRoot;
   if (!_workspaceRoot) {
     _workspaceRoot = findWorkspaceRoot();
   }
-  const configFile = await getDefaultConfig(
-    {
-      ...await getConfigFile(_workspaceRoot),
-      ...getConfigEnv()
-    },
-    _workspaceRoot
-  );
-  if (configFile) {
-    config = StormConfigSchema.parse(configFile);
-  } else {
-    writeWarning(
-      config,
-      "No Storm config file found in the current workspace. Please ensure this is the expected behavior - you can add a `storm.config.js` file to the root of your workspace if it is not."
-    );
-  }
+  const configFile = {
+    ...await getConfigFile(_workspaceRoot),
+    ...getConfigEnv()
+  };
+  const config = StormConfigSchema.parse(configFile);
   setConfigEnv(config);
   return config;
 };