You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/04/17 08:01:41 UTC
ignite git commit: IGNITE-8291 Web Console: Fixed Docker file
generation.
Repository: ignite
Updated Branches:
refs/heads/master bbc439b89 -> 5614621d1
IGNITE-8291 Web Console: Fixed Docker file generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5614621d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5614621d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5614621d
Branch: refs/heads/master
Commit: 5614621d1e1c0e84fe7915459961851f354fba88
Parents: bbc439b
Author: Ilya Borisov <kl...@gmail.com>
Authored: Tue Apr 17 15:01:36 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Apr 17 15:01:36 2018 +0700
----------------------------------------------------------------------
.../configuration/generator/Docker.service.js | 94 ++--
.../generator/Docker.service.spec.js | 133 +++++
modules/web-console/frontend/package-lock.json | 550 ++++++++++---------
modules/web-console/frontend/package.json | 1 +
4 files changed, 475 insertions(+), 303 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index ea49c41..8b03e9a 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -15,6 +15,15 @@
* limitations under the License.
*/
+import {outdent} from 'outdent/lib';
+import VersionService from 'app/services/Version.service';
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
+import get from 'lodash/get';
+
+const version = new VersionService();
+
+const ALPINE_DOCKER_SINCE = '2.1.0';
+
/**
* Docker file generation entry point.
*/
@@ -29,10 +38,10 @@ export default class IgniteDockerGenerator {
* @returns {String}
*/
from(cluster, targetVer) {
- return [
- '# Start from Apache Ignite image.',
- `FROM apacheignite/ignite:${targetVer.ignite}`
- ].join('\n');
+ return outdent`
+ # Start from Apache Ignite image.',
+ FROM apacheignite/ignite:${targetVer.ignite}
+ `;
}
/**
@@ -42,36 +51,59 @@ export default class IgniteDockerGenerator {
* @param {Object} targetVer Target version.
*/
generate(cluster, targetVer) {
+ return outdent`
+ ${this.from(cluster, targetVer)}
+
+ # Set config uri for node.
+ ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml
+
+ # Copy optional libs.
+ ENV OPTION_LIBS ${this.optionLibs(cluster, targetVer).join(',')}
+
+ # Update packages and install maven.
+ ${this.packages(cluster, targetVer)}
+
+ # Append project to container.
+ ADD . ${cluster.name}
+
+ # Build project in container.
+ RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests
+
+ # Copy project jars to node classpath.
+ RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\
+ find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name} \\;
+ `;
+ }
+
+ optionLibs(cluster, targetVer) {
return [
- this.from(cluster, targetVer),
- '',
- '# Set config uri for node.',
- `ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
- '',
- '# Copy ignite-http-rest from optional.',
- 'ENV OPTION_LIBS ignite-rest-http',
- '',
- '# Update packages and install maven.',
- 'RUN \\',
- ' apt-get update &&\\',
- ' apt-get install -y maven',
- '',
- '# Append project to container.',
- `ADD . ${cluster.name}`,
- '',
- '# Build project in container.',
- `RUN mvn -f ${cluster.name}/pom.xml clean package -DskipTests`,
- '',
- '# Copy project jars to node classpath.',
- `RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
- ` find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name} \\;`
- ].join('\n');
+ 'ignite-rest-http',
+ get(POM_DEPENDENCIES, [get(cluster, 'discovery.kind'), 'artifactId'])
+ ].filter(Boolean);
+ }
+
+ packages(cluster, targetVer) {
+ return version.since(targetVer.ignite, ALPINE_DOCKER_SINCE)
+ ? outdent`
+ RUN set -x \\
+ && apk add --no-cache \\
+ openjdk8
+
+ RUN apk --update add \\
+ maven \\
+ && rm -rfv /var/cache/apk/*
+ `
+ : outdent`
+ RUN \\
+ apt-get update &&\\
+ apt-get install -y maven
+ `;
}
ignoreFile() {
- return [
- 'target',
- 'Dockerfile'
- ].join('\n');
+ return outdent`
+ target
+ Dockerfile
+ `;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.spec.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.spec.js b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.spec.js
new file mode 100644
index 0000000..becc359
--- /dev/null
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.spec.js
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import DockerGenerator from './Docker.service';
+import {assert} from 'chai';
+import {outdent} from 'outdent/lib';
+
+suite.only('Dockerfile generator', () => {
+ const generator = new DockerGenerator();
+
+ test('Target 2.0', () => {
+ const cluster = {
+ name: 'FooBar'
+ };
+
+ const version = {ignite: '2.0.0'};
+
+ assert.equal(
+ generator.generate(cluster, version),
+ outdent`
+ # Start from Apache Ignite image.',
+ FROM apacheignite/ignite:2.0.0
+
+ # Set config uri for node.
+ ENV CONFIG_URI FooBar-server.xml
+
+ # Copy optional libs.
+ ENV OPTION_LIBS ignite-rest-http
+
+ # Update packages and install maven.
+ RUN \\
+ apt-get update &&\\
+ apt-get install -y maven
+
+ # Append project to container.
+ ADD . FooBar
+
+ # Build project in container.
+ RUN mvn -f FooBar/pom.xml clean package -DskipTests
+
+ # Copy project jars to node classpath.
+ RUN mkdir $IGNITE_HOME/libs/FooBar && \\
+ find FooBar/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/FooBar \\;
+ `
+ );
+ });
+ test('Target 2.1', () => {
+ const cluster = {
+ name: 'FooBar'
+ };
+ const version = {ignite: '2.1.0'};
+ assert.equal(
+ generator.generate(cluster, version),
+ outdent`
+ # Start from Apache Ignite image.',
+ FROM apacheignite/ignite:2.1.0
+
+ # Set config uri for node.
+ ENV CONFIG_URI FooBar-server.xml
+
+ # Copy optional libs.
+ ENV OPTION_LIBS ignite-rest-http
+
+ # Update packages and install maven.
+ RUN set -x \\
+ && apk add --no-cache \\
+ openjdk8
+
+ RUN apk --update add \\
+ maven \\
+ && rm -rfv /var/cache/apk/*
+
+ # Append project to container.
+ ADD . FooBar
+
+ # Build project in container.
+ RUN mvn -f FooBar/pom.xml clean package -DskipTests
+
+ # Copy project jars to node classpath.
+ RUN mkdir $IGNITE_HOME/libs/FooBar && \\
+ find FooBar/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/FooBar \\;
+ `
+ );
+ });
+
+ test('Discovery optional libs', () => {
+ const generateWithDiscovery = (discovery) => generator.generate({name: 'foo', discovery: {kind: discovery}}, {ignite: '2.1.0'});
+
+ assert.include(
+ generateWithDiscovery('Cloud'),
+ `ENV OPTION_LIBS ignite-rest-http,ignite-cloud`,
+ 'Adds Apache jclouds lib'
+ );
+
+ assert.include(
+ generateWithDiscovery('S3'),
+ `ENV OPTION_LIBS ignite-rest-http,ignite-aws`,
+ 'Adds Amazon AWS lib'
+ );
+
+ assert.include(
+ generateWithDiscovery('GoogleStorage'),
+ `ENV OPTION_LIBS ignite-rest-http,ignite-gce`,
+ 'Adds Google Cloud Engine lib'
+ );
+
+ assert.include(
+ generateWithDiscovery('ZooKeeper'),
+ `ENV OPTION_LIBS ignite-rest-http,ignite-zookeeper`,
+ 'Adds Zookeeper lib'
+ );
+
+ assert.include(
+ generateWithDiscovery('Kubernetes'),
+ `ENV OPTION_LIBS ignite-rest-http,ignite-kubernetes`,
+ 'Adds Kubernetes lib'
+ );
+ });
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/package-lock.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package-lock.json b/modules/web-console/frontend/package-lock.json
index 1834621..e28ef4d 100644
--- a/modules/web-console/frontend/package-lock.json
+++ b/modules/web-console/frontend/package-lock.json
@@ -83,9 +83,9 @@
"dev": true
},
"@types/lodash": {
- "version": "4.14.106",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.106.tgz",
- "integrity": "sha512-tOSvCVrvSqFZ4A/qrqqm6p37GZoawsZtoR0SJhlF7EonNZUgrn8FfT+RNQ11h+NUpMt6QVe36033f3qEKBwfWA==",
+ "version": "4.14.107",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.107.tgz",
+ "integrity": "sha512-afvjfP2rl3yvtv2qrCRN23zIQcDinF+munMJCoHEw2BXF22QJogTlVfNPTACQ6ieDyA6VnyKT4WLuN/wK368ng==",
"dev": true
},
"@types/mocha": {
@@ -95,9 +95,9 @@
"dev": true
},
"@types/node": {
- "version": "7.0.60",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.60.tgz",
- "integrity": "sha512-ZfCUDgCOPBDn0aAsyBOcNh1nLksuGp3LAL+8GULccZN2IkMBG2KfiwFIRrIuQkLKg1W1dIB9kQZ9MIF3IgAqlw==",
+ "version": "9.6.5",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.5.tgz",
+ "integrity": "sha512-NOLEgsT6UiDTjnWG5Hd2Mg25LRyz/oe8ql3wbjzgSFeRzRROhPmtlsvIrei4B46UjERF0td9SZ1ZXPLOdcrBHg==",
"dev": true
},
"@types/sinon": {
@@ -107,9 +107,9 @@
"dev": true
},
"@types/tapable": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.1.tgz",
- "integrity": "sha512-zRc13uGALq6rmLOYmpdI8X5TK6ATuf9jITC7iKTxaHqb/se7vBdiC8BEp1vM2VJQVSt3N53kDDzJOYeVkUKO/Q==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.2.tgz",
+ "integrity": "sha512-42zEJkBpNfMEAvWR5WlwtTH22oDzcMjFsL9gDGExwF8X8WvAiw7Vwop7hPw03QT8TKfec83LwbHj6SvpqM4ELQ==",
"dev": true
},
"@types/uglify-js": {
@@ -145,8 +145,8 @@
"integrity": "sha512-NoGVTCumOsyFfuy3934f3ktiJi+wcXHJFxT47tby3iCpuo6M/WjFA9VqT5bYO+FE46i3R0N00RpJX75HxHKDaQ==",
"dev": true,
"requires": {
- "@types/node": "7.0.60",
- "@types/tapable": "1.0.1",
+ "@types/node": "9.6.5",
+ "@types/tapable": "1.0.2",
"@types/uglify-js": "3.0.2",
"source-map": "0.6.1"
},
@@ -200,7 +200,7 @@
"resolved": "https://registry.npmjs.org/@uirouter/visualizer/-/visualizer-4.0.2.tgz",
"integrity": "sha512-95T0g9HHAjEa+sqwzfSbF6HxBG3shp2oTeGvqYk3VcLEHzrgNopEKJojd+3GNcVznQ+MUAaX4EDHXrzaHKJT6Q==",
"requires": {
- "d3-hierarchy": "1.1.5",
+ "d3-hierarchy": "1.1.6",
"d3-interpolate": "1.1.6",
"preact": "7.2.1"
}
@@ -933,7 +933,7 @@
"requires": {
"bn.js": "4.11.8",
"inherits": "2.0.3",
- "minimalistic-assert": "1.0.0"
+ "minimalistic-assert": "1.0.1"
}
},
"assert": {
@@ -1022,7 +1022,7 @@
"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
"requires": {
"browserslist": "1.7.7",
- "caniuse-db": "1.0.30000827",
+ "caniuse-db": "1.0.30000830",
"normalize-range": "0.1.2",
"num2fraction": "1.2.2",
"postcss": "5.2.18",
@@ -2097,7 +2097,7 @@
"querystring-es3": "0.2.1",
"read-only-stream": "2.0.0",
"readable-stream": "2.3.6",
- "resolve": "1.7.0",
+ "resolve": "1.7.1",
"shasum": "1.0.2",
"shell-quote": "1.6.1",
"stream-browserify": "2.0.1",
@@ -2202,26 +2202,26 @@
"requires": {
"buffer-xor": "1.0.3",
"cipher-base": "1.0.4",
- "create-hash": "1.1.3",
+ "create-hash": "1.2.0",
"evp_bytestokey": "1.0.3",
"inherits": "2.0.3",
"safe-buffer": "5.1.1"
}
},
"browserify-cipher": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
- "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
"requires": {
"browserify-aes": "1.2.0",
- "browserify-des": "1.0.0",
+ "browserify-des": "1.0.1",
"evp_bytestokey": "1.0.3"
}
},
"browserify-des": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
- "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
+ "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
"requires": {
"cipher-base": "1.0.4",
"des.js": "1.0.0",
@@ -2244,11 +2244,11 @@
"requires": {
"bn.js": "4.11.8",
"browserify-rsa": "4.0.1",
- "create-hash": "1.1.3",
- "create-hmac": "1.1.6",
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
"elliptic": "6.4.0",
"inherits": "2.0.3",
- "parse-asn1": "5.1.0"
+ "parse-asn1": "5.1.1"
}
},
"browserify-zlib": {
@@ -2264,7 +2264,7 @@
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
"requires": {
- "caniuse-db": "1.0.30000827",
+ "caniuse-db": "1.0.30000830",
"electron-to-chromium": "1.3.42"
}
},
@@ -2476,15 +2476,15 @@
"integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
"requires": {
"browserslist": "1.7.7",
- "caniuse-db": "1.0.30000827",
+ "caniuse-db": "1.0.30000830",
"lodash.memoize": "4.1.2",
"lodash.uniq": "4.5.0"
}
},
"caniuse-db": {
- "version": "1.0.30000827",
- "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000827.tgz",
- "integrity": "sha1-vSg53Rlgk7RMKMF/k1ExQMnZJYg="
+ "version": "1.0.30000830",
+ "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000830.tgz",
+ "integrity": "sha1-bkUlWzRWSf0V/1kHLaHhK7PeLxM="
},
"caseless": {
"version": "0.11.0",
@@ -2674,9 +2674,9 @@
"integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
},
"chrome-trace-event": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz",
- "integrity": "sha1-kPNohdU0WlBiEzLwcXtZWIPV2YI="
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz",
+ "integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A=="
},
"cipher-base": {
"version": "1.0.4",
@@ -3234,32 +3234,33 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"create-ecdh": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
- "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz",
+ "integrity": "sha512-iZvCCg8XqHQZ1ioNBTzXS/cQSkqkqcPs8xSX4upNB+DAk9Ht3uzQf2J32uAHNCne8LDmKr29AgZrEs4oIrwLuQ==",
"requires": {
"bn.js": "4.11.8",
"elliptic": "6.4.0"
}
},
"create-hash": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
- "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
"requires": {
"cipher-base": "1.0.4",
"inherits": "2.0.3",
+ "md5.js": "1.3.4",
"ripemd160": "2.0.1",
"sha.js": "2.4.11"
}
},
"create-hmac": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
- "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
"requires": {
"cipher-base": "1.0.4",
- "create-hash": "1.1.3",
+ "create-hash": "1.2.0",
"inherits": "2.0.3",
"ripemd160": "2.0.1",
"safe-buffer": "5.1.1",
@@ -3289,15 +3290,15 @@
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"requires": {
- "browserify-cipher": "1.0.0",
+ "browserify-cipher": "1.0.1",
"browserify-sign": "4.0.4",
- "create-ecdh": "4.0.0",
- "create-hash": "1.1.3",
- "create-hmac": "1.1.6",
- "diffie-hellman": "5.0.2",
+ "create-ecdh": "4.0.1",
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
+ "diffie-hellman": "5.0.3",
"inherits": "2.0.3",
"pbkdf2": "3.0.14",
- "public-encrypt": "4.0.0",
+ "public-encrypt": "4.0.2",
"randombytes": "2.0.6",
"randomfill": "1.0.4"
}
@@ -3424,7 +3425,7 @@
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz",
"integrity": "sha512-XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==",
"requires": {
- "mdn-data": "1.1.0",
+ "mdn-data": "1.1.1",
"source-map": "0.5.7"
}
},
@@ -3521,9 +3522,9 @@
"integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
},
"d3-hierarchy": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz",
- "integrity": "sha1-ochFxC+Eoga88cAcAQmOpN2qeiY="
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.6.tgz",
+ "integrity": "sha512-nn4bhBnwWnMSoZgkBXD7vRyZ0xVUsNMQRKytWYHhP1I4qHw+qzApCTgSQTZqMdf4XXZbTMqA59hFusga+THA/g=="
},
"d3-interpolate": {
"version": "1.1.6",
@@ -3759,7 +3760,7 @@
"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
"requires": {
"inherits": "2.0.3",
- "minimalistic-assert": "1.0.0"
+ "minimalistic-assert": "1.0.1"
}
},
"destroy": {
@@ -3807,9 +3808,9 @@
"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
},
"diffie-hellman": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
- "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
"requires": {
"bn.js": "4.11.8",
"miller-rabin": "4.0.1",
@@ -3995,7 +3996,7 @@
"hash.js": "1.1.3",
"hmac-drbg": "1.0.1",
"inherits": "2.0.3",
- "minimalistic-assert": "1.0.0",
+ "minimalistic-assert": "1.0.1",
"minimalistic-crypto-utils": "1.0.1"
}
},
@@ -5104,9 +5105,9 @@
"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
},
"flow-parser": {
- "version": "0.69.0",
- "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.69.0.tgz",
- "integrity": "sha1-N4tRKNbQtVSosvFqTKPhq5ZJ8A4="
+ "version": "0.70.0",
+ "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.70.0.tgz",
+ "integrity": "sha512-gGdyVUZWswG5jcINrVDHd3RY4nJptBTAx9mR9thGsrGGmAUR7omgJXQSpR+fXrLtxSTAea3HpAZNU/yzRJc2Cg=="
},
"flush-write-stream": {
"version": "1.0.3",
@@ -5727,11 +5728,12 @@
}
},
"hash-base": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
- "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
"requires": {
- "inherits": "2.0.3"
+ "inherits": "2.0.3",
+ "safe-buffer": "5.1.1"
}
},
"hash.js": {
@@ -5740,7 +5742,7 @@
"integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
"requires": {
"inherits": "2.0.3",
- "minimalistic-assert": "1.0.0"
+ "minimalistic-assert": "1.0.1"
}
},
"hawk": {
@@ -5765,7 +5767,7 @@
"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
"requires": {
"hash.js": "1.1.3",
- "minimalistic-assert": "1.0.0",
+ "minimalistic-assert": "1.0.1",
"minimalistic-crypto-utils": "1.0.1"
}
},
@@ -5830,9 +5832,9 @@
}
},
"html-minifier": {
- "version": "3.5.14",
- "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz",
- "integrity": "sha512-sZjw6zhQgyUnIlIPU+W80XpRjWjdxHtNcxjfyOskOsCTDKytcfLY04wsQY/83Yqb4ndoiD2FtauiL7Yg6uUQFQ==",
+ "version": "3.5.15",
+ "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz",
+ "integrity": "sha512-OZa4rfb6tZOZ3Z8Xf0jKxXkiDcFWldQePGYFDcgKqES2sXeWaEv9y6QQvWUtX3ySI3feApQi5uCsHLINQ6NoAw==",
"requires": {
"camel-case": "3.0.0",
"clean-css": "4.1.11",
@@ -5840,7 +5842,7 @@
"he": "1.1.1",
"param-case": "2.1.1",
"relateurl": "0.2.7",
- "uglify-js": "3.3.20"
+ "uglify-js": "3.3.21"
},
"dependencies": {
"source-map": {
@@ -5849,9 +5851,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"uglify-js": {
- "version": "3.3.20",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz",
- "integrity": "sha512-WpLkWCf9sGvGZnIvBV0PNID9BATQNT/IXKAmqegfKzIPcTmTV3FP8NQpoogQkt/Y402x2sOFdaHUmqFY9IZp+g==",
+ "version": "3.3.21",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.21.tgz",
+ "integrity": "sha512-uy82472lH8tshK3jS3c5IFb5MmNKd/5qyBd0ih8sM42L3jWvxnE339U9gZU1zufnLVs98Stib9twq8dLm2XYCA==",
"requires": {
"commander": "2.15.1",
"source-map": "0.6.1"
@@ -5864,7 +5866,7 @@
"resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
"integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
"requires": {
- "html-minifier": "3.5.14",
+ "html-minifier": "3.5.15",
"loader-utils": "0.2.17",
"lodash": "4.17.5",
"pretty-error": "2.1.1",
@@ -5902,7 +5904,7 @@
"posthtml": "0.11.3",
"posthtml-render": "1.1.3",
"svgo": "1.0.5",
- "uglify-js": "3.3.20"
+ "uglify-js": "3.3.21"
},
"dependencies": {
"coa": {
@@ -5926,7 +5928,7 @@
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.27.tgz",
"integrity": "sha512-BAYp9FyN4jLXjfvRpTDchBllDptqlK9I7OsagXCG9Am5C+5jc8eRZHgqb9x500W2OKS14MMlpQc/nmh/aA7TEQ==",
"requires": {
- "mdn-data": "1.1.0",
+ "mdn-data": "1.1.1",
"source-map": "0.5.7"
}
}
@@ -5962,15 +5964,15 @@
"mkdirp": "0.5.1",
"object.values": "1.0.4",
"sax": "1.2.4",
- "stable": "0.1.6",
+ "stable": "0.1.7",
"unquote": "1.1.1",
"util.promisify": "1.0.0"
}
},
"uglify-js": {
- "version": "3.3.20",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz",
- "integrity": "sha512-WpLkWCf9sGvGZnIvBV0PNID9BATQNT/IXKAmqegfKzIPcTmTV3FP8NQpoogQkt/Y402x2sOFdaHUmqFY9IZp+g==",
+ "version": "3.3.21",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.21.tgz",
+ "integrity": "sha512-uy82472lH8tshK3jS3c5IFb5MmNKd/5qyBd0ih8sM42L3jWvxnE339U9gZU1zufnLVs98Stib9twq8dLm2XYCA==",
"requires": {
"commander": "2.15.1",
"source-map": "0.6.1"
@@ -6104,13 +6106,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -6123,9 +6125,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"source-map": "0.6.1",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"source-map": {
@@ -6134,9 +6136,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -6245,7 +6247,7 @@
"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
"requires": {
"ansi-escapes": "3.1.0",
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"cli-cursor": "2.1.0",
"cli-width": "2.2.0",
"external-editor": "2.2.0",
@@ -6274,13 +6276,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -6297,9 +6299,9 @@
}
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -6793,10 +6795,10 @@
"babel-register": "6.26.0",
"babylon": "7.0.0-beta.44",
"colors": "1.1.2",
- "flow-parser": "0.69.0",
+ "flow-parser": "0.70.0",
"lodash": "4.17.5",
"micromatch": "2.3.11",
- "neo-async": "2.5.0",
+ "neo-async": "2.5.1",
"node-dir": "0.1.8",
"nomnom": "1.8.1",
"recast": "0.14.7",
@@ -7626,7 +7628,7 @@
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"requires": {
- "chalk": "2.3.2"
+ "chalk": "2.4.0"
},
"dependencies": {
"ansi-styles": {
@@ -7638,13 +7640,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -7653,9 +7655,9 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -7706,7 +7708,7 @@
"integrity": "sha512-YL/qpTxYtK0iWWbuKCrevDZz5lh+OjyHHD+mICqpjnYGKdNRBvPeh/1uYjkKUemT1CSO4wwLOwphWMpKAnD9kw==",
"dev": true,
"requires": {
- "circular-json": "0.5.1",
+ "circular-json": "0.5.3",
"date-format": "1.2.0",
"debug": "3.1.0",
"semver": "5.5.0",
@@ -7714,9 +7716,9 @@
},
"dependencies": {
"circular-json": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz",
- "integrity": "sha512-UjgcRlTAhAkLeXmDe2wK7ktwy/tgAqxiSndTIPiFZuIPLZmzHzWMwUIe9h9m/OokypG7snxCDEuwJshGBdPvaw==",
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz",
+ "integrity": "sha512-YlxLOimeIoQGHnMe3kbf8qIV2Bj7uXLbljMPRguNT49GmSAzooNfS9EJ91rSJKbLBOOzM5agvtx0WyechZN/Hw==",
"dev": true
},
"debug": {
@@ -7838,23 +7840,12 @@
"requires": {
"hash-base": "3.0.4",
"inherits": "2.0.3"
- },
- "dependencies": {
- "hash-base": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
- "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
- "requires": {
- "inherits": "2.0.3",
- "safe-buffer": "5.1.1"
- }
- }
}
},
"mdn-data": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz",
- "integrity": "sha512-jC6B3BFC07cCOU8xx1d+sQtDkVIpGKWv4TzK7pN7PyObdbwlIFJbHYk8ofvr0zrU8SkV1rSi87KAHhWCdLGw1Q=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.1.tgz",
+ "integrity": "sha512-2J5JENcb4yD5AzBI4ilTakiq2P9gHSsi4LOygnMu/bkchgTiA63AjsHAhDc+3U36AJHRfcz30Qv6Tb7i/Qsiew=="
},
"media-typer": {
"version": "0.3.0",
@@ -8058,9 +8049,9 @@
"integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4="
},
"minimalistic-assert": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
- "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M="
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
},
"minimalistic-crypto-utils": {
"version": "1.0.1",
@@ -8244,7 +8235,7 @@
"inherits": "2.0.3",
"parents": "1.0.1",
"readable-stream": "2.3.6",
- "resolve": "1.7.0",
+ "resolve": "1.7.1",
"stream-combiner2": "1.1.1",
"subarg": "1.0.0",
"through2": "2.0.3",
@@ -8460,9 +8451,9 @@
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
},
"neo-async": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz",
- "integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g=="
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+ "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA=="
},
"nice-try": {
"version": "1.0.4",
@@ -8547,7 +8538,7 @@
"stream-browserify": "2.0.1",
"stream-http": "2.8.1",
"string_decoder": "1.1.1",
- "timers-browserify": "2.0.6",
+ "timers-browserify": "2.0.7",
"tty-browserify": "0.0.0",
"url": "0.11.0",
"util": "0.10.3",
@@ -9027,6 +9018,11 @@
"os-tmpdir": "1.0.2"
}
},
+ "outdent": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz",
+ "integrity": "sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q=="
+ },
"p-cancelable": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
@@ -9127,13 +9123,13 @@
}
},
"parse-asn1": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
- "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+ "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
"requires": {
"asn1.js": "4.10.1",
"browserify-aes": "1.2.0",
- "create-hash": "1.1.3",
+ "create-hash": "1.2.0",
"evp_bytestokey": "1.0.3",
"pbkdf2": "3.0.14"
}
@@ -9261,8 +9257,8 @@
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
"integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
"requires": {
- "create-hash": "1.1.3",
- "create-hmac": "1.1.6",
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
"ripemd160": "2.0.1",
"safe-buffer": "5.1.1",
"sha.js": "2.4.11"
@@ -9533,13 +9529,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -9552,9 +9548,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"source-map": "0.6.1",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"source-map": {
@@ -9563,9 +9559,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -9590,13 +9586,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -9609,9 +9605,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"source-map": "0.6.1",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"source-map": {
@@ -9620,9 +9616,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -9647,13 +9643,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -9666,9 +9662,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"source-map": "0.6.1",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"source-map": {
@@ -9677,9 +9673,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -9704,13 +9700,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -9723,9 +9719,9 @@
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz",
"integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"source-map": "0.6.1",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"source-map": {
@@ -9734,9 +9730,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -9873,9 +9869,9 @@
}
},
"posthtml-rename-id": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/posthtml-rename-id/-/posthtml-rename-id-1.0.3.tgz",
- "integrity": "sha512-zaaHJSTihw1fsx2L81npO6gmDYu4yZuHfRX89IsJDhcRIV1P8SKJY5m1xDRZQh542flidwNS+70/pVAK8yMYOA==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/posthtml-rename-id/-/posthtml-rename-id-1.0.4.tgz",
+ "integrity": "sha512-bxsGN02JGqcihc9eztWu8Qlj2P/If9sY0ckYmEL+6hqrWRvwJw4RvnXSnlKmjS4yDBcT4cSpJdMy+xsSuHDvZw==",
"requires": {
"escape-string-regexp": "1.0.5"
}
@@ -9937,9 +9933,9 @@
"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
},
"prettier": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz",
- "integrity": "sha512-T/KD65Ot0PB97xTrG8afQ46x3oiVhnfGjGESSI9NWYcG92+OUPZKkwHqGWXH2t9jK1crnQjubECW0FuOth+hxw=="
+ "version": "1.12.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz",
+ "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU="
},
"pretty-bytes": {
"version": "4.0.2",
@@ -10037,14 +10033,14 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"public-encrypt": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
- "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+ "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
"requires": {
"bn.js": "4.11.8",
"browserify-rsa": "4.0.1",
- "create-hash": "1.1.3",
- "parse-asn1": "5.1.0",
+ "create-hash": "1.2.0",
+ "parse-asn1": "5.1.1",
"randombytes": "2.0.6"
}
},
@@ -10103,7 +10099,7 @@
"jstransformer": "1.0.0",
"pug-error": "1.3.2",
"pug-walk": "1.1.7",
- "resolve": "1.7.0",
+ "resolve": "1.7.1",
"uglify-js": "2.8.29"
}
},
@@ -10164,7 +10160,7 @@
"requires": {
"loader-utils": "1.1.0",
"pug-walk": "1.1.7",
- "resolve": "1.7.0"
+ "resolve": "1.7.1"
}
},
"pug-parser": {
@@ -10482,7 +10478,7 @@
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
"requires": {
- "resolve": "1.7.0"
+ "resolve": "1.7.1"
}
},
"redent": {
@@ -10791,9 +10787,9 @@
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
},
"resolve": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz",
- "integrity": "sha512-QdgZ5bjR1WAlpLaO5yHepFvC+o3rCr6wpfE2tpJNMkXdulf2jKomQBdNRQITF3ZKHNlT71syG98yQP03gasgnA==",
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+ "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
"requires": {
"path-parse": "1.0.5"
}
@@ -10921,6 +10917,16 @@
"requires": {
"hash-base": "2.0.2",
"inherits": "2.0.3"
+ },
+ "dependencies": {
+ "hash-base": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+ "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+ "requires": {
+ "inherits": "2.0.3"
+ }
+ }
}
},
"roboto-font": {
@@ -10944,7 +10950,7 @@
"acorn": "5.5.3",
"estree-walker": "0.5.1",
"magic-string": "0.22.5",
- "resolve": "1.7.0",
+ "resolve": "1.7.1",
"rollup-pluginutils": "2.0.1"
}
},
@@ -10955,7 +10961,7 @@
"requires": {
"builtin-modules": "2.0.0",
"is-module": "1.0.0",
- "resolve": "1.7.0"
+ "resolve": "1.7.1"
}
},
"rollup-plugin-progress": {
@@ -11173,7 +11179,7 @@
"clone-deep": "2.0.2",
"loader-utils": "1.1.0",
"lodash.tail": "4.1.1",
- "neo-async": "2.5.0",
+ "neo-async": "2.5.1",
"pify": "3.0.0"
}
},
@@ -11924,9 +11930,9 @@
}
},
"stable": {
- "version": "0.1.6",
- "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz",
- "integrity": "sha1-kQ9dKu17Ugxud3SZwfMuE5/eyxA="
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.7.tgz",
+ "integrity": "sha512-LmxBix+nUtyihSBpxXAhRakYEy49fan2suysdS1fUZcKjI+krXmH8DCZJ3yfngfrOnIFNU8O73EgNTzO2jI53w=="
},
"static-extend": {
"version": "0.1.2",
@@ -12191,7 +12197,7 @@
"micromatch": "3.1.0",
"postcss": "5.2.18",
"postcss-prefix-selector": "1.6.0",
- "posthtml-rename-id": "1.0.3",
+ "posthtml-rename-id": "1.0.4",
"posthtml-svg-mode": "1.0.2",
"query-string": "4.3.4",
"traverse": "0.6.6"
@@ -12330,9 +12336,9 @@
}
},
"svg-baker-runtime": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/svg-baker-runtime/-/svg-baker-runtime-1.3.3.tgz",
- "integrity": "sha512-yDnHhVM+nGxLu+Oj/zG07yUPXmJ7XLmekU2XQqL0jaLUazLjxj61uO8IMyww2roUjdMQo4x+J+KIlAp37qIbZQ==",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/svg-baker-runtime/-/svg-baker-runtime-1.3.5.tgz",
+ "integrity": "sha512-BKxJT/Zz9M+K043zXbZf7CA3c10NKWByxobAukO30VLv71OvmpagjG32Z0UIay6ctMaOUmywOKHuceiSDqwUOA==",
"requires": {
"deepmerge": "1.3.2",
"mitt": "1.1.2",
@@ -12350,7 +12356,7 @@
"escape-string-regexp": "1.0.5",
"loader-utils": "1.1.0",
"svg-baker": "1.2.17",
- "svg-baker-runtime": "1.3.3",
+ "svg-baker-runtime": "1.3.5",
"url-slug": "2.0.0"
}
},
@@ -12389,7 +12395,7 @@
"requires": {
"ajv": "6.4.0",
"ajv-keywords": "3.1.0",
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"lodash": "4.17.5",
"slice-ansi": "1.0.0",
"string-width": "2.1.1"
@@ -12415,13 +12421,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -12430,9 +12436,9 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -12522,9 +12528,9 @@
"integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
},
"timers-browserify": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
- "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.7.tgz",
+ "integrity": "sha512-U7DtjfsHeYjNAyEz4MdCLGZMY3ySyHIgZZp6ba9uxZlMRMiK5yTHUYc2XfGQHKFgxGcmvBF2jafoNtQYvlDpOw==",
"requires": {
"setimmediate": "1.0.5"
}
@@ -13205,7 +13211,7 @@
"requires": {
"chokidar": "2.0.3",
"graceful-fs": "4.1.11",
- "neo-async": "2.5.0"
+ "neo-async": "2.5.1"
}
},
"wbuf": {
@@ -13213,7 +13219,7 @@
"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
"requires": {
- "minimalistic-assert": "1.0.0"
+ "minimalistic-assert": "1.0.1"
}
},
"webpack": {
@@ -13225,7 +13231,7 @@
"acorn-dynamic-import": "3.0.0",
"ajv": "6.4.0",
"ajv-keywords": "3.1.0",
- "chrome-trace-event": "0.1.2",
+ "chrome-trace-event": "0.1.3",
"enhanced-resolve": "4.0.0",
"eslint-scope": "3.7.1",
"loader-runner": "2.3.0",
@@ -13233,7 +13239,7 @@
"memory-fs": "0.4.1",
"micromatch": "3.1.10",
"mkdirp": "0.5.1",
- "neo-async": "2.5.0",
+ "neo-async": "2.5.1",
"node-libs-browser": "2.1.0",
"schema-utils": "0.4.5",
"tapable": "1.0.0",
@@ -13566,7 +13572,7 @@
"babel-register": "6.26.0",
"babylon": "6.18.0",
"colors": "1.1.2",
- "flow-parser": "0.69.0",
+ "flow-parser": "0.70.0",
"lodash": "4.17.5",
"micromatch": "2.3.11",
"node-dir": "0.1.8",
@@ -13600,7 +13606,7 @@
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-2.0.14.tgz",
"integrity": "sha512-gRoWaxSi2JWiYsn1QgOTb6ENwIeSvN1YExZ+kJ0STsTZK7bWPElW+BBBv1UnTbvcPC3v7E17mK8hlFX8DOYSGw==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"cross-spawn": "6.0.5",
"diff": "3.5.0",
"enhanced-resolve": "4.0.0",
@@ -13619,13 +13625,13 @@
"mkdirp": "0.5.1",
"p-each-series": "1.0.0",
"p-lazy": "1.0.0",
- "prettier": "1.11.1",
- "supports-color": "5.3.0",
+ "prettier": "1.12.1",
+ "supports-color": "5.4.0",
"v8-compile-cache": "1.1.2",
"webpack-addons": "1.1.5",
"yargs": "11.1.0",
"yeoman-environment": "2.0.6",
- "yeoman-generator": "2.0.3"
+ "yeoman-generator": "2.0.4"
},
"dependencies": {
"ansi-regex": {
@@ -13647,13 +13653,13 @@
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"cliui": {
@@ -13689,7 +13695,7 @@
"integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
"requires": {
"ansi-escapes": "3.1.0",
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"cli-cursor": "2.1.0",
"cli-width": "2.2.0",
"external-editor": "2.2.0",
@@ -13697,7 +13703,7 @@
"lodash": "4.17.5",
"mute-stream": "0.0.7",
"run-async": "2.3.0",
- "rxjs": "5.5.8",
+ "rxjs": "5.5.10",
"string-width": "2.1.1",
"strip-ansi": "4.0.0",
"through": "2.3.8"
@@ -13714,9 +13720,9 @@
}
},
"rxjs": {
- "version": "5.5.8",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz",
- "integrity": "sha512-Bz7qou7VAIoGiglJZbzbXa4vpX5BmTTN2Dj/se6+SwADtw4SihqBIiEa7VmTXJ8pynvq0iFr5Gx9VLyye1rIxQ==",
+ "version": "5.5.10",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz",
+ "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==",
"requires": {
"symbol-observable": "1.0.1"
}
@@ -13730,9 +13736,9 @@
}
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -13788,7 +13794,7 @@
"requires": {
"loud-rejection": "1.6.0",
"memory-fs": "0.4.1",
- "mime": "2.2.2",
+ "mime": "2.3.1",
"path-is-absolute": "1.0.1",
"range-parser": "1.2.0",
"url-join": "4.0.0",
@@ -13796,9 +13802,9 @@
},
"dependencies": {
"mime": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz",
- "integrity": "sha512-A7PDg4s48MkqFEcYg2b069m3DXOEq7hx+9q9rIFrSSYfzsh35GX+LOVMQ8Au0ko7d8bSQCIAuzkjp0vCtwENlQ=="
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
+ "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
}
}
},
@@ -13831,7 +13837,7 @@
"sockjs-client": "1.1.4",
"spdy": "3.4.7",
"strip-ansi": "3.0.1",
- "supports-color": "5.3.0",
+ "supports-color": "5.4.0",
"webpack-dev-middleware": "3.0.1",
"webpack-log": "1.2.0",
"yargs": "9.0.1"
@@ -13883,9 +13889,9 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -13897,7 +13903,7 @@
"resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
"integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"log-symbols": "2.2.0",
"loglevelnext": "1.0.4",
"uuid": "3.2.1"
@@ -13912,13 +13918,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"has-flag": {
@@ -13927,9 +13933,9 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -14307,7 +14313,7 @@
"resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz",
"integrity": "sha512-jzHBTTy8EPI4ImV8dpUMt+Q5zELkSU5xvGpndHcHudQ4tqN6YgIWaCGmRFl+HDchwRUkcgyjQ+n6/w5zlJBCPg==",
"requires": {
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"debug": "3.1.0",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
@@ -14331,13 +14337,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"debug": {
@@ -14371,9 +14377,9 @@
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
@@ -14381,12 +14387,12 @@
}
},
"yeoman-generator": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-2.0.3.tgz",
- "integrity": "sha512-mODmrZ26a94djmGZZuIiomSGlN4wULdou29ZwcySupb2e9FdvoCl7Ps2FqHFjEHio3kOl/iBeaNqrnx3C3NwWg==",
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-2.0.4.tgz",
+ "integrity": "sha512-Sgvz3MAkOpEIobcpW3rjEl6bOTNnl8SkibP9z7hYKfIGIlw0QDC2k0MAeXvyE2pLqc2M0Duql+6R7/W9GrJojg==",
"requires": {
"async": "2.6.0",
- "chalk": "2.3.2",
+ "chalk": "2.4.0",
"cli-table": "0.3.1",
"cross-spawn": "5.1.0",
"dargs": "5.1.0",
@@ -14421,13 +14427,13 @@
}
},
"chalk": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
- "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+ "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
"requires": {
"ansi-styles": "3.2.1",
"escape-string-regexp": "1.0.5",
- "supports-color": "5.3.0"
+ "supports-color": "5.4.0"
}
},
"debug": {
@@ -14493,9 +14499,9 @@
"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
},
"supports-color": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
- "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
"has-flag": "3.0.0"
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5614621d/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index 3b42a61..87a516f 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -94,6 +94,7 @@
"natural-compare-lite": "^1.4.0",
"node-sass": "4.8.3",
"nvd3": "1.8.6",
+ "outdent": "^0.5.0",
"pako": "1.0.6",
"progress-bar-webpack-plugin": "1.11.0",
"pug-html-loader": "1.1.0",