module: disable conditional exports, self resolve warnings

nodejs · Feb 18, 2020 · 0ce99ad · 0ce99ad
1 parent 58de9b4
commit 0ce99ad
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 26 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -51,7 +51,7 @@ const {
   rekeySourceMap
 } = require('internal/source_map/source_map_cache');
 const { pathToFileURL, fileURLToPath, URL } = require('internal/url');
-const { deprecate, emitExperimentalWarning } = require('internal/util');
+const { deprecate } = require('internal/util');
 const vm = require('vm');
 const assert = require('internal/assert');
 const fs = require('fs');
@@ -614,7 +614,6 @@ function resolveExportsTarget(baseUrl, target, subpath, mappingKey) {
         case 'node':
         case 'require':
           try {
-            emitExperimentalWarning('Conditional exports');
             return resolveExportsTarget(baseUrl, target[p], subpath,
                                         mappingKey);
           } catch (e) {
@@ -1008,7 +1007,6 @@ Module._resolveFilename = function(request, parent, isMain, options) {
   if (parent && parent.filename) {
     const filename = trySelf(parent.filename, isMain, request);
     if (filename) {
-      emitExperimentalWarning('Package name self resolution');
       const cacheKey = request + '\x00' +
           (paths.length === 1 ? paths[0] : paths.join('\x00'));
       Module._pathCache[cacheKey] = filename;

diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -3,7 +3,7 @@
 const {
   FunctionPrototypeBind,
   ObjectSetPrototypeOf,
-  SafeMap,
+  SafeMap
 } = primordials;
 
 const {

diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js
@@ -24,12 +24,7 @@ exports.initializeImportMetaObject = function(wrap, meta) {
 
 exports.importModuleDynamicallyCallback = async function(wrap, specifier) {
   assert(calledInitialize === true || !userLoader);
-  if (!calledInitialize) {
-    process.emitWarning(
-      'The ESM module loader is experimental.',
-      'ExperimentalWarning', undefined);
-    calledInitialize = true;
-  }
+  calledInitialize = true;
   const { callbackMap } = internalBinding('module_wrap');
   if (callbackMap.has(wrap)) {
     const { importModuleDynamically } = callbackMap.get(wrap);
@@ -48,9 +43,6 @@ let calledInitialize = false;
 exports.initializeLoader = initializeLoader;
 async function initializeLoader() {
   assert(calledInitialize === false);
-  process.emitWarning(
-    'The ESM module loader is experimental.',
-    'ExperimentalWarning', undefined);
   calledInitialize = true;
   if (!userLoader)
     return;

diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -1073,7 +1073,6 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
             return Nothing<URL>();
           }
           CHECK(!try_catch.HasCaught());
-          ProcessEmitExperimentalWarning(env, "Conditional exports");
           return resolved;
         }
       } else if (key_str == "default") {
@@ -1094,7 +1093,6 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
             return Nothing<URL>();
           }
           CHECK(!try_catch.HasCaught());
-          ProcessEmitExperimentalWarning(env, "Conditional exports");
           return resolved;
         }
       }
@@ -1310,7 +1308,6 @@ Maybe<URL> PackageResolve(Environment* env,
       }
     }
     if (found_pjson && pcfg->name == pkg_name && !pcfg->exports.IsEmpty()) {
-      ProcessEmitExperimentalWarning(env, "Package name self resolution");
       if (pkg_subpath == "./") {
         return Just(URL("./", pjson_url));
       } else if (!pkg_subpath.length()) {

diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js
@@ -42,9 +42,6 @@ function expectFsNamespace(result) {
 // For direct use of import expressions inside of CJS or ES modules, including
 // via eval, all kinds of specifiers should work without issue.
 (function testScriptOrModuleImport() {
-  common.expectWarning('ExperimentalWarning',
-                       'The ESM module loader is experimental.');
-
   // Importing another file, both direct & via eval
   // expectOkNamespace(import(relativePath));
   expectOkNamespace(eval(`import("${relativePath}")`));

diff --git a/test/es-module/test-esm-nowarn-exports.mjs b/test/es-module/test-esm-nowarn-exports.mjs
@@ -0,0 +1,25 @@
+import '../common/index.mjs';
+import { path } from '../common/fixtures.mjs';
+import { strictEqual, ok } from 'assert';
+import { spawn } from 'child_process';
+
+const child = spawn(process.execPath, [
+  '--experimental-import-meta-resolve',
+  path('/es-modules/import-resolve-exports.mjs')
+]);
+
+let stderr = '';
+child.stderr.setEncoding('utf8');
+child.stderr.on('data', (data) => {
+  stderr += data;
+});
+child.on('close', (code, signal) => {
+  strictEqual(code, 0);
+  strictEqual(signal, null);
+  ok(!stderr.toString().includes(
+    'ExperimentalWarning: The ESM module loader is experimental'
+  ));
+  ok(!stderr.toString().includes(
+    'ExperimentalWarning: Conditional exports'
+  ));
+});
diff --git a/test/fixtures/es-modules/import-resolve-exports.mjs b/test/fixtures/es-modules/import-resolve-exports.mjs
@@ -0,0 +1,10 @@
+import { strictEqual } from 'assert';
+
+(async () => {
+  const resolved = await import.meta.resolve('pkgexports-sugar');
+  strictEqual(typeof resolved, 'string');
+})()
+.catch((e) => {
+  console.error(e);
+  process.exit(1);
+});
diff --git a/test/message/async_error_sync_esm.out b/test/message/async_error_sync_esm.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 Error: test
     at one (*fixtures*async-error.js:4:9)
     at two (*fixtures*async-error.js:17:9)

diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 file:///*/test/message/esm_display_syntax_error.mjs:2
 await async () => 0;
 ^^^^^

diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 file:///*/test/message/esm_display_syntax_error_import.mjs:5
   notfound
   ^^^^^^^^

diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1
 import { foo, notfound } from './module-named-exports.mjs';
               ^^^^^^^^

diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 file:///*/test/fixtures/es-module-loaders/syntax-error.mjs:2
 await async () => 0;
 ^^^^^

diff --git a/test/message/esm_loader_not_found.out b/test/message/esm_loader_not_found.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 (node:*) ExperimentalWarning: --experimental-loader is an experimental feature. This feature could change at any time
 internal/modules/esm/resolve.js:*
   let url = moduleWrapResolve(specifier, parentURL);

diff --git a/test/message/esm_loader_syntax_error.out b/test/message/esm_loader_syntax_error.out
@@ -1,4 +1,3 @@
-(node:*) ExperimentalWarning: The ESM module loader is experimental.
 (node:*) ExperimentalWarning: --experimental-loader is an experimental feature. This feature could change at any time
 file://*/test/fixtures/es-module-loaders/syntax-error.mjs:2
 await async () => 0;