Add patch support to upgrade-interactive

yarnpkg · Sep 12, 2024 · ccefe7e · ccefe7e
1 parent 10d16c3
commit ccefe7e
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 18 deletions.
diff --git a/.yarn/versions/4f3c8017.yml b/.yarn/versions/4f3c8017.yml
@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-interactive-tools": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
diff --git a/packages/plugin-interactive-tools/sources/commands/upgrade-interactive.tsx b/packages/plugin-interactive-tools/sources/commands/upgrade-interactive.tsx
@@ -88,8 +88,8 @@ export default class UpgradeInteractiveCommand extends BaseCommand {
       if (from === to)
         return to;
 
-      const parsedFrom = structUtils.parseRange(from);
-      const parsedTo = structUtils.parseRange(to);
+      const parsedFrom = structUtils.parseRange(from.replace(/^patch:/, ''));
+      const parsedTo = structUtils.parseRange(to.replace(/^patch:/, ''));
 
       const matchedFrom = parsedFrom.selector.match(SIMPLE_SEMVER);
       const matchedTo = parsedTo.selector.match(SIMPLE_SEMVER);
@@ -133,34 +133,43 @@ export default class UpgradeInteractiveCommand extends BaseCommand {
     };
 
     const fetchSuggestions = async (descriptor: Descriptor): Promise<UpgradeSuggestions> => {
-      const referenceRange = semver.valid(descriptor.range)
-        ? `^${descriptor.range}`
-        : descriptor.range;
+      // patch:@amplitude/analytics-browser@npm%3A2.11.0#~/.yarn/patches/@amplitude-analytics-browser-npm-2.11.0-790ed576a5.patch
+      const {protocol, source, selector, params } = structUtils.parseRange(descriptor.range);
+      const isPatched = protocol === 'patch:' && source;
+      const [patchPackageName, descriptorRange] = isPatched
+        ? source.split(':')
+        : [undefined, descriptor.range];
+
+      const referenceRange = semver.valid(descriptorRange)
+        ? `^${descriptorRange}`
+        : descriptorRange
 
       const [resolution, latest] = await Promise.all([
-        fetchUpdatedDescriptor(descriptor, descriptor.range, referenceRange).catch(() => null),
-        fetchUpdatedDescriptor(descriptor, descriptor.range, `latest`).catch(() => null),
+        fetchUpdatedDescriptor(descriptor, descriptorRange, referenceRange).catch(() => null),
+        fetchUpdatedDescriptor(descriptor, descriptorRange, `latest`).catch(() => null),
       ]);
 
       const suggestions: Array<{value: string | null, label: string}> = [{
         value: null,
-        label: descriptor.range,
+        label: isPatched ? `patch:${descriptorRange}` : descriptorRange,
       }];
 
-      if (resolution && resolution !== descriptor.range) {
-        suggestions.push({
-          value: resolution,
-          label: colorizeVersionDiff(descriptor.range, resolution),
-        });
+      if (resolution && resolution !== descriptorRange) {
+        const value = isPatched
+          ? `patch:${patchPackageName}%3A${resolution}#${selector}${params ? `?${params}` : ``}`
+          : resolution;
+        const label = `${isPatched ? 'patch:' : ''}${colorizeVersionDiff(descriptorRange, resolution)}`;
+        suggestions.push({ value, label });
       } else {
         suggestions.push({value: null, label: ``});
       }
 
-      if (latest && latest !== resolution && latest !== descriptor.range) {
-        suggestions.push({
-          value: latest,
-          label: colorizeVersionDiff(descriptor.range, latest),
-        });
+      if (latest && latest !== resolution && latest !== descriptorRange) {
+        const value = isPatched
+          ? `patch:${patchPackageName}%3A:${latest}#${selector}${params ? `?${params}` : ``}`
+          : latest;
+        const label = `${isPatched ? 'patch:' : ''}${colorizeVersionDiff(descriptorRange, latest)}`;
+        suggestions.push({ value, label });
       } else {
         suggestions.push({value: null, label: ``});
       }