Skip to content

Commit f925099

Browse files
alan-agius4dgp1130
authored andcommitted
fix(@angular-devkit/build-angular): resolve postcss from build-angular package
`postcss-loader` version 4.2.0 added an `implementation` option. Using the using will ensure that the correct postcss version is used. More info: webpack-contrib/postcss-loader@deac978 Fixes #19839 (cherry picked from commit 5711e69)
1 parent 50106ff commit f925099

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"popper.js": "^1.14.1",
192192
"postcss": "8.2.4",
193193
"postcss-import": "14.0.0",
194-
"postcss-loader": "4.1.0",
194+
"postcss-loader": "4.2.0",
195195
"prettier": "^2.0.0",
196196
"protractor": "~7.0.0",
197197
"puppeteer": "5.5.0",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"pnp-webpack-plugin": "1.6.4",
5050
"postcss": "8.2.4",
5151
"postcss-import": "14.0.0",
52-
"postcss-loader": "4.1.0",
52+
"postcss-loader": "4.2.0",
5353
"raw-loader": "4.0.2",
5454
"regenerator-runtime": "0.13.7",
5555
"resolve-url-loader": "3.1.2",

packages/angular_devkit/build_angular/src/webpack/configs/styles.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
210210
{
211211
loader: require.resolve('postcss-loader'),
212212
options: {
213+
implementation: require('postcss'),
213214
postcssOptions: postcssOptionsCreator(componentsSourceMap, false),
214215
},
215216
},
@@ -242,6 +243,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
242243
{
243244
loader: require.resolve('postcss-loader'),
244245
options: {
246+
implementation: require('postcss'),
245247
postcssOptions: postcssOptionsCreator(globalSourceMap, buildOptions.extractCss),
246248
},
247249
},

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9253,16 +9253,16 @@ [email protected]:
92539253
read-cache "^1.0.0"
92549254
resolve "^1.1.7"
92559255

9256-
postcss-loader@4.1.0:
9257-
version "4.1.0"
9258-
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.1.0.tgz#4647a6c8dad3cb6b253fbfaa21d62201086f6e39"
9259-
integrity sha512-vbCkP70F3Q9PIk6d47aBwjqAMI4LfkXCoyxj+7NPNuVIwfTGdzv2KVQes59/RuxMniIgsYQCFSY42P3+ykJfaw==
9256+
postcss-loader@4.2.0:
9257+
version "4.2.0"
9258+
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4"
9259+
integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==
92609260
dependencies:
92619261
cosmiconfig "^7.0.0"
92629262
klona "^2.0.4"
92639263
loader-utils "^2.0.0"
92649264
schema-utils "^3.0.0"
9265-
semver "^7.3.2"
9265+
semver "^7.3.4"
92669266

92679267
postcss-merge-longhand@^4.0.11:
92689268
version "4.0.11"
@@ -10592,7 +10592,7 @@ [email protected]:
1059210592
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
1059310593
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
1059410594

10595-
[email protected], semver@^7.0.0, semver@^7.1.1, semver@^7.3.2:
10595+
[email protected], semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4:
1059610596
version "7.3.4"
1059710597
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
1059810598
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==

0 commit comments

Comments
 (0)