Skip to content

module: improve named cjs import errors #35453

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
ctavan wants to merge 11 commits into from
Closed

module: improve named cjs import errors #35453

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
22f700c
module: improve named cjs import errors
ctavan Oct 1, 2020
e4a018a
Update lib/internal/modules/esm/module_job.js
ctavan Oct 2, 2020
75c84fd
Update lib/internal/modules/esm/module_job.js
ctavan Oct 2, 2020
757d643
Apply suggestions from code review
ctavan Oct 2, 2020
1fcb340
Fix syntax errors introduced by commit suggestions
ctavan Oct 2, 2020
368305c
Apply suggestions from code review
ctavan Oct 16, 2020
0677559
Add long multiline test with comment
ctavan Oct 16, 2020
ae0a8ee
Fail if import example cannot be extracted
ctavan Oct 16, 2020
4d11c44
fixup! Add long multiline test with comment
ctavan Jan 29, 2021
182245f
Satisfy eslint
ctavan Jan 29, 2021
533560f
Revert "module: improve named cjs import errors"
ctavan Jan 29, 2021
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
Revert "module: improve named cjs import errors" 
This reverts commit 22f700c.
  • Loading branch information
@ctavan
ctavan committed Jan 29, 2021
commit 533560f781a0110d9f391dd6e7b37f01847c9443
24 changes: 8 additions & 16 deletions lib/internal/modules/esm/module_job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,8 @@ class ModuleJob {
}
jobsInGraph.add(moduleJob);
const dependencyJobs = await moduleJob.linked;
return PromiseAll(
new SafeArrayIterator(
ArrayPrototypeMap(dependencyJobs, addJobsToDependencyGraph)
)
);
return PromiseAll(new SafeArrayIterator(
ArrayPrototypeMap(dependencyJobs, addJobsToDependencyGraph)));
};
await addJobsToDependencyGraph(this);

Expand All @@ -174,19 +171,15 @@ class ModuleJob {
}
} catch (e) {
decorateErrorStack(e);
if (
StringPrototypeIncludes(e.message, ' does not provide an export named')
) {
if (StringPrototypeIncludes(e.message,
' does not provide an export named')) {
const splitStack = StringPrototypeSplit(e.stack, '\n');
const parentFileUrl = splitStack[0];
const { 1: childSpecifier, 2: name } = StringPrototypeMatch(
e.message,
/module '(.*)' does not provide an export named '(.+)'/
);
const childFileURL = await this.loader.resolve(
childSpecifier,
parentFileUrl
);
/module '(.*)' does not provide an export named '(.+)'/);
const childFileURL =
await this.loader.resolve(childSpecifier, parentFileUrl);
const format = await this.loader.getFormat(childFileURL);
if (format === 'commonjs') {
const [, fileUrl, lineNumber] = StringPrototypeMatch(
Expand All @@ -197,8 +190,7 @@ class ModuleJob {
fileURLToPath(fileUrl),
Number(lineNumber)
);
e.message =
`Named export '${name}' not found. The requested module` +
e.message = `Named export '${name}' not found. The requested module` +
` '${childSpecifier}' is a CommonJS module, which may not support` +
' all module.exports as named exports.\nCommonJS modules can ' +
'always be imported via the default export, for example using:' +
Expand Down