@storm-software/workspace-tools 1.43.14 → 1.43.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/index.js +20 -21
  3. package/meta.json +1 -1
  4. package/package.json +1 -1
  5. package/src/base/index.js +13 -1
  6. package/src/executors/design-tokens/executor.js +13 -1
  7. package/src/executors/tsup/executor.js +20 -21
  8. package/src/executors/tsup-browser/executor.js +20 -21
  9. package/src/executors/tsup-neutral/executor.js +20 -21
  10. package/src/executors/tsup-node/executor.js +20 -21
  11. package/src/generators/browser-library/generator.js +13 -1
  12. package/src/generators/config-schema/generator.js +13 -1
  13. package/src/generators/neutral-library/generator.js +13 -1
  14. package/src/generators/node-library/generator.js +13 -1
  15. package/src/generators/preset/generator.js +13 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.43.14",
3
+ "version": "1.43.16",
4
4
  "private": false,
5
5
  "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
6
6
  "keywords": [
package/src/base/index.js CHANGED
@@ -47665,7 +47665,19 @@ var loadStormConfig = async (workspaceRoot) => {
47665
47665
  const configEnv = getConfigEnv();
47666
47666
  for (const key of Object.keys(configEnv)) {
47667
47667
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
47668
- configFile[key] = configEnv[key];
47668
+ if (key === "colors") {
47669
+ configFile.colors = {
47670
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
47671
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
47672
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
47673
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
47674
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
47675
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
47676
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
47677
+ };
47678
+ } else {
47679
+ configFile[key] = configEnv[key];
47680
+ }
47669
47681
  }
47670
47682
  }
47671
47683
  const config = StormConfigSchema.parse(configFile);
package/src/executors/design-tokens/executor.js CHANGED
@@ -65581,7 +65581,19 @@ var loadStormConfig = async (workspaceRoot) => {
65581
65581
  const configEnv = getConfigEnv();
65582
65582
  for (const key of Object.keys(configEnv)) {
65583
65583
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
65584
- configFile[key] = configEnv[key];
65584
+ if (key === "colors") {
65585
+ configFile.colors = {
65586
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
65587
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
65588
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
65589
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
65590
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
65591
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
65592
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
65593
+ };
65594
+ } else {
65595
+ configFile[key] = configEnv[key];
65596
+ }
65585
65597
  }
65586
65598
  }
65587
65599
  const config = StormConfigSchema.parse(configFile);
package/src/executors/tsup/executor.js CHANGED
@@ -8247,14 +8247,14 @@ var require_parse_target_string = __commonJS({
8247
8247
  Object.defineProperty(exports, "__esModule", { value: true });
8248
8248
  exports.targetToTargetString = exports.parseTargetString = void 0;
8249
8249
  var nx_1 = require_nx();
8250
- var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
8250
+ var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
8251
8251
  splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
8252
8252
  splitByColons = splitByColons ?? ((s) => s.split(":"));
8253
8253
  function parseTargetString(targetString, projectGraphOrCtx) {
8254
8254
  let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
8255
8255
  if (!projectGraph) {
8256
8256
  try {
8257
- projectGraph = readCachedProjectGraph();
8257
+ projectGraph = readCachedProjectGraph2();
8258
8258
  } catch (e) {
8259
8259
  projectGraph = { nodes: {} };
8260
8260
  }
@@ -130522,7 +130522,19 @@ var loadStormConfig = async (workspaceRoot) => {
130522
130522
  const configEnv = getConfigEnv();
130523
130523
  for (const key of Object.keys(configEnv)) {
130524
130524
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
130525
- configFile[key] = configEnv[key];
130525
+ if (key === "colors") {
130526
+ configFile.colors = {
130527
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
130528
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
130529
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
130530
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
130531
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
130532
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
130533
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
130534
+ };
130535
+ } else {
130536
+ configFile[key] = configEnv[key];
130537
+ }
130526
130538
  }
130527
130539
  }
130528
130540
  const config = StormConfigSchema.parse(configFile);
@@ -137254,29 +137266,19 @@ ${externalDependencies.map((dep) => {
137254
137266
  }
137255
137267
  return ret;
137256
137268
  }, {});
137257
- console.log("Conditional before checking entry points");
137258
137269
  if (options.generatePackageJson !== false) {
137259
- console.log("Checking entry points");
137260
- const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
137261
- exitOnError: true
137262
- });
137263
- console.log("Read project graph");
137270
+ const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
137264
137271
  packageJson.dependencies = void 0;
137265
137272
  for (const externalDependency of externalDependencies) {
137266
- console.log(externalDependency);
137267
137273
  const packageConfig = externalDependency.node.data;
137268
- if (packageConfig?.packageName && externalDependency.node.type === "npm") {
137269
- console.log("In if statement");
137270
- console.log(packageConfig);
137274
+ if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
137271
137275
  const { packageName, version } = packageConfig;
137272
- if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
137273
- return null;
137276
+ if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
137277
+ packageJson.dependencies ??= {};
137278
+ packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137274
137279
  }
137275
- packageJson.dependencies ??= {};
137276
- packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137277
137280
  }
137278
137281
  }
137279
- console.log("Checking entry points - internalDependencies");
137280
137282
  for (const packageName of internalDependencies) {
137281
137283
  if (!packageJson?.devDependencies?.[packageName]) {
137282
137284
  packageJson.dependencies ??= {};
@@ -137315,7 +137317,6 @@ ${externalDependencies.map((dep) => {
137315
137317
  },
137316
137318
  "./package.json": "./package.json"
137317
137319
  };
137318
- console.log("Checking entry points - packageJson.exports");
137319
137320
  packageJson.exports = Object.keys(entry).reduce((ret, key) => {
137320
137321
  let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
137321
137322
  packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137372,7 +137373,6 @@ ${externalDependencies.map((dep) => {
137372
137373
  packageJson.keywords ??= workspacePackageJson.keywords;
137373
137374
  packageJson.repository ??= workspacePackageJson.repository;
137374
137375
  packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
137375
- console.log("Checking entry points - packageJsonPath");
137376
137376
  const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
137377
137377
  writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
137378
137378
  (0, import_node_fs2.writeFileSync)(
@@ -137385,7 +137385,6 @@ ${externalDependencies.map((dep) => {
137385
137385
  } else {
137386
137386
  writeWarning(config, "Skipping writing to package.json file");
137387
137387
  }
137388
- console.log("Checking entry points - options.includeSrc");
137389
137388
  if (options.includeSrc === true) {
137390
137389
  const files = globSync([
137391
137390
  (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
package/src/executors/tsup-browser/executor.js CHANGED
@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
16239
16239
  Object.defineProperty(exports, "__esModule", { value: true });
16240
16240
  exports.targetToTargetString = exports.parseTargetString = void 0;
16241
16241
  var nx_1 = require_nx();
16242
- var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16242
+ var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16243
16243
  splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
16244
16244
  splitByColons = splitByColons ?? ((s) => s.split(":"));
16245
16245
  function parseTargetString(targetString, projectGraphOrCtx) {
16246
16246
  let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
16247
16247
  if (!projectGraph) {
16248
16248
  try {
16249
- projectGraph = readCachedProjectGraph();
16249
+ projectGraph = readCachedProjectGraph2();
16250
16250
  } catch (e) {
16251
16251
  projectGraph = { nodes: {} };
16252
16252
  }
@@ -130513,7 +130513,19 @@ var loadStormConfig = async (workspaceRoot) => {
130513
130513
  const configEnv = getConfigEnv();
130514
130514
  for (const key of Object.keys(configEnv)) {
130515
130515
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
130516
- configFile[key] = configEnv[key];
130516
+ if (key === "colors") {
130517
+ configFile.colors = {
130518
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
130519
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
130520
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
130521
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
130522
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
130523
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
130524
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
130525
+ };
130526
+ } else {
130527
+ configFile[key] = configEnv[key];
130528
+ }
130517
130529
  }
130518
130530
  }
130519
130531
  const config = StormConfigSchema.parse(configFile);
@@ -137285,29 +137297,19 @@ ${externalDependencies.map((dep) => {
137285
137297
  }
137286
137298
  return ret;
137287
137299
  }, {});
137288
- console.log("Conditional before checking entry points");
137289
137300
  if (options.generatePackageJson !== false) {
137290
- console.log("Checking entry points");
137291
- const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
137292
- exitOnError: true
137293
- });
137294
- console.log("Read project graph");
137301
+ const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
137295
137302
  packageJson.dependencies = void 0;
137296
137303
  for (const externalDependency of externalDependencies) {
137297
- console.log(externalDependency);
137298
137304
  const packageConfig = externalDependency.node.data;
137299
- if (packageConfig?.packageName && externalDependency.node.type === "npm") {
137300
- console.log("In if statement");
137301
- console.log(packageConfig);
137305
+ if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
137302
137306
  const { packageName, version } = packageConfig;
137303
- if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
137304
- return null;
137307
+ if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
137308
+ packageJson.dependencies ??= {};
137309
+ packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137305
137310
  }
137306
- packageJson.dependencies ??= {};
137307
- packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137308
137311
  }
137309
137312
  }
137310
- console.log("Checking entry points - internalDependencies");
137311
137313
  for (const packageName of internalDependencies) {
137312
137314
  if (!packageJson?.devDependencies?.[packageName]) {
137313
137315
  packageJson.dependencies ??= {};
@@ -137346,7 +137348,6 @@ ${externalDependencies.map((dep) => {
137346
137348
  },
137347
137349
  "./package.json": "./package.json"
137348
137350
  };
137349
- console.log("Checking entry points - packageJson.exports");
137350
137351
  packageJson.exports = Object.keys(entry).reduce((ret, key) => {
137351
137352
  let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
137352
137353
  packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137403,7 +137404,6 @@ ${externalDependencies.map((dep) => {
137403
137404
  packageJson.keywords ??= workspacePackageJson.keywords;
137404
137405
  packageJson.repository ??= workspacePackageJson.repository;
137405
137406
  packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
137406
- console.log("Checking entry points - packageJsonPath");
137407
137407
  const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
137408
137408
  writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
137409
137409
  (0, import_node_fs2.writeFileSync)(
@@ -137416,7 +137416,6 @@ ${externalDependencies.map((dep) => {
137416
137416
  } else {
137417
137417
  writeWarning(config, "Skipping writing to package.json file");
137418
137418
  }
137419
- console.log("Checking entry points - options.includeSrc");
137420
137419
  if (options.includeSrc === true) {
137421
137420
  const files = globSync([
137422
137421
  (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
package/src/executors/tsup-neutral/executor.js CHANGED
@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
16239
16239
  Object.defineProperty(exports, "__esModule", { value: true });
16240
16240
  exports.targetToTargetString = exports.parseTargetString = void 0;
16241
16241
  var nx_1 = require_nx();
16242
- var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16242
+ var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16243
16243
  splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
16244
16244
  splitByColons = splitByColons ?? ((s) => s.split(":"));
16245
16245
  function parseTargetString(targetString, projectGraphOrCtx) {
16246
16246
  let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
16247
16247
  if (!projectGraph) {
16248
16248
  try {
16249
- projectGraph = readCachedProjectGraph();
16249
+ projectGraph = readCachedProjectGraph2();
16250
16250
  } catch (e) {
16251
16251
  projectGraph = { nodes: {} };
16252
16252
  }
@@ -130513,7 +130513,19 @@ var loadStormConfig = async (workspaceRoot) => {
130513
130513
  const configEnv = getConfigEnv();
130514
130514
  for (const key of Object.keys(configEnv)) {
130515
130515
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
130516
- configFile[key] = configEnv[key];
130516
+ if (key === "colors") {
130517
+ configFile.colors = {
130518
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
130519
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
130520
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
130521
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
130522
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
130523
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
130524
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
130525
+ };
130526
+ } else {
130527
+ configFile[key] = configEnv[key];
130528
+ }
130517
130529
  }
130518
130530
  }
130519
130531
  const config = StormConfigSchema.parse(configFile);
@@ -137285,29 +137297,19 @@ ${externalDependencies.map((dep) => {
137285
137297
  }
137286
137298
  return ret;
137287
137299
  }, {});
137288
- console.log("Conditional before checking entry points");
137289
137300
  if (options.generatePackageJson !== false) {
137290
- console.log("Checking entry points");
137291
- const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
137292
- exitOnError: true
137293
- });
137294
- console.log("Read project graph");
137301
+ const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
137295
137302
  packageJson.dependencies = void 0;
137296
137303
  for (const externalDependency of externalDependencies) {
137297
- console.log(externalDependency);
137298
137304
  const packageConfig = externalDependency.node.data;
137299
- if (packageConfig?.packageName && externalDependency.node.type === "npm") {
137300
- console.log("In if statement");
137301
- console.log(packageConfig);
137305
+ if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
137302
137306
  const { packageName, version } = packageConfig;
137303
- if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
137304
- return null;
137307
+ if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
137308
+ packageJson.dependencies ??= {};
137309
+ packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137305
137310
  }
137306
- packageJson.dependencies ??= {};
137307
- packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137308
137311
  }
137309
137312
  }
137310
- console.log("Checking entry points - internalDependencies");
137311
137313
  for (const packageName of internalDependencies) {
137312
137314
  if (!packageJson?.devDependencies?.[packageName]) {
137313
137315
  packageJson.dependencies ??= {};
@@ -137346,7 +137348,6 @@ ${externalDependencies.map((dep) => {
137346
137348
  },
137347
137349
  "./package.json": "./package.json"
137348
137350
  };
137349
- console.log("Checking entry points - packageJson.exports");
137350
137351
  packageJson.exports = Object.keys(entry).reduce((ret, key) => {
137351
137352
  let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
137352
137353
  packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137403,7 +137404,6 @@ ${externalDependencies.map((dep) => {
137403
137404
  packageJson.keywords ??= workspacePackageJson.keywords;
137404
137405
  packageJson.repository ??= workspacePackageJson.repository;
137405
137406
  packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
137406
- console.log("Checking entry points - packageJsonPath");
137407
137407
  const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
137408
137408
  writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
137409
137409
  (0, import_node_fs2.writeFileSync)(
@@ -137416,7 +137416,6 @@ ${externalDependencies.map((dep) => {
137416
137416
  } else {
137417
137417
  writeWarning(config, "Skipping writing to package.json file");
137418
137418
  }
137419
- console.log("Checking entry points - options.includeSrc");
137420
137419
  if (options.includeSrc === true) {
137421
137420
  const files = globSync([
137422
137421
  (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
package/src/executors/tsup-node/executor.js CHANGED
@@ -16239,14 +16239,14 @@ var require_parse_target_string = __commonJS({
16239
16239
  Object.defineProperty(exports, "__esModule", { value: true });
16240
16240
  exports.targetToTargetString = exports.parseTargetString = void 0;
16241
16241
  var nx_1 = require_nx();
16242
- var { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16242
+ var { readCachedProjectGraph: readCachedProjectGraph2, splitTarget, splitByColons } = (0, nx_1.requireNx)();
16243
16243
  splitTarget = splitTarget ?? require("nx/src/utils/split-target").splitTarget;
16244
16244
  splitByColons = splitByColons ?? ((s) => s.split(":"));
16245
16245
  function parseTargetString(targetString, projectGraphOrCtx) {
16246
16246
  let projectGraph = projectGraphOrCtx && "projectGraph" in projectGraphOrCtx ? projectGraphOrCtx.projectGraph : projectGraphOrCtx;
16247
16247
  if (!projectGraph) {
16248
16248
  try {
16249
- projectGraph = readCachedProjectGraph();
16249
+ projectGraph = readCachedProjectGraph2();
16250
16250
  } catch (e) {
16251
16251
  projectGraph = { nodes: {} };
16252
16252
  }
@@ -130513,7 +130513,19 @@ var loadStormConfig = async (workspaceRoot) => {
130513
130513
  const configEnv = getConfigEnv();
130514
130514
  for (const key of Object.keys(configEnv)) {
130515
130515
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
130516
- configFile[key] = configEnv[key];
130516
+ if (key === "colors") {
130517
+ configFile.colors = {
130518
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
130519
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
130520
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
130521
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
130522
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
130523
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
130524
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
130525
+ };
130526
+ } else {
130527
+ configFile[key] = configEnv[key];
130528
+ }
130517
130529
  }
130518
130530
  }
130519
130531
  const config = StormConfigSchema.parse(configFile);
@@ -137285,29 +137297,19 @@ ${externalDependencies.map((dep) => {
137285
137297
  }
137286
137298
  return ret;
137287
137299
  }, {});
137288
- console.log("Conditional before checking entry points");
137289
137300
  if (options.generatePackageJson !== false) {
137290
- console.log("Checking entry points");
137291
- const projectGraph = await (0, import_devkit2.createProjectGraphAsync)({
137292
- exitOnError: true
137293
- });
137294
- console.log("Read project graph");
137301
+ const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
137295
137302
  packageJson.dependencies = void 0;
137296
137303
  for (const externalDependency of externalDependencies) {
137297
- console.log(externalDependency);
137298
137304
  const packageConfig = externalDependency.node.data;
137299
- if (packageConfig?.packageName && externalDependency.node.type === "npm") {
137300
- console.log("In if statement");
137301
- console.log(packageConfig);
137305
+ if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
137302
137306
  const { packageName, version } = packageConfig;
137303
- if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName] || packageJson?.devDependencies?.[packageName]) {
137304
- return null;
137307
+ if (!workspacePackageJson.dependencies?.[packageName] && !workspacePackageJson.devDependencies?.[packageName] && !packageJson?.devDependencies?.[packageName]) {
137308
+ packageJson.dependencies ??= {};
137309
+ packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137305
137310
  }
137306
- packageJson.dependencies ??= {};
137307
- packageJson.dependencies[packageName] = projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
137308
137311
  }
137309
137312
  }
137310
- console.log("Checking entry points - internalDependencies");
137311
137313
  for (const packageName of internalDependencies) {
137312
137314
  if (!packageJson?.devDependencies?.[packageName]) {
137313
137315
  packageJson.dependencies ??= {};
@@ -137346,7 +137348,6 @@ ${externalDependencies.map((dep) => {
137346
137348
  },
137347
137349
  "./package.json": "./package.json"
137348
137350
  };
137349
- console.log("Checking entry points - packageJson.exports");
137350
137351
  packageJson.exports = Object.keys(entry).reduce((ret, key) => {
137351
137352
  let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
137352
137353
  packageJsonKey = packageJsonKey.replaceAll("/index", "");
@@ -137403,7 +137404,6 @@ ${externalDependencies.map((dep) => {
137403
137404
  packageJson.keywords ??= workspacePackageJson.keywords;
137404
137405
  packageJson.repository ??= workspacePackageJson.repository;
137405
137406
  packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_node_path2.join)("packages", context.projectName);
137406
- console.log("Checking entry points - packageJsonPath");
137407
137407
  const packageJsonPath = (0, import_node_path2.join)(context.root, options.outputPath, "package.json");
137408
137408
  writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
137409
137409
  (0, import_node_fs2.writeFileSync)(
@@ -137416,7 +137416,6 @@ ${externalDependencies.map((dep) => {
137416
137416
  } else {
137417
137417
  writeWarning(config, "Skipping writing to package.json file");
137418
137418
  }
137419
- console.log("Checking entry points - options.includeSrc");
137420
137419
  if (options.includeSrc === true) {
137421
137420
  const files = globSync([
137422
137421
  (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
package/src/generators/browser-library/generator.js CHANGED
@@ -47658,7 +47658,19 @@ var loadStormConfig = async (workspaceRoot) => {
47658
47658
  const configEnv = getConfigEnv();
47659
47659
  for (const key of Object.keys(configEnv)) {
47660
47660
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
47661
- configFile[key] = configEnv[key];
47661
+ if (key === "colors") {
47662
+ configFile.colors = {
47663
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
47664
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
47665
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
47666
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
47667
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
47668
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
47669
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
47670
+ };
47671
+ } else {
47672
+ configFile[key] = configEnv[key];
47673
+ }
47662
47674
  }
47663
47675
  }
47664
47676
  const config = StormConfigSchema.parse(configFile);
package/src/generators/config-schema/generator.js CHANGED
@@ -30416,7 +30416,19 @@ var loadStormConfig = async (workspaceRoot) => {
30416
30416
  const configEnv = getConfigEnv();
30417
30417
  for (const key of Object.keys(configEnv)) {
30418
30418
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
30419
- configFile[key] = configEnv[key];
30419
+ if (key === "colors") {
30420
+ configFile.colors = {
30421
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
30422
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
30423
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
30424
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
30425
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
30426
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
30427
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
30428
+ };
30429
+ } else {
30430
+ configFile[key] = configEnv[key];
30431
+ }
30420
30432
  }
30421
30433
  }
30422
30434
  const config = StormConfigSchema.parse(configFile);
package/src/generators/neutral-library/generator.js CHANGED
@@ -47658,7 +47658,19 @@ var loadStormConfig = async (workspaceRoot) => {
47658
47658
  const configEnv = getConfigEnv();
47659
47659
  for (const key of Object.keys(configEnv)) {
47660
47660
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
47661
- configFile[key] = configEnv[key];
47661
+ if (key === "colors") {
47662
+ configFile.colors = {
47663
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
47664
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
47665
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
47666
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
47667
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
47668
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
47669
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
47670
+ };
47671
+ } else {
47672
+ configFile[key] = configEnv[key];
47673
+ }
47662
47674
  }
47663
47675
  }
47664
47676
  const config = StormConfigSchema.parse(configFile);
package/src/generators/node-library/generator.js CHANGED
@@ -47658,7 +47658,19 @@ var loadStormConfig = async (workspaceRoot) => {
47658
47658
  const configEnv = getConfigEnv();
47659
47659
  for (const key of Object.keys(configEnv)) {
47660
47660
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
47661
- configFile[key] = configEnv[key];
47661
+ if (key === "colors") {
47662
+ configFile.colors = {
47663
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
47664
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
47665
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
47666
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
47667
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
47668
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
47669
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
47670
+ };
47671
+ } else {
47672
+ configFile[key] = configEnv[key];
47673
+ }
47662
47674
  }
47663
47675
  }
47664
47676
  const config = StormConfigSchema.parse(configFile);
package/src/generators/preset/generator.js CHANGED
@@ -30417,7 +30417,19 @@ var loadStormConfig = async (workspaceRoot) => {
30417
30417
  const configEnv = getConfigEnv();
30418
30418
  for (const key of Object.keys(configEnv)) {
30419
30419
  if (configEnv[key] !== void 0 && configEnv[key] !== null) {
30420
- configFile[key] = configEnv[key];
30420
+ if (key === "colors") {
30421
+ configFile.colors = {
30422
+ primary: process.env.STORM_COLOR_PRIMARY ?? configFile.colors?.primary,
30423
+ background: process.env.STORM_COLOR_BACKGROUND ?? configFile.colors?.primary,
30424
+ success: process.env.STORM_COLOR_SUCCESS ?? configFile.colors?.primary,
30425
+ info: process.env.STORM_COLOR_INFO ?? configFile.colors?.primary,
30426
+ warning: process.env.STORM_COLOR_WARNING ?? configFile.colors?.primary,
30427
+ error: process.env.STORM_COLOR_ERROR ?? configFile.colors?.primary,
30428
+ fatal: process.env.STORM_COLOR_FATAL ?? configFile.colors?.primary
30429
+ };
30430
+ } else {
30431
+ configFile[key] = configEnv[key];
30432
+ }
30421
30433
  }
30422
30434
  }
30423
30435
  const config = StormConfigSchema.parse(configFile);