@storm-software/workspace-tools 1.36.4 → 1.36.6

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.36.4",
3
+ "version": "1.36.6",
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
@@ -12226,12 +12226,12 @@ var require_install_packages_task = __commonJS({
12226
12226
  var child_process_1 = require("child_process");
12227
12227
  var path_1 = require("path");
12228
12228
  var nx_1 = require_nx();
12229
- var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments2 } = (0, nx_1.requireNx)();
12229
+ var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments3 } = (0, nx_1.requireNx)();
12230
12230
  function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
12231
- if (!tree.listChanges().find((f) => f.path === joinPathFragments2(cwd, "package.json")) && !alwaysRun) {
12231
+ if (!tree.listChanges().find((f) => f.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
12232
12232
  return;
12233
12233
  }
12234
- const packageJsonValue = tree.read(joinPathFragments2(cwd, "package.json"), "utf-8");
12234
+ const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
12235
12235
  let storedPackageJsonValue = global["__packageJsonInstallCache__"];
12236
12236
  if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
12237
12237
  global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -30864,7 +30864,7 @@ var require_project_name_and_root_utils = __commonJS({
30864
30864
  var nx_1 = require_nx();
30865
30865
  var get_workspace_layout_1 = require_get_workspace_layout();
30866
30866
  var names_1 = require_names();
30867
- var { joinPathFragments: joinPathFragments2, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
30867
+ var { joinPathFragments: joinPathFragments3, normalizePath, logger, readJson: readJson2, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
30868
30868
  var deprecationWarning = stripIndents`
30869
30869
  In Nx 18, generating projects will no longer derive the name and root.
30870
30870
  Please provide the exact project name and root in the future.`;
@@ -30940,14 +30940,14 @@ var require_project_name_and_root_utils = __commonJS({
30940
30940
  if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
30941
30941
  asProvidedProjectDirectory = directory;
30942
30942
  } else {
30943
- asProvidedProjectDirectory = joinPathFragments2(relativeCwd, directory);
30943
+ asProvidedProjectDirectory = joinPathFragments3(relativeCwd, directory);
30944
30944
  }
30945
30945
  } else if (options.rootProject) {
30946
30946
  asProvidedProjectDirectory = ".";
30947
30947
  } else {
30948
30948
  asProvidedProjectDirectory = relativeCwd;
30949
30949
  if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
30950
- asProvidedProjectDirectory = joinPathFragments2(relativeCwd, asProvidedProjectName);
30950
+ asProvidedProjectDirectory = joinPathFragments3(relativeCwd, asProvidedProjectName);
30951
30951
  }
30952
30952
  }
30953
30953
  if (asProvidedProjectName.startsWith("@")) {
@@ -30980,7 +30980,7 @@ var require_project_name_and_root_utils = __commonJS({
30980
30980
  const derivedSimpleProjectName = name;
30981
30981
  let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
30982
30982
  if (derivedProjectDirectoryWithoutLayout !== ".") {
30983
- derivedProjectDirectory = joinPathFragments2(layoutDirectory, derivedProjectDirectory);
30983
+ derivedProjectDirectory = joinPathFragments3(layoutDirectory, derivedProjectDirectory);
30984
30984
  }
30985
30985
  let derivedImportPath;
30986
30986
  if (options.projectType === "library") {
@@ -47851,6 +47851,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
47851
47851
  };
47852
47852
 
47853
47853
  // packages/workspace-tools/src/base/get-tsup-config.ts
47854
+ var import_devkit = __toESM(require_devkit());
47854
47855
  function defaultConfig({
47855
47856
  entry,
47856
47857
  outDir,
@@ -47895,7 +47896,7 @@ function defaultConfig({
47895
47896
  } : false,
47896
47897
  projectRoot,
47897
47898
  workspaceRoot,
47898
- outDir,
47899
+ outDir: (0, import_devkit.joinPathFragments)(outDir, "dist"),
47899
47900
  silent: !verbose,
47900
47901
  metafile: true,
47901
47902
  shims,
@@ -47911,7 +47912,7 @@ function defaultConfig({
47911
47912
  ...dtsTsConfig,
47912
47913
  options: {
47913
47914
  ...dtsTsConfig.options,
47914
- outDir
47915
+ outDir: (0, import_devkit.joinPathFragments)(outDir, "dist")
47915
47916
  }
47916
47917
  }
47917
47918
  },
@@ -47969,7 +47970,7 @@ var outExtension = ({ format }) => {
47969
47970
  };
47970
47971
 
47971
47972
  // packages/workspace-tools/src/base/typescript-library-generator.ts
47972
- var import_devkit = __toESM(require_devkit());
47973
+ var import_devkit2 = __toESM(require_devkit());
47973
47974
  var import_project_name_and_root_utils = __toESM(require_project_name_and_root_utils());
47974
47975
  var import_js = __toESM(require_src());
47975
47976
  var import_init = __toESM(require_init());
@@ -47989,7 +47990,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
47989
47990
  })
47990
47991
  );
47991
47992
  tasks.push(
47992
- (0, import_devkit.addDependenciesToPackageJson)(
47993
+ (0, import_devkit2.addDependenciesToPackageJson)(
47993
47994
  tree,
47994
47995
  {},
47995
47996
  {
@@ -48005,16 +48006,16 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48005
48006
  const projectConfig = {
48006
48007
  root: options.directory,
48007
48008
  projectType: "library",
48008
- sourceRoot: (0, import_devkit.joinPathFragments)(options.directory, "src"),
48009
+ sourceRoot: (0, import_devkit2.joinPathFragments)(options.directory, "src"),
48009
48010
  targets: {
48010
48011
  build: {
48011
48012
  executor: schema.buildExecutor,
48012
48013
  outputs: ["{options.outputPath}"],
48013
48014
  options: {
48014
- entry: (0, import_devkit.joinPathFragments)(options.projectRoot, "src", "index.ts"),
48015
+ entry: (0, import_devkit2.joinPathFragments)(options.projectRoot, "src", "index.ts"),
48015
48016
  outputPath: getOutputPath(options),
48016
- tsConfig: (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
48017
- project: (0, import_devkit.joinPathFragments)(options.projectRoot, "package.json"),
48017
+ tsConfig: (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json"),
48018
+ project: (0, import_devkit2.joinPathFragments)(options.projectRoot, "package.json"),
48018
48019
  defaultConfiguration: "production",
48019
48020
  assets: [
48020
48021
  {
@@ -48046,23 +48047,23 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48046
48047
  };
48047
48048
  schema.platform && (projectConfig.targets.build.options.platform = schema.platform);
48048
48049
  createProjectTsConfigJson(tree, options);
48049
- (0, import_devkit.addProjectConfiguration)(tree, options.name, projectConfig);
48050
+ (0, import_devkit2.addProjectConfiguration)(tree, options.name, projectConfig);
48050
48051
  let repository = {
48051
48052
  type: "github",
48052
48053
  url: "https://github.com/storm-software/storm-stack.git"
48053
48054
  };
48054
48055
  let description = schema.description ?? "\u26A1 A Storm package used to create modern, scalable web applications.";
48055
48056
  if (tree.exists("package.json")) {
48056
- const packageJson = (0, import_devkit.readJson)(tree, "package.json");
48057
+ const packageJson = (0, import_devkit2.readJson)(tree, "package.json");
48057
48058
  packageJson?.repository && (repository = packageJson.repository);
48058
48059
  packageJson?.description && (description = packageJson.description);
48059
48060
  }
48060
- const packageJsonPath = (0, import_devkit.joinPathFragments)(
48061
+ const packageJsonPath = (0, import_devkit2.joinPathFragments)(
48061
48062
  options.projectRoot,
48062
48063
  "package.json"
48063
48064
  );
48064
48065
  if (tree.exists(packageJsonPath)) {
48065
- (0, import_devkit.updateJson)(tree, packageJsonPath, (json) => {
48066
+ (0, import_devkit2.updateJson)(tree, packageJsonPath, (json) => {
48066
48067
  json.name = options.importPath;
48067
48068
  json.version = "0.0.1";
48068
48069
  if (json.private && (options.publishable || options.rootProject)) {
@@ -48086,7 +48087,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48086
48087
  };
48087
48088
  });
48088
48089
  } else {
48089
- (0, import_devkit.writeJson)(tree, packageJsonPath, {
48090
+ (0, import_devkit2.writeJson)(tree, packageJsonPath, {
48090
48091
  name: options.importPath,
48091
48092
  version: "0.0.1",
48092
48093
  description,
@@ -48102,7 +48103,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48102
48103
  });
48103
48104
  }
48104
48105
  if (tree.exists("package.json")) {
48105
- (0, import_devkit.updateJson)(tree, "package.json", (json) => ({
48106
+ (0, import_devkit2.updateJson)(tree, "package.json", (json) => ({
48106
48107
  ...json,
48107
48108
  pnpm: {
48108
48109
  ...json?.pnpm,
@@ -48114,32 +48115,32 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48114
48115
  }));
48115
48116
  }
48116
48117
  (0, import_js.addTsConfigPath)(tree, options.importPath, [
48117
- (0, import_devkit.joinPathFragments)(
48118
+ (0, import_devkit2.joinPathFragments)(
48118
48119
  options.projectRoot,
48119
48120
  "./src",
48120
48121
  "index." + (options.js ? "js" : "ts")
48121
48122
  )
48122
48123
  ]);
48123
- (0, import_js.addTsConfigPath)(tree, (0, import_devkit.joinPathFragments)(options.importPath, "/*"), [
48124
- (0, import_devkit.joinPathFragments)(options.projectRoot, "./src", "/*")
48124
+ (0, import_js.addTsConfigPath)(tree, (0, import_devkit2.joinPathFragments)(options.importPath, "/*"), [
48125
+ (0, import_devkit2.joinPathFragments)(options.projectRoot, "./src", "/*")
48125
48126
  ]);
48126
48127
  if (tree.exists("package.json")) {
48127
- const packageJson = (0, import_devkit.readJson)(tree, "package.json");
48128
+ const packageJson = (0, import_devkit2.readJson)(tree, "package.json");
48128
48129
  packageJson?.repository && (repository = packageJson.repository);
48129
48130
  packageJson?.description && (description = packageJson.description);
48130
48131
  }
48131
- const tsconfigPath = (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json");
48132
+ const tsconfigPath = (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json");
48132
48133
  if (tree.exists(tsconfigPath)) {
48133
- (0, import_devkit.updateJson)(tree, tsconfigPath, (json) => {
48134
+ (0, import_devkit2.updateJson)(tree, tsconfigPath, (json) => {
48134
48135
  json.composite ??= true;
48135
48136
  return json;
48136
48137
  });
48137
48138
  } else {
48138
- (0, import_devkit.writeJson)(tree, tsconfigPath, {
48139
- extends: `${(0, import_devkit.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
48139
+ (0, import_devkit2.writeJson)(tree, tsconfigPath, {
48140
+ extends: `${(0, import_devkit2.offsetFromRoot)(options.projectRoot)}tsconfig.base.json`,
48140
48141
  composite: true,
48141
48142
  compilerOptions: {
48142
- outDir: `${(0, import_devkit.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
48143
+ outDir: `${(0, import_devkit2.offsetFromRoot)(options.projectRoot)}dist/out-tsc`
48143
48144
  },
48144
48145
  files: [],
48145
48146
  include: ["src/**/*.ts", "src/**/*.js"],
@@ -48148,21 +48149,21 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
48148
48149
  }
48149
48150
  const lintCallback = await addLint(tree, options);
48150
48151
  tasks.push(lintCallback);
48151
- await (0, import_devkit.formatFiles)(tree);
48152
+ await (0, import_devkit2.formatFiles)(tree);
48152
48153
  return null;
48153
48154
  }
48154
48155
  async function addLint(tree, options) {
48155
- const { lintProjectGenerator } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
48156
+ const { lintProjectGenerator } = (0, import_devkit2.ensurePackage)("@nx/eslint", nxVersion);
48156
48157
  const { mapLintPattern } = (
48157
48158
  // nx-ignore-next-line
48158
48159
  require_lint_project()
48159
48160
  );
48160
- const projectConfiguration = (0, import_devkit.readProjectConfiguration)(tree, options.name);
48161
+ const projectConfiguration = (0, import_devkit2.readProjectConfiguration)(tree, options.name);
48161
48162
  const task = lintProjectGenerator(tree, {
48162
48163
  project: options.name,
48163
48164
  linter: options.linter,
48164
48165
  skipFormat: true,
48165
- tsConfigPaths: [(0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json")],
48166
+ tsConfigPaths: [(0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json")],
48166
48167
  unitTestRunner: options.unitTestRunner,
48167
48168
  eslintFilePatterns: [
48168
48169
  mapLintPattern(
@@ -48233,7 +48234,7 @@ function getOutputPath(options) {
48233
48234
  } else {
48234
48235
  parts.push(options.projectRoot);
48235
48236
  }
48236
- return (0, import_devkit.joinPathFragments)(...parts);
48237
+ return (0, import_devkit2.joinPathFragments)(...parts);
48237
48238
  }
48238
48239
  function createProjectTsConfigJson(tree, options) {
48239
48240
  const tsconfig = {
@@ -48241,8 +48242,8 @@ function createProjectTsConfigJson(tree, options) {
48241
48242
  ...options?.tsConfigOptions ?? {},
48242
48243
  compilerOptions: {
48243
48244
  ...options.rootProject ? import_js.tsConfigBaseOptions : {},
48244
- outDir: (0, import_devkit.joinPathFragments)(
48245
- (0, import_devkit.offsetFromRoot)(options.projectRoot),
48245
+ outDir: (0, import_devkit2.joinPathFragments)(
48246
+ (0, import_devkit2.offsetFromRoot)(options.projectRoot),
48246
48247
  "dist/out-tsc"
48247
48248
  ),
48248
48249
  noEmit: true,
@@ -48262,9 +48263,9 @@ function createProjectTsConfigJson(tree, options) {
48262
48263
  "src/**/*.test.ts"
48263
48264
  ]
48264
48265
  };
48265
- (0, import_devkit.writeJson)(
48266
+ (0, import_devkit2.writeJson)(
48266
48267
  tree,
48267
- (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
48268
+ (0, import_devkit2.joinPathFragments)(options.projectRoot, "tsconfig.json"),
48268
48269
  tsconfig
48269
48270
  );
48270
48271
  }
@@ -48280,7 +48281,7 @@ async function normalizeOptions(tree, options) {
48280
48281
  if (options.publishable === false && options.buildable === false) {
48281
48282
  bundler = "none";
48282
48283
  }
48283
- const { Linter } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
48284
+ const { Linter } = (0, import_devkit2.ensurePackage)("@nx/eslint", nxVersion);
48284
48285
  const {
48285
48286
  projectName,
48286
48287
  names: projectNames,
@@ -48296,7 +48297,7 @@ async function normalizeOptions(tree, options) {
48296
48297
  callingGenerator: "@nx/js:library"
48297
48298
  });
48298
48299
  options.rootProject = projectRoot === ".";
48299
- const normalized = (0, import_devkit.names)(projectNames.projectFileName);
48300
+ const normalized = (0, import_devkit2.names)(projectNames.projectFileName);
48300
48301
  const fileName = normalized.fileName;
48301
48302
  return {
48302
48303
  js: false,
@@ -4438,12 +4438,12 @@ var require_install_packages_task = __commonJS({
4438
4438
  var child_process_1 = require("child_process");
4439
4439
  var path_1 = require("path");
4440
4440
  var nx_1 = require_nx();
4441
- var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments2 } = (0, nx_1.requireNx)();
4441
+ var { detectPackageManager, getPackageManagerCommand, joinPathFragments: joinPathFragments3 } = (0, nx_1.requireNx)();
4442
4442
  function installPackagesTask(tree, alwaysRun = false, cwd = "", packageManager = detectPackageManager(cwd)) {
4443
- if (!tree.listChanges().find((f) => f.path === joinPathFragments2(cwd, "package.json")) && !alwaysRun) {
4443
+ if (!tree.listChanges().find((f) => f.path === joinPathFragments3(cwd, "package.json")) && !alwaysRun) {
4444
4444
  return;
4445
4445
  }
4446
- const packageJsonValue = tree.read(joinPathFragments2(cwd, "package.json"), "utf-8");
4446
+ const packageJsonValue = tree.read(joinPathFragments3(cwd, "package.json"), "utf-8");
4447
4447
  let storedPackageJsonValue = global["__packageJsonInstallCache__"];
4448
4448
  if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
4449
4449
  global["__packageJsonInstallCache__"] = packageJsonValue;
@@ -33095,7 +33095,7 @@ var require_boolean = __commonJS({
33095
33095
  "node_modules/.pnpm/enquirer@2.3.6/node_modules/enquirer/lib/types/boolean.js"(exports, module2) {
33096
33096
  "use strict";
33097
33097
  var Prompt = require_prompt();
33098
- var { isPrimitive: isPrimitive2, hasColor } = require_utils8();
33098
+ var { isPrimitive, hasColor } = require_utils8();
33099
33099
  var BooleanPrompt = class extends Prompt {
33100
33100
  constructor(options) {
33101
33101
  super(options);
@@ -33126,7 +33126,7 @@ var require_boolean = __commonJS({
33126
33126
  return /^[fn0]/i.test(input);
33127
33127
  }
33128
33128
  isValue(value) {
33129
- return isPrimitive2(value) && (this.isTrue(value) || this.isFalse(value));
33129
+ return isPrimitive(value) && (this.isTrue(value) || this.isFalse(value));
33130
33130
  }
33131
33131
  async hint() {
33132
33132
  if (this.state.status === "pending") {
@@ -33301,11 +33301,11 @@ var require_string2 = __commonJS({
33301
33301
  "use strict";
33302
33302
  var Prompt = require_prompt();
33303
33303
  var placeholder = require_placeholder();
33304
- var { isPrimitive: isPrimitive2 } = require_utils8();
33304
+ var { isPrimitive } = require_utils8();
33305
33305
  var StringPrompt = class extends Prompt {
33306
33306
  constructor(options) {
33307
33307
  super(options);
33308
- this.initial = isPrimitive2(this.initial) ? String(this.initial) : "";
33308
+ this.initial = isPrimitive(this.initial) ? String(this.initial) : "";
33309
33309
  if (this.initial)
33310
33310
  this.cursorHide();
33311
33311
  this.state.prevCursor = 0;
@@ -34939,7 +34939,7 @@ var require_project_name_and_root_utils = __commonJS({
34939
34939
  var nx_1 = require_nx();
34940
34940
  var get_workspace_layout_1 = require_get_workspace_layout();
34941
34941
  var names_1 = require_names();
34942
- var { joinPathFragments: joinPathFragments2, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
34942
+ var { joinPathFragments: joinPathFragments3, normalizePath, logger, readJson, stripIndents, workspaceRoot } = (0, nx_1.requireNx)();
34943
34943
  var deprecationWarning = stripIndents`
34944
34944
  In Nx 18, generating projects will no longer derive the name and root.
34945
34945
  Please provide the exact project name and root in the future.`;
@@ -35015,14 +35015,14 @@ var require_project_name_and_root_utils = __commonJS({
35015
35015
  if (directory === relativeCwd || directory.startsWith(`${relativeCwd}/`)) {
35016
35016
  asProvidedProjectDirectory = directory;
35017
35017
  } else {
35018
- asProvidedProjectDirectory = joinPathFragments2(relativeCwd, directory);
35018
+ asProvidedProjectDirectory = joinPathFragments3(relativeCwd, directory);
35019
35019
  }
35020
35020
  } else if (options.rootProject) {
35021
35021
  asProvidedProjectDirectory = ".";
35022
35022
  } else {
35023
35023
  asProvidedProjectDirectory = relativeCwd;
35024
35024
  if (!relativeCwd.endsWith(asProvidedProjectName) && !relativeCwd.endsWith(options.name)) {
35025
- asProvidedProjectDirectory = joinPathFragments2(relativeCwd, asProvidedProjectName);
35025
+ asProvidedProjectDirectory = joinPathFragments3(relativeCwd, asProvidedProjectName);
35026
35026
  }
35027
35027
  }
35028
35028
  if (asProvidedProjectName.startsWith("@")) {
@@ -35055,7 +35055,7 @@ var require_project_name_and_root_utils = __commonJS({
35055
35055
  const derivedSimpleProjectName = name;
35056
35056
  let derivedProjectDirectory = derivedProjectDirectoryWithoutLayout;
35057
35057
  if (derivedProjectDirectoryWithoutLayout !== ".") {
35058
- derivedProjectDirectory = joinPathFragments2(layoutDirectory, derivedProjectDirectory);
35058
+ derivedProjectDirectory = joinPathFragments3(layoutDirectory, derivedProjectDirectory);
35059
35059
  }
35060
35060
  let derivedImportPath;
35061
35061
  if (options.projectType === "library") {
@@ -106223,7 +106223,7 @@ __export(executor_exports, {
106223
106223
  });
106224
106224
  module.exports = __toCommonJS(executor_exports);
106225
106225
  var import_esbuild_decorators = __toESM(require_src());
106226
- var import_devkit = __toESM(require_devkit());
106226
+ var import_devkit2 = __toESM(require_devkit());
106227
106227
  var import_js = __toESM(require_src2());
106228
106228
  var import_normalize_options = __toESM(require_normalize_options());
106229
106229
  var import_tsc = __toESM(require_tsc_impl());
@@ -116677,6 +116677,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
116677
116677
  };
116678
116678
 
116679
116679
  // packages/workspace-tools/src/base/get-tsup-config.ts
116680
+ var import_devkit = __toESM(require_devkit());
116680
116681
  function defaultConfig({
116681
116682
  entry,
116682
116683
  outDir,
@@ -116721,7 +116722,7 @@ function defaultConfig({
116721
116722
  } : false,
116722
116723
  projectRoot,
116723
116724
  workspaceRoot,
116724
- outDir,
116725
+ outDir: (0, import_devkit.joinPathFragments)(outDir, "dist"),
116725
116726
  silent: !verbose,
116726
116727
  metafile: true,
116727
116728
  shims,
@@ -116737,7 +116738,7 @@ function defaultConfig({
116737
116738
  ...dtsTsConfig,
116738
116739
  options: {
116739
116740
  ...dtsTsConfig.options,
116740
- outDir
116741
+ outDir: (0, import_devkit.joinPathFragments)(outDir, "dist")
116741
116742
  }
116742
116743
  }
116743
116744
  },
@@ -116825,7 +116826,7 @@ async function tsupExecutorFn(options, context) {
116825
116826
  options.verbose && console.log(
116826
116827
  `\u2699\uFE0F Executor options:
116827
116828
  ${Object.keys(options).map(
116828
- (key) => `${key}: ${!options[key] || isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
116829
+ (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
116829
116830
  ).join("\n")}
116830
116831
  `
116831
116832
  );
@@ -116874,8 +116875,8 @@ ${Object.keys(options).map(
116874
116875
  throw new Error("The Build process failed trying to copy assets");
116875
116876
  }
116876
116877
  const pathToPackageJson = (0, import_path4.join)(context.root, projectRoot, "package.json");
116877
- const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
116878
- const workspacePackageJson = (0, import_devkit.readJsonFile)(
116878
+ const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
116879
+ const workspacePackageJson = (0, import_devkit2.readJsonFile)(
116879
116880
  (0, import_path4.join)(workspaceRoot, "package.json")
116880
116881
  );
116881
116882
  options.external = options.external || [];
@@ -116914,7 +116915,7 @@ ${Object.keys(options).map(
116914
116915
  console.log(`\u26A1 Adding implicit dependency: ${key}`);
116915
116916
  const projectConfig = projectConfigs[key];
116916
116917
  if (projectConfig?.targets?.build) {
116917
- const projectPackageJson = (0, import_devkit.readJsonFile)(
116918
+ const projectPackageJson = (0, import_devkit2.readJsonFile)(
116918
116919
  projectConfig.targets?.build.options.project
116919
116920
  );
116920
116921
  if (projectPackageJson?.name && !options.external.includes(projectPackageJson.name)) {
@@ -116964,7 +116965,7 @@ ${externalDependencies.map((dep) => {
116964
116965
  entryPoints.push(options.entry);
116965
116966
  }
116966
116967
  if (options.emitOnAll === true) {
116967
- entryPoints.push((0, import_devkit.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
116968
+ entryPoints.push((0, import_devkit2.joinPathFragments)(sourceRoot, "**/*.{ts,tsx}"));
116968
116969
  }
116969
116970
  if (options.additionalEntryPoints) {
116970
116971
  entryPoints.push(...options.additionalEntryPoints);
@@ -116976,7 +116977,7 @@ ${externalDependencies.map((dep) => {
116976
116977
  if (formattedPath.toUpperCase().startsWith("C:")) {
116977
116978
  formattedPath = formattedPath.substring(2);
116978
116979
  }
116979
- let propertyKey = (0, import_devkit.joinPathFragments)(
116980
+ let propertyKey = (0, import_devkit2.joinPathFragments)(
116980
116981
  filePath.path,
116981
116982
  removeExtension(filePath.name)
116982
116983
  ).replaceAll("\\", "/").replaceAll(formattedPath, "").replaceAll(sourceRoot, "").replaceAll(projectRoot, "");
@@ -116985,19 +116986,19 @@ ${externalDependencies.map((dep) => {
116985
116986
  propertyKey = propertyKey.substring(1);
116986
116987
  }
116987
116988
  console.debug(
116988
- `Trying to add entry point ${propertyKey} at "${(0, import_devkit.joinPathFragments)(
116989
+ `Trying to add entry point ${propertyKey} at "${(0, import_devkit2.joinPathFragments)(
116989
116990
  filePath.path,
116990
116991
  filePath.name
116991
116992
  )}"`
116992
116993
  );
116993
116994
  if (!(propertyKey in ret)) {
116994
- ret[propertyKey] = (0, import_devkit.joinPathFragments)(filePath.path, filePath.name);
116995
+ ret[propertyKey] = (0, import_devkit2.joinPathFragments)(filePath.path, filePath.name);
116995
116996
  }
116996
116997
  }
116997
116998
  return ret;
116998
116999
  }, {});
116999
117000
  if (options.generatePackageJson !== false) {
117000
- const projectGraph = (0, import_devkit.readCachedProjectGraph)();
117001
+ const projectGraph = (0, import_devkit2.readCachedProjectGraph)();
117001
117002
  delete packageJson.dependencies;
117002
117003
  externalDependencies.forEach((externalDependency) => {
117003
117004
  const packageConfig = externalDependency.node.data;
@@ -117017,7 +117018,7 @@ ${externalDependencies.map((dep) => {
117017
117018
  }
117018
117019
  });
117019
117020
  console.log(JSON.stringify(options.getConfig));
117020
- const distPaths = !options?.getConfig || _isFunction(options.getConfig) ? [""] : Object.keys(options.getConfig).map((key) => `${key}/`);
117021
+ const distPaths = !options?.getConfig || _isFunction(options.getConfig) ? ["dist/"] : Object.keys(options.getConfig).map((key) => `${key}/`);
117021
117022
  packageJson.type = "module";
117022
117023
  if (distPaths.length > 0) {
117023
117024
  packageJson.exports ??= {
@@ -117125,10 +117126,10 @@ ${externalDependencies.map((dep) => {
117125
117126
  }
117126
117127
  if (options.includeSrc === true) {
117127
117128
  const files = globSync([
117128
- (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
117129
- (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
117130
- (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
117131
- (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
117129
+ (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
117130
+ (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.tsx"),
117131
+ (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.js"),
117132
+ (0, import_devkit2.joinPathFragments)(context.root, options.outputPath, "src/**/*.jsx")
117132
117133
  ]);
117133
117134
  await Promise.allSettled(
117134
117135
  files.map(
@@ -117251,7 +117252,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
117251
117252
  );
117252
117253
  tsConfig.options.pathsBasePath = workspaceRoot;
117253
117254
  if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
117254
- tsConfig.options.tsBuildInfoFile = (0, import_devkit.joinPathFragments)(
117255
+ tsConfig.options.tsBuildInfoFile = (0, import_devkit2.joinPathFragments)(
117255
117256
  outputPath,
117256
117257
  "tsconfig.tsbuildinfo"
117257
117258
  );
@@ -117266,13 +117267,6 @@ var build = async (options) => {
117266
117267
  await (0, import_tsup.build)(options);
117267
117268
  }
117268
117269
  };
117269
- var isPrimitive = (value) => {
117270
- try {
117271
- return value === void 0 || value === null || typeof value !== "object" && typeof value !== "function";
117272
- } catch (e) {
117273
- return false;
117274
- }
117275
- };
117276
117270
  var applyDefaultOptions = (options) => {
117277
117271
  options.entry ??= "{sourceRoot}/index.ts";
117278
117272
  options.outputPath ??= "dist/{projectRoot}";
@@ -117298,7 +117292,7 @@ var applyDefaultOptions = (options) => {
117298
117292
  options.define ??= {};
117299
117293
  options.env ??= {};
117300
117294
  options.verbose ??= !!process.env.CI;
117301
- options.getConfig ??= defaultConfig;
117295
+ options.getConfig ??= { "dist": defaultConfig };
117302
117296
  return options;
117303
117297
  };
117304
117298
  var executor_default = withRunExecutor(
@@ -117311,6 +117305,13 @@ var executor_default = withRunExecutor(
117311
117305
  }
117312
117306
  }
117313
117307
  );
117308
+ var _isPrimitive = (value) => {
117309
+ try {
117310
+ return value === void 0 || value === null || typeof value !== "object" && typeof value !== "function";
117311
+ } catch (e) {
117312
+ return false;
117313
+ }
117314
+ };
117314
117315
  var _isFunction = (value) => {
117315
117316
  try {
117316
117317
  return value instanceof Function || typeof value === "function" || !!(value && value.constructor && value?.call && value?.apply);