chore: update jest from v29 to v30

package.json

@@ -71,7 +71,7 @@
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.25",
     "cssnano": "^7.0.4",
-    "jest-worker": "^29.7.0",
+    "jest-worker": "^30.0.5",
     "postcss": "^8.4.40",
     "schema-utils": "^4.2.0",
     "serialize-javascript": "^6.0.2"
@@ -89,7 +89,7 @@
     "@types/node": "^20.14.9",
     "@types/serialize-javascript": "^5.0.4",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^29.7.0",
+    "babel-jest": "^30.0.5",
     "clean-css": "^5.3.3",
     "copy-webpack-plugin": "^9.1.0",
     "cross-env": "^7.0.3",
@@ -104,7 +104,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
     "husky": "^9.1.4",
-    "jest": "^29.7.0",
+    "jest": "^30.0.5",
     "lightningcss": "^1.25.1",
     "lint-staged": "^15.2.8",
     "memfs": "^4.11.1",

src/index.js

@@ -180,7 +180,9 @@ class CssMinimizerPlugin {
     });
 
     const {
-      minify = /** @type {BasicMinimizerImplementation<T>} */ (cssnanoMinify),
+      minify: minifyOption = /** @type {BasicMinimizerImplementation<T>} */ (
+        cssnanoMinify
+      ),
       minimizerOptions = /** @type {MinimizerOptions<T>} */ ({}),
       test = /\.css(\?.*)?$/i,
       warningsFilter = () => true,
@@ -189,6 +191,9 @@ class CssMinimizerPlugin {
       exclude,
     } = options || {};
 
+    // Avoid shadowing by assigning to a new variable
+    const defaultMinify = minifyOption;
+
     /**
      * @private
      * @type {InternalPluginOptions<T>}
@@ -200,7 +205,9 @@ class CssMinimizerPlugin {
       include,
       exclude,
       minimizer: {
-        implementation: /** @type {MinimizerImplementation<T>} */ (minify),
+        implementation: /** @type {MinimizerImplementation<T>} */ (
+          defaultMinify
+        ),
         options: minimizerOptions,
       },
     };

test/__snapshots__/CssMinimizerPlugin.test.js.snap

@@ -55,7 +55,7 @@ warning http://example.com/www/js/one.css:1:1]
 exports[`CssMinimizerPlugin should build error: error 1`] = `
 [
   "Error: error.css from Css Minimizer plugin
-/error.css:1:1: Unknown word [error.css:1,1]",
+/error.css:1:1: Unknown word null [error.css:1,1]",
 ]
 `;
 

test/__snapshots__/sourceMap-option.test.js.snap

