Skip to content

modules: Package exports validations and fallbacks #28949

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

Closed
guybedford wants to merge 11 commits into from
Closed

modules: Package exports validations and fallbacks #28949

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fe2648c
module: pkg exports validations and fallbacks
guybedford Aug 2, 2019
3a1d493
feedback, ownproperty checks
guybedford Aug 4, 2019
7597165
node_modules filtering in exports and boundaries
guybedford Aug 4, 2019
6cdcf6c
linting fixes
guybedford Aug 4, 2019
20f06d8
Fixup backslash escaping
guybedford Aug 5, 2019
110fa26
Closing bracket
guybedford Aug 5, 2019
406cb02
fixup double node_modules check
guybedford Aug 5, 2019
9d95b1d
pr feedback - validations on paths
guybedford Aug 6, 2019
a7e3e76
improve validation failure errors
guybedford Aug 6, 2019
0274de7
or -> and spec fixup
guybedford Aug 7, 2019
52fb846
ensure target dir mappings remain in target dir
guybedford Aug 11, 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
Prev Previous commit
Next Next commit
pr feedback - validations on paths
  • Loading branch information
@guybedford
guybedford committed Aug 6, 2019
commit 9d95b1da4eeb6c6455d69bdc989c25c102dda5a5
18 changes: 9 additions & 9 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,16 @@ function resolveExportsTarget(pkgPath, target, subpath, basePath, mappingKey) {
if (target.startsWith('./') &&
(subpath.length === 0 || target.endsWith('/'))) {
const resolvedTarget = new URL(target, pkgPath);
const pkgPathHref = pkgPath.href;
const resolvedTargetHref = resolvedTarget.href;
if (StringPrototype.startsWith(resolvedTargetHref, pkgPathHref) &&
StringPrototype.indexOf(resolvedTargetHref, '/node_modules/',
pkgPathHref.length - 1) === -1) {
const pkgPathPath = pkgPath.pathname;
const resolvedTargetPath = resolvedTarget.pathname;
if (StringPrototype.startsWith(resolvedTargetPath, pkgPathPath) &&
StringPrototype.indexOf(resolvedTargetPath, '/node_modules/',
pkgPathPath.length - 1) === -1) {
const resolved = new URL(subpath, resolvedTarget);
const resolvedHref = resolved.href;
if (StringPrototype.startsWith(resolvedHref, pkgPathHref) &&
StringPrototype.indexOf(resolvedHref, '/node_modules/',
pkgPathHref.length - 1) === -1) {
const resolvedPath = resolved.pathname;
if (StringPrototype.startsWith(resolvedPath, pkgPathPath) &&
StringPrototype.indexOf(resolvedPath, '/node_modules/',
pkgPathPath.length - 1) === -1) {
return fileURLToPath(resolved);
}
}
Expand Down