-
Notifications
You must be signed in to change notification settings - Fork 12k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(@angular-devkit/build-angular): retain css declarations order whe…
…n using `extractCss` and `@import` rule Relevant code: https://github.com/webpack-contrib/css-loader/blob/239e43d1f3c88bce9433e49b9674be2192a118bb/src/plugins/postcss-import-parser.js#L9 https://github.com/webpack-contrib/css-loader/blob/239e43d1f3c88bce9433e49b9674be2192a118bb/src/index.js#L132-L150 Fixes #9475
- Loading branch information
1 parent
618b293
commit 8c71aff
Showing
6 changed files
with
122 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
packages/angular_devkit/build_angular/src/angular-cli-files/plugins/raw-css-loader.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3710,6 +3710,25 @@ css-declaration-sorter@^4.0.1: | |
postcss "^7.0.1" | ||
timsort "^0.3.0" | ||
|
||
[email protected]: | ||
version "3.5.1" | ||
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.1.tgz#db2b2336f4169edb68e6a829ad4fd36552647b77" | ||
integrity sha512-0G4CbcZzQ9D1Q6ndOfjFuMDo8uLYMu5vc9Abs5ztyHcKvmil6GJrMiNjzzi3tQvUF+mVRuDg7bE6Oc0Prolgig== | ||
dependencies: | ||
camelcase "^5.3.1" | ||
cssesc "^3.0.0" | ||
icss-utils "^4.1.1" | ||
loader-utils "^1.2.3" | ||
normalize-path "^3.0.0" | ||
postcss "^7.0.27" | ||
postcss-modules-extract-imports "^2.0.0" | ||
postcss-modules-local-by-default "^3.0.2" | ||
postcss-modules-scope "^2.2.0" | ||
postcss-modules-values "^3.0.0" | ||
postcss-value-parser "^4.0.3" | ||
schema-utils "^2.6.5" | ||
semver "^6.3.0" | ||
|
||
css-parse@~2.0.0: | ||
version "2.0.0" | ||
resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4" | ||
|
@@ -4166,11 +4185,6 @@ destroy@~1.0.4: | |
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" | ||
integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= | ||
|
||
detect-libc@^1.0.2: | ||
version "1.0.3" | ||
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" | ||
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= | ||
|
||
detect-node@^2.0.4: | ||
version "2.0.4" | ||
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" | ||
|
@@ -5756,13 +5770,20 @@ husky@^4.0.10: | |
slash "^3.0.0" | ||
which-pm-runs "^1.0.0" | ||
|
||
[email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: | ||
[email protected], iconv-lite@^0.4.24, iconv-lite@~0.4.13: | ||
version "0.4.24" | ||
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" | ||
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== | ||
dependencies: | ||
safer-buffer ">= 2.1.2 < 3" | ||
|
||
icss-utils@^4.0.0, icss-utils@^4.1.1: | ||
version "4.1.1" | ||
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" | ||
integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== | ||
dependencies: | ||
postcss "^7.0.14" | ||
|
||
ieee754@^1.1.4: | ||
version "1.1.13" | ||
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" | ||
|
@@ -7827,15 +7848,6 @@ ncp@~2.0.0: | |
resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" | ||
integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= | ||
|
||
needle@^2.2.1: | ||
version "2.4.1" | ||
resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" | ||
integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== | ||
dependencies: | ||
debug "^3.2.6" | ||
iconv-lite "^0.4.4" | ||
sax "^1.2.4" | ||
|
||
[email protected]: | ||
version "0.6.2" | ||
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" | ||
|
@@ -7936,22 +7948,6 @@ node-libs-browser@^2.2.1: | |
util "^0.11.0" | ||
vm-browserify "^1.0.1" | ||
|
||
node-pre-gyp@*: | ||
version "0.14.0" | ||
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" | ||
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== | ||
dependencies: | ||
detect-libc "^1.0.2" | ||
mkdirp "^0.5.1" | ||
needle "^2.2.1" | ||
nopt "^4.0.1" | ||
npm-packlist "^1.1.6" | ||
npmlog "^4.0.2" | ||
rc "^1.2.7" | ||
rimraf "^2.6.1" | ||
semver "^5.3.0" | ||
tar "^4.4.2" | ||
|
||
node-releases@^1.1.53: | ||
version "1.1.53" | ||
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" | ||
|
@@ -8057,7 +8053,7 @@ [email protected], npm-package-arg@^8.0.0: | |
semver "^5.6.0" | ||
validate-npm-package-name "^3.0.0" | ||
|
||
npm-packlist@^1.1.12, npm-packlist@^1.1.6: | ||
npm-packlist@^1.1.12: | ||
version "1.4.8" | ||
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" | ||
integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== | ||
|
@@ -8123,7 +8119,7 @@ npm-run-path@^2.0.0: | |
dependencies: | ||
path-key "^2.0.0" | ||
|
||
"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2: | ||
"npmlog@2 || ^3.1.0 || ^4.0.0": | ||
version "4.1.2" | ||
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" | ||
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== | ||
|
@@ -8982,6 +8978,39 @@ postcss-minify-selectors@^4.0.2: | |
postcss "^7.0.0" | ||
postcss-selector-parser "^3.0.0" | ||
|
||
postcss-modules-extract-imports@^2.0.0: | ||
version "2.0.0" | ||
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" | ||
integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== | ||
dependencies: | ||
postcss "^7.0.5" | ||
|
||
postcss-modules-local-by-default@^3.0.2: | ||
version "3.0.2" | ||
resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" | ||
integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== | ||
dependencies: | ||
icss-utils "^4.1.1" | ||
postcss "^7.0.16" | ||
postcss-selector-parser "^6.0.2" | ||
postcss-value-parser "^4.0.0" | ||
|
||
postcss-modules-scope@^2.2.0: | ||
version "2.2.0" | ||
resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" | ||
integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== | ||
dependencies: | ||
postcss "^7.0.6" | ||
postcss-selector-parser "^6.0.0" | ||
|
||
postcss-modules-values@^3.0.0: | ||
version "3.0.0" | ||
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" | ||
integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== | ||
dependencies: | ||
icss-utils "^4.0.0" | ||
postcss "^7.0.6" | ||
|
||
postcss-normalize-charset@^4.0.1: | ||
version "4.0.1" | ||
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" | ||
|
@@ -9101,7 +9130,7 @@ postcss-selector-parser@^3.0.0: | |
indexes-of "^1.0.1" | ||
uniq "^1.0.1" | ||
|
||
postcss-selector-parser@^6.0.2: | ||
postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: | ||
version "6.0.2" | ||
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" | ||
integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== | ||
|
@@ -9145,12 +9174,12 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: | |
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" | ||
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== | ||
|
||
postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3: | ||
postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3: | ||
version "4.0.3" | ||
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" | ||
integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== | ||
|
||
"postcss@5 - 7", [email protected], postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27: | ||
"postcss@5 - 7", [email protected], postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: | ||
version "7.0.27" | ||
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" | ||
integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== | ||
|
@@ -9484,7 +9513,7 @@ [email protected]: | |
loader-utils "^1.2.3" | ||
schema-utils "^2.5.0" | ||
|
||
rc@^1.2.7, rc@^1.2.8: | ||
rc@^1.2.8: | ||
version "1.2.8" | ||
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" | ||
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== | ||
|
@@ -10105,7 +10134,7 @@ saucelabs@^1.5.0: | |
dependencies: | ||
https-proxy-agent "^2.2.1" | ||
|
||
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: | ||
sax@>=0.6.0, sax@~1.2.4: | ||
version "1.2.4" | ||
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" | ||
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== | ||
|
@@ -10506,14 +10535,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2, source-map-resolve@^0.5.3: | |
source-map-url "^0.4.0" | ||
urix "^0.1.0" | ||
|
||
[email protected], source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.12: | ||
version "0.5.16" | ||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" | ||
integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== | ||
dependencies: | ||
buffer-from "^1.0.0" | ||
source-map "^0.6.0" | ||
|
||
[email protected]: | ||
version "0.5.9" | ||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" | ||
|
@@ -10522,6 +10543,14 @@ [email protected]: | |
buffer-from "^1.0.0" | ||
source-map "^0.6.0" | ||
|
||
source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.12: | ||
version "0.5.16" | ||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" | ||
integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== | ||
dependencies: | ||
buffer-from "^1.0.0" | ||
source-map "^0.6.0" | ||
|
||
source-map-support@~0.4.0: | ||
version "0.4.18" | ||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" | ||
|
@@ -11079,7 +11108,7 @@ tapable@^1.0.0, tapable@^1.1.3: | |
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" | ||
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== | ||
|
||
tar@^4.4.10, tar@^4.4.2: | ||
tar@^4.4.10: | ||
version "4.4.13" | ||
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" | ||
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== | ||
|