From 0f12e771978310b62fe406ba64543fefd364360b Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 16 May 2020 15:57:16 +0530 Subject: [PATCH] Update dependency on node-css-loader to 2.1.1 --- debian/control | 2 +- debian/patches/0791-update-css-loader.patch | 274 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 276 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0791-update-css-loader.patch diff --git a/debian/control b/debian/control index 887e023681..0597b5a047 100644 --- a/debian/control +++ b/debian/control @@ -351,7 +351,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-chart.js (>= 2.7.2~), node-clipboard, node-core-js (>= 3.2.1~), - node-css-loader, + node-css-loader (>= 2.1.1~), node-d3-scale (>= 1.0.7~), node-d3-selection (>= 1.2~), node-dateformat, diff --git a/debian/patches/0791-update-css-loader.patch b/debian/patches/0791-update-css-loader.patch new file mode 100644 index 0000000000..664a9ab7c2 --- /dev/null +++ b/debian/patches/0791-update-css-loader.patch @@ -0,0 +1,274 @@ +From e687a88a5cde07e3c4efc54696704a212508afb1 Mon Sep 17 00:00:00 2001 +From: Pirate Praveen +Date: Tue, 12 May 2020 12:33:33 +0000 +Subject: [PATCH] Update css-loader ^1.0.0 -> ^2.1.1 + +--- + changelogs/unreleased/update-css-loader.yml | 5 + + config/webpack.config.js | 3 +- + package.json | 2 +- + yarn.lock | 138 ++++++++------------ + 4 files changed, 63 insertions(+), 85 deletions(-) + create mode 100644 changelogs/unreleased/update-css-loader.yml + +--- /dev/null ++++ b/changelogs/unreleased/update-css-loader.yml +@@ -0,0 +1,5 @@ ++--- ++title: Update css-loader ^1.0.0 -> ^2.1.1 ++merge_request: 31743 ++author: Pirate Praveen ++type: other +--- a/config/webpack.config.js ++++ b/config/webpack.config.js +@@ -240,7 +240,8 @@ + { + loader: 'css-loader', + options: { +- name: '[name].[hash:8].[ext]', ++ modules: true, ++ localIdentName: '[name].[hash:8].[ext]', + }, + }, + ], +--- a/yarn.lock ++++ b/yarn.lock +@@ -1891,15 +1891,6 @@ + follow-redirects "1.5.10" + is-buffer "^2.0.2" + +-babel-code-frame@^6.26.0: +- version "6.26.0" +- resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" +- integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= +- dependencies: +- chalk "^1.1.3" +- esutils "^2.0.2" +- js-tokens "^3.0.2" +- + babel-eslint@^10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" +@@ -2477,7 +2468,7 @@ + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= + +-camelcase@^5.0.0: ++camelcase@^5.0.0, camelcase@^5.2.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== +@@ -2525,7 +2516,7 @@ + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +-chalk@^1.1.1, chalk@^1.1.3: ++chalk@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= +@@ -3212,38 +3203,28 @@ + resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02" + integrity sha1-QgBdgyBLK0pdk7axpWRBM7WSegI= + +-css-loader@^1.0.0: +- version "1.0.1" +- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe" +- integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw== ++css-loader@^2.1.1: ++ version "2.1.1" ++ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea" ++ integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w== + dependencies: +- babel-code-frame "^6.26.0" +- css-selector-tokenizer "^0.7.0" +- icss-utils "^2.1.0" +- loader-utils "^1.0.2" +- lodash "^4.17.11" +- postcss "^6.0.23" +- postcss-modules-extract-imports "^1.2.0" +- postcss-modules-local-by-default "^1.2.0" +- postcss-modules-scope "^1.1.0" +- postcss-modules-values "^1.3.0" ++ camelcase "^5.2.0" ++ icss-utils "^4.1.0" ++ loader-utils "^1.2.3" ++ normalize-path "^3.0.0" ++ postcss "^7.0.14" ++ postcss-modules-extract-imports "^2.0.0" ++ postcss-modules-local-by-default "^2.0.6" ++ postcss-modules-scope "^2.1.0" ++ postcss-modules-values "^2.0.0" + postcss-value-parser "^3.3.0" +- source-list-map "^2.0.0" ++ schema-utils "^1.0.0" + + css-selector-parser@^1.3: + version "1.3.0" + resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz#5f1ad43e2d8eefbfdc304fcd39a521664943e3eb" + integrity sha1-XxrUPi2O77/cME/NOaUhZklD4+s= + +-css-selector-tokenizer@^0.7.0: +- version "0.7.2" +- resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz#11e5e27c9a48d90284f22d45061c303d7a25ad87" +- integrity sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw== +- dependencies: +- cssesc "^3.0.0" +- fastparse "^1.1.2" +- regexpu-core "^4.6.0" +- + css@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" +@@ -4703,11 +4684,6 @@ + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +-fastparse@^1.1.2: +- version "1.1.2" +- resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" +- integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== +- + fault@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa" +@@ -5667,12 +5643,12 @@ + resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" + integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= + +-icss-utils@^2.1.0: +- version "2.1.0" +- resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962" +- integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI= ++icss-utils@^4.1.0: ++ 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 "^6.0.1" ++ postcss "^7.0.14" + + ieee754@1.1.13, ieee754@^1.1.4: + version "1.1.13" +@@ -6830,11 +6806,6 @@ + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +-js-tokens@^3.0.2: +- version "3.0.2" +- resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" +- integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= +- + js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" +@@ -8932,36 +8903,37 @@ + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= + +-postcss-modules-extract-imports@^1.2.0: +- version "1.2.1" +- resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" +- integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw== ++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 "^6.0.1" ++ postcss "^7.0.5" + +-postcss-modules-local-by-default@^1.2.0: +- version "1.2.0" +- resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" +- integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= ++postcss-modules-local-by-default@^2.0.6: ++ version "2.0.6" ++ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63" ++ integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA== + dependencies: +- css-selector-tokenizer "^0.7.0" +- postcss "^6.0.1" ++ postcss "^7.0.6" ++ postcss-selector-parser "^6.0.0" ++ postcss-value-parser "^3.3.1" + +-postcss-modules-scope@^1.1.0: +- version "1.1.0" +- resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" +- integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= ++postcss-modules-scope@^2.1.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: +- css-selector-tokenizer "^0.7.0" +- postcss "^6.0.1" ++ postcss "^7.0.6" ++ postcss-selector-parser "^6.0.0" + +-postcss-modules-values@^1.3.0: +- version "1.3.0" +- resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" +- integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= ++postcss-modules-values@^2.0.0: ++ version "2.0.0" ++ resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64" ++ integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w== + dependencies: + icss-replace-symbols "^1.1.0" +- postcss "^6.0.1" ++ postcss "^7.0.6" + + postcss-reporter@^6.0.1: + version "6.0.1" +@@ -9018,7 +8990,7 @@ + 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== +@@ -9042,15 +9014,6 @@ + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d" + integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ== + +-postcss@^6.0.1, postcss@^6.0.23: +- version "6.0.23" +- resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" +- integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== +- dependencies: +- chalk "^2.4.1" +- source-map "^0.6.1" +- supports-color "^5.4.0" +- + postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.7: + version "7.0.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" +@@ -9060,6 +9023,15 @@ + source-map "^0.6.1" + supports-color "^6.1.0" + ++postcss@^7.0.5, postcss@^7.0.6: ++ version "7.0.30" ++ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2" ++ integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ== ++ dependencies: ++ chalk "^2.4.2" ++ source-map "^0.6.1" ++ supports-color "^6.1.0" ++ + prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" +@@ -10852,7 +10824,7 @@ + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +-supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: ++supports-color@^5.2.0, supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== diff --git a/debian/patches/series b/debian/patches/series index 3a0636a042..80c8571f4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ 0750-fix-relative-paths.patch 0760-update-grape.patch 0790-protobuf-compat.patch +0791-update-css-loader.patch