github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3124 from weaveworks/bump-ui-components-to-0-4-48

Browse Source 
Bump ui-components
This commit is contained in:
Filip Barl
2018-03-28 16:43:16 +02:00
committed by GitHub
parent 012ee77b20 9f0b359199
commit 3090cdcfe5
7 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/Dockerfile
View File

@@ -3,4 +3,4 @@ WORKDIR /home/weave
COPY package.json yarn.lock /home/weave/
ENV NPM_CONFIG_LOGLEVEL=warn NPM_CONFIG_PROGRESS=false
RUN yarn --pure-lockfile
COPY webpack-common.js webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore .stylelintrc .sass-lint.yml /home/weave/
COPY webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore .stylelintrc .sass-lint.yml /home/weave/

2
client/app/styles/_base.scss
View File

@@ -1454,7 +1454,7 @@ a {
.fa {
margin-left: 4px;
color: $color-red-berry;
color: $color-accent-orange;
}
&-wrapper {

2
client/package.json
View File

@@ -43,7 +43,7 @@
"reselect": "3.0.1",
"reselect-map": "1.0.3",
"styled-components": "2.2.4",
"weaveworks-ui-components": "0.4.42",
"weaveworks-ui-components": "0.4.49",
"whatwg-fetch": "2.0.3",
"xterm": "2.9.2"
},

25
client/webpack-common.js
View File

@@ -1,25 +0,0 @@
const { isString, kebabCase, forEach } = require('lodash');
const theme = require('weaveworks-ui-components/lib/theme').default;
// Flattens and collects all theme colors, names them
// as Scss vars and returns them as query string
// TODO: Move this helper to ui-components repo as
// it's currently used both here and in service-ui.
function themeColorsAsScss() {
const colors = [];
forEach(theme.colors, (value, name) => {
const colorPrefix = `$color-${kebabCase(name)}`;
if (isString(value)) {
colors.push(`${colorPrefix}: ${value}`);
} else {
forEach(value, (innerValue, subname) => {
colors.push(`${colorPrefix}-${kebabCase(subname)}: ${innerValue}`);
});
}
});
return `${colors.join('; ')};`;
}
module.exports = {
themeColorsAsScss,
};

3
client/webpack.local.config.js
View File

@@ -5,8 +5,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const SassLintPlugin = require('sasslint-webpack-plugin');
const ContrastStyleCompiler = require('./app/scripts/contrast-compiler');
const { themeColorsAsScss } = require('./webpack-common');
const { themeColorsAsScss } = require('weaveworks-ui-components/lib/theme');
/**
* This is the Webpack configuration file for local development.

3
client/webpack.production.config.js
View File

@@ -6,8 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const ContrastStyleCompiler = require('./app/scripts/contrast-compiler');
const { themeColorsAsScss } = require('./webpack-common');
const { themeColorsAsScss } = require('weaveworks-ui-components/lib/theme');
const GLOBALS = {
'process.env': {NODE_ENV: '"production"'}

6
client/yarn.lock
View File

@@ -7591,9 +7591,9 @@ wd@^0.4.0:
underscore.string "~3.0.3"
vargs "~0.1.0"
weaveworks-ui-components@0.4.42:
version "0.4.42"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.42.tgz#e2e4f22ebe9ac3f8c562e41a79b2cf29f628fbe6"
weaveworks-ui-components@0.4.49:
version "0.4.49"
resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.4.49.tgz#3aa1c014d6a93d2f3bc370b84268f7289bdfc0fb"
dependencies:
classnames "2.2.5"
d3-drag "1.2.1"