chore: use import instead of require to support modern NodeJS

vlsi · Jan 28, 2025 · a1c9e87 · a1c9e87
1 parent 72d88d9
commit a1c9e87
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -132,7 +132,7 @@ jobs:
         fetch-depth: 50
     - id: set-matrix
       run: |
-        node .github/workflows/matrix.js
+        node .github/workflows/matrix.mjs
 
   build-test:
     name: '${{ matrix.name }}'

diff --git a/.github/workflows/matrix.js → .github/workflows/matrix.mjs b/.github/workflows/matrix.js → .github/workflows/matrix.mjs
@@ -1,10 +1,10 @@
 // The script generates a random subset of valid jdk, os, timezone, and other axes.
-// You can preview the results by running "node matrix.js"
+// You can preview the results by running "node matrix.mjs"
 // See https://github.com/vlsi/github-actions-random-matrix
-let fs = require('fs');
-let os = require('os');
-const { RNG } = require('./rng');
-let {MatrixBuilder} = require('./matrix_builder');
+import { appendFileSync } from 'fs';
+import { EOL } from 'os';
+import { RNG } from './rng.mjs';
+import { MatrixBuilder } from './matrix_builder.mjs';
 const matrix = new MatrixBuilder();
 
 // Some of the filter conditions might become unsatisfiable, and by default
@@ -362,7 +362,7 @@ console.log(include);
 
 let filePath = process.env['GITHUB_OUTPUT'] || '';
 if (filePath) {
-    fs.appendFileSync(filePath, `matrix<<MATRIX_BODY${os.EOL}${JSON.stringify({include})}${os.EOL}MATRIX_BODY${os.EOL}`, {
+    appendFileSync(filePath, `matrix<<MATRIX_BODY${EOL}${JSON.stringify({include})}${EOL}MATRIX_BODY${EOL}`, {
         encoding: 'utf8'
     });
 }
diff --git a/.github/workflows/matrix_builder.js → .github/workflows/matrix_builder.mjs b/.github/workflows/matrix_builder.js → .github/workflows/matrix_builder.mjs
@@ -1,7 +1,7 @@
 // License: Apache-2.0
 // Copyright Vladimir Sitnikov, 2021
 // See https://github.com/vlsi/github-actions-random-matrix
-const { RNG } = require('./rng');
+import { RNG } from './rng.mjs';
 
 class Axis {
   constructor({name, title, values}) {
@@ -253,4 +253,4 @@ class MatrixBuilder {
   }
 }
 
-module.exports = {Axis, MatrixBuilder};
+export { Axis, MatrixBuilder };
diff --git a/.github/workflows/rng.js → .github/workflows/rng.mjs b/.github/workflows/rng.js → .github/workflows/rng.mjs
@@ -1,6 +1,6 @@
-const fs = require('fs');
-const crypto = require('crypto');
-const seedrandom = require('./seedrandom');
+import { appendFileSync } from 'fs';
+import { randomBytes } from 'crypto';
+import { default as seedrandom } from './seedrandom.js';
 
 function genSeedText() {
     const { RNG_SEED } = process.env;
@@ -14,7 +14,7 @@ function genSeedText() {
         return 'pr_' + GITHUB_PR_NUMBER;
     }
     // Otherwise generate a random seed. Note that we do not actually care
-    return 'seed_' + Date.now() + '_' + crypto.randomBytes(16).toString('hex');
+    return 'seed_' + Date.now() + '_' + randomBytes(16).toString('hex');
 }
 
 function createRNG() {
@@ -25,7 +25,7 @@ function createRNG() {
     console.log('Initialized RNG with RNG_SEED = %s', seedText);
     console.log('::endgroup::');
     if (process.env.GITHUB_STEP_SUMMARY) {
-        fs.appendFileSync(process.env.GITHUB_STEP_SUMMARY, [
+        appendFileSync(process.env.GITHUB_STEP_SUMMARY, [
             '# Random Number Generator Seed',
             'To regenerate this matrix in a different build, run it with the following seed:',
             '',
@@ -41,4 +41,4 @@ function createRNG() {
     };
 }
 
-module.exports.RNG = createRNG();
+export const RNG = createRNG();