From 68feb9ae9e7e817fc9888d2596259402203fe87d Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Wed, 11 Mar 2020 14:00:48 +0100 Subject: [PATCH 1/2] switch back to master image --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a8a0e2c1..d52361d29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,9 +8,7 @@ defaults: &defaults client-defaults: &client-defaults working_directory: /home/weave/scope docker: - # TODO: Change back to last master tag once - # https://github.com/weaveworks/scope/pull/3755 is merged. - - image: weaveworks/scope-ui-build:update-security-8dfd0abb + - image: weaveworks/scope-ui-build:master-aee14088 workflows: version: 2 From d224674b8924bcfc2ca4dc418a9ec392bdc15e0f Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Wed, 11 Mar 2020 14:17:06 +0100 Subject: [PATCH 2/2] sync deps between ui-components, service-ui and scope --- client/package.json | 6 +++--- client/yarn.lock | 23 +++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/client/package.json b/client/package.json index 1c9ee32ff..92fa2a0b7 100644 --- a/client/package.json +++ b/client/package.json @@ -62,7 +62,7 @@ "babel-loader": "^8.0.6", "babel-plugin-transform-class-properties": "6.24.1", "babel-plugin-transform-object-rest-spread": "6.26.0", - "clean-webpack-plugin": "0.1.17", + "clean-webpack-plugin": "1.0.1", "css-loader": "2.1.1", "eslint": "6.6.0", "eslint-config-airbnb": "17.1.1", @@ -71,7 +71,7 @@ "eslint-plugin-jsx-a11y": "6.2.3", "eslint-plugin-react": "7.14.3", "express": "4.16.4", - "file-loader": "1.1.11", + "file-loader": "^2.0.0", "html-webpack-plugin": "3.2.0", "http-proxy": "1.16.2", "http-proxy-rules": "1.1.1", @@ -81,7 +81,7 @@ "mockdate": "2.0.2", "postcss-loader": "3.0.0", "react-router": "3.2.0", - "style-loader": "0.21.0", + "style-loader": "0.23.0", "stylelint": "11.1.1", "stylelint-config-recommended": "3.0.0", "stylelint-config-styled-components": "0.1.1", diff --git a/client/yarn.lock b/client/yarn.lock index c0bce7701..3540e5685 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2343,9 +2343,10 @@ clean-css@4.1.x: dependencies: source-map "0.5.x" -clean-webpack-plugin@0.1.17: - version "0.1.17" - resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.17.tgz#71c57242e6d47204d46f809413176e7bed28ec49" +clean-webpack-plugin@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-1.0.1.tgz#b16ee2f1386aea403010236e632447c7d3505f5a" + integrity sha512-gvwfMsqu3HBgTVvaBa1H3AZKO03CHpr5uP92SPIktP3827EovAitwW+1xoqXyTxCuXnLYpMHG5ytS4AoukHDWA== dependencies: rimraf "^2.6.1" @@ -3599,12 +3600,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@1.1.11: - version "1.1.11" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8" +file-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" + integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ== dependencies: loader-utils "^1.0.2" - schema-utils "^0.4.5" + schema-utils "^1.0.0" filesize@4.1.2: version "4.1.2" @@ -7688,9 +7690,10 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@0.21.0: - version "0.21.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" +style-loader@0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1" + integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ== dependencies: loader-utils "^1.1.0" schema-utils "^0.4.5"