@backstage/cli 0.29.5 → 0.30.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @backstage/cli
 
+## 0.30.0-next.0
+
+### Minor Changes
+
+- cb76663: **BREAKING**: Add support for native ESM in Node.js code. This changes the behavior of dynamic import expressions in Node.js code. Typically this can be fixed by replacing `import(...)` with `require(...)`, with an `as typeof import(...)` cast if needed for types. This is because dynamic imports will no longer be transformed to `require(...)` calls, but instead be left as-is. This in turn allows you to load ESM modules from CommonJS code using `import(...)`.
+
+  This change adds support for the following in Node.js packages, across type checking, package builds, runtime transforms and Jest tests:
+
+  - Dynamic imports that load ESM modules from CommonJS code.
+  - Both `.mjs` and `.mts` files as explicit ESM files, as well as `.cjs` and `.cts` as explicit CommonJS files.
+  - Support for the `"type": "module"` field in `package.json` to indicate that the package is an ESM package.
+
+  There are a few caveats to be aware of:
+
+  - To enable support for native ESM in tests, you need to run the tests with the `--experimental-vm-modules` flag enabled, typically via `NODE_OPTIONS='--experimental-vm-modules'`.
+  - Declaring a package as `"type": "module"` in `package.json` is supported, but in tests it will cause all local transitive dependencies to also be treated as ESM, regardless of whether they declare `"type": "module"` or not.
+  - Node.js has an [ESM interoperability layer with CommonJS](https://nodejs.org/docs/latest-v22.x/api/esm.html#interoperability-with-commonjs) that allows for imports from ESM to identify named exports in CommonJS packages. This interoperability layer is **only** enabled when importing packages with a `.cts` or `.cjs` extension. This is because the interoperability layer is not fully compatible with the NPM ecosystem, and would break package if it was enabled for `.js` files.
+  - Dynamic imports of CommonJS packages will vary in shape depending on the runtime, i.e. test vs local development, etc. It is therefore recommended to avoid dynamic imports of CommonJS packages and instead use `require`, or to use the explicit CommonJS extensions as mentioned above. If you do need to dynamically import CommonJS packages, avoid using `default` exports, as the shape of them vary across different environments and you would otherwise need to manually unwrap the import based on the shape of the module object.
+
+### Patch Changes
+
+- f21b125: Ensure that both global-agent and undici agents are enabled when proxying is enabled.
+- Updated dependencies
+  - @backstage/cli-node@0.2.13-next.0
+  - @backstage/config-loader@1.9.6-next.0
+  - @backstage/catalog-model@1.7.3
+  - @backstage/cli-common@0.1.15
+  - @backstage/config@1.3.2
+  - @backstage/errors@1.2.7
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.16.1
+  - @backstage/release-manifests@0.0.12
+  - @backstage/types@1.2.1
+
 ## 0.29.5
 
 ### Patch Changes

package/config/jest.js

@@ -31,6 +31,14 @@ const FRONTEND_ROLES = [
   'frontend-plugin-module',
 ];
 
+const NODE_ROLES = [
+  'backend',
+  'cli',
+  'node-library',
+  'backend-plugin',
+  'backend-plugin-module',
+];
+
 const envOptions = {
   oldTests: Boolean(process.env.BACKSTAGE_OLD_TESTS),
 };
@@ -130,11 +138,97 @@ const transformIgnorePattern = [
 ].join('|');
 
 // Provides additional config that's based on the role of the target package
-function getRoleConfig(role) {
+function getRoleConfig(role, pkgJson) {
+  // Only Node.js package roles support native ESM modules, frontend and common
+  // packages are always transpiled to CommonJS.
+  const moduleOpts = NODE_ROLES.includes(role)
+    ? {
+        module: {
+          ignoreDynamic: true,
+          exportInteropAnnotation: true,
+        },
+      }
+    : undefined;
+
+  const transform = {
+    '\\.(mjs|cjs|js)$': [
+      require.resolve('./jestSwcTransform'),
+      {
+        ...moduleOpts,
+        jsc: {
+          parser: {
+            syntax: 'ecmascript',
+          },
+        },
+      },
+    ],
+    '\\.jsx$': [
+      require.resolve('./jestSwcTransform'),
+      {
+        jsc: {
+          parser: {
+            syntax: 'ecmascript',
+            jsx: true,
+          },
+          transform: {
+            react: {
+              runtime: 'automatic',
+            },
+          },
+        },
+      },
+    ],
+    '\\.(mts|cts|ts)$': [
+      require.resolve('./jestSwcTransform'),
+      {
+        ...moduleOpts,
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+          },
+        },
+      },
+    ],
+    '\\.tsx$': [
+      require.resolve('./jestSwcTransform'),
+      {
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+            tsx: true,
+          },
+          transform: {
+            react: {
+              runtime: 'automatic',
+            },
+          },
+        },
+      },
+    ],
+    '\\.(bmp|gif|jpg|jpeg|png|ico|webp|frag|xml|svg|eot|woff|woff2|ttf)$':
+      require.resolve('./jestFileTransform.js'),
+    '\\.(yaml)$': require.resolve('./jestYamlTransform'),
+  };
   if (FRONTEND_ROLES.includes(role)) {
-    return { testEnvironment: require.resolve('jest-environment-jsdom') };
+    return {
+      testEnvironment: require.resolve('jest-environment-jsdom'),
+      transform,
+    };
   }
