@backstage/cli 0.23.0-next.2 → 0.23.1

package/dist/cjs/{packageDetection-4af1c8ac.cjs.js → packageDetection-4281c9dc.cjs.js}

@@ -8,17 +8,18 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var cliCommon = require('@backstage/cli-common');
 var ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 var runScriptWebpackPlugin = require('run-script-webpack-plugin');
-var index = require('./index-56da7468.cjs.js');
+var index = require('./index-148826cb.cjs.js');
 var fs = require('fs-extra');
 var getPackages = require('@manypkg/get-packages');
 var nodeExternals = require('webpack-node-externals');
 var pickBy = require('lodash/pickBy');
 var entryPoints = require('./entryPoints-0cc55995.cjs.js');
-var run = require('./run-ea727d91.cjs.js');
+var run = require('./run-b8799a58.cjs.js');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin');
 var svgrTemplate = require('./svgrTemplate-3549ea1c.cjs.js');
 var ReactRefreshPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 var yn = require('yn');
+var config = require('@backstage/config');
 var chokidar = require('chokidar');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -331,6 +332,14 @@ async function readBuildInfo() {
     commit
   };
 }
+function hasReactDomClient() {
+  try {
+    require.resolve("react-dom/client");
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function createConfig(paths, options) {
   var _a;
   const { checksEnabled, isDev, frontendConfig } = options;
@@ -373,7 +382,10 @@ async function createConfig(paths, options) {
       "process.env.APP_CONFIG": webpack__default["default"].DefinePlugin.runtimeValue(
         () => JSON.stringify(options.getFrontendAppConfigs()),
         true
-      )
+      ),
+      // This allows for conditional imports of react-dom/client, since there's no way
+      // to check for presence of it in source code without module resolution errors.
+      "process.env.HAS_REACT_DOM_CLIENT": JSON.stringify(hasReactDomClient())
     })
   );
   const reactRefreshFiles = [
@@ -604,8 +616,8 @@ function resolveBundlingPaths(options) {
 }
 
 const DETECTED_MODULES_MODULE_NAME = "__backstage-autodetected-plugins__";
-function readPackageDetectionConfig(config) {
-  const packages = config.getOptional("app.experimental.packages");
+function readPackageDetectionConfig(config$1) {
+  const packages = config$1.getOptional("app.experimental.packages");
   if (packages === void 0 || packages === null) {
     return void 0;
   }
@@ -617,9 +629,18 @@ function readPackageDetectionConfig(config) {
     }
     return {};
   }
+  if (typeof packages !== "object" || Array.isArray(packages)) {
+    throw new Error(
+      "Invalid config at 'app.experimental.packages', expected object"
+    );
+  }
+  const packagesConfig = new config.ConfigReader(
+    packages,
+    "app.experimental.packages"
+  );
   return {
-    include: config.getOptionalStringArray("app.experimental.packages.include"),
-    exclude: config.getOptionalStringArray("app.experimental.packages.exclude")
+    include: packagesConfig.getOptionalStringArray("include"),
+    exclude: packagesConfig.getOptionalStringArray("exclude")
   };
 }
 async function detectPackages(targetPath, { include, exclude }) {
@@ -629,6 +650,12 @@ async function detectPackages(targetPath, { include, exclude }) {
   );
   return Object.keys((_a = pkg.dependencies) != null ? _a : {}).flatMap((depName) => {
     var _a2, _b;
+    if (exclude == null ? void 0 : exclude.includes(depName)) {
+      return [];
+    }
+    if (include && !include.includes(depName)) {
+      return [];
+    }
     const depPackageJson = require(require.resolve(
       `${depName}/package.json`,
       { paths: [targetPath] }
@@ -638,23 +665,22 @@ async function detectPackages(targetPath, { include, exclude }) {
     )) {
       const exp = depPackageJson.exports;
       if (exp && typeof exp === "object" && "./alpha" in exp) {
-        return [depName, `${depName}/alpha`];
+        return [
+          { name: depName, import: depName },
+          { name: depName, export: "./alpha", import: `${depName}/alpha` }
+        ];
       }
-      return [depName];
+      return [{ name: depName, import: depName }];
     }
     return [];
-  }).filter((name) => {
-    if (exclude == null ? void 0 : exclude.includes(name)) {
-      return false;
-    }
-    if (include && !include.includes(name)) {
-      return false;
-    }
-    return true;
   });
 }
-async function writeDetectedPackagesModule(packageNames) {
-  const requirePackageScript = packageNames == null ? void 0 : packageNames.map((pkg) => `{ name: '${pkg}', default: require('${pkg}').default }`).join(",");
+async function writeDetectedPackagesModule(pkgs) {
+  const requirePackageScript = pkgs == null ? void 0 : pkgs.map(
+    (pkg) => `{ name: ${JSON.stringify(pkg.name)}, export: ${JSON.stringify(
+      pkg.export
+    )}, default: require('${pkg.import}').default }`
+  ).join(",");
   await fs__default["default"].writeFile(
     path.join(
       index.paths.targetRoot,
@@ -690,4 +716,4 @@ exports.createConfig = createConfig;
 exports.createDetectedModulesEntryPoint = createDetectedModulesEntryPoint;
 exports.resolveBaseUrl = resolveBaseUrl;
 exports.resolveBundlingPaths = resolveBundlingPaths;
-//# sourceMappingURL=packageDetection-4af1c8ac.cjs.js.map
+//# sourceMappingURL=packageDetection-4281c9dc.cjs.js.map

package/dist/cjs/{packageExports-eded9a5f.cjs.js → packageExports-2323fa69.cjs.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-var fix = require('./fix-94798ad7.cjs.js');
+var fix = require('./fix-c878a75e.cjs.js');
 require('@backstage/cli-node');
 require('fs-extra');
 require('path');
-require('./index-56da7468.cjs.js');
+require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -23,4 +23,4 @@ async function command() {
 }
 
 exports.command = command;
-//# sourceMappingURL=packageExports-eded9a5f.cjs.js.map
+//# sourceMappingURL=packageExports-2323fa69.cjs.js.map

package/dist/cjs/{packageLintConfigs-47676d49.cjs.js → packageLintConfigs-8c269c68.cjs.js}

@@ -3,9 +3,9 @@
 var fs = require('fs-extra');
 var path = require('path');
 var cliNode = require('@backstage/cli-node');
-var run = require('./run-ea727d91.cjs.js');
+var run = require('./run-b8799a58.cjs.js');
 require('child_process');
-require('./index-56da7468.cjs.js');
+require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -79,4 +79,4 @@ async function command() {
 }
 
 exports.command = command;
-//# sourceMappingURL=packageLintConfigs-47676d49.cjs.js.map
+//# sourceMappingURL=packageLintConfigs-8c269c68.cjs.js.map

package/dist/cjs/{packageRole-69a52f21.cjs.js → packageRole-9318ff16.cjs.js}

@@ -4,7 +4,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var getPackages = require('@manypkg/get-packages');
 var cliNode = require('@backstage/cli-node');
-var index = require('./index-56da7468.cjs.js');
+var index = require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('semver');
@@ -55,4 +55,4 @@ var packageRole = async () => {
 };
 
 exports["default"] = packageRole;
-//# sourceMappingURL=packageRole-69a52f21.cjs.js.map
+//# sourceMappingURL=packageRole-9318ff16.cjs.js.map

package/dist/cjs/{packages-cd549fee.cjs.js → packages-ea62bc19.cjs.js}

@@ -2,9 +2,9 @@
 
 var minimatch = require('minimatch');
 var getPackages = require('@manypkg/get-packages');
-var index = require('./index-56da7468.cjs.js');
+var index = require('./index-148826cb.cjs.js');
 var yarn = require('./yarn-6cd89e16.cjs.js');
-var run = require('./run-ea727d91.cjs.js');
+var run = require('./run-b8799a58.cjs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -80,4 +80,4 @@ async function mapDependencies(targetDir, pattern) {
 
 exports.fetchPackageInfo = fetchPackageInfo;
 exports.mapDependencies = mapDependencies;
-//# sourceMappingURL=packages-cd549fee.cjs.js.map
+//# sourceMappingURL=packages-ea62bc19.cjs.js.map

package/dist/cjs/{print-70faa981.cjs.js → print-ec4b9878.cjs.js}

@@ -2,9 +2,9 @@
 
 var yaml = require('yaml');
 var config$1 = require('@backstage/config');
-var config = require('./config-306bf5a2.cjs.js');
+var config = require('./config-864614b9.cjs.js');
 require('@backstage/config-loader');
-require('./index-56da7468.cjs.js');
+require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -58,4 +58,4 @@ function serializeConfigData(appConfigs, schema, visibility) {
 }
 
 exports["default"] = print;
-//# sourceMappingURL=print-70faa981.cjs.js.map
+//# sourceMappingURL=print-ec4b9878.cjs.js.map

package/dist/cjs/{role-829916a6.cjs.js → role-1092264b.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var index = require('./index-56da7468.cjs.js');
+var index = require('./index-148826cb.cjs.js');
 var cliNode = require('@backstage/cli-node');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -22,4 +22,4 @@ async function findRoleFromCommand(opts) {
 }
 
 exports.findRoleFromCommand = findRoleFromCommand;
-//# sourceMappingURL=role-829916a6.cjs.js.map
+//# sourceMappingURL=role-1092264b.cjs.js.map

package/dist/cjs/{run-ea727d91.cjs.js → run-b8799a58.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var child_process = require('child_process');
-var index = require('./index-56da7468.cjs.js');
+var index = require('./index-148826cb.cjs.js');
 var util = require('util');
 var errors = require('@backstage/errors');
 
@@ -79,4 +79,4 @@ exports.execFile = execFile;
 exports.run = run;
 exports.runCheck = runCheck;
 exports.runPlain = runPlain;
-//# sourceMappingURL=run-ea727d91.cjs.js.map
+//# sourceMappingURL=run-b8799a58.cjs.js.map

package/dist/cjs/{schema-721e1c55.cjs.js → schema-04e7321f.cjs.js}

@@ -1,10 +1,10 @@
 'use strict';
 
 var yaml = require('yaml');
-var config = require('./config-306bf5a2.cjs.js');
+var config = require('./config-864614b9.cjs.js');
 var configLoader = require('@backstage/config-loader');
 require('@backstage/config');
-require('./index-56da7468.cjs.js');
+require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -42,4 +42,4 @@ var schema = async (opts) => {
 };
 
 exports["default"] = schema;
-//# sourceMappingURL=schema-721e1c55.cjs.js.map
+//# sourceMappingURL=schema-04e7321f.cjs.js.map

package/dist/cjs/{test-8b333130.cjs.js → test-56e64a6d.cjs.js}

@@ -2,8 +2,8 @@
 
 var os = require('os');
 var cliNode = require('@backstage/cli-node');
-var index = require('./index-56da7468.cjs.js');
-var run = require('./run-ea727d91.cjs.js');
+var index = require('./index-148826cb.cjs.js');
+var run = require('./run-b8799a58.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -123,4 +123,4 @@ async function command(opts, cmd) {
 
 exports.command = command;
 exports.createFlagFinder = createFlagFinder;
-//# sourceMappingURL=test-8b333130.cjs.js.map
+//# sourceMappingURL=test-56e64a6d.cjs.js.map

package/dist/cjs/{test-295e2ea3.cjs.js → test-87ae3d0d.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var index = require('./index-56da7468.cjs.js');
-var run = require('./run-ea727d91.cjs.js');
+var index = require('./index-148826cb.cjs.js');
+var run = require('./run-b8799a58.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -56,4 +56,4 @@ var test = async (_opts, cmd) => {
 };
 
 exports["default"] = test;
-//# sourceMappingURL=test-295e2ea3.cjs.js.map
+//# sourceMappingURL=test-87ae3d0d.cjs.js.map

package/dist/cjs/{validate-3f650475.cjs.js → validate-81616b20.cjs.js}

@@ -1,9 +1,9 @@
 'use strict';
 
-var config = require('./config-306bf5a2.cjs.js');
+var config = require('./config-864614b9.cjs.js');
 require('@backstage/config-loader');
 require('@backstage/config');
-require('./index-56da7468.cjs.js');
+require('./index-148826cb.cjs.js');
 require('commander');
 require('chalk');
 require('fs-extra');
@@ -25,4 +25,4 @@ var validate = async (opts) => {
 };
 
 exports["default"] = validate;
-//# sourceMappingURL=validate-3f650475.cjs.js.map
+//# sourceMappingURL=validate-81616b20.cjs.js.map

package/dist/index.cjs.js

@@ -2,7 +2,7 @@
 
 require('commander');
 require('chalk');
-require('./cjs/index-56da7468.cjs.js');
+require('./cjs/index-148826cb.cjs.js');
 require('fs-extra');
 require('semver');
 require('@backstage/cli-common');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.23.0-next.2",
+  "version": "0.23.1",
   "publishConfig": {
     "access": "public"
   },
@@ -30,14 +30,14 @@
     "backstage-cli": "bin/backstage-cli"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.4.3-next.0",
-    "@backstage/cli-common": "^0.1.13-next.0",
-    "@backstage/cli-node": "^0.1.5-next.1",
-    "@backstage/config": "^1.1.1-next.0",
-    "@backstage/config-loader": "^1.5.1-next.1",
-    "@backstage/errors": "^1.2.3-next.0",
+    "@backstage/catalog-model": "^1.4.3",
+    "@backstage/cli-common": "^0.1.13",
+    "@backstage/cli-node": "^0.1.5",
+    "@backstage/config": "^1.1.1",
+    "@backstage/config-loader": "^1.5.1",
+    "@backstage/errors": "^1.2.3",
     "@backstage/eslint-plugin": "^0.1.3",
-    "@backstage/integration": "^1.7.1-next.1",
+    "@backstage/integration": "^1.7.1",
     "@backstage/release-manifests": "^0.0.10",
     "@backstage/types": "^1.1.1",
     "@esbuild-kit/cjs-loader": "^2.4.1",
@@ -66,7 +66,7 @@
     "@swc/jest": "^0.2.22",
     "@types/jest": "^29.0.0",
     "@types/webpack-env": "^1.15.2",
-    "@typescript-eslint/eslint-plugin": "6.7.2",
+    "@typescript-eslint/eslint-plugin": "6.7.5",
     "@typescript-eslint/parser": "^6.7.2",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.4",
@@ -141,16 +141,16 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@backstage/backend-common": "^0.19.8-next.2",
-    "@backstage/backend-plugin-api": "^0.6.6-next.2",
-    "@backstage/backend-test-utils": "^0.2.7-next.2",
-    "@backstage/config": "^1.1.1-next.0",
-    "@backstage/core-app-api": "^1.11.0-next.2",
-    "@backstage/core-components": "^0.13.6-next.2",
-    "@backstage/core-plugin-api": "^1.7.0-next.1",
-    "@backstage/dev-utils": "^1.0.22-next.2",
-    "@backstage/test-utils": "^1.4.4-next.2",
-    "@backstage/theme": "^0.4.3-next.0",
+    "@backstage/backend-common": "^0.19.8",
+    "@backstage/backend-plugin-api": "^0.6.6",
+    "@backstage/backend-test-utils": "^0.2.7",
+    "@backstage/config": "^1.1.1",
+    "@backstage/core-app-api": "^1.11.0",
+    "@backstage/core-components": "^0.13.6",
+    "@backstage/core-plugin-api": "^1.7.0",
+    "@backstage/dev-utils": "^1.0.22",
+    "@backstage/test-utils": "^1.4.4",
+    "@backstage/theme": "^0.4.3",
     "@types/cross-spawn": "^6.0.2",
     "@types/diff": "^5.0.0",
     "@types/express": "^4.17.6",
@@ -158,7 +158,6 @@
     "@types/http-proxy": "^1.17.4",
     "@types/inquirer": "^8.1.3",
     "@types/minimatch": "^5.0.0",
-    "@types/mock-fs": "^4.13.0",
     "@types/node": "^18.17.8",
     "@types/npm-packlist": "^3.0.0",
     "@types/recursive-readdir": "^2.2.0",
@@ -169,7 +168,6 @@
     "@types/terser-webpack-plugin": "^5.0.4",
     "@types/yarnpkg__lockfile": "^1.1.4",
     "del": "^7.0.0",
-    "mock-fs": "^5.2.0",
     "msw": "^1.0.0",
     "nodemon": "^3.0.1",
     "ts-node": "^10.0.0",

package/templates/scaffolder-module/src/actions/example/example.test.ts

@@ -22,7 +22,7 @@ describe('acme:example', () => {
       logStream: new PassThrough(),
       output: jest.fn(),
       createTemporaryDirectory() {
-        // Usage of mock-fs is recommended for testing of filesystem operations
+        // Usage of createMockDirectory is recommended for testing of filesystem operations
         throw new Error('Not implemented');
       },
     });