WIP attempt at making "type":"module" work

Author: kainino0x

Gruntfile.js renamed to Gruntfile.cjs

@@ -1,4 +1,4 @@
-module.exports = function (api) {
+export default function (api) {
   api.cache(true);
   return {
     presets: ['@babel/preset-typescript'],

babel.config.js

@@ -2,6 +2,7 @@
   "name": "@webgpu/cts",
   "version": "0.1.0",
   "description": "WebGPU Conformance Test Suite",
+  "type": "module",
   "scripts": {
     "test": "grunt all",
     "all": "grunt all",

package.json

@@ -1,8 +1,8 @@
 /* eslint no-process-exit: "off" */
 /* eslint @typescript-eslint/no-namespace: "off" */
 
-function node() {
-  const { existsSync } = require('fs');
+async function node() {
+  const { existsSync } = await import('fs');
 
   return {
     type: 'node',
@@ -41,6 +41,6 @@ function deno() {
   };
 }
 
-const sys = typeof globalThis.process !== 'undefined' ? node() : deno();
+const sys = typeof globalThis.process !== 'undefined' ? await node() : deno();
 
 export default sys;

src/common/runtime/helper/sys.ts

@@ -3,7 +3,7 @@ const path = require('path');
 // Automatically transpile .ts imports
 require('ts-node').register({
   // Specify the project file so ts-node doesn't try to find it itself based on the CWD.
-  project: path.resolve(__dirname, '../../../tsconfig.json'),
+  project: path.resolve(__dirname, '../../../../tsconfig.json'),
   compilerOptions: {
     module: 'commonjs',
   },

src/common/tools/commonjs/package.json

@@ -1,4 +1,4 @@
-export const version = require('child_process')
+export const version = (await import('child_process'))
   .execSync('git describe --always --abbrev=0 --dirty')
   .toString()
   .trim();

src/common/tools/setup-ts-in-node.js renamed to src/common/tools/commonjs/setup-ts-in-node.js

@@ -7,5 +7,5 @@
 // and every query in it is valid (e.g. renames have been applied, and new tests added
 // to the spreadsheet have also been added to the CTS).
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/checklist.ts');

src/common/tools/version.ts

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/dev_server.ts');

tools/checklist

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/gen_cache.ts');

tools/dev_server

@@ -3,5 +3,5 @@
 // Crawl a suite directory (e.g. src/webgpu/) to generate a listing.js containing
 // the listing of test files in the suite.
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/gen_listings.ts');

tools/gen_cache

@@ -5,7 +5,7 @@
 
 /* eslint-disable no-console */
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 const fs = require('fs');
 
 const myself = 'tools/gen_version';
@@ -14,7 +14,7 @@ if (!fs.existsSync(myself)) {
   process.exit(1);
 }
 
-const { version } = require('../src/common/tools/version.ts');
+const { version } = require('../src/common/tools/version.ts'); // FIXME doesn't work because in order to require the placeholder version.ts it needs to be commonjs, but we can't configure that for a single file
 
 fs.mkdirSync('./gen/common/internal', { recursive: true });
 // This will be copied into the various other build directories.

tools/gen_listings

@@ -35,5 +35,5 @@
 //   ?q=webgpu:a/bar:bar1={"x":3} <- [ Mac ]
 //   ?q=webgpu:a/bar:bar2~
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/gen_wpt_cts_html.ts');

tools/gen_version

@@ -3,7 +3,7 @@
 // See `docs/adding_timing_metadata.md` for an explanation of listing times, and
 // a walkthrough on adding entries for new tests.
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 
 // See the help message in this file for info on how to use the tool.
 require('../src/common/tools/merge_listing_times.ts');

tools/gen_wpt_cts_html

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

tools/merge_listing_times

@@ -2,5 +2,5 @@
 
 // Run test suites under node.
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/runtime/cmdline.ts');

tools/package.json

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/run_wpt_ref_tests.ts');

tools/run_node

@@ -2,5 +2,5 @@
 
 // Validate several properties of test files and the tests in them.
 
-require('../src/common/tools/setup-ts-in-node.js');
+require('../src/common/tools/commonjs/setup-ts-in-node.js');
 require('../src/common/tools/validate.ts');