diff --git a/CHANGES.md b/CHANGES.md index c71fa2dfe0..d560dabeb4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ - Remove unused ts-loader dependency. - Remove unused class-list dependency. - TSify `ConsoleAnalytics` module. +- Update to style-loader 2.0.0 and mini-css-extract-plugin 1.6.2. - [The next improvement] #### 8.7.9 - 2024-11-22 diff --git a/buildprocess/webpack-tools.config.js b/buildprocess/webpack-tools.config.js index b932bdd55c..c64799a725 100644 --- a/buildprocess/webpack-tools.config.js +++ b/buildprocess/webpack-tools.config.js @@ -28,7 +28,6 @@ module.exports = function () { plugins: [ new MiniCssExtractPlugin({ filename: "TerriaJS.css", - disable: false, ignoreOrder: true }), // This is needed for a jsdom issue diff --git a/buildprocess/webpack.config.make.js b/buildprocess/webpack.config.make.js index e195f3d8ff..c782d16964 100644 --- a/buildprocess/webpack.config.make.js +++ b/buildprocess/webpack.config.make.js @@ -64,7 +64,6 @@ module.exports = function (hot, dev) { config.plugins = [ new MiniCssExtractPlugin({ filename: "nationalmap.css", - disable: false, ignoreOrder: true }) ]; diff --git a/package.json b/package.json index c2142b6f23..4fafd9c021 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "lodash-es": "^4.17.11", "markdown-it": "^14.1.0", "math-expression-evaluator": "^1.3.7", - "mini-css-extract-plugin": "^0.5.0", + "mini-css-extract-plugin": "^1.6.2", "minisearch": "^3.0.2", "mobx": "<6.13.0", "mobx-react": "7.6.0", @@ -169,7 +169,7 @@ "shpjs": "^4.0.4", "simple-statistics": "^7.0.1", "string-replace-webpack-plugin": "^0.1.3", - "style-loader": "^0.23.1", + "style-loader": "^2.0.0", "styled-components": "^5.3.9", "svg-sprite-loader": "^6.0.11", "terriajs-cesium": "8.0.1", diff --git a/yarn.lock b/yarn.lock index 1c49b66b5c..6892c74b2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8669,13 +8669,13 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0" - integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw== +mini-css-extract-plugin@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== dependencies: - loader-utils "^1.1.0" - schema-utils "^1.0.0" + loader-utils "^2.0.0" + schema-utils "^3.0.0" webpack-sources "^1.1.0" minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: @@ -11702,14 +11702,6 @@ strnum@^1.0.5: resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== -style-loader@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" - integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== - dependencies: - loader-utils "^1.1.0" - schema-utils "^1.0.0" - style-loader@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.8.3.tgz#f4f92eb7db63768748f15065cd6700f5a1c85357" @@ -11717,6 +11709,14 @@ style-loader@^0.8.3: dependencies: loader-utils "^0.2.5" +style-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" + integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + styled-components@^5.3.9: version "5.3.9" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.9.tgz#641af2a8bb89904de708c71b439caa9633e8f0ba"