Merge pull request #5 from Dcard/fix-patch-virtual-descriptor

fix(docker-build): Resolve virtual descriptors
Dcard · Jan 28, 2021 · 0ff0388 · 0ff0388
2 parents 6d79056 + 14b77a6
commit 0ff0388
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/docker-build/src/utils/copyPatchFiles.ts b/packages/docker-build/src/utils/copyPatchFiles.ts
@@ -1,4 +1,4 @@
-import { Report, Workspace } from '@yarnpkg/core';
+import { Report, structUtils, Workspace } from '@yarnpkg/core';
 import { PortablePath, ppath, xfs } from '@yarnpkg/fslib';
 import { patchUtils } from '@yarnpkg/plugin-patch';
 
@@ -18,10 +18,14 @@ export default async function copyPatchFiles({
 
   for (const ws of workspaces) {
     for (const descriptor of ws.dependencies.values()) {
-      if (!descriptor.range.startsWith('patch:')) continue;
+      const patchDescriptor = structUtils.isVirtualDescriptor(descriptor)
+        ? structUtils.devirtualizeDescriptor(descriptor)
+        : descriptor;
+
+      if (!patchDescriptor.range.startsWith('patch:')) continue;
 
       const { parentLocator, patchPaths } = patchUtils.parseDescriptor(
-        descriptor,
+        patchDescriptor,
       );
 
       for (const path of patchPaths) {