Skip to content
Open
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
8 changes: 4 additions & 4 deletions lib/internal/modules/esm/translators.js
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ translators.set('require-commonjs-typescript', (url, translateContext, parentURL
* @param {import('./loader').TranslateContext} translateContext Context for the translator
*/
function loadCJSModuleWithModuleLoad(module, source, url, filename, isMain, translateContext) {
assert(module === CJSModule._cache[filename]);
debug(`loadCJSModuleWithModuleLoad ${url}`);
let exports;
if (translateContext.isResolvedBySyncHooks) {
Expand All @@ -383,9 +382,10 @@ function loadCJSModuleWithModuleLoad(module, source, url, filename, isMain, tran
exports = wrapModuleLoad(filename, undefined, isMain, kShouldSkipModuleHooks);
}

// Patched Module._load implementations may return exports without updating the
// ESM-created cache entry. Mirror the returned value into the translator-owned
// module so the synthetic module namespace observes the loaded exports.
// Module._load may return exports without updating the ESM-created cache entry,
// e.g. when it is patched or require.cache has been modified. Mirror the returned
// value into the translator-owned module so the synthetic module namespace
// observes the loaded exports.
if (!module.loaded) {
module.exports = exports;
module.loaded = true;
Expand Down
20 changes: 20 additions & 0 deletions test/es-module/test-esm-cjs-cache-deleted-after-failed-import.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Tests that a CommonJS module left over from an import() that failed to link
// is loaded afresh when its require.cache entry is deleted before evaluation.

import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import assert from 'node:assert';
import { createRequire } from 'node:module';

const require = createRequire(import.meta.url);

await assert.rejects(
import(fixtures.fileURL('es-modules', 'cjs-after-failed-import', 'entry.mjs')),
{ code: 'ERR_IMPORT_ATTRIBUTE_MISSING' },
);

const depPath = fixtures.path('es-modules', 'cjs-after-failed-import', 'dep.cjs');
delete require.cache[depPath];
const { default: dep } = await import(fixtures.fileURL('es-modules', 'cjs-after-failed-import', 'importer.mjs'));
assert.deepStrictEqual(dep, { name: 'dep' });
assert.strictEqual(require(depPath), dep);
22 changes: 22 additions & 0 deletions test/es-module/test-esm-cjs-cache-replaced-after-failed-import.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Tests that a CommonJS module left over from an import() that failed to link
// uses the exports of its require.cache entry when replaced before evaluation.

import '../common/index.mjs';
import * as fixtures from '../common/fixtures.mjs';
import assert from 'node:assert';
import { createRequire, Module } from 'node:module';

const require = createRequire(import.meta.url);

await assert.rejects(
import(fixtures.fileURL('es-modules', 'cjs-after-failed-import', 'entry.mjs')),
{ code: 'ERR_IMPORT_ATTRIBUTE_MISSING' },
);

const depPath = fixtures.path('es-modules', 'cjs-after-failed-import', 'dep.cjs');
const replacement = new Module(depPath);
replacement.exports = { name: 'replacement' };
replacement.loaded = true;
require.cache[depPath] = replacement;
const { default: dep } = await import(fixtures.fileURL('es-modules', 'cjs-after-failed-import', 'importer.mjs'));
assert.strictEqual(dep, replacement.exports);
1 change: 1 addition & 0 deletions test/fixtures/es-modules/cjs-after-failed-import/data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions test/fixtures/es-modules/cjs-after-failed-import/dep.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { name: 'dep' };
2 changes: 2 additions & 0 deletions test/fixtures/es-modules/cjs-after-failed-import/entry.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import './importer.mjs';
import './data.json';
2 changes: 2 additions & 0 deletions test/fixtures/es-modules/cjs-after-failed-import/importer.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import dep from './dep.cjs';
export default dep;
Loading