@backstage/cli 0.29.0-next.1 → 0.29.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @backstage/cli
 
+## 0.29.0-next.3
+
+### Minor Changes
+
+- d849865: The package packing now populates `typesVersions` for additional entry points rather than using additional `package.json` files for type resolution. This improves auto completion of separate entry points when consuming published packages.
+
+### Patch Changes
+
+- 4a378d3: Fix dev server reloads of plugin discovery for new frontend system.
+- 6c48ebd: Add `--max-warnings -1` support to `backstage-cli package lint`
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- b533056: Updated dependency `css-loader` to `^7.0.0`.
+- be008c3: Updated dependency `@module-federation/enhanced` to `^0.7.0`.
+- 09ea093: Fixed an issue where `.css` style injection would fail for published packages.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## 0.29.0-next.2
+
+### Minor Changes
+
+- bc47b17: **BREAKING**: Updates ESLint config to ignore all generated source code under `src/**/generated/**/*.ts`.
+
+### Patch Changes
+
+- e19c53c: Fix for the `--link` flag for `package start` to deduplicate `react-router` and `react-router-dom`.
+- e565f73: Added support for `.webp` files in the frontend tooling.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.10
+  - @backstage/integration@1.15.1
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
 ## 0.29.0-next.1
 
 ### Minor Changes

package/config/eslint-factory.js

@@ -167,7 +167,7 @@ function createConfig(dir, extraConfig = {}) {
         },
       },
       {
-        files: ['**/src/generated/**/*.ts'],
+        files: ['**/src/**/generated/**/*.ts'],
         rules: {
           ...tsRules,
           'no-unused-vars': 'off',

package/config/jest.js

@@ -213,7 +213,7 @@ async function getProjectConfig(targetPath, extraConfig, extraOptions) {
           },
         },
       ],
-      '\\.(bmp|gif|jpg|jpeg|png|ico|frag|xml|svg|eot|woff|woff2|ttf)$':
+      '\\.(bmp|gif|jpg|jpeg|png|ico|webp|frag|xml|svg|eot|woff|woff2|ttf)$':
         require.resolve('./jestFileTransform.js'),
       '\\.(yaml)$': require.resolve('./jestYamlTransform'),
     },

package/dist/commands/index.cjs.js

@@ -90,7 +90,7 @@ function registerScriptCommand(program) {
     "eslint-formatter-friendly"
   ).option("--fix", "Attempt to automatically fix violations").option(
     "--max-warnings <number>",
-    "Fail if more than this number of warnings (default: 0)"
+    "Fail if more than this number of warnings. -1 allows warnings. (default: 0)"
   ).description("Lint a package").action(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(() => Promise.resolve().then(function () { return require('./test.cjs.js'); }).then((m) => m.default)));
   command.command("clean").description("Delete cache directories").action(lazy(() => Promise.resolve().then(function () { return require('./clean/clean.cjs.js'); }).then((m) => m.default)));

package/dist/commands/lint.cjs.js

@@ -15,7 +15,8 @@ var lint = async (directories, opts) => {
     directories.length ? directories : ["."]
   );
   const maxWarnings = opts.maxWarnings ?? 0;
-  const failed = results.some((r) => r.errorCount > 0) || results.reduce((current, next) => current + next.warningCount, 0) > maxWarnings;
+  const ignoreWarnings = +maxWarnings === -1;
+  const failed = results.some((r) => r.errorCount > 0) || !ignoreWarnings && results.reduce((current, next) => current + next.warningCount, 0) > maxWarnings;
   if (opts.fix) {
     await eslint.ESLint.outputFixes(results);
   }

package/dist/commands/repo/lint.cjs.js

@@ -145,8 +145,9 @@ async function command(opts, cmd) {
           await ESLint.outputFixes(results);
         }
         const maxWarnings = lintOptions?.maxWarnings ?? 0;
+        const ignoreWarnings = +maxWarnings === -1;
         const resultText = formatter.format(results);
