From f4b82c25ba9238137763b07c1d8afec69f782573 Mon Sep 17 00:00:00 2001 From: Luud Janssen Date: Fri, 23 Apr 2021 13:03:47 +0200 Subject: [PATCH 1/2] fix(utils): use webpack object version if package can't be required fix(utils): use webpack object version if package can't be required --- lib/utils/is-webpack-1.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/utils/is-webpack-1.js b/lib/utils/is-webpack-1.js index a3fb40c..a015741 100644 --- a/lib/utils/is-webpack-1.js +++ b/lib/utils/is-webpack-1.js @@ -1,6 +1,8 @@ -// eslint-disable-next-line import/no-extraneous-dependencies -const webpackPkg = require('webpack/package.json'); +// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved, global-require +const webpackPkg = require('webpack/package.json') || {}; +// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved, global-require +const webpackVersion = webpackPkg.version || require('webpack').version; -const webpackMajorVersion = parseInt(webpackPkg.version.split('.')[0], 10); +const webpackMajorVersion = parseInt(webpackVersion.split('.')[0], 10); module.exports = webpackMajorVersion === 1; From c21e3dbf0c5d67cb1ed8c814aa42dbe96b1c85e0 Mon Sep 17 00:00:00 2001 From: Stanislav Germanovskii Date: Fri, 23 Apr 2021 14:07:47 +0300 Subject: [PATCH 2/2] chore(release): 6.0.6 --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a6559c..23d9c1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ 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. + +## [6.0.6](https://github.com/JetBrains/svg-sprite-loader/compare/v6.0.5...v6.0.6) (2021-04-23) + + +### Bug Fixes + +* **utils:** use webpack object version if package can't be required ([f4b82c2](https://github.com/JetBrains/svg-sprite-loader/commit/f4b82c2)) + + + ## [6.0.5](https://github.com/JetBrains/svg-sprite-loader/compare/v6.0.4...v6.0.5) (2021-04-10) diff --git a/package.json b/package.json index f24dda9..2da76ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "svg-sprite-loader", - "version": "6.0.5", + "version": "6.0.6", "description": "Webpack loader for creating SVG sprites", "keywords": [ "svg",