fixup: naive solution to require.extensions

nodejs · Oct 15, 2019 · 935e46c · 935e46c
1 parent 8762750
commit 935e46c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js
@@ -9,6 +9,8 @@ const { getOptionValue } = require('internal/options');
 const preserveSymlinks = getOptionValue('--preserve-symlinks');
 const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
 const experimentalJsonModules = getOptionValue('--experimental-json-modules');
+const esModuleSpecifierResolution =
+  getOptionValue('--es-module-specifier-resolution');
 const typeFlag = getOptionValue('--input-type');
 const experimentalWasmModules = getOptionValue('--experimental-wasm-modules');
 const { resolve: moduleWrapResolve,
@@ -110,6 +112,8 @@ function resolve(specifier, parentURL) {
   if (!format) {
     if (isMain)
       format = type === TYPE_MODULE ? 'module' : 'commonjs';
+    else if (esModuleSpecifierResolution === 'node')
+      format = 'commonjs';
     else
       throw new ERR_UNKNOWN_FILE_EXTENSION(fileURLToPath(url));
   }

diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -51,8 +51,7 @@ static const char* const EXTENSIONS[] = {
   ".js",
   ".json",
   ".node",
-  ".mjs",
-  ".cjs"
+  ".mjs"
 };
 
 ModuleWrap::ModuleWrap(Environment* env,
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,8 +51,7 @@ static const char* const EXTENSIONS[] = { @@
       ".js",
       ".json",
       ".node",
-      ".mjs",
-      ".cjs"
+      ".mjs"
     };
     ModuleWrap::ModuleWrap(Environment* env,
@@ Expand Down @@