From e8873f46b4ac3cf94d854d8c20f0d0a444309eb6 Mon Sep 17 00:00:00 2001 From: Alexander Akait <4567934+alexander-akait@users.noreply.github.com> Date: Sun, 28 May 2023 04:35:43 +0300 Subject: [PATCH 1/2] fix: use `cause` to keep original errors and warnings (#655) --- src/utils.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/utils.js b/src/utils.js index 0c7423bb..01b53339 100644 --- a/src/utils.js +++ b/src/utils.js @@ -559,55 +559,55 @@ function reportError(loaderContext, callback, error) { } } -function warningFactory(obj) { +function warningFactory(warning) { let message = ""; - if (typeof obj.line !== "undefined") { - message += `(${obj.line}:${obj.column}) `; + if (typeof warning.line !== "undefined") { + message += `(${warning.line}:${warning.column}) `; } - if (typeof obj.plugin !== "undefined") { - message += `from "${obj.plugin}" plugin: `; + if (typeof warning.plugin !== "undefined") { + message += `from "${warning.plugin}" plugin: `; } - message += obj.text; + message += warning.text; - if (obj.node) { - message += `\n\nCode:\n ${obj.node.toString()}\n`; + if (warning.node) { + message += `\n\nCode:\n ${warning.node.toString()}\n`; } - const warning = new Error(message); + const obj = new Error(message, { cause: warning }); - warning.stack = null; + obj.stack = null; - return warning; + return obj; } -function syntaxErrorFactory(obj) { +function syntaxErrorFactory(error) { let message = "\nSyntaxError\n\n"; - if (typeof obj.line !== "undefined") { - message += `(${obj.line}:${obj.column}) `; + if (typeof error.line !== "undefined") { + message += `(${error.line}:${error.column}) `; } - if (typeof obj.plugin !== "undefined") { - message += `from "${obj.plugin}" plugin: `; + if (typeof error.plugin !== "undefined") { + message += `from "${error.plugin}" plugin: `; } - message += obj.file ? `${obj.file} ` : " "; - message += `${obj.reason}`; + message += error.file ? `${error.file} ` : " "; + message += `${error.reason}`; - const code = obj.showSourceCode(); + const code = error.showSourceCode(); if (code) { message += `\n\n${code}\n`; } - const error = new Error(message); + const obj = new Error(message, { cause: error }); - error.stack = null; + obj.stack = null; - return error; + return obj; } export { From c058a0612fc04b9a5a17c4a5f808bee38940aee4 Mon Sep 17 00:00:00 2001 From: "alexander.akait" Date: Sun, 28 May 2023 04:36:04 +0300 Subject: [PATCH 2/2] chore(release): 7.3.2 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3ed280..41fa2fea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [7.3.2](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.1...v7.3.2) (2023-05-28) + + +### Bug Fixes + +* use `cause` to keep original errors and warnings ([#655](https://github.com/webpack-contrib/postcss-loader/issues/655)) ([e8873f4](https://github.com/webpack-contrib/postcss-loader/commit/e8873f46b4ac3cf94d854d8c20f0d0a444309eb6)) + ### [7.3.1](https://github.com/webpack-contrib/postcss-loader/compare/v7.3.0...v7.3.1) (2023-05-26) diff --git a/package-lock.json b/package-lock.json index 4ee3dc57..1828a7cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "postcss-loader", - "version": "7.3.1", + "version": "7.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3a620a29..8f5ddb58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "postcss-loader", - "version": "7.3.1", + "version": "7.3.2", "description": "PostCSS loader for webpack", "license": "MIT", "repository": "webpack-contrib/postcss-loader",