From 6b9188026d44d80876b6244976f855857935162c Mon Sep 17 00:00:00 2001 From: Boshen Date: Thu, 29 Feb 2024 16:37:06 +0800 Subject: [PATCH] chore(deps): update npm dev dependencies --- .github/renovate.json | 4 +- package.json | 4 +- packages/rspack-cli/package.json | 2 +- .../rspack-plugin-html/tests/basic.spec.js | 5 +- packages/rspack-test-tools/src/case/diff.ts | 2 +- packages/rspack/package.json | 6 +-- .../rspack/tests/ConfigTestCases.template.js | 2 +- .../rspack/tests/HotTestCases.template.js | 2 +- .../rspack/tests/StatsTestCases.basictest.js | 2 +- packages/rspack/tests/TestCases.template.js | 5 +- .../rspack/tests/WatchTestCases.template.js | 5 +- pnpm-lock.yaml | 51 ++++++++++++------- scripts/diff.cjs | 2 +- webpack-test/BuildDependencies.longtest.js | 2 +- webpack-test/ChangesAndRemovals.test.js | 2 +- webpack-test/Compiler-caching.test.js | 2 +- webpack-test/ConfigTestCases.template.js | 2 +- webpack-test/HotTestCases.template.js | 2 +- webpack-test/MemoryLimitTestCases.test.js | 2 +- webpack-test/PersistentCaching.test.js | 2 +- webpack-test/ProfilingPlugin.test.js | 2 +- webpack-test/StatsTestCases.basictest.js | 2 +- webpack-test/TestCases.template.js | 2 +- webpack-test/WatchTestCases.template.js | 5 +- webpack-test/package.json | 6 +-- 25 files changed, 71 insertions(+), 52 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 666932ec93df..105063c505e7 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -58,7 +58,7 @@ "matchManagers": ["npm"], "matchDepTypes": ["devDependencies"], "excludePackagePrefixes": ["webpack"], - "excludePackageNames": ["@playwright/test", "react", "react-dom", "typescript", "pnpm"] + "excludePackageNames": ["@playwright/test", "react", "react-dom", "typescript", "pnpm", "copy-webpack-plugin", "internal-ip", "execa", "sass-loader"] }, { "groupName": "npm dependencies", @@ -69,7 +69,7 @@ { "groupName": "npm ignored dependencies", "matchManagers": ["npm"], - "matchPackageNames": ["@playwright/test", "react", "react-dom", "typescript", "pnpm"], + "matchPackageNames": ["@playwright/test", "react", "react-dom", "typescript", "pnpm", "copy-webpack-plugin", "internal-ip", "execa", "sass-loader"], "enabled": false }, { diff --git a/package.json b/package.json index 48af2c7628ef..eed882c7098b 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "oxlint": "0.2.10", "prettier": "3.2", "prettier-2": "npm:prettier@^2", - "rimraf": "3.0.2", + "rimraf": "5.0.5", "ts-jest": "29.1.2", "typescript": "5.0.2", "webpack": "5.90.0", @@ -69,4 +69,4 @@ "why-is-node-running": "2.2.2" }, "packageManager": "pnpm@8.14.3" -} \ No newline at end of file +} diff --git a/packages/rspack-cli/package.json b/packages/rspack-cli/package.json index a008d6d4cef7..94a7b0204e6c 100644 --- a/packages/rspack-cli/package.json +++ b/packages/rspack-cli/package.json @@ -34,7 +34,7 @@ "@types/webpack-bundle-analyzer": "^4.6.0", "concat-stream": "^2.0.0", "cross-env": "^7.0.3", - "execa": "^5.0.0", + "execa": "5.0.0", "internal-ip": "6.2.0", "source-map-support": "^0.5.19" }, diff --git a/packages/rspack-plugin-html/tests/basic.spec.js b/packages/rspack-plugin-html/tests/basic.spec.js index d042757e33ca..a4da99327bf1 100644 --- a/packages/rspack-plugin-html/tests/basic.spec.js +++ b/packages/rspack-plugin-html/tests/basic.spec.js @@ -3,7 +3,7 @@ const path = require("path"); const fs = require("fs"); const { rspack } = require("@rspack/core"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const _ = require("lodash"); const { default: HtmlWebpackPlugin, defaultTemplateCompiler } = require("../"); @@ -158,7 +158,8 @@ describe("HtmlWebpackPlugin", () => { jest.setTimeout(process.env.CI ? 120000 : 10000); beforeEach(done => { - rimraf(OUTPUT_DIR, done); + rimraf.sync(OUTPUT_DIR); + done(); }); it("generates a default index.html file for a single entry point", done => { diff --git a/packages/rspack-test-tools/src/case/diff.ts b/packages/rspack-test-tools/src/case/diff.ts index 04b9afd97946..7f11c5c53962 100644 --- a/packages/rspack-test-tools/src/case/diff.ts +++ b/packages/rspack-test-tools/src/case/diff.ts @@ -7,7 +7,7 @@ import { ECompareResultType, TModuleCompareResult } from "../"; -import rimraf from "rimraf"; +import { rimraf } from "rimraf"; const DEFAULT_CASE_CONFIG: Partial = { webpackPath: require.resolve("webpack"), diff --git a/packages/rspack/package.json b/packages/rspack/package.json index a55ccbc9453a..a91143079477 100644 --- a/packages/rspack/package.json +++ b/packages/rspack/package.json @@ -42,7 +42,7 @@ "@types/ws": "8.5.10", "babel-loader": "^9.1.0", "babel-plugin-import": "^1.13.5", - "copy-webpack-plugin": "5.1.2", + "copy-webpack-plugin": "5", "cross-env": "^7.0.3", "file-loader": "^6.2.0", "glob": "^10.3.10", @@ -55,8 +55,8 @@ "postcss-pxtorem": "^6.0.0", "pug-loader": "^2.4.0", "react-relay": "^16.0.0", - "sass": "^1.56.2", - "sass-loader": "^13.2.0", + "sass": "1.56.2", + "sass-loader": "13.2.0", "source-map": "^0.7.4", "styled-components": "^6.0.8", "terser": "5.27.2", diff --git a/packages/rspack/tests/ConfigTestCases.template.js b/packages/rspack/tests/ConfigTestCases.template.js index da78300ad321..7b2020539e02 100644 --- a/packages/rspack/tests/ConfigTestCases.template.js +++ b/packages/rspack/tests/ConfigTestCases.template.js @@ -6,7 +6,7 @@ const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); const { URL, pathToFileURL, fileURLToPath } = require("url"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const deprecationTracking = require("./helpers/deprecationTracking"); diff --git a/packages/rspack/tests/HotTestCases.template.js b/packages/rspack/tests/HotTestCases.template.js index 8bfcc9dd72a7..03fd4d4b4778 100644 --- a/packages/rspack/tests/HotTestCases.template.js +++ b/packages/rspack/tests/HotTestCases.template.js @@ -5,7 +5,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); diff --git a/packages/rspack/tests/StatsTestCases.basictest.js b/packages/rspack/tests/StatsTestCases.basictest.js index fbd56a914c22..521ec2c45af9 100644 --- a/packages/rspack/tests/StatsTestCases.basictest.js +++ b/packages/rspack/tests/StatsTestCases.basictest.js @@ -3,7 +3,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const captureStdio = require("./helpers/captureStdio"); const webpack = require(".."); diff --git a/packages/rspack/tests/TestCases.template.js b/packages/rspack/tests/TestCases.template.js index 7f7e41822886..796d271ca3d0 100644 --- a/packages/rspack/tests/TestCases.template.js +++ b/packages/rspack/tests/TestCases.template.js @@ -5,7 +5,7 @@ const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); const { pathToFileURL, URL } = require("url"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const deprecationTracking = require("./helpers/deprecationTracking"); @@ -242,7 +242,8 @@ const describeCases = config => { for (const fn of cleanups) fn(); }); beforeAll(done => { - rimraf(cacheDirectory, done); + rimraf.sync(cacheDirectory); + done(); }); if (config.cache) { it( diff --git a/packages/rspack/tests/WatchTestCases.template.js b/packages/rspack/tests/WatchTestCases.template.js index 23f384cce2d9..6da7a1ead7f0 100644 --- a/packages/rspack/tests/WatchTestCases.template.js +++ b/packages/rspack/tests/WatchTestCases.template.js @@ -5,7 +5,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const { remove } = require("./helpers/remove"); @@ -109,7 +109,8 @@ const describeCases = config => { .map(name => ({ name })); beforeAll(done => { - rimraf(tempDirectory, done); + rimraf.sync(tempDirectory); + done(); }); it( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 288e46341585..8830f7b079c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: npm:prettier@^2 version: /prettier@2.8.8 rimraf: - specifier: 3.0.2 - version: 3.0.2 + specifier: 5.0.5 + version: 5.0.5 ts-jest: specifier: 29.1.2 version: 29.1.2(@babel/core@7.23.2)(jest@29.7.0)(typescript@5.0.2) @@ -488,7 +488,7 @@ importers: specifier: ^1.13.5 version: 1.13.5 copy-webpack-plugin: - specifier: 5.1.2 + specifier: '5' version: 5.1.2(webpack@5.90.0) cross-env: specifier: ^7.0.3 @@ -527,10 +527,10 @@ importers: specifier: ^16.0.0 version: 16.2.0(react@18.2.0) sass: - specifier: ^1.56.2 + specifier: 1.56.2 version: 1.56.2 sass-loader: - specifier: ^13.2.0 + specifier: 13.2.0 version: 13.2.0(sass@1.56.2)(webpack@5.90.0) source-map: specifier: ^0.7.4 @@ -594,8 +594,8 @@ importers: specifier: ^7.0.3 version: 7.0.3 execa: - specifier: ^5.0.0 - version: 5.1.1 + specifier: 5.0.0 + version: 5.0.0 internal-ip: specifier: 6.2.0 version: 6.2.0 @@ -966,9 +966,6 @@ importers: '@types/node': specifier: ^20.9.4 version: 20.9.4 - '@types/rimraf': - specifier: 3.0.2 - version: 3.0.2 '@types/watchpack': specifier: ^2.4.0 version: 2.4.0 @@ -1038,14 +1035,11 @@ importers: react-relay: specifier: ^14.1.0 version: 14.1.0(react@18.2.0) - rimraf: - specifier: 3.0.2 - version: 3.0.2 sass: - specifier: ^1.56.2 + specifier: 1.56.2 version: 1.56.2 sass-loader: - specifier: ^13.2.0 + specifier: 13.2.0 version: 13.2.0(sass@1.56.2)(webpack@5.90.0) source-map: specifier: ^0.7.4 @@ -8904,7 +8898,7 @@ packages: resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==} engines: {node: '>= 10'} dependencies: - execa: 5.1.1 + execa: 5.0.0 /defaults@1.0.3: resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==} @@ -9495,6 +9489,20 @@ packages: md5.js: 1.3.5 safe-buffer: 5.2.1 + /execa@5.0.0: + resolution: {integrity: sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==} + engines: {node: '>=10'} + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 2.1.0 + is-stream: 2.0.1 + merge-stream: 2.0.0 + npm-run-path: 4.0.1 + onetime: 5.1.2 + signal-exit: 3.0.7 + strip-final-newline: 2.0.0 + /execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -9508,6 +9516,7 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 + dev: true /execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} @@ -11127,7 +11136,7 @@ packages: resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - execa: 5.1.1 + execa: 5.0.0 jest-util: 29.7.0 p-limit: 3.1.0 @@ -14506,6 +14515,14 @@ packages: dependencies: glob: 7.2.3 + /rimraf@5.0.5: + resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} + engines: {node: '>=14'} + hasBin: true + dependencies: + glob: 10.3.10 + dev: true + /ripemd160@2.0.2: resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==} dependencies: diff --git a/scripts/diff.cjs b/scripts/diff.cjs index f956921df9bb..5580a747cd08 100644 --- a/scripts/diff.cjs +++ b/scripts/diff.cjs @@ -1,6 +1,6 @@ // @ts-nocheck const { Tester, DiffProcessor, DiffStatsReporter, DiffHtmlReporter } = require("../packages/rspack-test-tools/dist"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const path = require("path"); const fs = require("fs-extra"); diff --git a/webpack-test/BuildDependencies.longtest.js b/webpack-test/BuildDependencies.longtest.js index 33fc8b8c64f6..dc170ba662f9 100644 --- a/webpack-test/BuildDependencies.longtest.js +++ b/webpack-test/BuildDependencies.longtest.js @@ -3,7 +3,7 @@ const path = require("path"); const child_process = require("child_process"); const fs = require("fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const cacheDirectory = path.resolve(__dirname, "js/buildDepsCache"); const outputDirectory = path.resolve(__dirname, "js/buildDeps"); diff --git a/webpack-test/ChangesAndRemovals.test.js b/webpack-test/ChangesAndRemovals.test.js index f6eba236b7b0..8b1c412bed28 100644 --- a/webpack-test/ChangesAndRemovals.test.js +++ b/webpack-test/ChangesAndRemovals.test.js @@ -5,7 +5,7 @@ const path = require("path"); const { createFsFromVolume, Volume } = require("memfs"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const createCompiler = config => { const webpack = require("@rspack/core").rspack; diff --git a/webpack-test/Compiler-caching.test.js b/webpack-test/Compiler-caching.test.js index ad58332a5c0a..68aac88c895f 100644 --- a/webpack-test/Compiler-caching.test.js +++ b/webpack-test/Compiler-caching.test.js @@ -4,7 +4,7 @@ const path = require("path"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); let fixtureCount = 0; diff --git a/webpack-test/ConfigTestCases.template.js b/webpack-test/ConfigTestCases.template.js index af692884c24a..7f820580cf98 100644 --- a/webpack-test/ConfigTestCases.template.js +++ b/webpack-test/ConfigTestCases.template.js @@ -6,7 +6,7 @@ const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); const { URL, pathToFileURL, fileURLToPath } = require("url"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const deprecationTracking = require("./helpers/deprecationTracking"); diff --git a/webpack-test/HotTestCases.template.js b/webpack-test/HotTestCases.template.js index bd6be58ae80a..4f2fb438b1de 100644 --- a/webpack-test/HotTestCases.template.js +++ b/webpack-test/HotTestCases.template.js @@ -5,7 +5,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const { normalizeFilteredTestName } = require("./lib/util/filterUtil"); diff --git a/webpack-test/MemoryLimitTestCases.test.js b/webpack-test/MemoryLimitTestCases.test.js index d0856944830e..06dcd6d7af37 100644 --- a/webpack-test/MemoryLimitTestCases.test.js +++ b/webpack-test/MemoryLimitTestCases.test.js @@ -3,7 +3,7 @@ // require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const captureStdio = require("./helpers/captureStdio"); const webpack = require("@rspack/core").rspack; const { normalizeFilteredTestName } = require("./lib/util/filterUtil") diff --git a/webpack-test/PersistentCaching.test.js b/webpack-test/PersistentCaching.test.js index dc4f4eb6f8a6..060591855b64 100644 --- a/webpack-test/PersistentCaching.test.js +++ b/webpack-test/PersistentCaching.test.js @@ -3,7 +3,7 @@ const path = require("path"); const util = require("util"); const fs = require("fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const vm = require("vm"); const readdir = util.promisify(fs.readdir); diff --git a/webpack-test/ProfilingPlugin.test.js b/webpack-test/ProfilingPlugin.test.js index e8abeb82be7f..2199585e8ba0 100644 --- a/webpack-test/ProfilingPlugin.test.js +++ b/webpack-test/ProfilingPlugin.test.js @@ -4,7 +4,7 @@ const path = require("path"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); describe.skip("Profiling Plugin", function () { jest.setTimeout(120000); diff --git a/webpack-test/StatsTestCases.basictest.js b/webpack-test/StatsTestCases.basictest.js index bb2b7aaf046c..c4eee1156b57 100644 --- a/webpack-test/StatsTestCases.basictest.js +++ b/webpack-test/StatsTestCases.basictest.js @@ -3,7 +3,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const captureStdio = require("./helpers/captureStdio"); const webpack = require(".."); const { normalizeFilteredTestName } = require('./lib/util/filterUtil') diff --git a/webpack-test/TestCases.template.js b/webpack-test/TestCases.template.js index 0833fa8f8af8..79143de39322 100644 --- a/webpack-test/TestCases.template.js +++ b/webpack-test/TestCases.template.js @@ -5,7 +5,7 @@ const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); const { pathToFileURL, URL } = require("url"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const deprecationTracking = require("./helpers/deprecationTracking"); diff --git a/webpack-test/WatchTestCases.template.js b/webpack-test/WatchTestCases.template.js index 5172449bc1cc..1a7100f5f777 100644 --- a/webpack-test/WatchTestCases.template.js +++ b/webpack-test/WatchTestCases.template.js @@ -5,7 +5,7 @@ require("./helpers/warmup-webpack"); const path = require("path"); const fs = require("graceful-fs"); const vm = require("vm"); -const rimraf = require("rimraf"); +const { rimraf } = require("rimraf"); const checkArrayExpectation = require("./checkArrayExpectation"); const createLazyTestEnv = require("./helpers/createLazyTestEnv"); const { remove } = require("./helpers/remove"); @@ -116,7 +116,8 @@ const describeCases = config => { .map(name => ({ name })); beforeAll(done => { - rimraf(tempDirectory, done); + rimraf.sync(tempDirectory); + done(); }); it( diff --git a/webpack-test/package.json b/webpack-test/package.json index 1e4b57d1cf6e..68872687a41e 100644 --- a/webpack-test/package.json +++ b/webpack-test/package.json @@ -18,7 +18,6 @@ "@rspack/plugin-minify": "workspace:^", "@rspack/plugin-node-polyfill": "workspace:^", "@types/node": "^20.9.4", - "@types/rimraf": "3.0.2", "@types/watchpack": "^2.4.0", "@types/webpack-sources": "3.2.0", "@types/ws": "8.5.3", @@ -42,9 +41,8 @@ "pug-loader": "^2.4.0", "raw-loader": "^4.0.2", "react-relay": "^14.1.0", - "rimraf": "3.0.2", - "sass": "^1.56.2", - "sass-loader": "^13.2.0", + "sass": "1.56.2", + "sass-loader": "13.2.0", "source-map": "^0.7.4", "terser": "5.16.1", "ts-node": "10.9.1",