diff --git a/CHANGELOG.md b/CHANGELOG.md index 81fc0c72f..be886b7b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [17.2.1](https://github.com/vuejs/vue-loader/compare/v17.1.2...v17.2.1) (2023-06-01) + + +### Features + +* A new `experimentalInlineMatchResource` option (webpack 5 only), which leverages webpack 5's inline match resource feature and works well with the [`experiments.css`](https://webpack.js.org/configuration/experiments/#experimentscss) feature ([#2046](https://github.com/vuejs/vue-loader/issues/2046)) ([3149f6d](https://github.com/vuejs/vue-loader/commit/3149f6d69c2f456bdcfa23acc0da93473a93a764)) + + +Note: v17.2.0 was released by accident, it has the same content as v17.1.2, therefore not included in the changelog. + + ## [17.1.2](https://github.com/vuejs/vue-loader/compare/v17.1.1...v17.1.2) (2023-05-29) diff --git a/README.md b/README.md index b3f34888c..aae03ae3d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ - [Documentation](https://vue-loader.vuejs.org) -## v17.1+ Only Options +## v17.2.1+ Only Options - `experimentalInlineMatchResource: boolean`: enable [Inline matchResource](https://webpack.js.org/api/loaders/#inline-matchresource) for rule matching for vue-loader. diff --git a/package.json b/package.json index 45c9cc97b..0899b137e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-loader", - "version": "17.2.1", + "version": "17.2.2", "license": "MIT", "author": "Evan You", "repository": "vuejs/vue-loader", diff --git a/src/pitcher.ts b/src/pitcher.ts index f12f5405a..426dd1c7d 100644 --- a/src/pitcher.ts +++ b/src/pitcher.ts @@ -88,9 +88,13 @@ export const pitch = function () { return typeof loader === 'string' ? loader : loader.request }) .join('!') - return `@import "${context.resourcePath}${ - query.lang ? `.${query.lang}` : '' - }${context.resourceQuery}!=!-!${loaderString}!${context.resource}";` + const styleRequest = stringifyRequest( + context, + `${context.resourcePath}${query.lang ? `.${query.lang}` : ''}${ + context.resourceQuery + }!=!-!${loaderString}!${context.resource}` + ) + return `@import ${styleRequest};` } const cssLoaderIndex = loaders.findIndex(isCSSLoader) if (cssLoaderIndex > -1) {