From e29c9453a993a215d9e2bd2dc8ba1e16c6ea0b81 Mon Sep 17 00:00:00 2001 From: Geoffrey Booth Date: Tue, 25 Jun 2024 03:08:44 -0700 Subject: [PATCH] esm: move hooks test with others Co-authored-by: Gabriel Bota PR-URL: https://github.com/nodejs/node/pull/53558 Reviewed-By: Matteo Collina Reviewed-By: Antoine du Hamel --- test/es-module/test-esm-loader-hooks.mjs | 13 +++++++++++++ test/es-module/test-esm-named-exports.js | 11 ----------- .../es-modules/require-esm-throws-with-loaders.js | 8 ++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 test/es-module/test-esm-named-exports.js create mode 100644 test/fixtures/es-modules/require-esm-throws-with-loaders.js diff --git a/test/es-module/test-esm-loader-hooks.mjs b/test/es-module/test-esm-loader-hooks.mjs index 80dbd885e25819..c7536f93e51567 100644 --- a/test/es-module/test-esm-loader-hooks.mjs +++ b/test/es-module/test-esm-loader-hooks.mjs @@ -772,6 +772,19 @@ describe('Loader hooks', { concurrency: !process.env.TEST_PARALLEL }, () => { assert.strictEqual(signal, null); }); + describe('should use hooks', async () => { + const { code, signal, stdout, stderr } = await spawnPromisified(process.execPath, [ + '--import', + fixtures.fileURL('es-module-loaders/builtin-named-exports.mjs'), + fixtures.path('es-modules/require-esm-throws-with-loaders.js'), + ]); + + assert.strictEqual(stderr, ''); + assert.strictEqual(stdout, ''); + assert.strictEqual(code, 0); + assert.strictEqual(signal, null); + }); + it('should support source maps in commonjs translator', async () => { const readFile = async () => {}; const hook = ` diff --git a/test/es-module/test-esm-named-exports.js b/test/es-module/test-esm-named-exports.js deleted file mode 100644 index 2c6f67288aa57c..00000000000000 --- a/test/es-module/test-esm-named-exports.js +++ /dev/null @@ -1,11 +0,0 @@ -// Flags: --import ./test/fixtures/es-module-loaders/builtin-named-exports.mjs -'use strict'; - -require('../common'); -const { readFile, __fromLoader } = require('fs'); -const assert = require('assert'); - -assert.throws(() => require('../fixtures/es-modules/test-esm-ok.mjs'), { code: 'ERR_REQUIRE_ESM' }); - -assert(readFile); -assert(__fromLoader); diff --git a/test/fixtures/es-modules/require-esm-throws-with-loaders.js b/test/fixtures/es-modules/require-esm-throws-with-loaders.js new file mode 100644 index 00000000000000..79c5cf96c14141 --- /dev/null +++ b/test/fixtures/es-modules/require-esm-throws-with-loaders.js @@ -0,0 +1,8 @@ +'use strict'; +const { readFile, __fromLoader } = require('fs'); +const assert = require('assert'); + +assert.throws(() => require('./test-esm-ok.mjs'), { code: 'ERR_REQUIRE_ESM' }); + +assert(readFile); +assert(__fromLoader);