Skip to content

Commit

Permalink
module: disable conditional exports, self resolve warnings
Browse files Browse the repository at this point in the history
PR-URL: #31845
Reviewed-By: Jan Krems <[email protected]>
Reviewed-By: Geoffrey Booth <[email protected]>
  • Loading branch information
guybedford authored and codebytere committed Feb 27, 2020
1 parent 04eda02 commit b9f3bfe
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
4 changes: 1 addition & 3 deletions lib/internal/modules/cjs/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,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');
Expand Down Expand Up @@ -610,7 +610,6 @@ function resolveExportsTarget(baseUrl, target, subpath, mappingKey) {
case 'node':
case 'require':
try {
emitExperimentalWarning('Conditional exports');
return resolveExportsTarget(baseUrl, target[p], subpath,
mappingKey);
} catch (e) {
Expand Down Expand Up @@ -953,7 +952,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;
Expand Down
3 changes: 0 additions & 3 deletions src/module_wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,6 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
return Nothing<URL>();
}
CHECK(!try_catch.HasCaught());
ProcessEmitExperimentalWarning(env, "Conditional exports");
return resolved;
}
} else if (key_str == "default") {
Expand All @@ -1096,7 +1095,6 @@ Maybe<URL> ResolveExportsTarget(Environment* env,
return Nothing<URL>();
}
CHECK(!try_catch.HasCaught());
ProcessEmitExperimentalWarning(env, "Conditional exports");
return resolved;
}
}
Expand Down Expand Up @@ -1312,7 +1310,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()) {
Expand Down
25 changes: 25 additions & 0 deletions test/es-module/test-esm-nowarn-exports.mjs
Original file line number Diff line number Diff line change
@@ -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'
));
});
10 changes: 10 additions & 0 deletions test/fixtures/es-modules/import-resolve-exports.mjs
Original file line number Diff line number Diff line change
@@ -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);
});

0 comments on commit b9f3bfe

Please sign in to comment.