esm: remove .js support

MylesBorins · MylesBorins · commit 85cf202a76ce · 2018-11-08T20:19:02.000+01:00
Refs: nodejs/modules#180 PR-URL: #6 Reviewed-By: Guy Bedford <guybedford@gmail.com> Reviewed-By: John-David Dalton <john.david.dalton@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/doc/api/esm.md b/doc/api/esm.md
@@ -54,6 +54,10 @@ property:
 
 ## Notable differences between `import` and `require`
 
+### Only Support for .mjs
+
+ESM must have the `.mjs` extension.
+
 ### No NODE_PATH
 
 `NODE_PATH` is not part of resolving `import` specifiers. Please use symlinks
@@ -95,12 +99,17 @@ When loaded via `import` these modules will provide a single `default` export
 representing the value of `module.exports` at the time they finished evaluating.
 
 ```js
-// foo.js
-module.exports = { one: 1 };
+// cjs.js
+module.exports = 'cjs';
+
+// esm.mjs
+import { createRequireFromPath as createRequire } from 'module';
+import { fileURLToPath as fromPath } from 'url';
+
+const require = createRequire(fromPath(import.meta.url));
 
-// bar.js
-import foo from './foo.js';
-foo.one === 1; // true
+const cjs = require('./cjs');
+cjs === 'cjs'; // true
 ```
 
 Builtin modules will provide named exports of their public API, as well as a
@@ -174,7 +183,6 @@ module. This can be one of the following:
 | `format` | Description |
 | --- | --- |
 | `'esm'` | Load a standard JavaScript module |
-| `'cjs'` | Load a node-style CommonJS module |
 | `'builtin'` | Load a node builtin CommonJS module |
 | `'dynamic'` | Use a [dynamic instantiate hook][] |
 
diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js
@@ -46,8 +46,7 @@ function search(target, base) {
 
 const extensionFormatMap = {
   '__proto__': null,
-  '.mjs': 'esm',
-  '.js': 'cjs'
+  '.mjs': 'esm'
 };
 
 function resolve(specifier, parentURL) {
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -44,7 +44,7 @@ using v8::TryCatch;
 using v8::Undefined;
 using v8::Value;
 
-static const char* const EXTENSIONS[] = {".mjs", ".js"};
+static const char* const EXTENSIONS[] = {".mjs"};
 
 ModuleWrap::ModuleWrap(Environment* env,
                        Local<Object> object,
diff --git a/test/common/index.mjs b/test/common/index.mjs
@@ -1,6 +1,15 @@
 // Flags: --experimental-modules
 /* eslint-disable node-core/required-modules */
-import common from './index.js';
+
+import { createRequireFromPath } from 'module';
+import { fileURLToPath as toPath } from 'url';
+
+function createRequire(metaUrl) {
+  return createRequireFromPath(toPath(metaUrl));
+}
+
+const require = createRequire(import.meta.url);
+const common = require('./index.js');
 
 const {
   isMainThread,
@@ -93,5 +102,6 @@ export {
   getBufferSources,
   disableCrashOnUnhandledRejection,
   getTTYfd,
-  runWithInvalidFD
+  runWithInvalidFD,
+  createRequire
 };
diff --git a/test/es-module/test-esm-double-encoding.mjs b/test/es-module/test-esm-double-encoding.mjs
@@ -3,4 +3,4 @@ import '../common';
 
 // Assert we can import files with `%` in their pathname.
 
-import '../fixtures/es-modules/test-esm-double-encoding-native%2520.js';
+import '../fixtures/es-modules/test-esm-double-encoding-native%2520.mjs';
diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js
@@ -1,4 +1,5 @@
 // Flags: --experimental-modules
+
 'use strict';
 const common = require('../common');
 const assert = require('assert');
diff --git a/test/es-module/test-esm-error-cache.js b/test/es-module/test-esm-error-cache.js
@@ -1,11 +1,11 @@
-'use strict';
-
 // Flags: --experimental-modules
 
+'use strict';
+
 require('../common');
 const assert = require('assert');
 
-const file = '../fixtures/syntax/bad_syntax.js';
+const file = '../fixtures/syntax/bad_syntax.mjs';
 
 let error;
 (async () => {
diff --git a/test/es-module/test-esm-require-cache.mjs b/test/es-module/test-esm-require-cache.mjs
@@ -1,7 +1,11 @@
 // Flags: --experimental-modules
-import '../common';
-import '../fixtures/es-module-require-cache/preload.js';
-import '../fixtures/es-module-require-cache/counter.js';
+import { createRequire } from '../common';
 import assert from 'assert';
+//
+const require = createRequire(import.meta.url);
+
+require('../fixtures/es-module-require-cache/preload.js');
+require('../fixtures/es-module-require-cache/counter.js');
+
 assert.strictEqual(global.counter, 1);
 delete global.counter;
diff --git a/test/es-module/test-esm-shared-loader-dep.mjs b/test/es-module/test-esm-shared-loader-dep.mjs
@@ -1,7 +1,9 @@
 // Flags: --experimental-modules --loader ./test/fixtures/es-module-loaders/loader-shared-dep.mjs
-import '../common';
+import { createRequire } from '../common';
 import assert from 'assert';
 import '../fixtures/es-modules/test-esm-ok.mjs';
-import dep from '../fixtures/es-module-loaders/loader-dep.js';
+
+const require = createRequire(import.meta.url);
+const dep = require('../fixtures/es-module-loaders/loader-dep.js');
 
 assert.strictEqual(dep.format, 'esm');
diff --git a/test/es-module/test-esm-snapshot.mjs b/test/es-module/test-esm-snapshot.mjs
diff --git a/test/fixtures/es-module-loaders/loader-shared-dep.mjs b/test/fixtures/es-module-loaders/loader-shared-dep.mjs
@@ -1,6 +1,10 @@
-import dep from './loader-dep.js';
 import assert from 'assert';
 
+import {createRequire} from '../../common';
+
+const require = createRequire(import.meta.url);
+const dep = require('./loader-dep.js');
+
 export function resolve(specifier, base, defaultResolve) {
   assert.strictEqual(dep.format, 'esm');
   return defaultResolve(specifier, base);
diff --git a/test/fixtures/es-module-loaders/loader-with-dep.mjs b/test/fixtures/es-module-loaders/loader-with-dep.mjs
@@ -1,4 +1,8 @@
-import dep from './loader-dep.js';
+import {createRequire} from '../../common';
+
+const require = createRequire(import.meta.url);
+const dep = require('./loader-dep.js');
+
 export function resolve (specifier, base, defaultResolve) {
   return {
     url: defaultResolve(specifier, base).url,
diff --git a/test/fixtures/es-modules/esm-snapshot-mutator.js b/test/fixtures/es-modules/esm-snapshot-mutator.js
diff --git a/test/fixtures/es-modules/esm-snapshot.js b/test/fixtures/es-modules/esm-snapshot.js
diff --git a/test/fixtures/es-modules/pjson-main/main.js b/test/fixtures/es-modules/pjson-main/main.js
diff --git a/test/fixtures/es-modules/pjson-main/main.mjs b/test/fixtures/es-modules/pjson-main/main.mjs
@@ -0,0 +1 @@
+export default 'main';
diff --git a/test/fixtures/es-modules/pjson-main/package.json b/test/fixtures/es-modules/pjson-main/package.json
@@ -1,3 +1,3 @@
 {
-  "main": "main.js"
+  "main": "main.mjs"
 }
diff --git a/test/fixtures/es-modules/test-esm-double-encoding-native%20.mjs b/test/fixtures/es-modules/test-esm-double-encoding-native%20.mjs
@@ -3,4 +3,4 @@
 // Trivial test to assert we can load files with `%` in their pathname.
 // Imported by `test-esm-double-encoding.mjs`.
 
-module.exports = 42;
+export default 42;
diff --git a/test/fixtures/syntax/bad_syntax.mjs b/test/fixtures/syntax/bad_syntax.mjs
@@ -0,0 +1 @@
+var foo bar;

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ import '../common';`
`3`	`3`
`4`	`4`	// Assert we can import files with `%` in their pathname.
`5`	`5`
`6`		`-import '../fixtures/es-modules/test-esm-double-encoding-native%2520.js';`
	`6`	`+import '../fixtures/es-modules/test-esm-double-encoding-native%2520.mjs';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// Flags: --experimental-modules`
	`2`	`+`
`2`	`3`	`'use strict';`
`3`	`4`	`const common = require('../common');`
`4`	`5`	`const assert = require('assert');`