esm: Move exports logic behind a flag

hybrist · hybrist · commit c4fdf271dc7a · 2019-07-04T14:37:07.000-07:00
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -613,7 +613,8 @@ Maybe<const PackageConfig*> GetPackageConfig(Environment* env,
 
   Local<Value> exports_v;
   Persistent<Value> exports;
-  if (pkg_json->Get(env->context(),
+  if (env->options()->experimental_exports &&
+      pkg_json->Get(env->context(),
       env->exports_string()).ToLocal(&exports_v) &&
       !exports_v->IsNullOrUndefined()) {
     exports.Reset(env->isolate(), exports_v);
@@ -809,6 +810,7 @@ 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
@@ -300,6 +300,10 @@ DebugOptionsParser::DebugOptionsParser() {
 }
 
 EnvironmentOptionsParser::EnvironmentOptionsParser() {
+  AddOption("--experimental-exports",
+            "experimental support for exports in package.json",
+            &EnvironmentOptions::experimental_exports,
+            kAllowedInEnvironment);
   AddOption("--experimental-modules",
             "experimental ES Module support and caching modules",
             &EnvironmentOptions::experimental_modules,
diff --git a/src/node_options.h b/src/node_options.h
@@ -100,6 +100,7 @@ class DebugOptions : public Options {
 class EnvironmentOptions : public Options {
  public:
   bool abort_on_uncaught_exception = false;
+  bool experimental_exports = false;
   bool experimental_modules = false;
   std::string es_module_specifier_resolution;
   bool experimental_wasm_modules = false;
diff --git a/test/es-module/test-esm-exports.mjs b/test/es-module/test-esm-exports.mjs
@@ -1,4 +1,4 @@
-// Flags: --experimental-modules
+// Flags: --experimental-modules --experimental-exports
 
 import { mustCall } from '../common/index.mjs';
 import { ok, strictEqual } from 'assert';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Flags: --experimental-modules`
	`1`	`+// Flags: --experimental-modules --experimental-exports`
`2`	`2`
`3`	`3`	`import { mustCall } from '../common/index.mjs';`
`4`	`4`	`import { ok, strictEqual } from 'assert';`