@backstage/repo-tools 0.11.0-next.2 → 0.11.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @backstage/repo-tools
 
+## 0.11.0-next.3
+
+### Patch Changes
+
+- 95401a8: The `generate-patch` command now properly includes newly created files in the patch.
+- 23f1da2: Updated dependency `ts-morph` to `^24.0.0`.
+- 3f1fb21: The `generate-patch` command will now fall back to always adding a `resolutions` entry, even if no matching descriptors are found.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.2-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.15-next.0
+  - @backstage/cli-node@0.2.10-next.0
+  - @backstage/config-loader@1.9.2-next.0
+  - @backstage/errors@1.2.4
+
 ## 0.11.0-next.2
 
 ### Minor Changes

package/dist/commands/generate-patch/generate-patch.cjs.js

@@ -145,8 +145,12 @@ async function loadTrimmedRootPkg(ctx, query) {
     descriptors.push(descriptor);
   }
   return async (patchEntry) => {
-    for (const descriptor of descriptors) {
-      resolutionsObj[descriptor] = patchEntry;
+    if (descriptors.length > 0) {
+      for (const descriptor of descriptors) {
+        resolutionsObj[descriptor] = patchEntry;
+      }
+    } else {
+      resolutionsObj[ctx.packageName] = patchEntry;
     }
     await fs__default.default.writeJson(
       path.resolve(ctx.targetRoot, "package.json"),
@@ -286,6 +290,22 @@ async function generatePatchForArchives(ctx, baseArchive, headArchive) {
     cwd: patchDir,
     env: { ...process.env, ...GIT_ENV }
   });
+  await exec.exec(
+    "git",
+    [
+      "-c",
+      'user.name="patcher"',
+      "-c",
+      'user.email="patcher@acme.org"',
+      "commit",
+      "-m",
+      "base"
+    ],
+    {
+      cwd: patchDir,
+      env: { ...process.env, ...GIT_ENV }
+    }
+  );
   for (const path$1 of await fs__default.default.readdir(patchDir)) {
     if (path$1 !== ".git" && path$1 !== ".gitignore") {
       await fs__default.default.rm(path.join(patchDir, path$1), {
@@ -296,12 +316,17 @@ async function generatePatchForArchives(ctx, baseArchive, headArchive) {
     }
   }
   await tar__default.default.extract({ file: headPath, cwd: patchDir, strip: 1 });
+  await exec.exec("git", ["add", "."], {
+    cwd: patchDir,
+    env: { ...process.env, ...GIT_ENV }
+  });
   const { stdout: patch } = await exec.exec(
     "git",
     [
       "-c",
       "core.safecrlf=false",
       "diff",
+      "--cached",
       "--src-prefix=a/",
       "--dst-prefix=b/",
       "--ignore-cr-at-eol",

package/dist/package.json.cjs.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.11.0-next.2",
+  "version": "0.11.0-next.3",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -75,12 +75,12 @@
     "p-limit": "^3.0.2",
     "portfinder": "^1.0.32",
     "tar": "^6.1.12",
-    "ts-morph": "^23.0.0",
+    "ts-morph": "^24.0.0",
     "yaml-diff-patch": "^2.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.1.0-next.2",
-    "@backstage/cli": "0.29.0-next.2",
+    "@backstage/backend-test-utils": "1.1.0-next.3",
+    "@backstage/cli": "0.29.0-next.3",
     "@backstage/types": "1.1.1",
     "@types/is-glob": "^4.0.2",
     "@types/node": "^20.16.0",