-  return { testEnvironment: require.resolve('jest-environment-node') };
+  return {
+    testEnvironment: require.resolve('jest-environment-node'),
+    moduleFileExtensions: [...SRC_EXTS, 'json', 'node'],
+    // Jest doesn't let us dynamically detect type=module per transformed file,
+    // so we have to assume that if the entry point is ESM, all TS files are
+    // ESM.
+    //
+    // This means you can't switch a package to type=module until all of its
+    // monorepo dependencies are also type=module or does not contain any .ts
+    // files.
+    extensionsToTreatAsEsm:
+      pkgJson.type === 'module' ? ['.ts', '.mts'] : ['.mts'],
+    transform,
+  };
 }
 
 async function getProjectConfig(targetPath, extraConfig, extraOptions) {
@@ -160,64 +254,6 @@ async function getProjectConfig(targetPath, extraConfig, extraOptions) {
       '\\.(css|less|scss|sss|styl)$': require.resolve('jest-css-modules'),
     },
 
-    transform: {
-      '\\.(mjs|cjs|js)$': [
-        require.resolve('./jestSwcTransform'),
-        {
-          jsc: {
-            parser: {
-              syntax: 'ecmascript',
-            },
-          },
-        },
-      ],
-      '\\.jsx$': [
-        require.resolve('./jestSwcTransform'),
-        {
-          jsc: {
-            parser: {
-              syntax: 'ecmascript',
-              jsx: true,
-            },
-            transform: {
-              react: {
-                runtime: 'automatic',
-              },
-            },
-          },
-        },
-      ],
-      '\\.ts$': [
-        require.resolve('./jestSwcTransform'),
-        {
-          jsc: {
-            parser: {
-              syntax: 'typescript',
-            },
-          },
-        },
-      ],
-      '\\.tsx$': [
-        require.resolve('./jestSwcTransform'),
-        {
-          jsc: {
-            parser: {
-              syntax: 'typescript',
-              tsx: true,
-            },
-            transform: {
-              react: {
-                runtime: 'automatic',
-              },
-            },
-          },
-        },
-      ],
-      '\\.(bmp|gif|jpg|jpeg|png|ico|webp|frag|xml|svg|eot|woff|woff2|ttf)$':
-        require.resolve('./jestFileTransform.js'),
-      '\\.(yaml)$': require.resolve('./jestYamlTransform'),
-    },
-
     // A bit more opinionated
     testMatch: [`**/*.test.{${SRC_EXTS.join(',')}}`],
 
@@ -226,7 +262,7 @@ async function getProjectConfig(targetPath, extraConfig, extraOptions) {
       : require.resolve('./jestCachingModuleLoader'),
 
     transformIgnorePatterns: [`/node_modules/(?:${transformIgnorePattern})/`],
-    ...getRoleConfig(pkgJson.backstage?.role),
+    ...getRoleConfig(pkgJson.backstage?.role, pkgJson),
   };
 
   options.setupFilesAfterEnv = options.setupFilesAfterEnv || [];

package/config/jestCachingModuleLoader.js

@@ -19,6 +19,11 @@ const { default: JestRuntime } = require('jest-runtime');
 const scriptTransformCache = new Map();
 
 module.exports = class CachingJestRuntime extends JestRuntime {
+  constructor(config, ...restAgs) {
+    super(config, ...restAgs);
+    this.allowLoadAsEsm = config.extensionsToTreatAsEsm.includes('.mts');
+  }
+
   // This may or may not be a good idea. Theoretically I don't know why this would impact
   // test correctness and flakiness, but it seems like it may introduce flakiness and strange failures.
   // It does seem to speed up test execution by a fair amount though.
@@ -33,4 +38,13 @@ module.exports = class CachingJestRuntime extends JestRuntime {
     }
     return script;
   }
+
+  // Unfortunately we need to use this unstable API to make sure that .js files
+  // are only loaded as modules where ESM is supported, i.e. Node.js packages.
+  unstable_shouldLoadAsEsm(path, ...restArgs) {
+    if (!this.allowLoadAsEsm) {
+      return false;
+    }
+    return super.unstable_shouldLoadAsEsm(path, ...restArgs);
+  }
 };

package/config/jestSwcTransform.js

@@ -23,10 +23,16 @@ function createTransformer(config) {
     ...config,
   });
   const process = (source, filePath, jestOptions) => {
+    // Skip transformation of .js files without ESM syntax, we never transform from CJS to ESM
     if (filePath.endsWith('.js') && !ESM_REGEX.test(source)) {
       return { code: source };
     }
 
+    // Skip transformation of .mjs files, they should only be used if ESM support is available
+    if (filePath.endsWith('.mjs')) {
+      return { code: source };
+    }
+
     return swcTransformer.process(source, filePath, jestOptions);
   };
 

package/config/nodeTransform.cjs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+const { pathToFileURL } = require('url');
 const { transformSync } = require('@swc/core');
 const { addHook } = require('pirates');
 const { Module } = require('module');
