@storm-software/cloudflare-tools 0.55.72 → 0.55.74

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/CHANGELOG.md CHANGED
@@ -2,6 +2,22 @@
2
2
 
3
3
  # Changelog for Storm Ops - Cloudflare Tools
4
4
 
5
+ ## [0.55.74](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.55.74) (2025-04-29)
6
+
7
+ ### Miscellaneous
8
+
9
+ - **monorepo:** Regenerate README markdown files
10
+ ([f2e5028dd](https://github.com/storm-software/storm-ops/commit/f2e5028dd))
11
+
12
+ ## [0.55.73](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.55.73) (2025-04-29)
13
+
14
+ ### Miscellaneous
15
+
16
+ - **monorepo:** Regenerate README markdown files
17
+ ([25750fcd9](https://github.com/storm-software/storm-ops/commit/25750fcd9))
18
+ - **monorepo:** Regenerate README markdown files
19
+ ([87d08a499](https://github.com/storm-software/storm-ops/commit/87d08a499))
20
+
5
21
  ## [0.55.72](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.55.72) (2025-04-28)
6
22
 
7
23
  ### Miscellaneous
package/README.md CHANGED
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
21
21
 
22
22
  <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
23
23
 
24
- [![Version](https://img.shields.io/badge/version-0.55.72-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
24
+ [![Version](https://img.shields.io/badge/version-0.55.73-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
25
25
 
26
26
  <!-- prettier-ignore-start -->
27
27
  <!-- markdownlint-disable -->
@@ -1,6 +1,6 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunkHPFRWJVVjs = require('./chunk-HPFRWJVV.js');
3
+ var _chunkFRBDGKHTjs = require('./chunk-FRBDGKHT.js');
4
4
 
5
5
 
6
6
  var _chunkIVLCYFXDjs = require('./chunk-IVLCYFXD.js');
@@ -52,7 +52,7 @@ async function applicationGenerator(tree, schema) {
52
52
  ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`, config);
53
53
  const options = await normalizeOptions(tree, schema, config);
54
54
  const tasks = [];
55
- tasks.push(await _chunkHPFRWJVVjs.generator_default.call(void 0, tree, {
55
+ tasks.push(await _chunkFRBDGKHTjs.generator_default.call(void 0, tree, {
56
56
  ...options,
57
57
  skipFormat: true
58
58
  }));
@@ -8,7 +8,7 @@ var require_package = _chunkJ5SB6L2Ljs.__commonJS.call(void 0, {
8
8
  "package.json"(exports, module) {
9
9
  module.exports = {
10
10
  name: "@storm-software/cloudflare-tools",
11
- version: "0.55.72",
11
+ version: "0.55.74",
12
12
  description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
13
13
  repository: {
14
14
  type: "github",
@@ -412,7 +412,6 @@ var DEFAULT_COMPILED_BANNER = `/*****************************************
412
412
  *****************************************/
413
413
  `;
414
414
  var DEFAULT_ENVIRONMENT = "production";
415
- var DEFAULT_TARGET = "esnext";
416
415
  var DEFAULT_ORGANIZATION = "storm-software";
417
416
 
418
417
  // ../build-tools/src/plugins/swc.ts
@@ -649,9 +648,7 @@ __name(cleanDirectories, "cleanDirectories");
649
648
  var DEFAULT_BUILD_OPTIONS = {
650
649
  assets: [],
651
650
  platform: "node",
652
- target: [
653
- "esnext"
654
- ],
651
+ target: "node22",
655
652
  format: "esm",
656
653
  tsconfig: "tsconfig.json",
657
654
  mode: "production",
@@ -660,9 +657,11 @@ var DEFAULT_BUILD_OPTIONS = {
660
657
  keepNames: true,
661
658
  metafile: false,
662
659
  treeshake: true,
660
+ splitting: true,
663
661
  shims: false,
664
662
  watch: false,
665
663
  bundle: true,
664
+ distDir: "dist",
666
665
  loader: {
667
666
  ".aac": "file",
668
667
  ".css": "file",
@@ -807,29 +806,23 @@ async function resolveContext(userOptions) {
807
806
  throw new Error("The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project.");
808
807
  }
809
808
  const options = defu2(userOptions, DEFAULT_BUILD_OPTIONS);
810
- options.name ??= `${projectName}-${options.format}`;
811
- options.target ??= DEFAULT_TARGET;
809
+ options.name ??= projectName;
812
810
  const packageJsonPath = joinPaths(workspaceRoot3.dir, options.projectRoot, "package.json");
813
811
  if (!existsSync3(packageJsonPath)) {
814
812
  throw new Error("Cannot find package.json configuration");
815
813
  }
816
814
  const env = getEnv("esbuild", options);
815
+ const define = defu2(options.define ?? {}, env ?? {});
817
816
  const resolvedOptions = {
818
817
  ...options,
819
818
  tsconfig: joinPaths(projectRoot, userOptions.tsconfig ? userOptions.tsconfig.replace(projectRoot, "") : "tsconfig.json"),
820
- distDir: "dist",
821
- name: projectName,
822
819
  metafile: userOptions.mode === "development",
823
- ...userOptions,
824
820
  clean: false,
825
- target: userOptions.target || options.target,
826
- splitting: options.format === "iife" ? false : options.treeshake === void 0 ? options.splitting : true,
827
821
  env,
828
822
  define: {
829
823
  STORM_FORMAT: JSON.stringify(options.format),
830
- ...options.define,
831
- ...Object.keys(env || {}).reduce((res, key) => {
832
- const value = JSON.stringify(env[key]);
824
+ ...Object.keys(define).filter((key) => define[key] !== void 0).reduce((res, key) => {
825
+ const value = JSON.stringify(define[key]);
833
826
  const safeKey = key.replaceAll("(", "").replaceAll(")", "");
834
827
  return {
835
828
  ...res,
@@ -871,26 +864,79 @@ async function generatePackageJson(context) {
871
864
  if (context.options.entry) {
872
865
  packageJson.exports ??= {};
873
866
  packageJson.exports["./package.json"] ??= "./package.json";
874
- packageJson.exports["."] ??= `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js`;
875
867
  const entryPoints = Array.isArray(context.options.entry) ? context.options.entry : Object.keys(context.options.entry);
876
- for (const entryPoint of entryPoints) {
877
- if (context.options.entry[entryPoint]) {
878
- const entry = context.options.entry[entryPoint].replaceAll("\\", "/").replaceAll(/^(\.\/)*/g, "").replace(/\.([cm])?[jt]s(x)?$/g, "");
879
- packageJson.exports[`./${entry}`] ??= `.${context.options.distDir ? `/${context.options.distDir}` : ""}/${entry}.js`;
868
+ if (entryPoints.length > 0) {
869
+ const defaultEntry = entryPoints.includes("index") ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/${entryPoints[0]}`;
870
+ const isEsm = Array.isArray(context.options.format) ? context.options.format.includes("esm") : context.options.format === "esm";
871
+ const isCjs = Array.isArray(context.options.format) ? context.options.format.includes("cjs") : context.options.format === "cjs";
872
+ const isDts = context.options.dts || context.options.experimentalDts;
873
+ packageJson.exports["."] ??= `${defaultEntry}.${isEsm ? "mjs" : isCjs ? "cjs" : "js"}`;
874
+ for (const entryPoint of entryPoints) {
875
+ packageJson.exports[`./${entryPoint}`] ??= {};
876
+ if (isEsm) {
877
+ if (isDts) {
878
+ packageJson.exports[`./${entryPoint}`].import = {
879
+ types: `./dist/${entryPoint}.d.mts`,
880
+ default: `./dist/${entryPoint}.mjs`
881
+ };
882
+ } else {
883
+ packageJson.exports[`./${entryPoint}`].import = `./dist/${entryPoint}.mjs`;
884
+ }
885
+ if (isDts) {
886
+ packageJson.exports[`./${entryPoint}`].default = {
887
+ types: `./dist/${entryPoint}.d.mts`,
888
+ default: `./dist/${entryPoint}.mjs`
889
+ };
890
+ } else {
891
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.mjs`;
892
+ }
893
+ }
894
+ if (isCjs) {
895
+ if (isDts) {
896
+ packageJson.exports[`./${entryPoint}`].require = {
897
+ types: `./dist/${entryPoint}.d.cts`,
898
+ default: `./dist/${entryPoint}.cjs`
899
+ };
900
+ } else {
901
+ packageJson.exports[`./${entryPoint}`].require = `./dist/${entryPoint}.cjs`;
902
+ }
903
+ if (!isEsm) {
904
+ if (isDts) {
905
+ packageJson.exports[`./${entryPoint}`].default = {
906
+ types: `./dist/${entryPoint}.d.cts`,
907
+ default: `./dist/${entryPoint}.cjs`
908
+ };
909
+ } else {
910
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.cjs`;
911
+ }
912
+ }
913
+ }
914
+ if (!isEsm && !isCjs) {
915
+ if (isDts) {
916
+ packageJson.exports[`./${entryPoint}`].default = {
917
+ types: `./dist/${entryPoint}.d.ts`,
918
+ default: `./dist/${entryPoint}.js`
919
+ };
920
+ } else {
921
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.js`;
922
+ }
923
+ }
880
924
  }
881
- }
882
- if (context.options.format === "esm") {
883
- packageJson.module = packageJson.type === "module" ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.mjs`;
884
- } else {
885
- packageJson.main = packageJson.type === "commonjs" ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.cjs`;
886
- }
887
- packageJson.types = `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.d.ts`;
888
- packageJson.exports = Object.keys(packageJson.exports).reduce((ret, key) => {
889
- if (key.endsWith("/index") && !ret[key.replace("/index", "")]) {
890
- ret[key.replace("/index", "")] = packageJson.exports[key];
925
+ if (isEsm) {
926
+ packageJson.module = `${defaultEntry}.mjs`;
927
+ } else {
928
+ packageJson.main = `${defaultEntry}.cjs`;
891
929
  }
892
- return ret;
893
- }, packageJson.exports);
930
+ if (isDts) {
931
+ packageJson.types = `${defaultEntry}.d.${isEsm ? "mts" : isCjs ? "cts" : "ts"}`;
932
+ }
933
+ packageJson.exports = Object.keys(packageJson.exports).reduce((ret, key) => {
934
+ if (key.endsWith("/index") && !ret[key.replace("/index", "")]) {
935
+ ret[key.replace("/index", "")] = packageJson.exports[key];
936
+ }
937
+ return ret;
938
+ }, packageJson.exports);
939
+ }
894
940
  }
895
941
  await writeJsonFile(joinPaths(context.outputPath, "package.json"), packageJson);
896
942
  stopwatch();
@@ -903,7 +949,7 @@ async function executeTsup(context) {
903
949
  const stopwatch = getStopwatch(`${context.options.name} build`);
904
950
  await tsup({
905
951
  ...context.options,
906
- outDir: context.outputPath,
952
+ outDir: context.options.distDir ? joinPaths(context.outputPath, context.options.distDir) : context.outputPath,
907
953
  workspaceConfig: context.workspaceConfig
908
954
  });
909
955
  stopwatch();
@@ -8,7 +8,7 @@ var require_package = __commonJS({
8
8
  "package.json"(exports, module) {
9
9
  module.exports = {
10
10
  name: "@storm-software/cloudflare-tools",
11
- version: "0.55.72",
11
+ version: "0.55.74",
12
12
  description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
13
13
  repository: {
14
14
  type: "github",
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  generator_default
3
- } from "./chunk-BMSGENK2.mjs";
3
+ } from "./chunk-LUFRAFX6.mjs";
4
4
  import {
5
5
  getConfig
6
6
  } from "./chunk-KGEVN742.mjs";
@@ -411,7 +411,6 @@ var DEFAULT_COMPILED_BANNER = `/*****************************************
411
411
  *****************************************/
412
412
  `;
413
413
  var DEFAULT_ENVIRONMENT = "production";
414
- var DEFAULT_TARGET = "esnext";
415
414
  var DEFAULT_ORGANIZATION = "storm-software";
416
415
 
417
416
  // ../build-tools/src/plugins/swc.ts
@@ -648,9 +647,7 @@ _chunkJ5SB6L2Ljs.__name.call(void 0, cleanDirectories, "cleanDirectories");
648
647
  var DEFAULT_BUILD_OPTIONS = {
649
648
  assets: [],
650
649
  platform: "node",
651
- target: [
652
- "esnext"
653
- ],
650
+ target: "node22",
654
651
  format: "esm",
655
652
  tsconfig: "tsconfig.json",
656
653
  mode: "production",
@@ -659,9 +656,11 @@ var DEFAULT_BUILD_OPTIONS = {
659
656
  keepNames: true,
660
657
  metafile: false,
661
658
  treeshake: true,
659
+ splitting: true,
662
660
  shims: false,
663
661
  watch: false,
664
662
  bundle: true,
663
+ distDir: "dist",
665
664
  loader: {
666
665
  ".aac": "file",
667
666
  ".css": "file",
@@ -806,29 +805,23 @@ async function resolveContext(userOptions) {
806
805
  throw new Error("The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project.");
807
806
  }
808
807
  const options = _defu2.default.call(void 0, userOptions, DEFAULT_BUILD_OPTIONS);
809
- options.name ??= `${projectName}-${options.format}`;
810
- options.target ??= DEFAULT_TARGET;
808
+ options.name ??= projectName;
811
809
  const packageJsonPath = _chunkV7LBWOVVjs.joinPaths.call(void 0, workspaceRoot3.dir, options.projectRoot, "package.json");
812
810
  if (!_fs.existsSync.call(void 0, packageJsonPath)) {
813
811
  throw new Error("Cannot find package.json configuration");
814
812
  }
815
813
  const env = getEnv("esbuild", options);
814
+ const define = _defu2.default.call(void 0, _nullishCoalesce(options.define, () => ( {})), _nullishCoalesce(env, () => ( {})));
816
815
  const resolvedOptions = {
817
816
  ...options,
818
817
  tsconfig: _chunkV7LBWOVVjs.joinPaths.call(void 0, projectRoot, userOptions.tsconfig ? userOptions.tsconfig.replace(projectRoot, "") : "tsconfig.json"),
819
- distDir: "dist",
820
- name: projectName,
821
818
  metafile: userOptions.mode === "development",
822
- ...userOptions,
823
819
  clean: false,
824
- target: userOptions.target || options.target,
825
- splitting: options.format === "iife" ? false : options.treeshake === void 0 ? options.splitting : true,
826
820
  env,
827
821
  define: {
828
822
  STORM_FORMAT: JSON.stringify(options.format),
829
- ...options.define,
830
- ...Object.keys(env || {}).reduce((res, key) => {
831
- const value = JSON.stringify(env[key]);
823
+ ...Object.keys(define).filter((key) => define[key] !== void 0).reduce((res, key) => {
824
+ const value = JSON.stringify(define[key]);
832
825
  const safeKey = key.replaceAll("(", "").replaceAll(")", "");
833
826
  return {
834
827
  ...res,
@@ -870,26 +863,79 @@ async function generatePackageJson(context) {
870
863
  if (context.options.entry) {
871
864
  packageJson.exports ??= {};
872
865
  packageJson.exports["./package.json"] ??= "./package.json";
873
- packageJson.exports["."] ??= `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js`;
874
866
  const entryPoints = Array.isArray(context.options.entry) ? context.options.entry : Object.keys(context.options.entry);
875
- for (const entryPoint of entryPoints) {
876
- if (context.options.entry[entryPoint]) {
877
- const entry = context.options.entry[entryPoint].replaceAll("\\", "/").replaceAll(/^(\.\/)*/g, "").replace(/\.([cm])?[jt]s(x)?$/g, "");
878
- packageJson.exports[`./${entry}`] ??= `.${context.options.distDir ? `/${context.options.distDir}` : ""}/${entry}.js`;
867
+ if (entryPoints.length > 0) {
868
+ const defaultEntry = entryPoints.includes("index") ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/${entryPoints[0]}`;
869
+ const isEsm = Array.isArray(context.options.format) ? context.options.format.includes("esm") : context.options.format === "esm";
870
+ const isCjs = Array.isArray(context.options.format) ? context.options.format.includes("cjs") : context.options.format === "cjs";
871
+ const isDts = context.options.dts || context.options.experimentalDts;
872
+ packageJson.exports["."] ??= `${defaultEntry}.${isEsm ? "mjs" : isCjs ? "cjs" : "js"}`;
873
+ for (const entryPoint of entryPoints) {
874
+ packageJson.exports[`./${entryPoint}`] ??= {};
875
+ if (isEsm) {
876
+ if (isDts) {
877
+ packageJson.exports[`./${entryPoint}`].import = {
878
+ types: `./dist/${entryPoint}.d.mts`,
879
+ default: `./dist/${entryPoint}.mjs`
880
+ };
881
+ } else {
882
+ packageJson.exports[`./${entryPoint}`].import = `./dist/${entryPoint}.mjs`;
883
+ }
884
+ if (isDts) {
885
+ packageJson.exports[`./${entryPoint}`].default = {
886
+ types: `./dist/${entryPoint}.d.mts`,
887
+ default: `./dist/${entryPoint}.mjs`
888
+ };
889
+ } else {
890
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.mjs`;
891
+ }
892
+ }
893
+ if (isCjs) {
894
+ if (isDts) {
895
+ packageJson.exports[`./${entryPoint}`].require = {
896
+ types: `./dist/${entryPoint}.d.cts`,
897
+ default: `./dist/${entryPoint}.cjs`
898
+ };
899
+ } else {
900
+ packageJson.exports[`./${entryPoint}`].require = `./dist/${entryPoint}.cjs`;
901
+ }
902
+ if (!isEsm) {
903
+ if (isDts) {
904
+ packageJson.exports[`./${entryPoint}`].default = {
905
+ types: `./dist/${entryPoint}.d.cts`,
906
+ default: `./dist/${entryPoint}.cjs`
907
+ };
908
+ } else {
909
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.cjs`;
910
+ }
911
+ }
912
+ }
913
+ if (!isEsm && !isCjs) {
914
+ if (isDts) {
915
+ packageJson.exports[`./${entryPoint}`].default = {
916
+ types: `./dist/${entryPoint}.d.ts`,
917
+ default: `./dist/${entryPoint}.js`
918
+ };
919
+ } else {
920
+ packageJson.exports[`./${entryPoint}`].default = `./dist/${entryPoint}.js`;
921
+ }
922
+ }
879
923
  }
880
- }
881
- if (context.options.format === "esm") {
882
- packageJson.module = packageJson.type === "module" ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.mjs`;
883
- } else {
884
- packageJson.main = packageJson.type === "commonjs" ? `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.js` : `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.cjs`;
885
- }
886
- packageJson.types = `.${context.options.distDir ? `/${context.options.distDir}` : ""}/index.d.ts`;
887
- packageJson.exports = Object.keys(packageJson.exports).reduce((ret, key) => {
888
- if (key.endsWith("/index") && !ret[key.replace("/index", "")]) {
889
- ret[key.replace("/index", "")] = packageJson.exports[key];
924
+ if (isEsm) {
925
+ packageJson.module = `${defaultEntry}.mjs`;
926
+ } else {
927
+ packageJson.main = `${defaultEntry}.cjs`;
890
928
  }
891
- return ret;
892
- }, packageJson.exports);
929
+ if (isDts) {
930
+ packageJson.types = `${defaultEntry}.d.${isEsm ? "mts" : isCjs ? "cts" : "ts"}`;
931
+ }
932
+ packageJson.exports = Object.keys(packageJson.exports).reduce((ret, key) => {
933
+ if (key.endsWith("/index") && !ret[key.replace("/index", "")]) {
934
+ ret[key.replace("/index", "")] = packageJson.exports[key];
935
+ }
936
+ return ret;
937
+ }, packageJson.exports);
938
+ }
893
939
  }
894
940
  await _devkit.writeJsonFile.call(void 0, _chunkV7LBWOVVjs.joinPaths.call(void 0, context.outputPath, "package.json"), packageJson);
895
941
  stopwatch();
@@ -902,7 +948,7 @@ async function executeTsup(context) {
902
948
  const stopwatch = _chunkV7LBWOVVjs.getStopwatch.call(void 0, `${context.options.name} build`);
903
949
  await _tsup.build.call(void 0, {
904
950
  ...context.options,
905
- outDir: context.outputPath,
951
+ outDir: context.options.distDir ? _chunkV7LBWOVVjs.joinPaths.call(void 0, context.outputPath, context.options.distDir) : context.outputPath,
906
952
  workspaceConfig: context.workspaceConfig
907
953
  });
908
954
  stopwatch();
package/dist/executors.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";require('./chunk-XO66D74Z.js');
2
2
  require('./chunk-R7AIVBS7.js');
3
- require('./chunk-4O3YATGZ.js');
3
+ require('./chunk-X275XPRR.js');
4
4
  require('./chunk-6B5PUF7X.js');
5
5
  require('./chunk-QGRENI3O.js');
6
6
  require('./chunk-VTHBMY4B.js');
@@ -1,6 +1,6 @@
1
1
  import "./chunk-YSCEY447.mjs";
2
2
  import "./chunk-ZTKU4P4C.mjs";
3
- import "./chunk-V645LRBL.mjs";
3
+ import "./chunk-L4E4ZISE.mjs";
4
4
  import "./chunk-5EOQCEFP.mjs";
5
5
  import "./chunk-TH2W32CX.mjs";
6
6
  import "./chunk-7OJAYAYY.mjs";
@@ -2,11 +2,11 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkZHT7OUSLjs = require('./chunk-ZHT7OUSL.js');
5
+ var _chunkAYSQEPGSjs = require('./chunk-AYSQEPGS.js');
6
6
 
7
7
 
8
8
 
9
- var _chunkHPFRWJVVjs = require('./chunk-HPFRWJVV.js');
9
+ var _chunkFRBDGKHTjs = require('./chunk-FRBDGKHT.js');
10
10
  require('./chunk-IVLCYFXD.js');
11
11
  require('./chunk-V7LBWOVV.js');
12
12
  require('./chunk-J5SB6L2L.js');
@@ -15,4 +15,4 @@ require('./chunk-J5SB6L2L.js');
15
15
 
16
16
 
17
17
 
18
- exports.applicationGenerator = _chunkZHT7OUSLjs.applicationGenerator; exports.applicationSchematic = _chunkZHT7OUSLjs.applicationSchematic; exports.initGenerator = _chunkHPFRWJVVjs.initGenerator; exports.initSchematic = _chunkHPFRWJVVjs.initSchematic;
18
+ exports.applicationGenerator = _chunkAYSQEPGSjs.applicationGenerator; exports.applicationSchematic = _chunkAYSQEPGSjs.applicationSchematic; exports.initGenerator = _chunkFRBDGKHTjs.initGenerator; exports.initSchematic = _chunkFRBDGKHTjs.initSchematic;
@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
2
2
  import {
3
3
  applicationGenerator,
4
4
  applicationSchematic
5
- } from "./chunk-625R5LBL.mjs";
5
+ } from "./chunk-QDLAITVL.mjs";
6
6
  import {
7
7
  initGenerator,
8
8
  initSchematic
9
- } from "./chunk-BMSGENK2.mjs";
9
+ } from "./chunk-LUFRAFX6.mjs";
10
10
  import "./chunk-KGEVN742.mjs";
11
11
  import "./chunk-UPK4D74Z.mjs";
12
12
  import "./chunk-LGGVU67H.mjs";
package/dist/index.js CHANGED
@@ -3,14 +3,14 @@ require('./chunk-DHBG5ASJ.js');
3
3
 
4
4
 
5
5
 
6
- var _chunkZHT7OUSLjs = require('./chunk-ZHT7OUSL.js');
6
+ var _chunkAYSQEPGSjs = require('./chunk-AYSQEPGS.js');
7
7
 
8
8
 
9
9
 
10
- var _chunkHPFRWJVVjs = require('./chunk-HPFRWJVV.js');
10
+ var _chunkFRBDGKHTjs = require('./chunk-FRBDGKHT.js');
11
11
  require('./chunk-CVGPWUNP.js');
12
12
  require('./chunk-R7AIVBS7.js');
13
- require('./chunk-4O3YATGZ.js');
13
+ require('./chunk-X275XPRR.js');
14
14
  require('./chunk-6B5PUF7X.js');
15
15
 
16
16
 
@@ -148,4 +148,4 @@ _chunkJ5SB6L2Ljs.__name.call(void 0, createPackageJson, "createPackageJson");
148
148
 
149
149
 
150
150
 
151
- exports.applicationGenerator = _chunkZHT7OUSLjs.applicationGenerator; exports.applicationSchematic = _chunkZHT7OUSLjs.applicationSchematic; exports.createNodes = createNodes; exports.getInternalDependencies = _chunkQGRENI3Ojs.getInternalDependencies; exports.initGenerator = _chunkHPFRWJVVjs.initGenerator; exports.initSchematic = _chunkHPFRWJVVjs.initSchematic; exports.name = name; exports.r2UploadFile = _chunkQGRENI3Ojs.r2UploadFile;
151
+ exports.applicationGenerator = _chunkAYSQEPGSjs.applicationGenerator; exports.applicationSchematic = _chunkAYSQEPGSjs.applicationSchematic; exports.createNodes = createNodes; exports.getInternalDependencies = _chunkQGRENI3Ojs.getInternalDependencies; exports.initGenerator = _chunkFRBDGKHTjs.initGenerator; exports.initSchematic = _chunkFRBDGKHTjs.initSchematic; exports.name = name; exports.r2UploadFile = _chunkQGRENI3Ojs.r2UploadFile;
package/dist/index.mjs CHANGED
@@ -3,14 +3,14 @@ import "./chunk-3J7KBHMJ.mjs";
3
3
  import {
4
4
  applicationGenerator,
5
5
  applicationSchematic
6
- } from "./chunk-625R5LBL.mjs";
6
+ } from "./chunk-QDLAITVL.mjs";
7
7
  import {
8
8
  initGenerator,
9
9
  initSchematic
10
- } from "./chunk-BMSGENK2.mjs";
10
+ } from "./chunk-LUFRAFX6.mjs";
11
11
  import "./chunk-7Z5PILRU.mjs";
12
12
  import "./chunk-ZTKU4P4C.mjs";
13
- import "./chunk-V645LRBL.mjs";
13
+ import "./chunk-L4E4ZISE.mjs";
14
14
  import "./chunk-5EOQCEFP.mjs";
15
15
  import {
16
16
  getInternalDependencies,
@@ -1,7 +1,7 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
3
  var _chunkR7AIVBS7js = require('../../../chunk-R7AIVBS7.js');
4
- require('../../../chunk-4O3YATGZ.js');
4
+ require('../../../chunk-X275XPRR.js');
5
5
  require('../../../chunk-VTHBMY4B.js');
6
6
  require('../../../chunk-IVLCYFXD.js');
7
7
  require('../../../chunk-V7LBWOVV.js');
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  runExecutor
3
3
  } from "../../../chunk-ZTKU4P4C.mjs";
4
- import "../../../chunk-V645LRBL.mjs";
4
+ import "../../../chunk-L4E4ZISE.mjs";
5
5
  import "../../../chunk-7OJAYAYY.mjs";
6
6
  import "../../../chunk-KGEVN742.mjs";
7
7
  import "../../../chunk-UPK4D74Z.mjs";
@@ -1,6 +1,6 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
2
2
 
3
- var _chunk4O3YATGZjs = require('../../../chunk-4O3YATGZ.js');
3
+ var _chunkX275XPRRjs = require('../../../chunk-X275XPRR.js');
4
4
 
5
5
 
6
6
  var _chunkVTHBMY4Bjs = require('../../../chunk-VTHBMY4B.js');
@@ -60,7 +60,7 @@ async function* serveExecutor(options, context, config) {
60
60
  };
61
61
  }
62
62
  _chunkJ5SB6L2Ljs.__name.call(void 0, serveExecutor, "serveExecutor");
63
- var executor_default = _chunk4O3YATGZjs.withRunExecutor.call(void 0, "Cloudflare Serve executor", serveExecutor, {
63
+ var executor_default = _chunkX275XPRRjs.withRunExecutor.call(void 0, "Cloudflare Serve executor", serveExecutor, {
64
64
  skipReadingConfig: false,
65
65
  hooks: {
66
66
  applyDefaultOptions: /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, (options) => {
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  withRunExecutor
3
- } from "../../../chunk-V645LRBL.mjs";
3
+ } from "../../../chunk-L4E4ZISE.mjs";
4
4
  import {
5
5
  createCliOptions
6
6
  } from "../../../chunk-7OJAYAYY.mjs";
@@ -2,10 +2,10 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkHPFRWJVVjs = require('../../../chunk-HPFRWJVV.js');
5
+ var _chunkFRBDGKHTjs = require('../../../chunk-FRBDGKHT.js');
6
6
  require('../../../chunk-J5SB6L2L.js');
7
7
 
8
8
 
9
9
 
10
10
 
11
- exports.default = _chunkHPFRWJVVjs.generator_default; exports.initGenerator = _chunkHPFRWJVVjs.initGenerator; exports.initSchematic = _chunkHPFRWJVVjs.initSchematic;
11
+ exports.default = _chunkFRBDGKHTjs.generator_default; exports.initGenerator = _chunkFRBDGKHTjs.initGenerator; exports.initSchematic = _chunkFRBDGKHTjs.initSchematic;
@@ -2,7 +2,7 @@ import {
2
2
  generator_default,
3
3
  initGenerator,
4
4
  initSchematic
5
- } from "../../../chunk-BMSGENK2.mjs";
5
+ } from "../../../chunk-LUFRAFX6.mjs";
6
6
  import "../../../chunk-LGGVU67H.mjs";
7
7
  export {
8
8
  generator_default as default,
@@ -2,8 +2,8 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkZHT7OUSLjs = require('../../../chunk-ZHT7OUSL.js');
6
- require('../../../chunk-HPFRWJVV.js');
5
+ var _chunkAYSQEPGSjs = require('../../../chunk-AYSQEPGS.js');
6
+ require('../../../chunk-FRBDGKHT.js');
7
7
  require('../../../chunk-IVLCYFXD.js');
8
8
  require('../../../chunk-V7LBWOVV.js');
9
9
  require('../../../chunk-J5SB6L2L.js');
@@ -11,4 +11,4 @@ require('../../../chunk-J5SB6L2L.js');
11
11
 
12
12
 
13
13
 
14
- exports.applicationGenerator = _chunkZHT7OUSLjs.applicationGenerator; exports.applicationSchematic = _chunkZHT7OUSLjs.applicationSchematic; exports.default = _chunkZHT7OUSLjs.generator_default;
14
+ exports.applicationGenerator = _chunkAYSQEPGSjs.applicationGenerator; exports.applicationSchematic = _chunkAYSQEPGSjs.applicationSchematic; exports.default = _chunkAYSQEPGSjs.generator_default;
@@ -2,8 +2,8 @@ import {
2
2
  applicationGenerator,
3
3
  applicationSchematic,
4
4
  generator_default
5
- } from "../../../chunk-625R5LBL.mjs";
6
- import "../../../chunk-BMSGENK2.mjs";
5
+ } from "../../../chunk-QDLAITVL.mjs";
6
+ import "../../../chunk-LUFRAFX6.mjs";
7
7
  import "../../../chunk-KGEVN742.mjs";
8
8
  import "../../../chunk-UPK4D74Z.mjs";
9
9
  import "../../../chunk-LGGVU67H.mjs";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/cloudflare-tools",
3
- "version": "0.55.72",
3
+ "version": "0.55.74",
4
4
  "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
5
5
  "repository": {
6
6
  "type": "github",