-        const failed2 = results.some((r) => r.errorCount > 0) || results.reduce((current, next) => current + next.warningCount, 0) > maxWarnings;
+        const failed2 = results.some((r) => r.errorCount > 0) || !ignoreWarnings && results.reduce((current, next) => current + next.warningCount, 0) > maxWarnings;
         return {
           relativeDir,
           resultText,

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

@@ -87,10 +87,11 @@ async function makeRollupConfigs(options) {
   if (options.outputs.has(types.Output.cjs) || options.outputs.has(types.Output.esm)) {
     const output = new Array();
     const mainFields = ["module", "main"];
+    const rewriteNodeModules = (name) => name.replaceAll("node_modules", "node_modules_dist");
     if (options.outputs.has(types.Output.cjs)) {
       output.push({
         dir: distDir,
-        entryFileNames: `[name].cjs.js`,
+        entryFileNames: (chunkInfo) => `${rewriteNodeModules(chunkInfo.name)}.cjs.js`,
         chunkFileNames: `cjs/[name]-[hash].cjs.js`,
         format: "commonjs",
         interop: "compat",
@@ -103,7 +104,7 @@ async function makeRollupConfigs(options) {
     if (options.outputs.has(types.Output.esm)) {
       output.push({
         dir: distDir,
-        entryFileNames: `[name].esm.js`,
+        entryFileNames: (chunkInfo) => `${rewriteNodeModules(chunkInfo.name)}.esm.js`,
         chunkFileNames: `esm/[name]-[hash].esm.js`,
         format: "module",
         sourcemap: true,
@@ -137,6 +138,7 @@ async function makeRollupConfigs(options) {
             /\.gif$/,
             /\.jpg$/,
             /\.jpeg$/,
+            /\.webp$/,
             /\.eot$/,
             /\.woff$/,
             /\.woff2$/,

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

@@ -287,7 +287,7 @@ async function createConfig(paths, options) {
     profile: false,
     ...isDev ? {
       watchOptions: {
-        ignored: /node_modules/
+        ignored: /node_modules\/(?!__backstage-autodetected-plugins__)/
       }
     } : {},
     optimization: optimization$1,

package/dist/lib/bundler/linkWorkspaces.cjs.js

@@ -19,11 +19,14 @@ async function createWorkspaceLinkingPlugins(bundler, workspace) {
     }),
     // react and react-dom are always resolved from the target directory
     // Note: this often requires that the linked and target workspace use the same versions of React
-    new bundler.NormalModuleReplacementPlugin(/^react(?:-dom)?$/, (resource) => {
-      if (!path.relative(linkedRoot.dir, resource.context).startsWith("..")) {
-        resource.context = paths.paths.targetDir;
+    new bundler.NormalModuleReplacementPlugin(
+      /^react(?:-router)?(?:-dom)?$/,
+      (resource) => {
+        if (!path.relative(linkedRoot.dir, resource.context).startsWith("..")) {
+          resource.context = paths.paths.targetDir;
+        }
       }
-    })
+    )
   ];
 }
 

package/dist/lib/bundler/transforms.cjs.js

@@ -111,7 +111,8 @@ const transforms = (options) => {
         /\.vert$/,
         { and: [/\.svg$/, { not: [/\.icon\.svg$/] }] },
         /\.xml$/,
-        /\.ico$/
+        /\.ico$/,
+        /\.webp$/
       ],
       type: "asset/resource",
       generator: {

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

@@ -23,18 +23,13 @@ async function productionPack(options) {
   if (!targetDir) {
     await fs__default.default.writeFile(PKG_BACKUP_PATH, pkgContent);
   }
-  const writeCompatibilityEntryPoints = await prepareExportsEntryPoints(
-    pkg,
-    packageDir,
-    options.featureDetectionProject
-  );
+  await rewriteEntryPoints(pkg, packageDir, options.featureDetectionProject);
   const publishConfig = pkg.publishConfig ?? {};
   for (const key of Object.keys(publishConfig)) {
     if (!SKIPPED_KEYS.includes(key)) {
       pkg[key] = publishConfig[key];
     }
   }
-  delete pkg.typesVersions;
   if (pkg.bundled) {
     delete pkg.dependencies;
     delete pkg.devDependencies;
@@ -62,9 +57,6 @@ async function productionPack(options) {
   } else {
     await fs__default.default.writeJson(pkgPath, pkg, { encoding: "utf8", spaces: 2 });
   }
-  if (writeCompatibilityEntryPoints) {
-    await writeCompatibilityEntryPoints(targetDir ?? packageDir);
-  }
 }
 async function revertProductionPack(packageDir) {
   try {
@@ -87,15 +79,17 @@ const EXPORT_MAP = {
   require: ".cjs.js",
   types: ".d.ts"
 };
-async function prepareExportsEntryPoints(pkg, packageDir, featureDetectionProject) {
+async function rewriteEntryPoints(pkg, packageDir, featureDetectionProject) {
   const distPath = path.resolve(packageDir, "dist");
   if (!await fs__default.default.pathExists(distPath)) {
     return void 0;
   }
   const distFiles = await fs__default.default.readdir(distPath);
   const outputExports = {};
-  const compatibilityWriters = new Array();
   const entryPoints$1 = entryPoints.readEntryPoints(pkg);
+  if (pkg.typesVersions) {
+    pkg.typesVersions = { "*": {} };
+  }
   for (const entryPoint of entryPoints$1) {
     if (!SCRIPT_EXTS.includes(entryPoint.ext)) {
       outputExports[entryPoint.mount] = entryPoint.path;
@@ -108,6 +102,14 @@ async function prepareExportsEntryPoints(pkg, packageDir, featureDetectionProjec
         exp[key] = `./${path.posix.join(`dist`, name)}`;
       }
     }
+    if (exp.types) {
+      if (!pkg.typesVersions) {
+        pkg.typesVersions = { "*": {} };
+      }
+      pkg.typesVersions["*"][entryPoint.name] = [
+        `dist/${entryPoint.name}.d.ts`
+      ];
+    }
     exp.default = exp.require ?? exp.import;
     if (exp.types && featureDetectionProject) {
       const defaultFeatureType = pkg.backstage?.role && typeDistProject.getEntryPointDefaultFeatureType(
@@ -130,27 +132,6 @@ async function prepareExportsEntryPoints(pkg, packageDir, featureDetectionProjec
       if (exp.types) {
         pkg.types = exp.types;
       }
-    } else {
-      compatibilityWriters.push(async (targetDir) => {
-        const entryPointDir = path.resolve(targetDir, entryPoint.name);
-        await fs__default.default.ensureDir(entryPointDir);
-        await fs__default.default.writeJson(
-          path.resolve(entryPointDir, PKG_PATH),
-          {
-            // Need a temporary name, as sharing the same name causes some typescript issues with caching of packages names
-            // And their defined `types` field.
-            name: `${pkg.name}__${entryPoint.name.toLocaleLowerCase("en-US")}`,
-            version: pkg.version,
-            ...exp.default ? { main: path.posix.join("..", exp.default) } : {},
-            ...exp.import ? { module: path.posix.join("..", exp.import) } : {},
-            ...exp.types ? { types: path.posix.join("..", exp.types) } : {}
-          },
-          { encoding: "utf8", spaces: 2 }
-        );
-      });
-      if (Array.isArray(pkg.files) && !pkg.files.includes(entryPoint.name)) {
-        pkg.files.push(entryPoint.name);
-      }
     }
     if (Object.keys(exp).length > 0) {
       outputExports[entryPoint.mount] = exp;
@@ -160,11 +141,6 @@ async function prepareExportsEntryPoints(pkg, packageDir, featureDetectionProjec
     pkg.exports = outputExports;
     pkg.exports["./package.json"] = "./package.json";
   }
-  if (compatibilityWriters.length > 0) {
-    return async (targetDir) => {
-      await Promise.all(compatibilityWriters.map((writer) => writer(targetDir)));
-    };
-  }
   return void 0;
 }
 

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.5.3-next.1";
+var version = "0.5.3-next.3";
 
 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.0.2-next.1";
+var version = "1.0.2-next.2";
 
 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.0.3-next.1";
+var version = "1.1.0-next.3";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/dist/packages/catalog-client/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.8.0-next.0";
+var version = "1.8.0-next.1";
 
 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.0-next.1";
+var version = "0.29.0-next.3";
 var dependencies = {
 	"@backstage/catalog-model": "workspace:^",
 	"@backstage/cli-common": "workspace:^",
@@ -13,7 +13,7 @@ var dependencies = {
 	"@backstage/release-manifests": "workspace:^",
 	"@backstage/types": "workspace:^",
 	"@manypkg/get-packages": "^1.1.3",
-	"@module-federation/enhanced": "^0.6.0",
+	"@module-federation/enhanced": "^0.7.0",
 	"@octokit/graphql": "^5.0.0",
 	"@octokit/graphql-schema": "^13.7.0",
 	"@octokit/oauth-app": "^4.2.0",
@@ -48,7 +48,7 @@ var dependencies = {
 	commander: "^12.0.0",
 	"cross-fetch": "^4.0.0",
 	"cross-spawn": "^7.0.3",
-	"css-loader": "^6.5.1",
+	"css-loader": "^7.0.0",
 	"ctrlc-windows": "^2.1.0",
 	esbuild: "^0.24.0",
 	"esbuild-loader": "^4.0.0",
@@ -107,7 +107,7 @@ var dependencies = {
 	"swc-loader": "^0.2.3",
 	tar: "^6.1.12",
 	"terser-webpack-plugin": "^5.1.3",
-	"ts-morph": "^23.0.0",
+	"ts-morph": "^24.0.0",
 	util: "^0.12.3",
 	webpack: "^5.94.0",
 	"webpack-dev-server": "^5.0.0",

package/dist/packages/core-components/package.json.cjs.js

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

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.1.3-next.1";
+var version = "1.1.3-next.3";
 
 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.0-next.1";
+var version = "0.24.0-next.2";
 
 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.2-next.1";
+var version = "0.2.2-next.2";
 
 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.14.0-next.1";
+var version = "1.14.0-next.2";
 
 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.5.1-next.1";
+var version = "0.5.1-next.3";
 
 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.15-next.1";
+var version = "0.1.15-next.3";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.29.0-next.1",
+  "version": "0.29.0-next.3",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -53,7 +53,7 @@
     "@backstage/release-manifests": "0.0.11",
     "@backstage/types": "1.1.1",
     "@manypkg/get-packages": "^1.1.3",
-    "@module-federation/enhanced": "^0.6.0",
+    "@module-federation/enhanced": "^0.7.0",
     "@octokit/graphql": "^5.0.0",
     "@octokit/graphql-schema": "^13.7.0",
     "@octokit/oauth-app": "^4.2.0",
@@ -88,7 +88,7 @@
     "commander": "^12.0.0",
     "cross-fetch": "^4.0.0",
     "cross-spawn": "^7.0.3",
-    "css-loader": "^6.5.1",
+    "css-loader": "^7.0.0",
     "ctrlc-windows": "^2.1.0",
     "esbuild": "^0.24.0",
     "esbuild-loader": "^4.0.0",
@@ -147,7 +147,7 @@
     "swc-loader": "^0.2.3",
     "tar": "^6.1.12",
     "terser-webpack-plugin": "^5.1.3",
-    "ts-morph": "^23.0.0",
+    "ts-morph": "^24.0.0",
     "util": "^0.12.3",
     "webpack": "^5.94.0",
     "webpack-dev-server": "^5.0.0",
@@ -159,20 +159,20 @@
   },
   "devDependencies": {
     "@backstage/backend-common": "^0.25.0",
-    "@backstage/backend-plugin-api": "1.0.2-next.1",
-    "@backstage/backend-test-utils": "1.0.3-next.1",
-    "@backstage/catalog-client": "1.8.0-next.0",
+    "@backstage/backend-plugin-api": "1.0.2-next.2",
+    "@backstage/backend-test-utils": "1.1.0-next.3",
+    "@backstage/catalog-client": "1.8.0-next.1",
     "@backstage/config": "1.2.0",
     "@backstage/core-app-api": "1.15.1",
-    "@backstage/core-components": "0.16.0-next.1",
+    "@backstage/core-components": "0.16.0-next.2",
     "@backstage/core-plugin-api": "1.10.0",
-    "@backstage/dev-utils": "1.1.3-next.1",
+    "@backstage/dev-utils": "1.1.3-next.3",
     "@backstage/errors": "1.2.4",
-    "@backstage/plugin-auth-backend": "0.24.0-next.1",
-    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.2-next.1",
-    "@backstage/plugin-catalog-node": "1.14.0-next.1",
-    "@backstage/plugin-scaffolder-node": "0.5.1-next.1",
-    "@backstage/plugin-scaffolder-node-test-utils": "0.1.15-next.1",
+    "@backstage/plugin-auth-backend": "0.24.0-next.2",
+    "@backstage/plugin-auth-backend-module-guest-provider": "0.2.2-next.2",
+    "@backstage/plugin-catalog-node": "1.14.0-next.2",
+    "@backstage/plugin-scaffolder-node": "0.5.1-next.3",
+    "@backstage/plugin-scaffolder-node-test-utils": "0.1.15-next.3",
     "@backstage/test-utils": "1.7.1-next.0",
     "@backstage/theme": "0.6.1-next.0",
     "@rspack/core": "^1.0.10",