test: move ESM fixtures to fixtures dir

Also consistently import the `common` module where possible.

PR-URL: #19409
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Guy Bedford <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Gus Caplan <[email protected]>
Reviewed-By: Khaidi Chu <[email protected]>
Reviewed-By: Richard Lau <[email protected]>

test/es-module/test-esm-basic-imports.mjs

@@ -1,7 +1,7 @@
 // Flags: --experimental-modules
 import '../common';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 import okShebang from './test-esm-shebang.mjs';
 
 assert(ok);

test/es-module/test-esm-double-encoding.mjs

@@ -3,4 +3,4 @@ import '../common';
 
 // Assert we can import files with `%` in their pathname.
 
-import './test-esm-double-encoding-native%2520.js';
+import '../fixtures/es-modules/test-esm-double-encoding-native%2520.js';

test/es-module/test-esm-dynamic-import.js

@@ -7,8 +7,8 @@ const vm = require('vm');
 
 common.crashOnUnhandledRejection();
 
-const relativePath = './test-esm-ok.mjs';
-const absolutePath = require.resolve('./test-esm-ok.mjs');
+const relativePath = '../fixtures/es-modules/test-esm-ok.mjs';
+const absolutePath = require.resolve('../fixtures/es-modules/test-esm-ok.mjs');
 const targetURL = new URL('file:///');
 targetURL.pathname = absolutePath;
 

test/es-module/test-esm-encoded-path.mjs

@@ -2,6 +2,6 @@
 import '../common';
 import assert from 'assert';
 // ./test-esm-ok.mjs
-import ok from './test-%65%73%6d-ok.mjs';
+import ok from '../fixtures/es-modules/test-%65%73%6d-ok.mjs';
 
 assert(ok);

test/es-module/test-esm-example-loader.js

@@ -1,6 +1,6 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/example-loader.mjs
 /* eslint-disable node-core/required-modules */
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);

test/es-module/test-esm-forbidden-globals.mjs

@@ -1,5 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 
 if (typeof arguments !== 'undefined') {
   throw new Error('not an ESM');

test/es-module/test-esm-json.mjs

@@ -1,9 +1,8 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-import '../common/index';
+import '../common';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
-import json from './json.json';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
+import json from '../fixtures/es-modules/json.json';
 
 assert(ok);
 assert.strictEqual(json.val, 42);

test/es-module/test-esm-loader-dependency.mjs

@@ -1,5 +1,5 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-with-dep.mjs
 /* eslint-disable node-core/required-modules */
-import './test-esm-ok.mjs';
+import '../fixtures/es-modules/test-esm-ok.mjs';
 
 // We just test that this module doesn't fail loading

test/es-module/test-esm-main-lookup.mjs

@@ -1,5 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 import assert from 'assert';
 import main from '../fixtures/es-modules/pjson-main';
 

test/es-module/test-esm-named-exports.mjs

@@ -1,9 +1,8 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
-/* eslint-disable node-core/required-modules */
-import '../common/index';
+import '../common';
 import { readFile } from 'fs';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);
 assert(readFile);

test/es-module/test-esm-namespace.mjs

@@ -1,7 +1,5 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-
-import '../common/index';
+import '../common';
 import * as fs from 'fs';
 import assert from 'assert';
 

test/es-module/test-esm-preserve-symlinks.js

@@ -1,4 +1,3 @@
-// Flags: --experimental-modules
 'use strict';
 
 const common = require('../common');

test/es-module/test-esm-resolve-hook.mjs

@@ -2,7 +2,7 @@
 /* eslint-disable node-core/required-modules */
 import { namedExport } from '../fixtures/es-module-loaders/js-as-esm.js';
 import assert from 'assert';
-import ok from './test-esm-ok.mjs';
+import ok from '../fixtures/es-modules/test-esm-ok.mjs';
 
 assert(ok);
 assert(namedExport);

test/es-module/test-esm-shared-loader-dep.mjs

@@ -1,7 +1,7 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-shared-dep.mjs
-/* eslint-disable node-core/required-modules */
+import '../common';
 import assert from 'assert';
-import './test-esm-ok.mjs';
+import '../fixtures/es-modules/test-esm-ok.mjs';
 import dep from '../fixtures/es-module-loaders/loader-dep.js';
 
 assert.strictEqual(dep.format, 'esm');

test/es-module/test-esm-shebang.mjs

@@ -1,6 +1,6 @@
 #! }]) // isn't js
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
+import '../common';
 
 const isJs = true;
 export default isJs;

test/es-module/test-esm-snapshot.mjs

@@ -1,8 +1,7 @@
 // Flags: --experimental-modules
-/* eslint-disable node-core/required-modules */
-import '../common/index';
-import './esm-snapshot-mutator';
-import one from './esm-snapshot';
+import '../common';
+import '../fixtures/es-modules/esm-snapshot-mutator';
+import one from '../fixtures/es-modules/esm-snapshot';
 import assert from 'assert';
 
 assert.strictEqual(one, 1);

test/es-module/esm-snapshot-mutator.js → test/fixtures/es-modules/esm-snapshot-mutator.js

@@ -1,4 +1,3 @@
-/* eslint-disable node-core/required-modules */
 'use strict';
 const shouldSnapshotFilePath = require.resolve('./esm-snapshot.js');
 require('./esm-snapshot.js');

test/fixtures/es-modules/esm-snapshot.js

@@ -0,0 +1,2 @@
+'use strict';
+module.exports = 1;

test/es-module/test-esm-double-encoding-native%20.js → test/fixtures/es-modules/test-esm-double-encoding-native%20.js

@@ -1,5 +1,4 @@
 'use strict';
-require('../common');
 
 // Trivial test to assert we can load files with `%` in their pathname.
 // Imported by `test-esm-double-encoding.mjs`.

test/fixtures/es-modules/test-esm-ok.mjs

@@ -0,0 +1,2 @@
+const isJs = true;
+export default isJs;

test/parallel/test-module-main-extension-lookup.js

@@ -1,9 +1,11 @@
 'use strict';
 require('../common');
+const fixtures = require('../common/fixtures');
 const { execFileSync } = require('child_process');
 
 const node = process.argv[0];
 
-execFileSync(node, ['--experimental-modules', 'test/es-module/test-esm-ok']);
 execFileSync(node, ['--experimental-modules',
-                    'test/fixtures/es-modules/noext']);
+                    fixtures.path('es-modules', 'test-esm-ok')]);
+execFileSync(node, ['--experimental-modules',
+                    fixtures.path('es-modules', 'noext')]);