Skip to content

PnP: Fix watch mode for files required under PnP #7077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clemyan wants to merge 2 commits into
base: master
Choose a base branch
from
+38 −8
Open

PnP: Fix watch mode for files required under PnP #7077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365602b
fix(pnp): fix node watch mode for virtuals
clemyan Mar 16, 2026
bb87c75
versions
clemyan Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .pnp.cjs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions .yarn/versions/c071c1e5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
releases:
"@yarnpkg/cli": patch
"@yarnpkg/plugin-pnp": patch
"@yarnpkg/pnp": patch

declined:
- "@yarnpkg/plugin-compat"
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@yarnpkg/plugin-init"
- "@yarnpkg/plugin-interactive-tools"
- "@yarnpkg/plugin-nm"
- "@yarnpkg/plugin-npm-cli"
- "@yarnpkg/plugin-pack"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnpm"
- "@yarnpkg/plugin-stage"
- "@yarnpkg/plugin-typescript"
- "@yarnpkg/plugin-version"
- "@yarnpkg/plugin-workspace-tools"
- "@yarnpkg/builder"
- "@yarnpkg/core"
- "@yarnpkg/doctor"
- "@yarnpkg/nm"
- "@yarnpkg/pnpify"
- "@yarnpkg/sdks"
2 changes: 1 addition & 1 deletion packages/yarnpkg-pnp/sources/hook.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/yarnpkg-pnp/sources/loader/makeApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,10 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
const qualifiedPath = applyNodeExtensionResolution(unqualifiedPath, candidates, {extensions});

if (qualifiedPath) {
nodeUtils.reportRequiredFilesToWatchMode([qualifiedPath]);
return ppath.normalize(qualifiedPath);
} else {
nodeUtils.reportRequiredFilesToWatchMode(candidates.map(candidate => npath.fromPortablePath(candidate)));
nodeUtils.reportRequiredFilesToWatchMode(candidates);

const unqualifiedPathForDisplay = getPathForDisplay(unqualifiedPath);

Expand Down
7 changes: 4 additions & 3 deletions packages/yarnpkg-pnp/sources/loader/nodeUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {NativePath, npath, VirtualFS} from '@yarnpkg/fslib';
import type {NativePath, PortablePath} from '@yarnpkg/fslib';
import {npath, VirtualFS} from '@yarnpkg/fslib';
import fs from 'fs';
import path from 'path';

Expand Down Expand Up @@ -54,9 +55,9 @@ Instead change the require of ${basename} in ${parentPath} to a dynamic import()

// https://github.com/nodejs/node/pull/44366
// https://github.com/nodejs/node/pull/45348
export function reportRequiredFilesToWatchMode(files: Array<NativePath>) {
export function reportRequiredFilesToWatchMode(paths: Array<PortablePath>) {
if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) {
files = files.map(filename => npath.fromPortablePath(VirtualFS.resolveVirtual(npath.toPortablePath(filename))));
const files = paths.map(filename => npath.fromPortablePath(VirtualFS.resolveVirtual(filename)));
if (WATCH_MODE_MESSAGE_USES_ARRAYS) {
process.send({'watch:require': files});
} else {
Expand Down
Loading