Skip to content
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

Jump to bottom

module: implement "exports" proposal for CommonJS #28759

Closed
wants to merge 6 commits into from
Closed

module: implement "exports" proposal for CommonJS #28759

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
817d5c8
module: implement "exports" proposal for CommonJS
jkrems Jul 19, 2019
8b29deb
fixup! module: implement "exports" proposal for CommonJS
jkrems Jul 23, 2019
3316fea
fixup! module: implement "exports" proposal for CommonJS
jkrems Jul 23, 2019
b7258f9
fixup! module: implement "exports" proposal for CommonJS
jkrems Jul 23, 2019
bd68eaf
fixup! module: implement "exports" proposal for CommonJS
jkrems Jul 23, 2019
104af34
fixup! module: implement "exports" proposal for CommonJS
jkrems Jul 23, 2019
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
9 changes: 5 additions & 4 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,13 @@ function resolveExports(nmPath, request, absoluteRequest) {

const basePath = path.resolve(nmPath, name);
const pkgExports = readExports(basePath);
const baseURL = `${pathToFileURL(basePath)}/`;

if (pkgExports != null) {
const mappingKey = `.${expansion}`;
const mapping = pkgExports[mappingKey];
if (typeof mapping === 'string') {
return path.resolve(basePath, mapping);
return fileURLToPath(new URL(mapping, baseURL));
}
bmeck marked this conversation as resolved.
Show resolved Hide resolved

let dirMatch = '';
Expand All @@ -369,10 +370,10 @@ function resolveExports(nmPath, request, absoluteRequest) {
if (dirMatch !== '') {
const dirMapping = pkgExports[dirMatch];
const remainder = StringPrototype.slice(mappingKey, dirMatch.length);
const expectedPrefix = path.resolve(basePath, dirMapping);
const resolved = path.resolve(expectedPrefix, remainder);
const expectedPrefix = new URL(dirMapping, baseURL).href;
guybedford marked this conversation as resolved.
Show resolved Hide resolved
const resolved = new URL(remainder, expectedPrefix).href;
if (StringPrototype.startsWith(resolved, expectedPrefix)) {
return resolved;
return fileURLToPath(resolved);
}
}
throw new ERR_PATH_NOT_EXPORTED(basePath, mappingKey);
Expand Down
3 changes: 2 additions & 1 deletion test/es-module/test-esm-exports.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { mustCall } from '../common/index.mjs';
import { ok, strictEqual } from 'assert';

import { asdf, asdf2 } from '../fixtures/pkgexports.mjs';
import { asdf, asdf2, space } from '../fixtures/pkgexports.mjs';
import {
loadMissing,
loadFromNumber,
Expand All @@ -12,6 +12,7 @@ import {

strictEqual(asdf, 'asdf');
strictEqual(asdf2, 'asdf');
strictEqual(space, 'encoded path');

loadMissing().catch(mustCall((err) => {
ok(err.message.toString().startsWith('Package exports'));
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/node_modules/pkgexports/package.json
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions test/fixtures/node_modules/pkgexports/sp ce.js
View file
Open in desktop

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

1 change: 1 addition & 0 deletions test/fixtures/pkgexports.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { default as asdf } from 'pkgexports/asdf';
export { default as asdf2 } from 'pkgexports/sub/asdf.js';
export { default as space } from 'pkgexports/space';
2 changes: 2 additions & 0 deletions test/parallel/test-module-package-exports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ assert.strictEqual(fixtureRequire('baz/index'), 'eye catcher');

assert.strictEqual(fixtureRequire('pkgexports/sub/asdf.js'), 'asdf');
jkrems marked this conversation as resolved.
Show resolved Hide resolved

assert.strictEqual(fixtureRequire('pkgexports/space'), 'encoded path');

assert.throws(
() => fixtureRequire('pkgexports/not-a-known-entry'),
(e) => {
Expand Down