@@ -55,7 +56,10 @@ addHook(
     const transformed = transformSync(code, {
       filename,
       sourceMaps: 'inline',
-      module: { type: 'commonjs' },
+      module: {
+        type: 'commonjs',
+        ignoreDynamic: true,
+      },
       jsc: {
         target: 'es2022',
         parser: {
@@ -76,3 +80,8 @@ addHook(
   },
   { extensions: ['.js', '.cjs'], ignoreNodeModules: true },
 );
+
+// Register module hooks, used by "type": "module" in package.json, .mjs and
+// .mts files, as well as dynamic import(...)s, although dynamic imports will be
+// handled be the CommonJS hooks in this file if what it points to is CommonJS.
+Module.register('./nodeTransformHooks.mjs', pathToFileURL(__filename));

package/config/nodeTransformHooks.mjs

@@ -0,0 +1,282 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { dirname, extname, resolve as resolvePath } from 'path';
+import { fileURLToPath } from 'url';
+import { transformFile } from '@swc/core';
+import { isBuiltin } from 'node:module';
+import { readFile } from 'fs/promises';
+import { existsSync } from 'fs';
+
+// @ts-check
+
+// No explicit file extension, no type in package.json
+const DEFAULT_MODULE_FORMAT = 'commonjs';
+
+// Source file extensions to look for when using bundle resolution strategy
+const SRC_EXTS = ['.ts', '.js'];
+const TS_EXTS = ['.ts', '.mts', '.cts'];
+const moduleTypeTable = {
+  '.mjs': 'module',
+  '.mts': 'module',
+  '.cjs': 'commonjs',
+  '.cts': 'commonjs',
+  '.ts': undefined,
+  '.js': undefined,
+};
+
+/** @type {import('module').ResolveHook} */
+export async function resolve(specifier, context, nextResolve) {
+  // Built-in modules are handled by the default resolver
+  if (isBuiltin(specifier)) {
+    return nextResolve(specifier, context);
+  }
+
+  const ext = extname(specifier);
+
+  // Unless there's an explicit import attribute, JSON files are loaded with our custom loader that's defined below.
+  if (ext === '.json' && !context.importAttributes?.type) {
+    const jsonResult = await nextResolve(specifier, context);
+    return {
+      ...jsonResult,
+      format: 'commonjs',
+      importAttributes: { type: 'json' },
+    };
+  }
+
+  // Anything else with an explicit extension is handled by the default
+  // resolver, except that we help determine the module type where needed.
+  if (ext !== '') {
+    return withDetectedModuleType(await nextResolve(specifier, context));
+  }
+
+  // Other external modules are handled by the default resolver, but again we
+  // help determine the module type where needed.
+  if (!specifier.startsWith('.')) {
+    return withDetectedModuleType(await nextResolve(specifier, context));
+  }
+
+  // The rest of this function handles the case of resolving imports that do not
+  // specify any extension and might point to a directory with an `index.*`
+  // file. We resolve those using the same logic as most JS bundlers would, with
+  // the addition of checking if there's an explicit module format listed in the
+  // closest `package.json` file.
+  //
+  // We use a bundle resolution strategy in order to keep code consistent across
+  // Backstage codebases that contains code both for Web and Node.js, and to
+  // support packages with common code that can be used in both environments.
+  try {
+    // This is expected to throw, but in the event that this module specifier is
+    // supported we prefer to use the default resolver.
+    return await nextResolve(specifier, context);
+  } catch (error) {
+    if (error.code === 'ERR_UNSUPPORTED_DIR_IMPORT') {
+      const spec = `${specifier}${specifier.endsWith('/') ? '' : '/'}index`;
+      const resolved = await resolveWithoutExt(spec, context, nextResolve);
+      if (resolved) {
+        return withDetectedModuleType(resolved);
+      }
+    } else if (error.code === 'ERR_MODULE_NOT_FOUND') {
+      const resolved = await resolveWithoutExt(specifier, context, nextResolve);
+      if (resolved) {
+        return withDetectedModuleType(resolved);
+      }
+    }
+
+    // Unexpected error or no resolution found
+    throw error;
+  }
+}
+
+/**
+ * Populates the `format` field in the resolved object based on the closest `package.json` file.
+ *
+ * @param {import('module').ResolveFnOutput} resolved
+ * @returns {Promise<import('module').ResolveFnOutput>}
+ */
+async function withDetectedModuleType(resolved) {
+  // Already has an explicit format
+  if (resolved.format) {
+    return resolved;
+  }
+  // Happens in Node.js v22 when there's a package.json without an explicit "type" field. Use the default.
+  if (resolved.format === null) {
+    return { ...resolved, format: DEFAULT_MODULE_FORMAT };
+  }
+
+  const ext = extname(resolved.url);
+
+  const explicitFormat = moduleTypeTable[ext];
+  if (explicitFormat) {
+    return {
+      ...resolved,
+      format: explicitFormat,
+    };
+  }
+
+  // TODO(Rugvip): Afaik this should never happen and we can remove this check, but want it here for a little while to verify.
+  if (ext === '.js') {
+    throw new Error('Unexpected .js file without explicit format');
+  }
+
+  // TODO(Rugvip): Does this need caching? kept it simple for now but worth exploring
+  const packageJsonPath = await findPackageJSON(fileURLToPath(resolved.url));
+  if (!packageJsonPath) {
+    return resolved;
+  }
+
+  const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'));
+  return {
+    ...resolved,
+    format: packageJson.type ?? DEFAULT_MODULE_FORMAT,
+  };
+}
+
+/**
+ * Find the closest package.json file from the given path.
+ *
+ * TODO(Rugvip): This can be replaced with the Node.js built-in with the same name once it is stable.
+ * @param {string} startPath
+ * @returns {Promise<string | undefined>}
+ */
+async function findPackageJSON(startPath) {
+  let path = startPath;
+
+  // Some confidence check to avoid infinite loop
+  for (let i = 0; i < 1000; i++) {
+    const packagePath = resolvePath(path, 'package.json');
+    if (existsSync(packagePath)) {
+      return packagePath;
+    }
+
+    const newPath = dirname(path);
+    if (newPath === path) {
+      return undefined;
+    }
+    path = newPath;
+  }
+
+  throw new Error(
+    `Iteration limit reached when searching for package.json at ${startPath}`,
+  );
+}
+
+/** @type {import('module').ResolveHook} */
+async function resolveWithoutExt(specifier, context, nextResolve) {
+  for (const tryExt of SRC_EXTS) {
+    try {
+      const resolved = await nextResolve(specifier + tryExt, {
+        ...context,
+        format: 'commonjs',
+      });
+      return {
+        ...resolved,
+        format: moduleTypeTable[tryExt] ?? resolved.format,
+      };
+    } catch {
+      /* ignore */
+    }
+  }
+  return undefined;
+}
+
+/** @type {import('module').LoadHook} */
+export async function load(url, context, nextLoad) {
+  // Non-file URLs are handled by the default loader
+  if (!url.startsWith('file://')) {
+    return nextLoad(url, context);
+  }
+
+  // JSON files loaded as CommonJS are handled by this custom loader, because
+  // the default one doesn't work. For JSON loading to work we'd need the
+  // synchronous hooks that aren't supported yet, or avoid using the CommonJS
+  // compatibility.
+  if (
+    context.format === 'commonjs' &&
+    context.importAttributes?.type === 'json'
+  ) {
+    try {
+      // TODO(Rugvip): Make sure this is valid JSON
+      const content = await readFile(fileURLToPath(url), 'utf8');
+      return {
+        source: `module.exports = (${content})`,
+        format: 'commonjs',
+        shortCircuit: true,
+      };
+    } catch {
+      // Let the default loader generate the error
+      return nextLoad(url, context);
+    }
+  }
+
+  const ext = extname(url);
+
+  // Non-TS files are handled by the default loader
+  if (!TS_EXTS.includes(ext)) {
+    return nextLoad(url, context);
+  }
+
+  const format = context.format ?? DEFAULT_MODULE_FORMAT;
+
+  // We have two choices at this point, we can either transform CommonJS files
+  // and return the transformed source code, or let the default loader handle
+  // them. If we transform them ourselves we will enter CommonJS compatibility
+  // mode in the new module system in Node.js, this effectively means all
+  // CommonJS loaded via `require` calls from this point will all be treated as
+  // if it was loaded via `import` calls from modules.
+  //
+  // The CommonJS compatibility layer will try to identify named exports and
+  // make them available directly, which is convenient as it avoids things like
+  // `import(...).then(m => m.default.foo)`, allowing you to instead write
+  // `import(...).then(m => m.foo)`. The compatibility layer doesn't always work
+  // all that well though, and can lead to module loading issues in many cases,
+  // especially for older code.
+
+  // This `if` block opts-out of using CommonJS compatibility mode by default,
+  // and instead leaves it to our existing loader to transform CommonJS. We do
+  // however use compatibility mode for the more explicit .cts file extension,
+  // allows for a way to opt-in to the new behavior.
+  //
+  // TODO(Rugvip): Once the synchronous hooks API is available for us to use, we might be able to adopt that instead
+  if (format === 'commonjs' && ext !== '.cts') {
+    return nextLoad(url, { ...context, format });
+  }
+
+  const transformed = await transformFile(fileURLToPath(url), {
+    sourceMaps: 'inline',
+    module: {
+      type: format === 'module' ? 'es6' : 'commonjs',
+      ignoreDynamic: true,
+
+      // This helps the Node.js CommonJS compat layer identify named exports.
+      exportInteropAnnotation: true,
+    },
+    jsc: {
+      target: 'es2022',
+      parser: {
+        syntax: 'typescript',
+      },
+    },
+  });
+
+  return {
+    ...context,
+    shortCircuit: true,
+    source: transformed.code,
+    format,
+    responseURL: url,
+  };
+}

package/config/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowImportingTsExtensions": true,
     "allowJs": true,
     "declaration": true,
     "declarationMap": false,

package/dist/commands/index.cjs.js

@@ -17,7 +17,7 @@ function registerRepoCommand(program) {
   ).option(
     "--minify",
     "Minify the generated code. Does not apply to app package (app is minified by default)."
-  ).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/build.cjs.js'); }).then((m) => m.command)));
+  ).action(lazy.lazy(() => import('./repo/build.cjs.js'), "command"));
   command.command("lint").description("Lint all packages in the project").option(
     "--format <format>",
     "Lint report output format",
@@ -34,18 +34,16 @@ function registerRepoCommand(program) {
   ).option(
     "--successCacheDir <path>",
     "Set the success cache location, (default: node_modules/.cache/backstage-cli)"
-  ).option("--fix", "Attempt to automatically fix violations").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/lint.cjs.js'); }).then((m) => m.command)));
+  ).option("--fix", "Attempt to automatically fix violations").action(lazy.lazy(() => import('./repo/lint.cjs.js'), "command"));
   command.command("fix").description("Automatically fix packages in the project").option(
     "--publish",
     "Enable additional fixes that only apply when publishing packages"
   ).option(
     "--check",
     "Fail if any packages would have been changed by the command"
-  ).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/fix.cjs.js'); }).then((m) => m.command)));
-  command.command("clean").description("Delete cache and output directories").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/clean.cjs.js'); }).then((m) => m.command)));
-  command.command("list-deprecations").description("List deprecations").option("--json", "Output as JSON").action(
-    lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/list-deprecations.cjs.js'); }).then((m) => m.command))
-  );
+  ).action(lazy.lazy(() => import('./repo/fix.cjs.js'), "command"));
+  command.command("clean").description("Delete cache and output directories").action(lazy.lazy(() => import('./repo/clean.cjs.js'), "command"));
+  command.command("list-deprecations").description("List deprecations").option("--json", "Output as JSON").action(lazy.lazy(() => import('./repo/list-deprecations.cjs.js'), "command"));
   command.command("test").allowUnknownOption(true).option(
     "--since <ref>",
     "Only test packages that changed since the specified ref"
@@ -58,14 +56,14 @@ function registerRepoCommand(program) {
   ).option(
     "--jest-help",
     "Show help for Jest CLI options, which are passed through"
-  ).description("Run tests, forwarding args to Jest, defaulting to watch mode").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./repo/test.cjs.js'); }).then((m) => m.command)));
+  ).description("Run tests, forwarding args to Jest, defaulting to watch mode").action(lazy.lazy(() => import('./repo/test.cjs.js'), "command"));
 }
 function registerScriptCommand(program) {
   const command = program.command("package [command]").description("Lifecycle scripts for individual packages");
   command.command("start").description("Start a package for local development").option(...index.configOption).option("--role <name>", "Run the command with an explicit package role").option("--check", "Enable type checking and linting if available").option("--inspect [host]", "Enable debugger in Node.js environments").option(
     "--inspect-brk [host]",
     "Enable debugger in Node.js environments, breaking before code starts"
-  ).option("--require <path>", "Add a --require argument to the node process").option("--link <path>", "Link an external workspace for module resolution").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./start/index.cjs.js'); }).then((m) => m.command)));
+  ).option("--require <path>", "Add a --require argument to the node process").option("--link <path>", "Link an external workspace for module resolution").action(lazy.lazy(() => import('./start/index.cjs.js'), "command"));
   command.command("build").description("Build a package for production deployment or publishing").option("--role <name>", "Run the command with an explicit package role").option(
     "--minify",
     "Minify the generated code. Does not apply to app package (app is minified by default)."
@@ -80,7 +78,7 @@ function registerScriptCommand(program) {
     "Config files to load instead of app-config.yaml. Applies to app packages only.",
     (opt, opts) => opts ? [...opts, opt] : [opt],
     Array()
-  ).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./build/index.cjs.js'); }).then((m) => m.command)));
+  ).action(lazy.lazy(() => import('./build/index.cjs.js'), "command"));
   command.command("lint [directories...]").option(
     "--format <format>",
     "Lint report output format",
@@ -91,31 +89,23 @@ function registerScriptCommand(program) {
   ).option("--fix", "Attempt to automatically fix violations").option(
     "--max-warnings <number>",
     "Fail if more than this number of warnings. -1 allows warnings. (default: 0)"
-  ).description("Lint a package").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./lint.cjs.js'); }).then((m) => m.default)));
-  command.command("test").allowUnknownOption(true).helpOption(", --backstage-cli-help").description("Run tests, forwarding args to Jest, defaulting to watch mode").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./test.cjs.js'); }).then((m) => m.default)));
-  command.command("clean").description("Delete cache directories").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./clean/clean.cjs.js'); }).then((m) => m.default)));
-  command.command("prepack").description("Prepares a package for packaging before publishing").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./pack.cjs.js'); }).then((m) => m.pre)));
-  command.command("postpack").description("Restores the changes made by the prepack command").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./pack.cjs.js'); }).then((m) => m.post)));
+  ).description("Lint a package").action(lazy.lazy(() => import('./lint.cjs.js'), "default"));
+  command.command("test").allowUnknownOption(true).helpOption(", --backstage-cli-help").description("Run tests, forwarding args to Jest, defaulting to watch mode").action(lazy.lazy(() => import('./test.cjs.js'), "default"));
+  command.command("clean").description("Delete cache directories").action(lazy.lazy(() => import('./clean/clean.cjs.js'), "default"));
+  command.command("prepack").description("Prepares a package for packaging before publishing").action(lazy.lazy(() => import('./pack.cjs.js'), "pre"));
+  command.command("postpack").description("Restores the changes made by the prepack command").action(lazy.lazy(() => import('./pack.cjs.js'), "post"));
 }
 function registerMigrateCommand(program) {
   const command = program.command("migrate [command]").description("Migration utilities");
-  command.command("package-roles").description(`Add package role field to packages that don't have it`).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./migrate/packageRole.cjs.js'); }).then((m) => m.default)));
-  command.command("package-scripts").description("Set package scripts according to each package role").action(
-    lazy.lazy(() => Promise.resolve().then(function () { return require('./migrate/packageScripts.cjs.js'); }).then((m) => m.command))
-  );
-  command.command("package-exports").description("Synchronize package subpath export definitions").action(
-    lazy.lazy(() => Promise.resolve().then(function () { return require('./migrate/packageExports.cjs.js'); }).then((m) => m.command))
-  );
+  command.command("package-roles").description(`Add package role field to packages that don't have it`).action(lazy.lazy(() => import('./migrate/packageRole.cjs.js'), "default"));
+  command.command("package-scripts").description("Set package scripts according to each package role").action(lazy.lazy(() => import('./migrate/packageScripts.cjs.js'), "command"));
+  command.command("package-exports").description("Synchronize package subpath export definitions").action(lazy.lazy(() => import('./migrate/packageExports.cjs.js'), "command"));
   command.command("package-lint-configs").description(
     "Migrates all packages to use @backstage/cli/config/eslint-factory"
-  ).action(
-    lazy.lazy(() => Promise.resolve().then(function () { return require('./migrate/packageLintConfigs.cjs.js'); }).then((m) => m.command))
-  );
+  ).action(lazy.lazy(() => import('./migrate/packageLintConfigs.cjs.js'), "command"));
   command.command("react-router-deps").description(
     "Migrates the react-router dependencies for all packages to be peer dependencies"
-  ).action(
-    lazy.lazy(() => Promise.resolve().then(function () { return require('./migrate/reactRouterDeps.cjs.js'); }).then((m) => m.command))
-  );
+  ).action(lazy.lazy(() => import('./migrate/reactRouterDeps.cjs.js'), "command"));
 }
 function registerCommands(program) {
   program.command("new").storeOptionsAsProperties(false).description(
@@ -137,7 +127,7 @@ function registerCommands(program) {
   ).option(
     "--license <license>",
     "The license to use for any new packages (default: Apache-2.0)"
-  ).option("--no-private", "Do not mark new packages as private").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./new/new.cjs.js'); }).then((m) => m.default)));
+  ).option("--no-private", "Do not mark new packages as private").action(lazy.lazy(() => import('./new/new.cjs.js'), "default"));
   index.registerCommands(program);
   registerRepoCommand(program);
   registerScriptCommand(program);
@@ -149,7 +139,7 @@ function registerCommands(program) {
     "--release <version|next|main>",
     "Bump to a specific Backstage release line or version",
     "main"
-  ).option("--skip-install", "Skips yarn install step").option("--skip-migrate", "Skips migration of any moved packages").description("Bump Backstage packages to the latest versions").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./versions/bump.cjs.js'); }).then((m) => m.default)));
+  ).option("--skip-install", "Skips yarn install step").option("--skip-migrate", "Skips migration of any moved packages").description("Bump Backstage packages to the latest versions").action(lazy.lazy(() => import('./versions/bump.cjs.js'), "default"));
   program.command("versions:migrate").option(
     "--pattern <glob>",
     "Override glob for matching packages to upgrade"
@@ -158,7 +148,7 @@ function registerCommands(program) {
     "Skip code changes and only update package.json files"
   ).description(
     "Migrate any plugins that have been moved to the @backstage-community namespace automatically"
-  ).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./versions/migrate.cjs.js'); }).then((m) => m.default)));
+  ).action(lazy.lazy(() => import('./versions/migrate.cjs.js'), "default"));
   program.command("build-workspace <workspace-dir> [packages...]").addOption(
     new commander.Option(
       "--alwaysYarnPack",
@@ -167,9 +157,9 @@ function registerCommands(program) {
   ).option(
     "--alwaysPack",
     "Force workspace output to be a result of running `yarn pack` on each package (warning: very slow)"
-  ).description("Builds a temporary dist workspace from the provided packages").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./buildWorkspace.cjs.js'); }).then((m) => m.default)));
-  program.command("create-github-app <github-org>").description("Create new GitHub App in your organization.").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./create-github-app/index.cjs.js'); }).then((m) => m.default)));
-  program.command("info").description("Show helpful information for debugging and reporting bugs").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./info.cjs.js'); }).then((m) => m.default)));
+  ).description("Builds a temporary dist workspace from the provided packages").action(lazy.lazy(() => import('./buildWorkspace.cjs.js'), "default"));
+  program.command("create-github-app <github-org>").description("Create new GitHub App in your organization.").action(lazy.lazy(() => import('./create-github-app/index.cjs.js'), "default"));
+  program.command("info").description("Show helpful information for debugging and reporting bugs").action(lazy.lazy(() => import('./info.cjs.js'), "default"));
   program.command("create").allowUnknownOption(true).action(removed("use 'backstage-cli new' instead"));
   program.command("create-plugin").allowUnknownOption(true).action(removed("use 'backstage-cli new' instead"));
   program.command("plugin:diff").allowUnknownOption(true).action(removed("use 'backstage-cli fix' instead"));

package/dist/commands/versions/bump.cjs.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var globalAgent = require('global-agent');
 var fs = require('fs-extra');
 var chalk = require('chalk');
 var semver = require('semver');
@@ -28,15 +27,17 @@ var semver__default = /*#__PURE__*/_interopDefaultCompat(semver);
 var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
 var z__default = /*#__PURE__*/_interopDefaultCompat(z);
 
-if (shouldUseGlobalAgent()) {
-  globalAgent.bootstrap();
-}
-function shouldUseGlobalAgent() {
-  const namespace = process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE ?? "GLOBAL_AGENT_";
-  if (process.env[`${namespace}HTTP_PROXY`] || process.env[`${namespace}HTTPS_PROXY`]) {
-    return true;
+maybeBootstrapProxy();
+function maybeBootstrapProxy() {
+  const globalAgentNamespace = process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE ?? "GLOBAL_AGENT_";
+  if (process.env[`${globalAgentNamespace}HTTP_PROXY`] || process.env[`${globalAgentNamespace}HTTPS_PROXY`]) {
+    const globalAgent = require("global-agent");
+    globalAgent.bootstrap();
+  }
+  if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
+    const { setGlobalDispatcher, EnvHttpProxyAgent } = require("undici");
+    setGlobalDispatcher(new EnvHttpProxyAgent());
   }
-  return false;
 }
 const DEP_TYPES = [
   "dependencies",

package/dist/lib/builder/config.cjs.js

@@ -31,6 +31,11 @@ var json__default = /*#__PURE__*/_interopDefaultCompat(json);
 var yaml__default = /*#__PURE__*/_interopDefaultCompat(yaml);
 
 const SCRIPT_EXTS = [".js", ".jsx", ".ts", ".tsx"];
+const MODULE_EXTS = [".mjs", ".mts"];
+const COMMONJS_EXTS = [".cjs", ".cts"];
+const MOD_EXT = ".mjs";
+const CJS_EXT = ".cjs";
+const CJS_JS_EXT = ".cjs.js";
 function isFileImport(source) {
   if (source.startsWith(".")) {
     return true;
@@ -57,6 +62,29 @@ function buildInternalImportPattern(options) {
   const names = inlinedPackages.map((pkg) => pkg.packageJson.name);
   return new RegExp(`^(?:${names.join("|")})(?:$|/)`);
 }
+function multiOutputFormat() {
+  return {
+    name: "backstage-multi-output-format",
+    generateBundle(opts, bundle) {
+      const filter = opts.format === "cjs" ? (s) => s.endsWith(MOD_EXT) : (s) => !s.endsWith(MOD_EXT);
+      for (const name in bundle) {
+        if (filter(name)) {
+          delete bundle[name];
+          delete bundle[`${name}.map`];
+        }
+      }
+    },
+    renderDynamicImport(opts) {
+      if (opts.format === "cjs") {
+        return {
+          left: "import(",
+          right: ")"
+        };
+      }
+      return void 0;
+    }
+  };
+}
 async function makeRollupConfigs(options) {
   const configs = new Array();
   const targetDir = options.targetDir ?? paths.paths.targetDir;
@@ -89,16 +117,38 @@ async function makeRollupConfigs(options) {
     const mainFields = ["module", "main"];
     const rewriteNodeModules = (name) => name.replaceAll("node_modules", "node_modules_dist");
     if (options.outputs.has(types.Output.cjs)) {
-      output.push({
+      const defaultExt = targetPkg.type === "module" ? MOD_EXT : CJS_JS_EXT;
+      const outputOpts = {
         dir: distDir,
-        entryFileNames: (chunkInfo) => `${rewriteNodeModules(chunkInfo.name)}.cjs.js`,
-        chunkFileNames: `cjs/[name]-[hash].cjs.js`,
-        format: "commonjs",
-        interop: "compat",
+        entryFileNames(chunkInfo) {
+          const cleanName = rewriteNodeModules(chunkInfo.name);
+          const inputId = chunkInfo.facadeModuleId;
+          if (!inputId) {
+            return cleanName + defaultExt;
+          }
+          const inputExt = path.extname(inputId);
+          if (MODULE_EXTS.includes(inputExt)) {
+            return cleanName + MOD_EXT;
+          }
+          if (COMMONJS_EXTS.includes(inputExt)) {
+            return cleanName + CJS_EXT;
+          }
+          return cleanName + defaultExt;
+        },
         sourcemap: true,
         preserveModules: true,
         preserveModulesRoot: `${targetDir}/src`,
-        exports: "named"
+        interop: "compat",
+        exports: "named",
+        plugins: [multiOutputFormat()]
+      };
+      output.push({
+        ...outputOpts,
+        format: "cjs"
+      });
+      output.push({
+        ...outputOpts,
+        format: "module"
       });
     }
     if (options.outputs.has(types.Output.esm)) {
@@ -124,7 +174,10 @@ async function makeRollupConfigs(options) {
       // All module imports are always marked as external
       external,
       plugins: [
-        resolve__default.default({ mainFields }),
+        resolve__default.default({
+          mainFields,
+          extensions: SCRIPT_EXTS
+        }),
         commonjs__default.default({
           include: /node_modules/,
           exclude: [/\/[^/]+\.(?:stories|test)\.[^/]+$/]

package/dist/lib/builder/packager.cjs.js

@@ -90,7 +90,7 @@ const buildPackage = async (options) => {
   } catch {
   }
   const rollupConfigs = await config.makeRollupConfigs(options);
-  await fs__default.default.remove(paths.paths.resolveTarget("dist"));
+  await fs__default.default.remove(path.resolve(options.targetDir ?? paths.paths.targetDir, "dist"));
   const buildTasks = rollupConfigs.map(rollupBuild);
   await Promise.all(buildTasks);
 };

package/dist/lib/lazy.cjs.js

@@ -3,10 +3,12 @@
 var errors = require('@backstage/errors');
 var errors$1 = require('./errors.cjs.js');
 
-function lazy(getActionFunc) {
+function lazy(moduleLoader, exportName) {
   return async (...args) => {
     try {
-      const actionFunc = await getActionFunc();
+      const mod = await moduleLoader();
+      const actualModule = mod.default;
+      const actionFunc = actualModule[exportName];
       await actionFunc(...args);
       process.exit(0);
     } catch (error) {

package/dist/modules/config/index.cjs.js

@@ -12,14 +12,14 @@ function registerCommands(program) {
   program.command("config:docs").option(
     "--package <name>",
     "Only include the schema that applies to the given package"
-  ).description("Browse the configuration reference documentation").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./commands/docs.cjs.js'); }).then((m) => m.default)));
+  ).description("Browse the configuration reference documentation").action(lazy.lazy(() => import('./commands/docs.cjs.js'), "default"));
   program.command("config:print").option(
     "--package <name>",
     "Only load config schema that applies to the given package"
   ).option("--lax", "Do not require environment variables to be set").option("--frontend", "Print only the frontend configuration").option("--with-secrets", "Include secrets in the printed configuration").option(
     "--format <format>",
     "Format to print the configuration in, either json or yaml [yaml]"
-  ).option(...configOption).description("Print the app configuration for the current package").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./commands/print.cjs.js'); }).then((m) => m.default)));
+  ).option(...configOption).description("Print the app configuration for the current package").action(lazy.lazy(() => import('./commands/print.cjs.js'), "default"));
   program.command("config:check").option(
     "--package <name>",
     "Only load config schema that applies to the given package"
@@ -28,14 +28,14 @@ function registerCommands(program) {
     "Enable strict config validation, forbidding errors and unknown keys"
   ).option(...configOption).description(
     "Validate that the given configuration loads and matches schema"
-  ).action(lazy.lazy(() => Promise.resolve().then(function () { return require('./commands/validate.cjs.js'); }).then((m) => m.default)));
+  ).action(lazy.lazy(() => import('./commands/validate.cjs.js'), "default"));
   program.command("config:schema").option(
     "--package <name>",
     "Only output config schema that applies to the given package"
   ).option(
     "--format <format>",
     "Format to print the schema in, either json or yaml [yaml]"
-  ).option("--merge", "Print the config schemas merged", true).option("--no-merge", "Print the config schemas not merged").description("Print configuration schema").action(lazy.lazy(() => Promise.resolve().then(function () { return require('./commands/schema.cjs.js'); }).then((m) => m.default)));
+  ).option("--merge", "Print the config schemas merged", true).option("--no-merge", "Print the config schemas not merged").description("Print configuration schema").action(lazy.lazy(() => import('./commands/schema.cjs.js'), "default"));
 }
 
 exports.configOption = configOption;

package/dist/packages/backend-defaults/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.7.0";
+var version = "0.8.0-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/backend-plugin-api/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.1.1";
+var version = "1.2.0-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/backend-test-utils/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.2.1";
+var version = "1.3.0-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/cli/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.29.5";
+var version = "0.30.0-next.0";
 var dependencies = {
 	"@backstage/catalog-model": "workspace:^",
 	"@backstage/cli-common": "workspace:^",
@@ -107,6 +107,7 @@ var dependencies = {
 	tar: "^6.1.12",
 	"terser-webpack-plugin": "^5.1.3",
 	"ts-morph": "^24.0.0",
+	undici: "^7.2.3",
 	util: "^0.12.3",
 	webpack: "^5.94.0",
 	"webpack-dev-server": "^5.0.0",

package/dist/packages/dev-utils/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.1.6";
+var version = "1.1.7-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/plugins/auth-backend/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.24.2";
+var version = "0.24.3-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/plugins/auth-backend-module-guest-provider/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.2.4";
+var version = "0.2.5-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/plugins/catalog-node/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.15.1";
+var version = "1.15.2-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/plugins/scaffolder-node/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.6.3";
+var version = "0.7.0-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/plugins/scaffolder-node-test-utils/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.1.18";
+var version = "0.1.19-next.0";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.29.5",
+  "version": "0.30.0-next.0",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -41,17 +41,22 @@
     "ext": "ts",
     "watch": "./src"
   },
+  "jest": {
+    "coveragePathIgnorePatterns": [
+      "/__fixtures__/"
+    ]
+  },
   "dependencies": {
-    "@backstage/catalog-model": "^1.7.3",
-    "@backstage/cli-common": "^0.1.15",
-    "@backstage/cli-node": "^0.2.12",
-    "@backstage/config": "^1.3.2",
-    "@backstage/config-loader": "^1.9.5",
-    "@backstage/errors": "^1.2.7",
-    "@backstage/eslint-plugin": "^0.1.10",
-    "@backstage/integration": "^1.16.1",
-    "@backstage/release-manifests": "^0.0.12",
-    "@backstage/types": "^1.2.1",
+    "@backstage/catalog-model": "1.7.3",
+    "@backstage/cli-common": "0.1.15",
+    "@backstage/cli-node": "0.2.13-next.0",
+    "@backstage/config": "1.3.2",
+    "@backstage/config-loader": "1.9.6-next.0",
+    "@backstage/errors": "1.2.7",
+    "@backstage/eslint-plugin": "0.1.10",
+    "@backstage/integration": "1.16.1",
+    "@backstage/release-manifests": "0.0.12",
+    "@backstage/types": "1.2.1",
     "@manypkg/get-packages": "^1.1.3",
     "@module-federation/enhanced": "^0.8.0",
     "@octokit/graphql": "^5.0.0",
@@ -147,6 +152,7 @@
     "tar": "^6.1.12",
     "terser-webpack-plugin": "^5.1.3",
     "ts-morph": "^24.0.0",
+    "undici": "^7.2.3",
     "util": "^0.12.3",
     "webpack": "^5.94.0",
     "webpack-dev-server": "^5.0.0",
@@ -157,22 +163,22 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-plugin-api": "^1.1.1",
-    "@backstage/backend-test-utils": "^1.2.1",
-    "@backstage/catalog-client": "^1.9.1",
-    "@backstage/config": "^1.3.2",
-    "@backstage/core-app-api": "^1.15.4",
-    "@backstage/core-components": "^0.16.3",
-    "@backstage/core-plugin-api": "^1.10.3",
-    "@backstage/dev-utils": "^1.1.6",
-    "@backstage/errors": "^1.2.7",
-    "@backstage/plugin-auth-backend": "^0.24.2",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.4",
-    "@backstage/plugin-catalog-node": "^1.15.1",
-    "@backstage/plugin-scaffolder-node": "^0.6.3",
-    "@backstage/plugin-scaffolder-node-test-utils": "^0.1.18",
-    "@backstage/test-utils": "^1.7.4",
-    "@backstage/theme": "^0.6.3",
+    "@backstage/backend-plugin-api": "1.2.0-next.0",
+    "@backstage/backend-test-utils": "1.3.0-next.0",
+    "@backstage/catalog-client": "1.9.1",
+    "@backstage/config": "1.3.2",
+    "@backstage/core-app-api": "1.15.4",
+    "@backstage/core-components": "0.16.3",
+    "@backstage/core-plugin-api": "1.10.3",
+    "@backstage/dev-utils": "1.1.7-next.0",
+    "@backstage/errors": "1.2.7",
+    "@backstage/plugin-auth-backend": "0.24.3-next.0",
+    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.5-next.0",
+    "@backstage/plugin-catalog-node": "1.15.2-next.0",
+    "@backstage/plugin-scaffolder-node": "0.7.0-next.0",
+    "@backstage/plugin-scaffolder-node-test-utils": "0.1.19-next.0",
+    "@backstage/test-utils": "1.7.4",
+    "@backstage/theme": "0.6.3",
     "@rspack/core": "^1.0.10",
     "@rspack/dev-server": "^1.0.9",
     "@rspack/plugin-react-refresh": "^1.0.0",