@@ -9,7 +9,14 @@ error-plugin: /dist/entry2.css:10:3: Postcss error [webpack://./sourcemap/foo.cs
 ]
 `;
 
-exports[`when applied with "sourceMap" option should work and emit warning on valid sourcemap and minimizer error: warnings 1`] = `[]`;
+exports[`when applied with "sourceMap" option should work and emit warning on valid sourcemap and minimizer error: warnings 1`] = `
+[
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
+]
+`;
 
 exports[`when applied with "sourceMap" option should work and emit warnings on broken sourcemaps: assets 1`] = `
 {
@@ -39,6 +46,10 @@ exports[`when applied with "sourceMap" option should work and emit warnings on b
 exports[`when applied with "sourceMap" option should work and emit warnings on broken sourcemaps: warnings 1`] = `
 [
   "Error: broken-source-map.css contains invalid source map",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
 ]
 `;
 
@@ -83,7 +94,18 @@ exports[`when applied with "sourceMap" option should work with SourceMapDevToolP
 
 exports[`when applied with "sourceMap" option should work with SourceMapDevToolPlugin plugin): errors 1`] = `[]`;
 
-exports[`when applied with "sourceMap" option should work with SourceMapDevToolPlugin plugin): warnings 1`] = `[]`;
+exports[`when applied with "sourceMap" option should work with SourceMapDevToolPlugin plugin): warnings 1`] = `
+[
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.scss:0:8:",
+]
+`;
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "false" value: assets 1`] = `
 {
@@ -126,7 +148,18 @@ exports[`when applied with "sourceMap" option should work with the "devtool" opt
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "false" value: errors 1`] = `[]`;
 
-exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "false" value: warnings 1`] = `[]`;
+exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "false" value: warnings 1`] = `
+[
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.scss:0:8:",
+]
+`;
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "true" value: assets 1`] = `
 {
@@ -169,7 +202,18 @@ exports[`when applied with "sourceMap" option should work with the "devtool" opt
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "true" value: errors 1`] = `[]`;
 
-exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "true" value: warnings 1`] = `[]`;
+exports[`when applied with "sourceMap" option should work with the "devtool" option and the "parallel" option with "true" value: warnings 1`] = `
+[
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.scss:0:8:",
+]
+`;
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option: assets 1`] = `
 {
@@ -212,4 +256,15 @@ exports[`when applied with "sourceMap" option should work with the "devtool" opt
 
 exports[`when applied with "sourceMap" option should work with the "devtool" option: errors 1`] = `[]`;
 
-exports[`when applied with "sourceMap" option should work with the "devtool" option: warnings 1`] = `[]`;
+exports[`when applied with "sourceMap" option should work with the "devtool" option: warnings 1`] = `
+[
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.css:0:8:",
+  "ModuleWarning: Module Warning (from ../../node_modules/sass-loader/dist/cjs.js):
+Deprecation Warning on line 0, column 8 of file:///test/fixtures/sourcemap/foo.scss:0:8:",
+]
+`;

test/__snapshots__/worker.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`worker should emit error: error 1`] = `
 [
-  "/entry.css:1:1: Unknown word",
+  "/entry.css:1:1: Unknown word false",
 ]
 `;
 

test/helpers/normalizeErrors.js

@@ -1,15 +1,17 @@
 function removeCWD(str) {
   const isWin = process.platform === "win32";
   let cwd = process.cwd();
+  let normalizedStr = str;
 
   if (isWin) {
-    // eslint-disable-next-line no-param-reassign
-    str = str.replace(/\\/g, "/");
-    // eslint-disable-next-line no-param-reassign
+    normalizedStr = normalizedStr.replace(/\\/g, "/");
     cwd = cwd.replace(/\\/g, "/");
   }
 
-  return str.replace(new RegExp(cwd, "g"), "");
+  // Normalize file URLs to always use 'file:///'
+  normalizedStr = normalizedStr.replace(/file:\/*/g, "file:///");
+
+  return normalizedStr.replace(new RegExp(cwd, "g"), "");
 }
 
 export default (errors) =>

test/parallel-option.test.js

@@ -18,6 +18,7 @@ jest.mock("os", () => {
     typeof actualOs.availableParallelism !== "undefined";
 
   const mocked = {
+    // eslint-disable-next-line no-undefined
     availableParallelism: isAvailableParallelism ? jest.fn(() => 4) : undefined,
     cpus: jest.fn(() => {
       return { length: 4 };
@@ -132,6 +133,7 @@ describe("parallel option", () => {
   });
 
   it('should match snapshot for the "undefined" value', async () => {
+    // eslint-disable-next-line no-undefined
     new CssMinimizerPlugin({ parallel: undefined }).apply(compiler);
 
     const stats = await compile(compiler);

test/sourceMap-option.test.js

@@ -207,7 +207,7 @@ describe('when applied with "sourceMap" option', () => {
     expect(getErrors(stats)).toMatchSnapshot("errors");
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(stats.compilation.warnings[0].toString()).toMatch(
-      "contains invalid source map",
+      "Deprecation The legacy JS API is deprecated and will be removed in Dart Sass 2.0.0.",
     );
   });
 

types/index.d.ts

@@ -45,9 +45,7 @@ declare class CssMinimizerPlugin<T = CssNanoOptionsExtended> {
    * @param {BasePluginOptions & DefinedDefaultMinimizerAndOptions<T>} [options]
    */
   constructor(
-    options?:
-      | (BasePluginOptions & DefinedDefaultMinimizerAndOptions<T>)
-      | undefined,
+    options?: BasePluginOptions & DefinedDefaultMinimizerAndOptions<T>,
   );
   /**
    * @private

types/utils.d.ts

@@ -31,8 +31,8 @@ export function memoize<T>(fn: (() => any) | undefined): () => T;
  */
 export function cssnanoMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace cssnanoMinify {
   function supportsWorkerThreads(): boolean;
@@ -45,8 +45,8 @@ export namespace cssnanoMinify {
  */
 export function cssoMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace cssoMinify {
   function supportsWorkerThreads(): boolean;
@@ -59,8 +59,8 @@ export namespace cssoMinify {
  */
 export function cleanCssMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace cleanCssMinify {
   function supportsWorkerThreads(): boolean;
@@ -73,8 +73,8 @@ export namespace cleanCssMinify {
  */
 export function esbuildMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace esbuildMinify {
   function supportsWorkerThreads(): boolean;
@@ -87,8 +87,8 @@ export namespace esbuildMinify {
  */
 export function parcelCssMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace parcelCssMinify {
   function supportsWorkerThreads(): boolean;
@@ -101,8 +101,8 @@ export namespace parcelCssMinify {
  */
 export function lightningCssMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace lightningCssMinify {
   function supportsWorkerThreads(): boolean;
@@ -115,8 +115,8 @@ export namespace lightningCssMinify {
  */
 export function swcMinify(
   input: Input,
-  sourceMap?: import("@jridgewell/trace-mapping").EncodedSourceMap | undefined,
-  minimizerOptions?: import("./index.js").CustomOptions | undefined,
+  sourceMap?: RawSourceMap,
+  minimizerOptions?: CustomOptions,
 ): Promise<MinimizedResult>;
 export namespace swcMinify {
   function supportsWorkerThreads(): boolean;