lib,doc: revert format name to cjs over commonjs

guybedford · MylesBorins · commit 1fd1395ee936 · 2018-02-20T17:03:44.000-05:00
PR-URL: #18596 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/doc/api/esm.md b/doc/api/esm.md
@@ -133,7 +133,7 @@ module. This can be one of the following:
 | `format` | Description |
 | --- | --- |
 | `"esm"` | Load a standard JavaScript module |
-| `"commonjs"` | Load a node-style CommonJS module |
+| `"cjs"` | Load a node-style CommonJS module |
 | `"builtin"` | Load a node builtin CommonJS module |
 | `"json"` | Load a JSON file |
 | `"addon"` | Load a [C++ Addon][addons] |
diff --git a/lib/internal/loader/DefaultResolve.js b/lib/internal/loader/DefaultResolve.js
@@ -44,7 +44,7 @@ const extensionFormatMap ={
 '.mjs': 'esm',
 '.json': 'json',
 '.node': 'addon',
- '.js': 'commonjs'
+ '.js': 'cjs'
 };
 
 function resolve(specifier, parentURL){
diff --git a/lib/internal/loader/Translators.js b/lib/internal/loader/Translators.js
@@ -32,7 +32,7 @@ translators.set('esm', async (url) =>{
 // Strategy for loading a node-style CommonJS module
 const isWindows = process.platform === 'win32';
 const winSepRegEx = /\//g;
-translators.set('commonjs', async (url) =>{
+translators.set('cjs', async (url) =>{
 debug(`Translating CJSModule ${url}`);
 const pathname = internalURLModule.getPathFromURL(new URL(url));
 const module = CJSModule._cache[

-Original file line number
+Diff line change
 |`format`| Description |
 | --- | --- |
 |`"esm"`| Load a standard JavaScript module |
 -|`"commonjs"`| Load a node-style CommonJS module |
 +|`"cjs"`| Load a node-style CommonJS module |
 |`"builtin"`| Load a node builtin CommonJS module |
 |`"json"`| Load a JSON file |
 |`"addon"`| Load a [C++ Addon][addons]|
-Original file line number
+Diff line change
 // Strategy for loading a node-style CommonJS module
 constisWindows=process.platform==='win32';
 constwinSepRegEx=/\//g;
 -translators.set('commonjs',async(url)=>{
 +translators.set('cjs',async(url)=>{
 debug(`Translating CJSModule ${url}`);
 constpathname=internalURLModule.getPathFromURL(newURL(url));
 constmodule=CJSModule._cache[