Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .pnp.loader.mjs

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/1c86bcd3.yml
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"
61 changes: 59 additions & 2 deletions packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Filename, ppath, xfs} from '@yarnpkg/fslib';
import * as loaderFlags from '@yarnpkg/pnp/sources/esm-loader/loaderFlags';
import {Filename, npath, ppath, xfs} from '@yarnpkg/fslib';
import * as loaderFlags from '@yarnpkg/pnp/sources/esm-loader/loaderFlags';
import {pathToFileURL} from 'url';

describe(`Plug'n'Play - ESM`, () => {
test(
Expand Down Expand Up @@ -970,5 +971,61 @@ describe(`Plug'n'Play - ESM`, () => {
},
),
);

(loaderFlags.HAS_CONSOLIDATED_HOOKS ? test : test.skip)(
`it should allow importing files regardless of parent URL`,
makeTemporaryEnv(
{
type: `module`,
},
async ({path, run, source}) => {
await expect(run(`install`)).resolves.toMatchObject({code: 0});

await xfs.writeFilePromise(
ppath.join(path, `loader.js`),
`
export function resolve(specifier, context, next) {
if (specifier !== 'custom:foo') {
return next(specifier, context);
}

return {
shortCircuit: true,
url: 'custom:foo',
};
}

export function load(url, context, next) {
if (url !== 'custom:foo') {
return next(url, context);
}

return {
format: 'module',
source: "import { foo } from '${pathToFileURL(npath.fromPortablePath(ppath.join(path, `foo.js`)))}'\\nconsole.log(foo);",
shortCircuit: true,
};
}
`,
);

await xfs.writeFilePromise(
ppath.join(path, `foo.js`),
`export const foo = 42;`,
);

await xfs.writeFilePromise(
ppath.join(path, `index.js`),
`import 'custom:foo'`,
);

await expect(run(`node`, `--loader`, `./loader.js`, `./index.js`)).resolves.toMatchObject({
code: 0,
stdout: `42\n`,
stderr: ``,
});
},
),
);
});
});
2 changes: 1 addition & 1 deletion packages/yarnpkg-pnp/sources/esm-loader/built-loader.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/yarnpkg-pnp/sources/esm-loader/hooks/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export async function resolve(

const {parentURL, conditions = []} = context;

const issuer = parentURL ? fileURLToPath(parentURL) : process.cwd();
const issuer = parentURL && loaderUtils.tryParseURL(parentURL)?.protocol === `file:` ? fileURLToPath(parentURL) : process.cwd();

// Get the pnpapi of either the issuer or the specifier.
// The latter is required when the specifier is an absolute path to a
Expand Down