module: 12.x self resolve flag as experimental modules

guybedford · MylesBorins · commit f0b2d875d96d · 2020-02-13T14:58:33.000-08:00
PR-URL: #31757 Reviewed-By: Geoffrey Booth <webmaster@geoffreybooth.com> Reviewed-By: Jan Krems <jan.krems@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -432,6 +432,7 @@ function resolveBasePath(basePath, exts, isMain, trailingSlash, request) {
 }
 
 function trySelf(parentPath, isMain, request) {
+ if (!experimentalModules) return false;
 const { data: pkg, path: basePath } = readPackageScope(parentPath) || {};
 if (!pkg || pkg.exports === undefined) return false;
 if (typeof pkg.name !== 'string') return false;
diff --git a/test/es-module/test-esm-flagged-self.js b/test/es-module/test-esm-flagged-self.js
@@ -0,0 +1,16 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const path = require('path');
+const { createRequireFromPath } = require('module');
+
+const fixturesRequire =
+ createRequireFromPath(path.resolve(__dirname, '../fixtures/_'));
+
+try {
+ fixturesRequire('pkgexports/resolve-self');
+ assert(false);
+} catch (e) {
+ assert.strictEqual(e.code, 'MODULE_NOT_FOUND');
+}

Original file line number	Diff line number	Diff line change
`@@ -432,6 +432,7 @@ function resolveBasePath(basePath, exts, isMain, trailingSlash, request) {`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`functiontrySelf(parentPath,isMain,request){`
	`435`	`+if(!experimentalModules)returnfalse;`
`435`	`436`	`const{data: pkg,path: basePath}=readPackageScope(parentPath)\|\|{};`
`436`	`437`	`if(!pkg\|\|pkg.exports===undefined)returnfalse;`
`437`	`438`	`if(typeofpkg.name!=='string')returnfalse;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,16 @@ @@
 +'use strict';
++
 +require('../common');
 +constassert=require('assert');
 +constpath=require('path');
 +const{ createRequireFromPath }=require('module');
++
 +constfixturesRequire=
 +createRequireFromPath(path.resolve(__dirname,'../fixtures/_'));
++
 +try{
 +fixturesRequire('pkgexports/resolve-self');
 +assert(false);
 +}catch(e){
 +assert.strictEqual(e.code,'MODULE_NOT_FOUND');
 +}