diff options
| author | Guy Bedford <guybedford@gmail.com> | 2019-10-07 00:09:20 -0400 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-10-10 16:29:08 -0700 |
| commit | b798f645667c0b60cab84c467713a21c5676998d (patch) | |
| tree | 45377fa6dd8fbf4bf58a842af61672f04329a9d5 /src | |
| parent | 1294c7e48564a549ef391786b67798d29238aace (diff) | |
| download | android-node-v8-b798f645667c0b60cab84c467713a21c5676998d.tar.gz android-node-v8-b798f645667c0b60cab84c467713a21c5676998d.tar.bz2 android-node-v8-b798f645667c0b60cab84c467713a21c5676998d.zip | |
esm: unflag --experimental-exports
PR-URL: https://github.com/nodejs/node/pull/29867
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/module_wrap.cc | 4 | ||||
| -rw-r--r-- | src/node_options.cc | 5 | ||||
| -rw-r--r-- | src/node_options.h | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/module_wrap.cc b/src/module_wrap.cc index 67e0cbc618..c2ffee14b2 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -652,8 +652,7 @@ Maybe<const PackageConfig*> GetPackageConfig(Environment* env, } Local<Value> exports_v; - if (env->options()->experimental_exports && - pkg_json->Get(env->context(), + if (pkg_json->Get(env->context(), env->exports_string()).ToLocal(&exports_v) && !exports_v->IsNullOrUndefined()) { Global<Value> exports; @@ -995,7 +994,6 @@ Maybe<URL> PackageExportsResolve(Environment* env, const std::string& pkg_subpath, const PackageConfig& pcfg, const URL& base) { - CHECK(env->options()->experimental_exports); Isolate* isolate = env->isolate(); Local<Context> context = env->context(); Local<Value> exports = pcfg.exports.Get(isolate); diff --git a/src/node_options.cc b/src/node_options.cc index c75a5f5487..23fa3c0f54 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -317,10 +317,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { "experimental Source Map V3 support", &EnvironmentOptions::enable_source_maps, kAllowedInEnvironment); - AddOption("--experimental-exports", - "experimental support for exports in package.json", - &EnvironmentOptions::experimental_exports, - kAllowedInEnvironment); AddOption("--experimental-json-modules", "experimental JSON interop support for the ES Module loader", &EnvironmentOptions::experimental_json_modules, @@ -335,7 +331,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { "experimental ES Module support and caching modules", &EnvironmentOptions::experimental_modules, kAllowedInEnvironment); - Implies("--experimental-modules", "--experimental-exports"); AddOption("--experimental-wasm-modules", "experimental ES Module support for webassembly modules", &EnvironmentOptions::experimental_wasm_modules, diff --git a/src/node_options.h b/src/node_options.h index 5887191877..f9d2581deb 100644 --- a/src/node_options.h +++ b/src/node_options.h @@ -101,7 +101,6 @@ class EnvironmentOptions : public Options { public: bool abort_on_uncaught_exception = false; bool enable_source_maps = false; - bool experimental_exports = false; bool experimental_json_modules = false; bool experimental_modules = false; std::string es_module_specifier_resolution; |