refactor(deps): upgrade to latest glob, rimraf and minimatch (#4040)

Upgrade to the latest `glob`, `rimraf` and `minimatch` versions and do minor refactoring. Also remove `mkdirp`, since it is no longer needed.

Author: nicojs

e2e/package-lock.json

@@ -34,7 +34,6 @@
     "karma-mocha": "2.0.1",
     "karma-sourcemap-loader": "0.4.0",
     "karma-webpack": "5.0.0",
-    "load-grunt-tasks": "5.1.0",
     "mocha": "10.2.0",
     "mutation-testing-metrics": "1.7.14",
     "mutation-testing-report-schema": "1.7.14",

e2e/package.json

@@ -1,6 +1,5 @@
 import { promises as fsPromises } from 'fs';
 import path from 'path';
-import { promisify } from 'util';
 import { fileURLToPath, URL } from 'url';
 
 import chai from 'chai';
@@ -13,7 +12,6 @@ import { expectMetricsJsonToMatchSnapshot } from '../../../helpers.js';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
-const rm = promisify(rimraf);
 
 const rootResolve = path.resolve.bind(path, fileURLToPath(new URL('..', import.meta.url)));
 
@@ -29,8 +27,8 @@ describe('in place', () => {
     originalAddJSContent = await readAddJS();
   });
   afterEach(async () => {
-    await rm(rootResolve('reports'));
-    await rm(rootResolve('.lock'));
+    await rimraf(rootResolve('reports'));
+    await rimraf(rootResolve('.lock'));
   });
   it('should reset files after a successful run', async () => {
     execaSync('stryker', ['run']);

e2e/test/in-place/verify/verify.js

@@ -37,7 +37,7 @@ describe('The Stryker meta schema', () => {
   });
   it('should invalidate an invalid schema', async () => {
     expect(validator(invalid)).false;
-    expect(validator.errors).deep.eq(expectedErrors);
+    expect(validator.errors.sort(orderByInstancePath)).deep.eq(expectedErrors);
   });
   const expectedErrors = [
     {
@@ -94,5 +94,15 @@ describe('The Stryker meta schema', () => {
       },
       message: 'must be object',
     },
-  ];
+  ].sort(orderByInstancePath);
+
+  /**
+   *
+   * @param {import('ajv').ErrorObject} a
+   * @param {import('ajv').ErrorObject} b
+   * @returns {number}
+   */
+  function orderByInstancePath(a, b) {
+    return a.instancePath.localeCompare(b.instancePath);
+  }
 });

e2e/test/mono-schema/verify/verify.js

@@ -5,7 +5,7 @@
   "description": "A module to perform an integration test",
   "main": "index.js",
   "scripts": {
-    "clean": "rimraf dist",
+    "clean": "rimraf dist .stryker-tmp reports",
     "prebuild": "npm run clean",
     "build": "tsc -b tsconfig.json",
     "pretest:unit": "npm run build",
@@ -16,7 +16,7 @@
   },
   "mocha": {
     "spec":  [
-      "test/**/*.js"
+      "dist/test/*.js"
     ]
   },
   "author": "",

e2e/test/typescript-project-references/package.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.settings",
   "compilerOptions": {
-    "outDir": "../dist/src"
+    "outDir": "../../dist/core"
   },
   "references": [
     { "path": "../utils" }

e2e/test/typescript-project-references/src/core/tsconfig.json

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import {start} from '../src/core/job';
+import {start} from '../core/job';
 
 describe(start.name, () => {
   it('should format a correct message', () => {

e2e/test/typescript-project-references/src/core/tsconfig.tsbuildinfo

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.settings",
+  "compilerOptions": {
+    "outDir": "../../dist/test",
+    "types": ["mocha"]
+  },
+  "references": [
+    { "path": "../core" }
+  ]
+}

e2e/test/typescript-project-references/test/job.spec.ts e2e/test/typescript-project-references/src/test/job.spec.ts

@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.settings",
   "compilerOptions": {
-    "outDir": "../dist/utils",
+    "outDir": "../../dist/utils",
   }
 }

e2e/test/typescript-project-references/src/test/tsconfig.json

@@ -7,7 +7,6 @@
   "coverageAnalysis": "perTest",
   "reporters": ["json", "html", "progress", "clear-text"],
   "checkers": ["typescript"],
-  "tsconfigFile": "src/core/tsconfig.json",
   "fileLogLevel": "warn",
   "buildCommand": "npm run build",
   "plugins": [

e2e/test/typescript-project-references/src/utils/tsconfig.json

@@ -1,3 +1,8 @@
 {
-  "include": ["src/core", "src/utils", "test"]
+  "files": [],
+  "references": [
+    { "path": "src/core" },
+    { "path": "src/utils" },
+    { "path": "src/test" }
+  ]
 }

e2e/test/typescript-project-references/src/utils/tsconfig.tsbuildinfo

@@ -1,17 +1,19 @@
 {
   "compilerOptions": {
     "strict": true,
-    "target": "es5",
+    "target": "es2019",
     "moduleResolution": "node",
     "module": "commonjs",
+    "lib": ["es2019"],
     "composite": true,
     "declaration": true,
     "declarationMap": true,
 
     // These settings should be overridden by the typescript checker
     "noUnusedLocals": true,
     "noUnusedParameters": true,
+    "skipLibCheck": true,
 
-    "types": []
+    "types": ["node"]
   }
 }

e2e/test/typescript-project-references/stryker.conf.json

@@ -1,27 +1,11 @@
 // @ts-check
 import { LocalInstaller, progress } from 'install-local';
 import fs from 'fs';
-import glob from 'glob';
 import path from 'path';
 
-console.log('starting installation of local dependencies');
+import { glob } from 'glob';
 
-/**
- * @param {string} pattern 
- * @param {glob.IOptions} options 
- * @returns {Promise<string[]>}
- */
-function globAsPromised(pattern, options) {
-  return new Promise((res, rej) => {
-    glob(pattern, options, (err, matches) => {
-      if (err) {
-        rej(err);
-      } else {
-        res(matches);
-      }
-    });
-  });
-}
+console.log('starting installation of local dependencies');
 
 /**
  * @typedef Package
@@ -37,23 +21,26 @@ function globAsPromised(pattern, options) {
  */
 export async function bootstrapLocalDependencies(directory, packageJsonGlobs = ['package.json', 'test/*/package.json']) {
   console.log(`bootstrap ${path.resolve(directory)} (using ${packageJsonGlobs.join(',')})`);
-  const files = (await Promise.all(packageJsonGlobs.map((globPattern) => globAsPromised(globPattern, { cwd: path.resolve(directory) })))).flat();
-  const packages = await Promise.all(files.map(fileName => fs.promises.readFile(fileName, 'utf-8')
-    .then((rawContent) => {
-      /**
-       * @type {Package}
-       */
-      const content = JSON.parse(rawContent);
-      return { dir: path.dirname(fileName), content };
-    })));
+  const files = (await Promise.all(packageJsonGlobs.map((globPattern) => glob(globPattern, { cwd: path.resolve(directory) })))).flat();
+  const packages = await Promise.all(
+    files.map((fileName) =>
+      fs.promises.readFile(fileName, 'utf-8').then((rawContent) => {
+        /**
+         * @type {Package}
+         */
+        const content = JSON.parse(rawContent);
+        return { dir: path.dirname(fileName), content };
+      })
+    )
+  );
   /**
    * @type {import('install-local').ListByPackage}
    */
   const sourcesByTarget = {};
   for (const pkg of packages) {
     const localDeps = pkg.content.localDependencies;
     if (localDeps) {
-      sourcesByTarget[path.resolve(pkg.dir)] = Object.keys(localDeps).map(key => path.resolve(pkg.dir, localDeps[key]));
+      sourcesByTarget[path.resolve(pkg.dir)] = Object.keys(localDeps).map((key) => path.resolve(pkg.dir, localDeps[key]));
     }
   }
   const localInstaller = new LocalInstaller(sourcesByTarget);

e2e/test/typescript-project-references/tsconfig.json

@@ -6,15 +6,11 @@
     "@types/chai": "4.3.4",
     "@types/chai-as-promised": "7.1.5",
     "@types/chai-jest-snapshot": "1.3.6",
-    "@types/glob": "8.1.0",
     "@types/istanbul": "0.4.30",
     "@types/karma": "6.3.3",
     "@types/lodash": "4.14.191",
-    "@types/minimatch": "5.1.2",
-    "@types/mkdirp": "1.0.2",
     "@types/mocha": "10.0.1",
     "@types/node": "18.15.3",
-    "@types/rimraf": "3.0.2",
     "@types/sinon": "10.0.13",
     "@types/sinon-chai": "3.2.9",
     "@types/source-map-support": "0.5.6",
@@ -32,16 +28,16 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-unicorn": "46.0.0",
     "execa": "7.1.1",
-    "glob": "8.1.0",
+    "glob": "9.3.0",
     "install-local": "3.0.1",
     "jasmine": "4.6.0",
     "jasmine-core": "4.6.0",
     "json-schema-to-typescript": "12.0.0",
     "lerna": "6.5.1",
-    "minimatch": "5.1.6",
+    "minimatch": "7.4.2",
     "mocha": "10.2.0",
     "prettier": "2.8.4",
-    "rimraf": "3.0.2",
+    "rimraf": "4.4.0",
     "sinon": "15.0.2",
     "sinon-chai": "3.7.0",
     "source-map-support": "0.5.21",
@@ -52,7 +48,7 @@
     "postinstall": "lerna bootstrap",
     "lint": "eslint . --resolve-plugins-relative-to . --ext .ts,.js",
     "lint:fix": "npm run lint -- --fix",
-    "clean": "rimraf \"packages/*/{.nyc_output,reports,coverage,src-generated,*.tsbuildinfo,.stryker-tmp,dist,testResources/tmp}\" \"packages/core/schema/stryker-schema.json\"",
+    "clean": "rimraf --glob \"packages/*/{.nyc_output,reports,coverage,src-generated,*.tsbuildinfo,.stryker-tmp,dist,testResources/tmp}\" \"packages/core/schema/stryker-schema.json\"",
     "generate": "node tasks/generate-json-schema-to-ts.js && node tasks/generate-mono-schema.js",
     "prebuild": "npm run generate",
     "build": "tsc -b && lerna run build",

e2e/test/typescript-project-references/tsconfig.settings.json

@@ -68,19 +68,18 @@
     "execa": "~7.1.0",
     "file-url": "~4.0.0",
     "get-port": "~6.1.0",
-    "glob": "~8.1.0",
+    "glob": "~9.3.0",
     "inquirer": "~9.1.0",
     "lodash.flatmap": "~4.5.0",
     "lodash.groupby": "~4.6.0",
     "log4js": "~6.9.0",
-    "minimatch": "~5.1.0",
-    "mkdirp": "~2.1.0",
+    "minimatch": "~7.4.2",
     "mutation-testing-elements": "1.7.14",
     "mutation-testing-metrics": "1.7.14",
     "mutation-testing-report-schema": "1.7.14",
     "npm-run-path": "~5.1.0",
     "progress": "~2.0.0",
-    "rimraf": "~3.0.0",
+    "rimraf": "~4.4.0",
     "rxjs": "~7.8.0",
     "semver": "^7.3.5",
     "source-map": "~0.7.3",
@@ -96,7 +95,6 @@
     "@types/inquirer": "9.0.3",
     "@types/lodash.flatmap": "4.5.7",
     "@types/lodash.groupby": "4.6.7",
-    "@types/minimatch": "5.1.2",
     "@types/node": "18.15.3",
     "@types/progress": "2.0.5",
     "@types/semver": "7.3.13",

helpers/bootstrap-local-dependencies.js

@@ -1,8 +1,6 @@
 import path from 'path';
 import { createReadStream, createWriteStream, promises as fs } from 'fs';
 
-import mkdirp from 'mkdirp';
-
 export const reporterUtil = {
   copyFile(fromFilename: string, toFilename: string): Promise<void> {
     return new Promise<void>((resolve, reject) => {
@@ -15,10 +13,8 @@ export const reporterUtil = {
     });
   },
 
-  mkdir: mkdirp,
-
   async writeFile(fileName: string, content: string): Promise<void> {
-    await mkdirp(path.dirname(fileName));
+    await fs.mkdir(path.dirname(fileName), { recursive: true });
     await fs.writeFile(fileName, content, 'utf8');
   },
 };

package-lock.json

@@ -1,12 +1,11 @@
 import path from 'path';
 import fs from 'fs';
-import { promisify } from 'util';
 
 import rimraf from 'rimraf';
 import { isErrnoException } from '@stryker-mutator/util';
 
 export const fileUtils = {
-  deleteDir: promisify(rimraf),
+  deleteDir: rimraf,
 
   async cleanFolder(folderName: string): Promise<string | undefined> {
     try {

package.json

@@ -1,16 +1,12 @@
 import os from 'os';
 import path from 'path';
 import { promises as fsPromises } from 'fs';
-import { promisify } from 'util';
 
-import mkdirp from 'mkdirp';
 import { expect } from 'chai';
-import nodeGlob from 'glob';
+import { glob } from 'glob';
 
 import { fileUtils } from '../../../src/utils/file-utils.js';
 
-const glob = promisify(nodeGlob);
-
 describe('fileUtils', () => {
   describe('moveDirectoryRecursiveSync', () => {
     const from = path.resolve(os.tmpdir(), 'moveDirectoryRecursiveSyncFrom');
@@ -95,7 +91,7 @@ describe('fileUtils', () => {
   async function writeAll(files: Record<string, string>): Promise<void> {
     await Promise.all(
       Object.entries(files).map(async ([fileName, fileContent]) => {
-        await mkdirp(path.dirname(fileName));
+        await fsPromises.mkdir(path.dirname(fileName), { recursive: true });
         await fsPromises.writeFile(fileName, fileContent);
       })
     );

packages/core/package-lock.json

@@ -44,7 +44,6 @@
   },
   "devDependencies": {
     "@stryker-mutator/test-helpers": "6.4.1",
-    "@types/glob": "8.1.0",
     "@types/node": "18.15.3"
   },
   "peerDependencies": {

packages/core/package.json

@@ -1,28 +1,22 @@
 // @ts-check
-import fs from 'fs';
+import { writeFile, mkdir, readFile } from 'fs/promises';
 import path from 'path';
-
-import { promisify } from 'util';
 import { fileURLToPath } from 'url';
 
-import glob from 'glob';
+import { glob } from 'glob';
 import { compile } from 'json-schema-to-typescript';
 
-const writeFile = promisify(fs.writeFile);
-const mkdir = promisify(fs.mkdir);
-
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
 const resolveFromParent = path.resolve.bind(path, dirname, '..');
-const globAsPromised = promisify(glob);
 
 /**
  *
  * @param {string} schemaFile
  */
 async function generate(schemaFile) {
   const parsedFile = path.parse(schemaFile);
-  const schema = preprocessSchema(JSON.parse(await fs.promises.readFile(schemaFile, 'utf-8')));
+  const schema = preprocessSchema(JSON.parse(await readFile(schemaFile, 'utf-8')));
   const resolveOutputDir = path.resolve.bind(path, parsedFile.dir, '..', 'src-generated');
   const outFile = resolveOutputDir(`${parsedFile.name}.ts`);
   await mkdir(resolveOutputDir(), { recursive: true });
@@ -52,7 +46,7 @@ async function generate(schemaFile) {
 }
 
 async function generateAllSchemas() {
-  const files = await globAsPromised('packages/!(core)/schema/*.json', { cwd: resolveFromParent() });
+  const files = await glob('packages/!(core)/schema/*.json', { cwd: resolveFromParent() });
   await Promise.all(files.map((fileName) => generate(resolveFromParent(fileName))));
 }
 generateAllSchemas().catch((err) => {

packages/core/src/reporters/reporter-util.ts

@@ -1,24 +1,18 @@
 // @ts-check
-import { writeFile as _writeFile, readFile as _readFile, mkdir as _mkdir } from 'fs';
+import { writeFile, readFile, mkdir } from 'fs/promises';
 import path from 'path';
-
-import { promisify } from 'util';
 import { fileURLToPath } from 'url';
 
-import glob from 'glob';
+import { glob } from 'glob';
 
-const writeFile = promisify(_writeFile);
-const readFile = promisify(_readFile);
-const mkdir = promisify(_mkdir);
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 const resolveFromParent = path.resolve.bind(path, dirname, '..');
-const globAsPromised = promisify(glob);
 
 /**
  * Build the mono schema based on all schemas from the plugin as well as the Stryker core schema
  */
 async function buildMonoSchema() {
-  const schemaFiles = await globAsPromised('packages/!(core)/schema/*.json', { cwd: resolveFromParent() });
+  const schemaFiles = await glob('packages/!(core)/schema/*.json', { cwd: resolveFromParent() });
   const allContent = await Promise.all(schemaFiles.map((schemaFile) => readFile(resolveFromParent(schemaFile), 'utf8')));
   const allSchemas = allContent.map((content) => JSON.parse(content));
   const monoSchema = {