Skip to content

Commit 0ff0388

Browse files
authored
Merge pull request #5 from Dcard/fix-patch-virtual-descriptor
fix(docker-build): Resolve virtual descriptors
2 parents 6d79056 + 14b77a6 commit 0ff0388

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

packages/docker-build/src/utils/copyPatchFiles.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Report, Workspace } from '@yarnpkg/core';
1+
import { Report, structUtils, Workspace } from '@yarnpkg/core';
22
import { PortablePath, ppath, xfs } from '@yarnpkg/fslib';
33
import { patchUtils } from '@yarnpkg/plugin-patch';
44

@@ -18,10 +18,14 @@ export default async function copyPatchFiles({
1818

1919
for (const ws of workspaces) {
2020
for (const descriptor of ws.dependencies.values()) {
21-
if (!descriptor.range.startsWith('patch:')) continue;
21+
const patchDescriptor = structUtils.isVirtualDescriptor(descriptor)
22+
? structUtils.devirtualizeDescriptor(descriptor)
23+
: descriptor;
24+
25+
if (!patchDescriptor.range.startsWith('patch:')) continue;
2226

2327
const { parentLocator, patchPaths } = patchUtils.parseDescriptor(
24-
descriptor,
28+
patchDescriptor,
2529
);
2630

2731
for (const path of patchPaths) {

0 commit comments

Comments
 (0)