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

esm: fix emit deprecation on legacy main resolve #48664

Merged
merged 7 commits into from
Jul 11, 2023
Merged

esm: fix emit deprecation on legacy main resolve #48664

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5a1eb0
esm: fix emit deprecation on legacy main resolve
aduh95 Jul 5, 2023
ac15b0b
add tests
aduh95 Jul 5, 2023
94a5ce4
simplify condition
aduh95 Jul 5, 2023
c905e5e
add test for falsy `"main"`
aduh95 Jul 5, 2023
b9cada0
jsdoc
aduh95 Jul 5, 2023
ee13bbc
fixup! jsdoc
aduh95 Jul 5, 2023
ee89104
missing `await`s
aduh95 Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/internal/modules/esm/resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const { getOptionValue } = require('internal/options');
const policy = getOptionValue('--experimental-policy') ?
require('internal/process/policy') :
null;
const { sep, relative, toNamespacedPath } = require('path');
const { sep, relative, toNamespacedPath, resolve } = require('path');
const preserveSymlinks = getOptionValue('--preserve-symlinks');
const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
const experimentalNetworkImports =
Expand Down Expand Up @@ -111,17 +111,17 @@ function emitLegacyIndexDeprecation(url, packageJSONUrl, base, main) {
const path = fileURLToPath(url);
const pkgPath = fileURLToPath(new URL('.', packageJSONUrl));
const basePath = fileURLToPath(base);
if (main)
if (main && resolve(pkgPath, main) !== path)
process.emitWarning(
`Package ${pkgPath} has a "main" field set to ${JSONStringify(main)}, ` +
`Package ${pkgPath} has a "main" field set to "${main}", ` +
`excluding the full filename and extension to the resolved file at "${
StringPrototypeSlice(path, pkgPath.length)}", imported from ${
basePath}.\n Automatic extension resolution of the "main" field is ` +
'deprecated for ES modules.',
'DeprecationWarning',
'DEP0151',
);
else
else if (!main)
anonrig marked this conversation as resolved.
Show resolved Hide resolved
process.emitWarning(
`No "main" or "exports" field defined in the package.json for ${pkgPath
} resolving the main entry point "${
Expand Down