Allow json modules to be resolved in Node >=17.5.0 without flag (#1665)

Jamesernator · cspotcode · web-flow · commit 20cbbf58565b · 2022-03-02T18:57:35.000-05:00
* Enable JSON modules by default in Node &gt;=17.5.0

* Added tests for experimental json modules no longer requiring flag

* bump node version used for development; just more convenient this way

Co-authored-by: Andrew Bradley &lt;cspotcode@gmail.com&gt;
diff --git a/dist-raw/node-esm-default-get-format.js b/dist-raw/node-esm-default-get-format.js
@@ -11,7 +11,11 @@ const {
 const { extname } = require('path');
 const { getOptionValue } = require('./node-options');
 
-const experimentalJsonModules = getOptionValue('--experimental-json-modules');
+const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(s => parseInt(s, 10));
+const experimentalJsonModules =
+  nodeMajor > 17
+  || (nodeMajor === 17 && nodeMinor >= 5)
+  || getOptionValue('--experimental-json-modules');
 const experimentalSpeciferResolution =
   getOptionValue('--experimental-specifier-resolution');
 const experimentalWasmModules = getOptionValue('--experimental-wasm-modules');
diff --git a/package.json b/package.json
@@ -171,7 +171,7 @@
     "singleQuote": true
   },
   "volta": {
-    "node": "16.9.1",
+    "node": "17.5.0",
     "npm": "6.14.15"
   }
 }
diff --git a/src/test/esm-loader.spec.ts b/src/test/esm-loader.spec.ts
@@ -261,17 +261,38 @@ test.suite('esm', (test) => {
     test.suite('supports import assertions', (test) => {
       test.runIf(nodeSupportsImportAssertions);
 
-      test('Can import JSON using the appropriate flag and assertion', async (t) => {
-        const { err, stdout } = await exec(
-          `${CMD_ESM_LOADER_WITHOUT_PROJECT} --experimental-json-modules ./importJson.ts`,
-          {
-            cwd: resolve(TEST_DIR, 'esm-import-assertions'),
-          }
-        );
-        expect(err).toBe(null);
-        expect(stdout.trim()).toBe(
-          'A fuchsia car has 2 seats and the doors are open.\nDone!'
-        );
+      test.suite('node >=17.5.0', (test) => {
+        test.runIf(semver.gte(process.version, '17.5.0'));
+
+        test('Can import JSON modules with appropriate assertion', async (t) => {
+          const { err, stdout } = await exec(
+            `${CMD_ESM_LOADER_WITHOUT_PROJECT} ./importJson.ts`,
+            {
+              cwd: resolve(TEST_DIR, 'esm-import-assertions'),
+            }
+          );
+          expect(err).toBe(null);
+          expect(stdout.trim()).toBe(
+            'A fuchsia car has 2 seats and the doors are open.\nDone!'
+          );
+        });
+      });
+
+      test.suite('node <17.5.0', (test) => {
+        test.runIf(semver.lt(process.version, '17.5.0'));
+
+        test('Can import JSON using the appropriate flag and assertion', async (t) => {
+          const { err, stdout } = await exec(
+            `${CMD_ESM_LOADER_WITHOUT_PROJECT} --experimental-json-modules ./importJson.ts`,
+            {
+              cwd: resolve(TEST_DIR, 'esm-import-assertions'),
+            }
+          );
+          expect(err).toBe(null);
+          expect(stdout.trim()).toBe(
+            'A fuchsia car has 2 seats and the doors are open.\nDone!'
+          );
+        });
       });
     });
 

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@`
`171`	`171`	`"singleQuote": true`
`172`	`172`	`},`
`173`	`173`	`"volta": {`
`174`		`- "node": "16.9.1",`
	`174`	`+ "node": "17.5.0",`
`175`	`175`	`"npm": "6.14.15"`
`176`	`176`	`}`
`177`	`177`	`}`