diff --git a/.eslintignore b/.eslintignore index d68999f17799..39ef5e596b55 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,6 +3,8 @@ build coverage node_modules docs/public +storybook-static +built-storybooks lib/cli/test *.bundle.js *.js.map diff --git a/app/angular/package.json b/app/angular/package.json index 03ea8b24e073..01cb49c57f03 100644 --- a/app/angular/package.json +++ b/app/angular/package.json @@ -41,7 +41,7 @@ "dotenv-webpack": "^1.5.5", "global": "^4.3.2", "html-loader": "^0.5.5", - "html-webpack-plugin": "^2.30.1", + "html-webpack-plugin": "^3.1.0", "json5": "^0.5.1", "markdown-loader": "^2.0.2", "node-sass": "^4.8.3", @@ -50,10 +50,9 @@ "react-dev-utils": "^5.0.0", "react-dom": "^16.0.0", "sass-loader": "^6.0.7", - "ts-loader": "^3.5.0", - "uglifyjs-webpack-plugin": "^1.2.4", + "ts-loader": "^4.1.0", "util-deprecate": "^1.0.2", - "webpack": "^3.11.0", + "webpack": "^4.2.0", "webpack-hot-middleware": "^2.21.2", "zone.js": "^0.8.20" }, diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js index 30132bde3eda..b194ee0c671d 100644 --- a/app/angular/src/server/config/webpack.config.js +++ b/app/angular/src/server/config/webpack.config.js @@ -14,6 +14,7 @@ import { version } from '../../../package.json'; export default function(configDir) { const config = { + mode: 'development', devtool: 'cheap-module-source-map', entry: { manager: [require.resolve('./polyfills'), managerPath], @@ -29,7 +30,6 @@ export default function(configDir) { publicPath: '/', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -47,6 +47,7 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv()), new webpack.HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), diff --git a/app/angular/src/server/config/webpack.config.prod.js b/app/angular/src/server/config/webpack.config.prod.js index da46d98edbd9..8300c2fef9dd 100644 --- a/app/angular/src/server/config/webpack.config.prod.js +++ b/app/angular/src/server/config/webpack.config.prod.js @@ -1,6 +1,5 @@ import path from 'path'; import webpack from 'webpack'; -import UglifyJsPlugin from 'uglifyjs-webpack-plugin'; import Dotenv from 'dotenv-webpack'; import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -18,6 +17,7 @@ export default function(configDir) { }; const config = { + mode: 'production', bail: true, devtool: '#cheap-module-source-map', entry: entries, @@ -31,7 +31,6 @@ export default function(configDir) { publicPath: '', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -49,21 +48,8 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv({ production: true })), - new UglifyJsPlugin({ - parallel: true, - uglifyOptions: { - ie8: false, - mangle: false, - warnings: false, - compress: { - keep_fnames: true, - }, - output: { - comments: false, - }, - }, - }), new webpack.ContextReplacementPlugin( /angular(\\|\/)core(\\|\/)(@angular|esm5)/, path.resolve(__dirname, '../src') diff --git a/app/polymer/package.json b/app/polymer/package.json index fb1e0dffc0fc..a5951919fc3f 100644 --- a/app/polymer/package.json +++ b/app/polymer/package.json @@ -46,14 +46,13 @@ "dotenv-webpack": "^1.5.5", "find-cache-dir": "^1.0.0", "global": "^4.3.2", - "html-webpack-plugin": "^2.30.1", + "html-webpack-plugin": "^3.1.0", "json5": "^0.5.1", "react": "^16.0.0", "react-dev-utils": "^5.0.0", "react-dom": "^16.0.0", - "uglifyjs-webpack-plugin": "^1.2.4", "util-deprecate": "^1.0.2", - "webpack": "^3.11.0", + "webpack": "^4.2.0", "webpack-hot-middleware": "^2.21.2" }, "devDependencies": { diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js index 2e4880bc76b2..b54c40221544 100644 --- a/app/polymer/src/server/config/webpack.config.js +++ b/app/polymer/src/server/config/webpack.config.js @@ -15,6 +15,7 @@ import { version } from '../../../package.json'; export default function(configDir) { const config = { + mode: 'development', devtool: 'cheap-module-source-map', entry: { manager: [require.resolve('./polyfills'), managerPath], @@ -30,7 +31,6 @@ export default function(configDir) { publicPath: '/', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -48,6 +48,7 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new CopyWebpackPlugin([ { from: require.resolve('@webcomponents/webcomponentsjs/webcomponents-lite.js') }, { from: require.resolve('@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js') }, diff --git a/app/polymer/src/server/config/webpack.config.prod.js b/app/polymer/src/server/config/webpack.config.prod.js index 65328637e227..2b2bde9c5452 100644 --- a/app/polymer/src/server/config/webpack.config.prod.js +++ b/app/polymer/src/server/config/webpack.config.prod.js @@ -1,5 +1,4 @@ import webpack from 'webpack'; -import UglifyJsPlugin from 'uglifyjs-webpack-plugin'; import Dotenv from 'dotenv-webpack'; import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -17,6 +16,7 @@ export default function(configDir) { }; const config = { + mode: 'production', bail: true, devtool: '#cheap-module-source-map', entry: entries, @@ -30,7 +30,6 @@ export default function(configDir) { publicPath: '', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -48,25 +47,12 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new CopyWebpackPlugin([ { from: require.resolve('@webcomponents/webcomponentsjs/webcomponents-lite.js') }, { from: require.resolve('@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js') }, ]), new webpack.DefinePlugin(loadEnv({ production: true })), - new UglifyJsPlugin({ - parallel: true, - uglifyOptions: { - ie8: false, - mangle: false, - warnings: false, - compress: { - keep_fnames: true, - }, - output: { - comments: false, - }, - }, - }), new Dotenv({ silent: true }), ], module: { diff --git a/app/react-native/package.json b/app/react-native/package.json index ada7fb02c9a2..c6a4a504a415 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -49,7 +49,7 @@ "find-cache-dir": "^1.0.0", "global": "^4.3.2", "html-loader": "^0.5.5", - "html-webpack-plugin": "^2.30.1", + "html-webpack-plugin": "^3.1.0", "json5": "^0.5.1", "markdown-loader": "^2.0.2", "prop-types": "^15.6.1", @@ -57,12 +57,11 @@ "react-native-compat": "^1.0.0", "react-native-iphone-x-helper": "^1.0.2", "shelljs": "^0.8.1", - "uglifyjs-webpack-plugin": "^1.2.4", "url-parse": "^1.1.9", "util-deprecate": "^1.0.2", "uuid": "^3.2.1", - "webpack": "^3.11.0", - "webpack-dev-middleware": "^1.12.2", + "webpack": "^4.2.0", + "webpack-dev-middleware": "^3.0.1", "webpack-hot-middleware": "^2.21.2", "ws": "^4.1.0" }, diff --git a/app/react-native/src/server/config/utils.js b/app/react-native/src/server/config/utils.js index b71c33df1a9c..fee44f7b254e 100644 --- a/app/react-native/src/server/config/utils.js +++ b/app/react-native/src/server/config/utils.js @@ -1,12 +1,5 @@ -import webpack from 'webpack'; import path from 'path'; -export const OccurenceOrderPlugin = - // for webpack 2 - webpack.optimize.OccurrenceOrderPlugin || - // for webpack 1 - webpack.optimize.OccurenceOrderPlugin; - export const includePaths = [path.resolve('./')]; export const excludePaths = [path.resolve('./node_modules')]; diff --git a/app/react-native/src/server/config/webpack.config.js b/app/react-native/src/server/config/webpack.config.js index 0f0cf073a73c..9979277ae43b 100644 --- a/app/react-native/src/server/config/webpack.config.js +++ b/app/react-native/src/server/config/webpack.config.js @@ -3,9 +3,10 @@ import webpack from 'webpack'; import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin'; import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; -import { OccurenceOrderPlugin, includePaths, excludePaths, nodeModulesPaths } from './utils'; +import { includePaths, excludePaths, nodeModulesPaths } from './utils'; const getConfig = options => ({ + mode: 'development', devtool: '#cheap-module-eval-source-map', entry: { manager: [require.resolve('../../manager')], @@ -23,7 +24,6 @@ const getConfig = options => ({ }, template: require.resolve('../index.html.ejs'), }), - new OccurenceOrderPlugin(), new webpack.HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), new WatchMissingNodeModulesPlugin(nodeModulesPaths), diff --git a/app/react-native/src/server/config/webpack.config.prod.js b/app/react-native/src/server/config/webpack.config.prod.js index 578a4b57ff02..3235cedb9678 100644 --- a/app/react-native/src/server/config/webpack.config.prod.js +++ b/app/react-native/src/server/config/webpack.config.prod.js @@ -1,11 +1,11 @@ import path from 'path'; import webpack from 'webpack'; -import UglifyJsPlugin from 'uglifyjs-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; -import { OccurenceOrderPlugin, includePaths, excludePaths } from './utils'; +import { includePaths, excludePaths } from './utils'; const getConfig = options => { const config = { + mode: 'production', bail: true, devtool: '#cheap-module-source-map', entry: { @@ -31,20 +31,6 @@ const getConfig = options => { }), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }), new webpack.optimize.DedupePlugin(), - new UglifyJsPlugin({ - parallel: true, - uglifyOptions: { - ie8: false, - mangle: false, - warnings: false, - compress: { - keep_fnames: true, - }, - output: { - comments: false, - }, - }, - }), ], module: { rules: [ @@ -70,12 +56,6 @@ const getConfig = options => { }, }; - // Webpack 2 doesn't have a OccurenceOrderPlugin plugin in the production mode. - // But webpack 1 has it. That's why we do this. - if (OccurenceOrderPlugin) { - config.plugins.unshift(new OccurenceOrderPlugin()); - } - return config; }; diff --git a/app/react/package.json b/app/react/package.json index ec33b5f4e679..62240634cfc1 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -51,15 +51,14 @@ "glamorous": "^4.12.1", "global": "^4.3.2", "html-loader": "^0.5.5", - "html-webpack-plugin": "^2.30.1", + "html-webpack-plugin": "^3.1.0", "json5": "^0.5.1", "lodash.flattendeep": "^4.4.0", "markdown-loader": "^2.0.2", "prop-types": "^15.6.1", "react-dev-utils": "^5.0.0", - "uglifyjs-webpack-plugin": "^1.2.4", "util-deprecate": "^1.0.2", - "webpack": "^3.11.0", + "webpack": "^4.2.0", "webpack-hot-middleware": "^2.21.2" }, "devDependencies": { diff --git a/app/react/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js index 138a68d0ea27..056565dc92bc 100644 --- a/app/react/src/server/config/webpack.config.js +++ b/app/react/src/server/config/webpack.config.js @@ -14,6 +14,7 @@ import { version } from '../../../package.json'; export default function(configDir) { const config = { + mode: 'development', devtool: 'cheap-module-source-map', entry: { manager: [require.resolve('./polyfills'), managerPath], @@ -29,7 +30,6 @@ export default function(configDir) { publicPath: '/', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -47,6 +47,7 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv()), new webpack.HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), diff --git a/app/react/src/server/config/webpack.config.prod.js b/app/react/src/server/config/webpack.config.prod.js index 120737a15146..cf4a52274623 100644 --- a/app/react/src/server/config/webpack.config.prod.js +++ b/app/react/src/server/config/webpack.config.prod.js @@ -1,5 +1,4 @@ import webpack from 'webpack'; -import UglifyJsPlugin from 'uglifyjs-webpack-plugin'; import Dotenv from 'dotenv-webpack'; import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -16,6 +15,7 @@ export default function(configDir) { }; const config = { + mode: 'production', bail: true, devtool: '#cheap-module-source-map', entry: entries, @@ -29,7 +29,6 @@ export default function(configDir) { publicPath: '', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -47,21 +46,8 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv({ production: true })), - new UglifyJsPlugin({ - parallel: true, - uglifyOptions: { - ie8: false, - mangle: false, - warnings: false, - compress: { - keep_fnames: true, - }, - output: { - comments: false, - }, - }, - }), new Dotenv({ silent: true }), ], module: { diff --git a/app/vue/package.json b/app/vue/package.json index 520f614bdacc..17d61b322a87 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -43,15 +43,14 @@ "find-cache-dir": "^1.0.0", "global": "^4.3.2", "html-loader": "^0.5.5", - "html-webpack-plugin": "^2.30.1", + "html-webpack-plugin": "^3.1.0", "json5": "^0.5.1", "markdown-loader": "^2.0.2", "react": "^16.2.0", "react-dev-utils": "^5.0.0", "react-dom": "^16.2.0", - "uglifyjs-webpack-plugin": "^1.2.4", "util-deprecate": "^1.0.2", - "webpack": "^3.11.0", + "webpack": "^4.2.0", "webpack-hot-middleware": "^2.21.2" }, "devDependencies": { diff --git a/app/vue/src/server/config/webpack.config.js b/app/vue/src/server/config/webpack.config.js index eec173319fe4..df6ab4bc4edb 100644 --- a/app/vue/src/server/config/webpack.config.js +++ b/app/vue/src/server/config/webpack.config.js @@ -14,6 +14,7 @@ import { version } from '../../../package.json'; export default function(configDir) { const config = { + mode: 'development', devtool: 'cheap-module-source-map', entry: { manager: [require.resolve('./polyfills'), managerPath], @@ -29,7 +30,6 @@ export default function(configDir) { publicPath: '/', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -47,6 +47,7 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv()), new webpack.HotModuleReplacementPlugin(), new CaseSensitivePathsPlugin(), diff --git a/app/vue/src/server/config/webpack.config.prod.js b/app/vue/src/server/config/webpack.config.prod.js index 40091d93f197..05a2f07794b4 100644 --- a/app/vue/src/server/config/webpack.config.prod.js +++ b/app/vue/src/server/config/webpack.config.prod.js @@ -1,5 +1,4 @@ import webpack from 'webpack'; -import UglifyJsPlugin from 'uglifyjs-webpack-plugin'; import Dotenv from 'dotenv-webpack'; import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -16,6 +15,7 @@ export default function(configDir) { }; const config = { + mode: 'production', bail: true, devtool: '#cheap-module-source-map', entry: entries, @@ -29,7 +29,6 @@ export default function(configDir) { publicPath: '', }, plugins: [ - new InterpolateHtmlPlugin(process.env), new HtmlWebpackPlugin({ filename: 'index.html', chunks: ['manager'], @@ -47,21 +46,8 @@ export default function(configDir) { }, template: require.resolve('../iframe.html.ejs'), }), + new InterpolateHtmlPlugin(process.env), new webpack.DefinePlugin(loadEnv({ production: true })), - new UglifyJsPlugin({ - parallel: true, - uglifyOptions: { - ie8: false, - mangle: false, - warnings: false, - compress: { - keep_fnames: true, - }, - output: { - comments: false, - }, - }, - }), new Dotenv({ silent: true }), ], module: { diff --git a/examples/cra-kitchen-sink/.storybook/webpack.config.js b/examples/cra-kitchen-sink/.storybook/webpack.config.js deleted file mode 100644 index 8a6998fc93a3..000000000000 --- a/examples/cra-kitchen-sink/.storybook/webpack.config.js +++ /dev/null @@ -1,23 +0,0 @@ -const webpack = require('webpack'); - -// Export a function. -module.exports = (storybookBaseConfig, configType, defaultConfig) => { - // configType has a value of 'DEVELOPMENT' or 'PRODUCTION' - // You can change the configuration based on that. - // 'PRODUCTION' is used when building the static version of storybook. - - // Make whatever fine-grained changes you need - defaultConfig.plugins.push( - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - chunks: ['preview'], - minChunks(module) { - // this assumes your vendor imports exist in the node_modules directory - return module.context && module.context.indexOf('node_modules') !== -1; - }, - }) - ); - - // Return the altered config - return defaultConfig; -}; diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json index cd5edfdce811..2471e72d9e12 100644 --- a/examples/cra-kitchen-sink/package.json +++ b/examples/cra-kitchen-sink/package.json @@ -38,6 +38,6 @@ "enzyme-to-json": "^3.3.3", "jest": "^20.0.4", "react-scripts": "^1.1.1", - "webpack": "^3.11.0" + "webpack": "^4.2.0" } } diff --git a/examples/crna-kitchen-sink/package.json b/examples/crna-kitchen-sink/package.json index 9a8d318628fb..48988d6d5592 100644 --- a/examples/crna-kitchen-sink/package.json +++ b/examples/crna-kitchen-sink/package.json @@ -20,8 +20,7 @@ "babel-runtime": "^6.26.0", "jest-expo": "^24.0.0", "react-native-scripts": "^1.8.1", - "react-test-renderer": "~16.2.0", - "webpack": "^3.8.1" + "react-test-renderer": "~16.2.0" }, "main": "./node_modules/react-native-scripts/build/bin/crna-entry.js", "scripts": { diff --git a/examples/crna-kitchen-sink/storybook/webpack.config.js b/examples/crna-kitchen-sink/storybook/webpack.config.js deleted file mode 100644 index fc1c6ded8738..000000000000 --- a/examples/crna-kitchen-sink/storybook/webpack.config.js +++ /dev/null @@ -1,21 +0,0 @@ -const webpack = require('webpack'); - -module.exports = (storybookBaseConfig, configType, defaultConfig) => { - // configType has a value of 'DEVELOPMENT' or 'PRODUCTION' - // You can change the configuration based on that. - // 'PRODUCTION' is used when building the static version of storybook. - - // Make whatever fine-grained changes you need - defaultConfig.plugins.push( - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks(module) { - // this assumes your vendor imports exist in the node_modules directory - return module.context && module.context.indexOf('node_modules') !== -1; - }, - }) - ); - - // Return the altered config - return defaultConfig; -}; diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json index b9d26da20f57..f6eb056538cd 100644 --- a/examples/polymer-cli/package.json +++ b/examples/polymer-cli/package.json @@ -20,14 +20,14 @@ "@webcomponents/webcomponentsjs": "^1.1.1", "global": "^4.3.2", "polymer-webpack-loader": "^2.0.2", - "webpack": "^3.11.0" + "webpack": "^4.2.0" }, "devDependencies": { "babel-core": "^6.26.0", "babel-loader": "^7.1.4", "babel-runtime": "^6.26.0", "copy-webpack-plugin": "^4.5.1", - "html-webpack-plugin": "^2.30.1", - "webpack-dev-server": "^2.11.2" + "html-webpack-plugin": "^3.1.0", + "webpack-dev-server": "^3.1.1" } } diff --git a/examples/vue-kitchen-sink/.storybook/webpack.config.js b/examples/vue-kitchen-sink/.storybook/webpack.config.js index 6066d3215c5e..647e02ae0d4a 100644 --- a/examples/vue-kitchen-sink/.storybook/webpack.config.js +++ b/examples/vue-kitchen-sink/.storybook/webpack.config.js @@ -1,5 +1,4 @@ const path = require('path'); -const webpack = require('webpack'); module.exports = (storybookBaseConfig, configType, defaultConfig) => { defaultConfig.module.rules.push({ @@ -9,16 +8,5 @@ module.exports = (storybookBaseConfig, configType, defaultConfig) => { enforce: 'pre', }); - defaultConfig.plugins.push( - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - chunks: ['preview'], - minChunks(module) { - // this assumes your vendor imports exist in the node_modules directory - return module.context && module.context.indexOf('node_modules') !== -1; - }, - }) - ); - return defaultConfig; }; diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json index 240e70de2cea..7c4b7fffa96f 100644 --- a/examples/vue-kitchen-sink/package.json +++ b/examples/vue-kitchen-sink/package.json @@ -32,7 +32,7 @@ "file-loader": "^1.1.11", "svg-url-loader": "^2.3.2", "vue-loader": "^14.2.2", - "webpack": "^3.11.0", - "webpack-dev-server": "^2.11.2" + "webpack": "^4.2.0", + "webpack-dev-server": "^3.1.1" } } diff --git a/lib/core/package.json b/lib/core/package.json index 95054c8b5df5..a0a8f4d0347a 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -44,9 +44,9 @@ "shelljs": "^0.8.1", "style-loader": "^0.20.3", "svg-url-loader": "^2.3.2", - "url-loader": "^0.6.2", - "webpack": "^3.11.0", - "webpack-dev-middleware": "^1.12.2", + "url-loader": "^1.0.1", + "webpack": "^4.2.0", + "webpack-dev-middleware": "^3.0.1", "webpack-hot-middleware": "^2.21.2" } } diff --git a/lib/core/src/server/config/defaults/webpack.config.js b/lib/core/src/server/config/defaults/webpack.config.js index 2d3c11e18423..9e35dd667cfa 100644 --- a/lib/core/src/server/config/defaults/webpack.config.js +++ b/lib/core/src/server/config/defaults/webpack.config.js @@ -31,10 +31,6 @@ export function createDefaultWebpackConfig(storybookBaseConfig) { }, ], }, - { - test: /\.json$/, - loader: require.resolve('json-loader'), - }, { test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2)(\?.*)?$/, loader: require.resolve('file-loader'), diff --git a/yarn.lock b/yarn.lock index 306960b1b07e..63799ca160ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -214,6 +214,13 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" +"@mrmlnc/readdir-enhanced@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + dependencies: + call-me-maybe "^1.0.1" + glob-to-regexp "^0.3.0" + "@ngrx/store@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-5.2.0.tgz#627ed74c9cd95462930485d912a557117b23903e" @@ -416,6 +423,12 @@ acorn-dynamic-import@^2.0.0: dependencies: acorn "^4.0.3" +acorn-dynamic-import@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" + dependencies: + acorn "^5.0.0" + acorn-globals@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf" @@ -1048,7 +1061,7 @@ babel-cli@^6.26.0: optionalDependencies: chokidar "^1.6.1" -babel-code-frame@6.26.0, babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, 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" dependencies: @@ -2498,7 +2511,7 @@ bplist-parser@0.1.1: dependencies: big-integer "^1.6.7" -brace-expansion@^1.0.0, brace-expansion@^1.1.7: +brace-expansion@^1.1.7: version "1.1.8" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" dependencies: @@ -2685,6 +2698,13 @@ browserify@^14.5.0: vm-browserify "~0.0.1" xtend "^4.0.0" +browserslist@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.1.1.tgz#d380fc048bc3a33e60fb87dc135110ebaaa6320a" + dependencies: + caniuse-lite "^1.0.30000809" + electron-to-chromium "^1.3.33" + browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" @@ -2888,6 +2908,10 @@ call-limit@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.0.tgz#6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea" +call-me-maybe@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + caller-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" @@ -2953,6 +2977,10 @@ caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000789, caniuse-lite@^1.0.300007 version "1.0.30000791" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16" +caniuse-lite@^1.0.30000809: + version "1.0.30000815" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz#3a4258e6850362185adb11b0d754a48402d35bf6" + caniuse-lite@^1.0.30000817, caniuse-lite@^1.0.30000819: version "1.0.30000819" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000819.tgz#aabee5fd15a080febab6ae5d30c9ea15f4c6d4e2" @@ -3012,6 +3040,14 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@2.3.1, chalk@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" + dependencies: + ansi-styles "^3.2.0" + escape-string-regexp "^1.0.5" + supports-color "^5.2.0" + chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" @@ -3020,14 +3056,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" -chalk@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" - dependencies: - ansi-styles "^3.2.0" - escape-string-regexp "^1.0.5" - supports-color "^5.2.0" - chalk@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" @@ -3161,6 +3189,10 @@ chownr@^1.0.1, chownr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" +chrome-trace-event@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz#90f36885d5345a50621332f0717b595883d5d982" + ci-info@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4" @@ -4093,11 +4125,13 @@ cross-fetch@1.1.1: node-fetch "1.7.3" whatwg-fetch "2.0.3" -cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" +cross-spawn@6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.4.tgz#bbf44ccb30fb8314a08f178b62290c669c36d808" dependencies: - lru-cache "^4.0.1" + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" shebang-command "^1.2.0" which "^1.2.9" @@ -4115,6 +4149,14 @@ cross-spawn@^4.0.2: lru-cache "^4.0.1" which "^1.2.9" +cross-spawn@^5.0.1, cross-spawn@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4890,7 +4932,7 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: dependencies: electron-releases "^2.1.0" -electron-to-chromium@^1.3.40: +electron-to-chromium@^1.3.33, electron-to-chromium@^1.3.40: version "1.3.40" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf" @@ -4981,7 +5023,7 @@ engine.io@~3.1.0: optionalDependencies: uws "~9.14.0" -enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0: +enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0: version "3.4.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" dependencies: @@ -4990,6 +5032,14 @@ enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0, enhanced-resolve@^3.4.0: object-assign "^4.0.1" tapable "^0.2.7" +enhanced-resolve@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a" + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.4.0" + tapable "^1.0.0" + ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" @@ -5897,6 +5947,16 @@ fast-diff@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" +fast-glob@^2.0.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.0.tgz#e9d032a69b86bef46fc03d935408f02fb211d9fc" + dependencies: + "@mrmlnc/readdir-enhanced" "^2.2.1" + glob-parent "^3.1.0" + is-glob "^4.0.0" + merge2 "^1.2.1" + micromatch "^3.1.8" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -6030,9 +6090,9 @@ fileset@^2.0.2: glob "^7.0.3" minimatch "^3.0.3" -filesize@3.5.11: - version "3.5.11" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" +filesize@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa" fill-range@^2.1.0: version "2.2.3" @@ -6125,6 +6185,12 @@ find-cache-dir@^1.0.0: make-dir "^1.0.0" pkg-dir "^2.0.0" +find-file-up@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/find-file-up/-/find-file-up-1.0.2.tgz#4d53664bc128cf793901497f4b13558d979755ca" + dependencies: + resolve-dir "^1.0.0" + find-index@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" @@ -6133,6 +6199,12 @@ find-parent-dir@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" +find-pkg@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/find-pkg/-/find-pkg-1.0.0.tgz#96db242e001c7c55025d32213302ea3aba677177" + dependencies: + find-file-up "^1.0.2" + find-root@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" @@ -6625,6 +6697,10 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob-to-regexp@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + glob2base@^0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" @@ -6702,6 +6778,18 @@ globals@^9.17.0, globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" +globby@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + fast-glob "^2.0.2" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + globby@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" @@ -6924,11 +7012,12 @@ gulplog@^1.0.0: dependencies: glogg "^1.0.0" -gzip-size@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520" +gzip-size@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c" dependencies: duplexer "^0.1.1" + pify "^3.0.0" handle-thing@^1.2.5: version "1.2.5" @@ -7247,7 +7336,7 @@ html-webpack-plugin@2.29.0: pretty-error "^2.0.2" toposort "^1.0.0" -html-webpack-plugin@^2.29.0, html-webpack-plugin@^2.30.1: +html-webpack-plugin@^2.29.0: version "2.30.1" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz#7f9c421b7ea91ec460f56527d78df484ee7537d5" dependencies: @@ -7258,6 +7347,18 @@ html-webpack-plugin@^2.29.0, html-webpack-plugin@^2.30.1: pretty-error "^2.0.2" toposort "^1.0.0" +html-webpack-plugin@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.1.0.tgz#6e02baaedb1e906310917f03239c793a75af2885" + dependencies: + html-minifier "^3.2.3" + loader-utils "^0.2.16" + lodash "^4.17.3" + pretty-error "^2.0.2" + tapable "^1.0.0" + toposort "^1.0.0" + util.promisify "1.0.0" + htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" @@ -7581,21 +7682,20 @@ inline-style-prefixer@^3.0.6: bowser "^1.7.3" css-in-js-utils "^2.0.0" -inquirer@3.3.0, inquirer@^3.0.6, inquirer@^3.2.2: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" +inquirer@5.1.0, inquirer@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.0" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^2.0.4" + external-editor "^2.1.0" figures "^2.0.0" lodash "^4.3.0" mute-stream "0.0.7" run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" + rxjs "^5.5.2" string-width "^2.1.0" strip-ansi "^4.0.0" through "^2.3.6" @@ -7618,20 +7718,21 @@ inquirer@^0.11.0: strip-ansi "^3.0.0" through "^2.3.6" -inquirer@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67" +inquirer@^3.0.6, inquirer@^3.2.2: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.0" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^2.1.0" + external-editor "^2.0.4" figures "^2.0.0" lodash "^4.3.0" mute-stream "0.0.7" run-async "^2.2.0" - rxjs "^5.5.2" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" string-width "^2.1.0" strip-ansi "^4.0.0" through "^2.3.6" @@ -9912,7 +10013,7 @@ log-symbols@^1.0.2: dependencies: chalk "^1.0.0" -log-symbols@^2.2.0: +log-symbols@^2.1.0, log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" dependencies: @@ -9956,6 +10057,10 @@ loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" +loglevelnext@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e" + longest-streak@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" @@ -9970,7 +10075,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0" -loud-rejection@^1.0.0: +loud-rejection@^1.0.0, loud-rejection@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" dependencies: @@ -10233,6 +10338,10 @@ merge-stream@^1.0.1: dependencies: readable-stream "^2.0.1" +merge2@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.1.tgz#271d2516ff52d4af7f7b710b8bf3e16e183fef66" + merge@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -10414,6 +10523,10 @@ mime@^1.2.11, mime@^1.3.4, mime@^1.4.1, mime@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" +mime@^2.0.3, mime@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -10432,18 +10545,12 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" -minimatch@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" - dependencies: - brace-expansion "^1.0.0" - minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" @@ -11884,6 +11991,12 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" +pkg-up@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + dependencies: + find-up "^2.1.0" + please-upgrade-node@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz#0a681f2c18915e5433a5ca2cd94e0b8206a782db" @@ -12793,25 +12906,29 @@ react-deep-force-update@^1.0.0: react-dev-utils@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.0.tgz#425ac7c9c40c2603bc4f7ab8836c1406e96bb473" + resolved "https://codeload.github.com/zanettin/react-dev-utils/tar.gz/7a8cd932dcb2025daca6a907a404613d5c2ae086" dependencies: + "@babel/code-frame" "7.0.0-beta.40" address "1.0.3" - babel-code-frame "6.26.0" - chalk "1.1.3" - cross-spawn "5.1.0" + browserslist "3.1.1" + chalk "2.3.1" + cross-spawn "6.0.4" detect-port-alt "1.1.5" escape-string-regexp "1.0.5" - filesize "3.5.11" + filesize "3.6.0" + find-pkg "1.0.0" global-modules "1.0.0" - gzip-size "3.0.0" - inquirer "3.3.0" + globby "8.0.1" + gzip-size "4.1.0" + inquirer "5.1.0" is-root "1.0.0" opn "5.2.0" + pkg-up "2.0.0" react-error-overlay "^4.0.0" - recursive-readdir "2.2.1" + recursive-readdir "2.2.2" shell-quote "1.6.1" sockjs-client "1.1.4" - strip-ansi "3.0.1" + strip-ansi "4.0.0" text-table "0.2.0" react-devtools-core@3.0.0: @@ -13352,11 +13469,11 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" -recursive-readdir@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99" +recursive-readdir@2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" dependencies: - minimatch "3.0.3" + minimatch "3.0.4" redent@^1.0.0: version "1.0.0" @@ -14164,7 +14281,7 @@ schema-utils@^0.3.0: dependencies: ajv "^5.0.0" -schema-utils@^0.4.0, schema-utils@^0.4.5: +schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: @@ -15117,11 +15234,11 @@ stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" -strip-ansi@3.0.1, strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" +strip-ansi@4.0.0, strip-ansi@^4.0.0, strip-ansi@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" dependencies: - ansi-regex "^2.0.0" + ansi-regex "^3.0.0" strip-ansi@^0.3.0: version "0.3.0" @@ -15129,11 +15246,11 @@ strip-ansi@^0.3.0: dependencies: ansi-regex "^0.2.1" -strip-ansi@^4.0.0, strip-ansi@~4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" dependencies: - ansi-regex "^3.0.0" + ansi-regex "^2.0.0" strip-ansi@~0.1.0: version "0.1.1" @@ -15370,6 +15487,10 @@ tapable@^0.2.7: version "0.2.8" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" +tapable@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2" + tar-fs@^1.15.3: version "1.16.0" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896" @@ -15671,12 +15792,12 @@ ts-jest@^22.4.1: pkg-dir "^2.0.0" yargs "^11.0.0" -ts-loader@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0" +ts-loader@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.1.0.tgz#6216e75600941df3270bc4a7125e20aefb2dc5ea" dependencies: chalk "^2.3.0" - enhanced-resolve "^3.0.0" + enhanced-resolve "^4.0.0" loader-utils "^1.0.2" micromatch "^3.1.4" semver "^5.0.1" @@ -15853,9 +15974,9 @@ uglifyjs-webpack-plugin@^0.4.6: uglify-js "^2.8.29" webpack-sources "^1.0.1" -uglifyjs-webpack-plugin@^1.1.8: - version "1.2.0" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz#f706fa4c655000a086b4a97c7d835ed0f6e9b0ef" +uglifyjs-webpack-plugin@^1.1.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9" dependencies: cacache "^10.0.1" find-cache-dir "^1.0.0" @@ -15866,13 +15987,13 @@ uglifyjs-webpack-plugin@^1.1.8: webpack-sources "^1.1.0" worker-farm "^1.5.2" -uglifyjs-webpack-plugin@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043" +uglifyjs-webpack-plugin@^1.1.8: + version "1.2.0" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz#f706fa4c655000a086b4a97c7d835ed0f6e9b0ef" dependencies: - cacache "^10.0.4" + cacache "^10.0.1" find-cache-dir "^1.0.0" - schema-utils "^0.4.5" + schema-utils "^0.4.2" serialize-javascript "^1.4.0" source-map "^0.6.1" uglify-es "^3.3.4" @@ -16166,6 +16287,10 @@ urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" +url-join@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a" + url-loader@0.6.2, url-loader@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" @@ -16174,6 +16299,14 @@ url-loader@0.6.2, url-loader@^0.6.2: mime "^1.4.1" schema-utils "^0.3.0" +url-loader@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee" + dependencies: + loader-utils "^1.1.0" + mime "^2.0.3" + schema-utils "^0.4.3" + url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" @@ -16236,7 +16369,7 @@ util-extend@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" -util.promisify@^1.0.0: +util.promisify@1.0.0, util.promisify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" dependencies: @@ -16500,6 +16633,14 @@ watchpack@^1.4.0: chokidar "^1.7.0" graceful-fs "^4.1.2" +watchpack@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" + dependencies: + chokidar "^2.0.2" + graceful-fs "^4.1.2" + neo-async "^2.5.0" + wbuf@^1.1.0, wbuf@^1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" @@ -16550,7 +16691,7 @@ webpack-core@^0.6.8: source-list-map "~0.1.7" source-map "~0.4.1" -webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.11.0, webpack-dev-middleware@^1.12.2, webpack-dev-middleware@~1.12.0: +webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.11.0, webpack-dev-middleware@~1.12.0: version "1.12.2" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" dependencies: @@ -16560,6 +16701,18 @@ webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.11.0, webpack-dev-middl range-parser "^1.0.3" time-stamp "^2.0.0" +webpack-dev-middleware@3.0.1, webpack-dev-middleware@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.0.1.tgz#7ffd6d0192883c83d3f262e8d7dec822493c6166" + dependencies: + loud-rejection "^1.6.0" + memory-fs "~0.4.1" + mime "^2.1.0" + path-is-absolute "^1.0.0" + range-parser "^1.0.3" + url-join "^4.0.0" + webpack-log "^1.0.1" + webpack-dev-server@2.9.4: version "2.9.4" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1" @@ -16592,9 +16745,9 @@ webpack-dev-server@2.9.4: webpack-dev-middleware "^1.11.0" yargs "^6.6.0" -webpack-dev-server@^2.11.2: - version "2.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f" +webpack-dev-server@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.1.tgz#3c0fdd1ba3b50ebc79858a0e6b9ccdd1565b0c24" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" @@ -16621,8 +16774,9 @@ webpack-dev-server@^2.11.2: spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^5.1.0" - webpack-dev-middleware "1.12.2" - yargs "6.6.0" + webpack-dev-middleware "3.0.1" + webpack-log "^1.1.2" + yargs "9.0.1" webpack-dev-server@~2.11.0: version "2.11.0" @@ -16665,6 +16819,15 @@ webpack-hot-middleware@^2.21.2: querystring "^0.2.0" strip-ansi "^3.0.0" +webpack-log@^1.0.1, webpack-log@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.2.tgz#cdc76016537eed24708dc6aa3d1e52189efee107" + dependencies: + chalk "^2.1.0" + log-symbols "^2.1.0" + loglevelnext "^1.0.1" + uuid "^3.1.0" + webpack-manifest-plugin@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.3.2.tgz#5ea8ee5756359ddc1d98814324fe43496349a7d4" @@ -16718,7 +16881,31 @@ webpack@3.8.1: webpack-sources "^1.0.1" yargs "^8.0.2" -webpack@^3.11.0, webpack@~3.11.0: +webpack@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.2.0.tgz#a4f80807651a0e611bb09609600dc266262efcc1" + dependencies: + acorn "^5.0.0" + acorn-dynamic-import "^3.0.0" + ajv "^6.1.0" + ajv-keywords "^3.1.0" + chrome-trace-event "^0.1.1" + enhanced-resolve "^4.0.0" + eslint-scope "^3.7.1" + loader-runner "^2.3.0" + loader-utils "^1.1.0" + memory-fs "~0.4.1" + micromatch "^3.1.8" + mkdirp "~0.5.0" + neo-async "^2.5.0" + node-libs-browser "^2.0.0" + schema-utils "^0.4.2" + tapable "^1.0.0" + uglifyjs-webpack-plugin "^1.1.1" + watchpack "^1.5.0" + webpack-sources "^1.0.1" + +webpack@~3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894" dependencies: @@ -17146,6 +17333,24 @@ yargs@6.6.0, yargs@^6.6.0: y18n "^3.2.1" yargs-parser "^4.2.0" +yargs@9.0.1, yargs@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c" + dependencies: + camelcase "^4.1.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^2.0.0" + read-pkg-up "^2.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1" + yargs-parser "^7.0.0" + yargs@^10.0.3: version "10.1.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.1.tgz#5fe1ea306985a099b33492001fa19a1e61efe285" @@ -17235,24 +17440,6 @@ yargs@^8.0.2: y18n "^3.2.1" yargs-parser "^7.0.0" -yargs@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c" - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"