diff --git a/build/cooking.common.js b/build/cooking.common.js deleted file mode 100644 index 16f6be61d..000000000 --- a/build/cooking.common.js +++ /dev/null @@ -1,22 +0,0 @@ -var cooking = require('cooking'); -var config = require('./config'); - -cooking.set({ - entry: './src/index.js', - dist: './lib', - clean: false, - format: 'cjs', - extends: ['vue2'], - minimize: false, - alias: config.alias, - externals: config.externals -}); - -cooking.add('output.filename', 'element-ui.common.js'); -cooking.add('loader.js.exclude', config.jsexclude); -cooking.add('loader.scss', { - test: /\.scss$/, - loaders: ['style-loader', 'css-loader', 'sass-loader'] -}); -cooking.add('vue.preserveWhitespace', false); -module.exports = cooking.resolve(); diff --git a/build/cooking.component.js b/build/cooking.component.js deleted file mode 100644 index 5d8ac42ff..000000000 --- a/build/cooking.component.js +++ /dev/null @@ -1,23 +0,0 @@ -var cooking = require('cooking'); -var Components = require('../components.json'); -var config = require('./config'); - -cooking.set({ - entry: Components, - dist: './lib', - clean: false, - format: 'cjs', - extends: ['vue2'], - minimize: false, - externals: config.externals, - alias: config.alias -}); - -cooking.add('output.filename', '[name].js'); -cooking.add('loader.js.exclude', config.jsexclude); -cooking.add('loader.scss', { - test: /\.scss$/, - loaders: ['style-loader', 'css-loader', 'sass-loader'] -}); -cooking.add('vue.preserveWhitespace', false); -module.exports = cooking.resolve(); diff --git a/build/cooking.conf.js b/build/cooking.conf.js deleted file mode 100644 index 0f3707f3d..000000000 --- a/build/cooking.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -var cooking = require('cooking'); -var config = require('./config'); - -cooking.set({ - entry: './src/index.js', - dist: './lib', - clean: false, - format: 'umd', - moduleName: 'ELEMENT', - extends: ['vue2'], - alias: config.alias, - externals: { vue: config.vue } -}); - -cooking.add('output.filename', 'index.js'); -cooking.add('loader.js.exclude', config.jsexclude); -cooking.add('loader.scss', { - test: /\.scss$/, - loaders: ['style-loader', 'css-loader', 'sass-loader'] -}); -cooking.add('vue.preserveWhitespace', false); -module.exports = cooking.resolve(); diff --git a/build/cooking.demo.js b/build/cooking.demo.js deleted file mode 100644 index 972f83f8d..000000000 --- a/build/cooking.demo.js +++ /dev/null @@ -1,133 +0,0 @@ -var cooking = require('cooking'); -var config = require('./config'); -var md = require('markdown-it')(); -var CopyWebpackPlugin = require('copy-webpack-plugin'); -var striptags = require('./strip-tags'); -var slugify = require('transliteration').slugify; -var isProd = process.env.NODE_ENV === 'production'; -var isPlay = !!process.env.PLAY_ENV; - -function convert(str) { - str = str.replace(/(&#x)(\w{4});/gi, function($0) { - return String.fromCharCode(parseInt(encodeURIComponent($0).replace(/(%26%23x)(\w{4})(%3B)/g, '$2'), 16)); - }); - return str; -} - -cooking.set({ - entry: isProd ? { - docs: './examples/entry.js', - 'element-ui': './src/index.js' - } : (isPlay ? './examples/play.js' : './examples/entry.js'), - dist: './examples/element-ui/', - template: [ - { - template: './examples/index.tpl', - filename: './index.html', - favicon: './examples/favicon.ico' - } - ], - publicPath: process.env.CI_ENV || '', - hash: true, - devServer: { - hostname: '0.0.0.0', - port: 8085, - log: false, - publicPath: '/' - }, - minimize: true, - chunk: isProd ? { - 'common': { name: ['element-ui', 'manifest'] } - } : false, - extractCSS: true, - alias: config.alias, - extends: ['vue2', 'lint'], - postcss: config.postcss -}); - -// fix publicPath -if (!process.env.CI_ENV) { - cooking.add('output.publicPath', ''); -} - -cooking.add('loader.md', { - test: /\.md$/, - loader: 'vue-markdown-loader' -}); - -cooking.add('loader.scss', { - test: /\.scss$/, - loaders: ['style-loader', 'css-loader', 'sass-loader'] -}); - -cooking.add( - 'output.chunkFilename', - isProd ? '[name].[chunkhash:7].js' : '[name].js' -); - -cooking.add('vueMarkdown', { - use: [ - [require('markdown-it-anchor'), { - level: 2, - slugify: slugify, - permalink: true, - permalinkBefore: true - }], - [require('markdown-it-container'), 'demo', { - validate: function(params) { - return params.trim().match(/^demo\s*(.*)$/); - }, - - render: function(tokens, idx) { - var m = tokens[idx].info.trim().match(/^demo\s*(.*)$/); - if (tokens[idx].nesting === 1) { - var description = (m && m.length > 1) ? m[1] : ''; - var content = tokens[idx + 1].content; - var html = convert(striptags.strip(content, ['script', 'style'])).replace(/(<[^>]*)=""(?=.*>)/g, '$1'); - var script = striptags.fetch(content, 'script'); - var style = striptags.fetch(content, 'style'); - var jsfiddle = { html: html, script: script, style: style }; - var descriptionHTML = description - ? md.render(description) - : ''; - - jsfiddle = md.utils.escapeHtml(JSON.stringify(jsfiddle)); - - return ` -
${html}
- ${descriptionHTML} -
`; - } - return '
\n'; - } - }], - [require('markdown-it-container'), 'tip'], - [require('markdown-it-container'), 'warning'] - ], - preprocess: function(MarkdownIt, source) { - MarkdownIt.renderer.rules.table_open = function() { - return ''; - }; - MarkdownIt.renderer.rules.fence = wrap(MarkdownIt.renderer.rules.fence); - return source; - } -}); - -var wrap = function(render) { - return function() { - return render.apply(this, arguments) - .replace('', ''); - }; -}; - -if (isProd) { - cooking.add('externals.vue', 'Vue'); - cooking.add('externals.vue-router', 'VueRouter'); -} - -cooking.add('plugin.CopyWebpackPlugin', new CopyWebpackPlugin([ - { from: 'examples/versions.json' } -])); -cooking.add('vue.preserveWhitespace', false); -module.exports = cooking.resolve(); diff --git a/build/cooking.test.js b/build/cooking.test.js deleted file mode 100644 index 079815f0d..000000000 --- a/build/cooking.test.js +++ /dev/null @@ -1,29 +0,0 @@ -var cooking = require('cooking'); -var config = require('./config'); -var ProgressBarPlugin = require('progress-bar-webpack-plugin'); -var jsLoader = process.env.CI_ENV ? 'isparta-loader' : 'isparta-loader!eslint-loader'; - -cooking.set({ - entry: './src/index.js', - extends: process.env.CI_ENV ? ['vue2'] : ['vue2', 'lint'], - minimize: false, - alias: Object.assign(config.alias, { - 'vue$': 'vue/dist/vue.common.js' - }), - sourceMap: '#inline-source-map' -}); - -cooking.add('vue.loaders.js', jsLoader); -cooking.add('loader.js.exclude', config.jsexclude); -cooking.add('preLoader.0', { - test: /\.js$/, - loader: 'isparta', - exclude: config.jsexclude, - include: /src|packages/ -}); - -if (!process.env.CI_ENV) { - cooking.add('plugins.process', new ProgressBarPlugin()); -} -cooking.add('vue.preserveWhitespace', false); -module.exports = cooking.resolve(); diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 461359145..ff4bef115 100644 --- a/build/deploy-ci.sh +++ b/build/deploy-ci.sh @@ -56,7 +56,7 @@ if [ "$TRAVIS_TAG" ]; then fi # build dev site -npm run build:file && CI_ENV=/dev/$TRAVIS_BRANCH/ node_modules/.bin/cooking build -c build/cooking.demo.js +npm run build:file && CI_ENV=/dev/$TRAVIS_BRANCH/ node_modules/.bin/webpack --config build/webpack.demo.js cd temp_web git clone https://$ROT_TOKEN@github.com/ElementUI/dev.git && cd dev mkdir $TRAVIS_BRANCH diff --git a/build/webpack.common.js b/build/webpack.common.js new file mode 100644 index 000000000..e9a6085c8 --- /dev/null +++ b/build/webpack.common.js @@ -0,0 +1,90 @@ +const path = require('path'); +const webpack = require('webpack'); +const ProgressBarPlugin = require('progress-bar-webpack-plugin'); + +const config = require('./config'); + +module.exports = { + entry: { + app: ['./src/index.js'] + }, + output: { + path: path.resolve(process.cwd(), './lib'), + publicPath: '/dist/', + filename: 'element-ui.common.js', + chunkFilename: '[id].js', + libraryTarget: 'commonjs2' + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: config.alias, + modules: ['node_modules'] + }, + externals: config.externals, + module: { + rules: [ + { + test: /\.(jsx?|babel|es6)$/, + include: process.cwd(), + exclude: config.jsexclude, + loader: 'babel-loader' + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + preserveWhitespace: false + } + }, + { + test: /\.json$/, + loader: 'json-loader' + }, + { + test: /\.css$/, + loaders: ['style-loader', 'css-loader', 'postcss-loader'] + }, + { + test: /\.scss$/, + loaders: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.html$/, + loader: 'html-loader?minimize=false' + }, + { + test: /\.otf|ttf|woff2?|eot(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.svg(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.(gif|png|jpe?g)(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + } + ] + }, + plugins: [ + new ProgressBarPlugin(), + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production') + }), + new webpack.LoaderOptionsPlugin({ + minimize: true + }) + ] +}; diff --git a/build/webpack.component.js b/build/webpack.component.js new file mode 100644 index 000000000..37344c0aa --- /dev/null +++ b/build/webpack.component.js @@ -0,0 +1,91 @@ +const path = require('path'); +const webpack = require('webpack'); +const ProgressBarPlugin = require('progress-bar-webpack-plugin'); + +var Components = require('../components.json'); +const config = require('./config'); + +const webpackConfig = { + entry: Components, + output: { + path: path.resolve(process.cwd(), './lib'), + publicPath: '/dist/', + filename: '[name].js', + chunkFilename: '[id].js', + libraryTarget: 'commonjs2' + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: config.alias, + modules: ['node_modules'] + }, + externals: config.externals, + module: { + rules: [ + { + test: /\.(jsx?|babel|es6)$/, + include: process.cwd(), + exclude: config.jsexclude, + loader: 'babel-loader' + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + preserveWhitespace: false + } + }, + { + test: /\.json$/, + loader: 'json-loader' + }, + { + test: /\.css$/, + loaders: ['style-loader', 'css-loader', 'postcss-loader'] + }, + { + test: /\.scss$/, + loaders: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.html$/, + loader: 'html-loader?minimize=false' + }, + { + test: /\.otf|ttf|woff2?|eot(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.svg(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.(gif|png|jpe?g)(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + } + ] + }, + plugins: [ + new ProgressBarPlugin(), + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production') + }), + new webpack.LoaderOptionsPlugin({ + minimize: true + }) + ] +}; + +module.exports = webpackConfig; diff --git a/build/webpack.conf.js b/build/webpack.conf.js new file mode 100644 index 000000000..1f7300126 --- /dev/null +++ b/build/webpack.conf.js @@ -0,0 +1,102 @@ +const path = require('path'); +const webpack = require('webpack'); +const ProgressBarPlugin = require('progress-bar-webpack-plugin'); + +const config = require('./config'); + +module.exports = { + entry: { + app: ['./src/index.js'] + }, + output: { + path: path.resolve(process.cwd(), './lib'), + publicPath: '/dist/', + filename: 'index.js', + chunkFilename: '[id].js', + libraryTarget: 'umd', + library: 'ELEMENT', + umdNamedDefine: true + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: config.alias + }, + externals: { + vue: config.vue + }, + module: { + rules: [ + { + test: /\.(jsx?|babel|es6)$/, + include: process.cwd(), + exclude: config.jsexclude, + loader: 'babel-loader' + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + preserveWhitespace: false + } + }, + { + test: /\.json$/, + loader: 'json-loader' + }, + { + test: /\.css$/, + loaders: ['style-loader', 'css-loader', 'postcss-loader'] + }, + { + test: /\.scss$/, + loaders: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.html$/, + loader: 'html-loader?minimize=false' + }, + { + test: /\.otf|ttf|woff2?|eot(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.svg(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.(gif|png|jpe?g)(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + } + ] + }, + plugins: [ + new ProgressBarPlugin(), + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production') + }), + new webpack.optimize.UglifyJsPlugin({ + compress: { + warnings: false + }, + output: { + comments: false + }, + sourceMap: false + }), + new webpack.LoaderOptionsPlugin({ + minimize: true + }) + ] +}; diff --git a/build/webpack.demo.js b/build/webpack.demo.js new file mode 100644 index 000000000..e341926c2 --- /dev/null +++ b/build/webpack.demo.js @@ -0,0 +1,251 @@ +const path = require('path'); +const webpack = require('webpack'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const ProgressBarPlugin = require('progress-bar-webpack-plugin'); +const md = require('markdown-it')(); +const slugify = require('transliteration').slugify; + +const striptags = require('./strip-tags'); +const config = require('./config'); + +const isProd = process.env.NODE_ENV === 'production'; +const isDev = process.env.NODE_ENV === 'development'; +const isPlay = !!process.env.PLAY_ENV; + +function convert(str) { + str = str.replace(/(&#x)(\w{4});/gi, function($0) { + return String.fromCharCode(parseInt(encodeURIComponent($0).replace(/(%26%23x)(\w{4})(%3B)/g, '$2'), 16)); + }); + return str; +} + +function wrap(render) { + return function() { + return render.apply(this, arguments) + .replace('', ''); + }; +} + +const webpackConfig = { + entry: isProd ? { + docs: './examples/entry.js', + 'element-ui': './src/index.js' + } : (isPlay ? './examples/play.js' : './examples/entry.js'), + output: { + path: path.resolve(process.cwd(), './examples/element-ui/'), + publicPath: process.env.CI_ENV || '', + filename: '[name].[hash:7].js', + chunkFilename: isProd ? '[name].[hash:7].js' : '[name].js' + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: config.alias, + modules: ['node_modules'] + }, + devServer: { + host: '0.0.0.0', + port: 8085, + publicPath: '/', + noInfo: true + }, + module: { + rules: [ + { + enforce: 'pre', + test: /\.jsx?$/, + exclude: /node_modules|bower_components/, + loader: 'eslint-loader' + }, + { + enforce: 'pre', + test: /\.vue$/, + exclude: /node_modules|bower_components/, + loader: 'eslint-loader' + }, + { + test: /\.(jsx?|babel|es6)$/, + include: process.cwd(), + exclude: config.jsexclude, + loader: 'babel-loader' + }, + { + test: /\.md$/, + loader: 'vue-markdown-loader', + options: { + use: [ + [require('markdown-it-anchor'), { + level: 2, + slugify: slugify, + permalink: true, + permalinkBefore: true + }], + [require('markdown-it-container'), 'demo', { + validate: function(params) { + return params.trim().match(/^demo\s*(.*)$/); + }, + + render: function(tokens, idx) { + var m = tokens[idx].info.trim().match(/^demo\s*(.*)$/); + if (tokens[idx].nesting === 1) { + var description = (m && m.length > 1) ? m[1] : ''; + var content = tokens[idx + 1].content; + var html = convert(striptags.strip(content, ['script', 'style'])).replace(/(<[^>]*)=""(?=.*>)/g, '$1'); + var script = striptags.fetch(content, 'script'); + var style = striptags.fetch(content, 'style'); + var jsfiddle = { html: html, script: script, style: style }; + var descriptionHTML = description + ? md.render(description) + : ''; + + jsfiddle = md.utils.escapeHtml(JSON.stringify(jsfiddle)); + + return ` +
${html}
+ ${descriptionHTML} +
`; + } + return '
\n'; + } + }], + [require('markdown-it-container'), 'tip'], + [require('markdown-it-container'), 'warning'] + ], + preprocess: function(MarkdownIt, source) { + MarkdownIt.renderer.rules.table_open = function() { + return '
'; + }; + MarkdownIt.renderer.rules.fence = wrap(MarkdownIt.renderer.rules.fence); + return source; + } + } + }, + { + test: /\.json$/, + loader: 'json-loader' + }, + { + test: /\.scss$/, + loaders: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.html$/, + loader: 'html-loader?minimize=false' + }, + { + test: /\.otf|ttf|woff2?|eot(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.svg(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.(gif|png|jpe?g)(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + } + ] + }, + plugins: [ + new HtmlWebpackPlugin({ + template: './examples/index.tpl', + filename: './index.html', + favicon: './examples/favicon.ico' + }), + new CopyWebpackPlugin([ + { from: 'examples/versions.json' } + ]), + new ProgressBarPlugin(), + new webpack.LoaderOptionsPlugin({ + minimize: true, + vue: { + preserveWhitespace: false + } + }) + ] +}; + +if (isProd) { + webpackConfig.externals = { + vue: 'Vue', + 'vue-router': 'VueRouter' + }; + webpackConfig.module.rules.push( + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + extractCSS: true, + preserveWhitespace: false + } + }, + { + test: /\.css$/, + loader: ExtractTextPlugin.extract({ + fallback: 'style-loader', + use: [ + { loader: 'css-loader', options: { importLoaders: 1 } }, + 'postcss-loader' + ] + }) + } + ); + webpackConfig.plugins.push( + new webpack.optimize.UglifyJsPlugin({ + compress: { + warnings: false + }, + output: { + comments: false + }, + sourceMap: false + }), + new ExtractTextPlugin({ + filename: '[name].[contenthash:7].css' + }), + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('production') + }), + new webpack.optimize.CommonsChunkPlugin({ + name: ['element-ui', 'manifest'] + }) + ); +} +if (isDev) { + webpackConfig.module.rules.push( + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + preserveWhitespace: false + } + }, + { + test: /\.css$/, + loaders: ['style-loader', 'css-loader', 'postcss-loader'] + } + ); + webpackConfig.plugins.push( + new webpack.HotModuleReplacementPlugin(), + new webpack.NamedModulesPlugin(), + new webpack.DefinePlugin({ + 'process.env.NODE_ENV': JSON.stringify('development') + }) + ); +} + +module.exports = webpackConfig; diff --git a/build/webpack.test.js b/build/webpack.test.js new file mode 100644 index 000000000..54f4f515c --- /dev/null +++ b/build/webpack.test.js @@ -0,0 +1,98 @@ +const path = require('path'); +const ProgressBarPlugin = require('progress-bar-webpack-plugin'); + +const config = require('./config'); + +const webpackConfig = { + entry: { + app: ['./src/index.js'] + }, + output: { + path: path.resolve(process.cwd(), './dist'), + publicPath: '/dist/', + filename: '[name].js', + chunkFilename: '[id].js' + }, + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: Object.assign(config.alias, { + 'vue$': 'vue/dist/vue.common.js' + }), + modules: ['node_modules'] + }, + devtool: '#inline-source-map', + module: { + rules: [ + { + enforce: 'post', + test: /\.jsx?$/, + loader: 'isparta-loader', + options: { esModules: true }, + exclude: config.jsexclude, + include: /src|packages/ + }, + { + test: /\.(jsx?|babel|es6)$/, + include: process.cwd(), + exclude: config.jsexclude, + loader: 'babel-loader' + }, + { + test: /\.vue$/, + loader: 'vue-loader', + options: { + loaders: { + js: process.env.CI_ENV ? 'isparta-loader' : 'isparta-loader!eslint-loader' + }, + preserveWhitespace: false + } + }, + { + test: /\.json$/, + loader: 'json-loader' + }, + { + test: /\.css$/, + loaders: ['style-loader', 'css-loader', 'postcss-loader'] + }, + { + test: /\.html$/, + loader: 'html-loader?minimize=false' + }, + { + test: /\.otf|ttf|woff2?|eot(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.svg(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + }, + { + test: /\.(gif|png|jpe?g)(\?\S*)?$/, + loader: 'url-loader', + query: { + limit: 10000, + name: path.posix.join('static', '[name].[hash:7].[ext]') + } + } + ] + }, + plugins: [ + ] +}; + +if (!process.env.CI_ENV) { + webpackConfig.plugins.push( + new ProgressBarPlugin() + ); +} + +module.exports = webpackConfig; diff --git a/package.json b/package.json index 445095e3e..f031815a3 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "build:umd": "node build/bin/build-locale.js", "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage && lerna clean --yes", "deploy": "npm run deploy:build && gh-pages -d examples/element-ui --remote eleme && del examples/element-ui", - "deploy:build": "npm run build:file && cooking build -c build/cooking.demo.js -p && echo element.eleme.io>>examples/element-ui/CNAME", - "dev": "npm run bootstrap && npm run build:file && cooking watch -c build/cooking.demo.js -p & node build/bin/template.js", - "dev:play": "npm run build:file && cross-env PLAY_ENV=true cooking watch -c build/cooking.demo.js -p", - "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:umd && npm run build:theme", + "deploy:build": "npm run build:file && cross-env NODE_ENV=production webpack --config build/webpack.demo.js && echo element.eleme.io>>examples/element-ui/CNAME", + "dev": "npm run bootstrap && npm run build:file && cross-env NODE_ENV=development webpack-dev-server --config build/webpack.demo.js & node build/bin/template.js", + "dev:play": "npm run build:file && cross-env NODE_ENV=development PLAY_ENV=true webpack-dev-server --config build/webpack.demo.js", + "dist": "npm run clean && npm run build:file && npm run lint && webpack --config build/webpack.conf.js && webpack --config build/webpack.common.js && webpack --config build/webpack.component.js && npm run build:utils && npm run build:umd && npm run build:theme", "dist:all": "node build/bin/build-all.js && npm run build:theme", "i18n": "node build/bin/i18n.js", "lint": "eslint src/**/* test/**/* packages/**/* build/**/* --quiet", @@ -65,7 +65,7 @@ "algoliasearch": "^3.24.5", "babel-cli": "^6.14.0", "babel-core": "^6.14.0", - "babel-loader": "^6.2.5", + "babel-loader": "^7.1.2", "babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-module-resolver": "^2.2.0", "babel-plugin-syntax-jsx": "^6.8.0", @@ -74,9 +74,6 @@ "chai": "^3.5.0", "cheerio": "^0.18.0", "chokidar": "^1.7.0", - "cooking": "^1.5.4", - "cooking-lint": "0.1.3", - "cooking-vue2": "^0.3.3", "copy-webpack-plugin": "^4.1.1", "coveralls": "^2.11.14", "cp-cli": "^1.0.2", @@ -111,7 +108,7 @@ "karma-sinon-chai": "^1.2.4", "karma-sourcemap-loader": "^0.3.7", "karma-spec-reporter": "0.0.26", - "karma-webpack": "^1.8.0", + "karma-webpack": "^3.0.0", "lerna": "^2.0.0-beta.32", "lolex": "^1.5.1", "markdown-it": "^6.1.1", @@ -123,6 +120,7 @@ "postcss": "^5.1.2", "postcss-loader": "0.11.1", "postcss-salad": "^1.0.8", + "progress-bar-webpack-plugin": "^1.11.0", "rimraf": "^2.5.4", "sass-loader": "^6.0.6", "sinon": "^1.17.6", diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 000000000..6c2f74899 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,20 @@ +module.exports = { + plugins: { + 'postcss-salad': { + browsers: ['ie > 8', 'last 2 versions'], + features: { + bem: { + shortcuts: { + component: 'b', + modifier: 'm', + descendent: 'e' + }, + separators: { + descendent: '__', + modifier: '--' + } + } + } + } + } +}; diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js index f0568c701..225489e49 100644 --- a/test/unit/karma.conf.js +++ b/test/unit/karma.conf.js @@ -1,4 +1,4 @@ -var webpackConfig = require('../../build/cooking.test'); +var webpackConfig = require('../../build/webpack.test'); // no need for app entry during tests // delete webpackConfig.entry; diff --git a/yarn.lock b/yarn.lock index d01a8c698..8bbefb729 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,12 +2,6 @@ # yarn lockfile v1 -"2webpack2@^1.0.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/2webpack2/-/2webpack2-1.2.1.tgz#5f0ffe0693bf407154fb5bef8960e4e7e11c6d28" - dependencies: - object-set "^1.0.1" - CSSselect@~0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/CSSselect/-/CSSselect-0.4.1.tgz#f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2" @@ -53,7 +47,7 @@ acorn-globals@^1.0.4: dependencies: acorn "^2.1.0" -acorn-jsx@^3.0.0, acorn-jsx@^3.0.1: +acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" dependencies: @@ -67,7 +61,7 @@ acorn@^3.0.4: version "3.3.0" resolved "http://registry.npm.taobao.org/acorn/download/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.1, acorn@^4.0.3: +acorn@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.3.tgz#1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1" @@ -87,10 +81,6 @@ agentkeepalive@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-2.2.0.tgz#c5d1bd4b129008f1163f236f86e5faea2026e2ef" -ajv-keywords@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.2.0.tgz#676c4f087bfe1e8b12dca6fda2f3c74f417b099c" - ajv-keywords@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0" @@ -99,13 +89,6 @@ ajv-keywords@^2.1.0: version "2.1.1" resolved "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" -ajv@^4.7.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.0.tgz#7ae6169180eb199192a8b9a19fd0f47fc9ac8764" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - ajv@^5.0.0, ajv@^5.1.5: version "5.2.3" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2" @@ -198,6 +181,12 @@ ansi-styles@^3.1.0: dependencies: color-convert "^1.9.0" +ansi-styles@^3.2.1: + version "3.2.1" + resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" @@ -353,6 +342,12 @@ async@1.5.2, async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" +async@^2.0.0: + version "2.6.0" + resolved "http://registry.npm.taobao.org/async/download/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" + dependencies: + lodash "^4.14.0" + async@^2.1.2, async@^2.1.5, async@^2.4.1: version "2.5.0" resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" @@ -363,10 +358,6 @@ async@~0.2.6: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@~0.9.0: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -422,7 +413,7 @@ babel-cli@^6.14.0: optionalDependencies: chokidar "^1.0.0" -babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.20.0: +babel-code-frame@^6.11.0, babel-code-frame@^6.20.0: version "6.20.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.20.0.tgz#b968f839090f9a8bc6d41938fb96cb84f7387b26" dependencies: @@ -553,14 +544,13 @@ babel-helpers@^6.16.0: babel-runtime "^6.0.0" babel-template "^6.16.0" -babel-loader@^6.2.5: - version "6.2.9" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.9.tgz#2bce6a1c29b47afa90b937ba1fb1f87084d61c61" +babel-loader@^7.1.2: + version "7.1.4" + resolved "http://registry.npm.taobao.org/babel-loader/download/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015" dependencies: - find-cache-dir "^0.1.1" - loader-utils "^0.2.11" + find-cache-dir "^1.0.0" + loader-utils "^1.0.2" mkdirp "^0.5.1" - object-assign "^4.0.1" babel-messages@^6.8.0: version "6.8.0" @@ -995,13 +985,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bottom-tip@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/bottom-tip/-/bottom-tip-0.0.4.tgz#2094bc55dc22eb386c71676f4edabc2208296631" - dependencies: - hsl "^0.1.1" - virtual-dom "^2.1.1" - brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.8" resolved "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" @@ -1027,10 +1010,6 @@ brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" -browser-split@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/browser-split/-/browser-split-0.0.1.tgz#7b097574f8e3ead606fb4664e64adfdda2981a93" - browser-stdout@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f" @@ -1180,10 +1159,6 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -camelize@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" - caniuse-api@^1.3.2: version "1.5.2" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.5.2.tgz#8f393c682f661c0a997b77bba6e826483fb3600e" @@ -1249,6 +1224,14 @@ chalk@^2.0.0, chalk@^2.1.0: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.0.1: + version "2.4.1" + resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f" @@ -1531,14 +1514,6 @@ concat-map@0.0.1: version "0.0.1" resolved "http://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.4.6: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - concat-stream@^1.6.0: version "1.6.0" resolved "http://registry.npm.taobao.org/concat-stream/download/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" @@ -1600,38 +1575,6 @@ cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" -cooking-lint@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/cooking-lint/-/cooking-lint-0.1.3.tgz#ad46c165eb4ecf4a65af63000bb0d69a8b869581" - dependencies: - eslint "*" - eslint-config-defaults "*" - eslint-config-elemefe "*" - eslint-friendly-formatter "*" - eslint-loader "*" - eslint-plugin-html "*" - eslint-plugin-react "*" - eslint-plugin-vue "*" - -cooking-vue2@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/cooking-vue2/-/cooking-vue2-0.3.3.tgz#c5a9959de4babedb66925c48498267758d4014cb" - dependencies: - vue-loader ">=9.4.2" - -cooking@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/cooking/-/cooking-1.5.4.tgz#1f40d898cc78b2c00635c04475fad8ef38979553" - dependencies: - "2webpack2" "^1.0.0" - chalk "^1.1.3" - commander "^2.9.0" - is-path-inside "^1.0.0" - lodash "^4.15.0" - progress-bar-webpack-plugin "^1.9.0" - shelljs "^0.7.4" - webpack-hud "*" - copy-webpack-plugin@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.1.1.tgz#53ae69e04955ebfa9fda411f54cbb968531d71fd" @@ -1891,6 +1834,12 @@ custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" +d@1: + version "1.0.0" + resolved "http://registry.npm.taobao.org/d/download/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" + dependencies: + es5-ext "^0.10.9" + d@^0.1.1, d@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" @@ -2090,19 +2039,6 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -doc-ready@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/doc-ready/-/doc-ready-1.0.4.tgz#37f5391969cff994303fdfef2e5d50357f8164d3" - dependencies: - eventie "^1" - -doctrine@^1.2.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - doctrine@^2.0.2: version "2.0.2" resolved "http://registry.npm.taobao.org/doctrine/download/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075" @@ -2309,14 +2245,6 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -error@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/error/-/error-4.4.0.tgz#bf69ff251fb4a279c19adccdaa6b61e90d9bf12a" - dependencies: - camelize "^1.0.0" - string-template "~0.2.0" - xtend "~4.0.0" - es-abstract@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" @@ -2335,6 +2263,14 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" +es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.42" + resolved "http://registry.npm.taobao.org/es5-ext/download/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" + dependencies: + es6-iterator "~2.0.3" + es6-symbol "~3.1.1" + next-tick "1" + es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: version "0.10.12" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" @@ -2350,6 +2286,14 @@ es6-iterator@2: es5-ext "^0.10.7" es6-symbol "3" +es6-iterator@~2.0.3: + version "2.0.3" + resolved "http://registry.npm.taobao.org/es6-iterator/download/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" + dependencies: + d "1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" + es6-map@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" @@ -2386,6 +2330,13 @@ es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: d "~0.1.1" es5-ext "~0.10.11" +es6-symbol@^3.1.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "http://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-templates@^0.2.2: version "0.2.3" resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4" @@ -2430,36 +2381,10 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-config-defaults@*: - version "9.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-defaults/-/eslint-config-defaults-9.0.0.tgz#a090adc13b2935e3f43b3cd048a92701654e5ad5" - -eslint-config-elemefe@*: - version "0.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-elemefe/-/eslint-config-elemefe-0.3.0.tgz#6f06cd6a8c6949bf58fa7fe2d4b4a4fde89bf008" - eslint-config-elemefe@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/eslint-config-elemefe/-/eslint-config-elemefe-0.1.1.tgz#5a1664ce3f7d91f68528b508d040044ae6c10aa3" -eslint-friendly-formatter@*: - version "2.0.6" - resolved "https://registry.yarnpkg.com/eslint-friendly-formatter/-/eslint-friendly-formatter-2.0.6.tgz#eddd18dd001798b8f769e169936a3749c36c2d5a" - dependencies: - chalk "^1.0.0" - extend "^3.0.0" - minimist "^1.2.0" - text-table "^0.2.0" - -eslint-loader@*: - version "1.6.1" - resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.6.1.tgz#96c47c812772eeb077e3a81681818e671a2cabf5" - dependencies: - find-cache-dir "^0.1.1" - loader-utils "^0.2.7" - object-assign "^4.0.1" - object-hash "^1.1.4" - eslint-loader@^1.9.0: version "1.9.0" resolved "http://registry.npm.taobao.org/eslint-loader/download/eslint-loader-1.9.0.tgz#7e1be9feddca328d3dcfaef1ad49d5beffe83a13" @@ -2470,12 +2395,6 @@ eslint-loader@^1.9.0: object-hash "^1.1.4" rimraf "^2.6.1" -eslint-plugin-html@*, eslint-plugin-html@^1.5.2: - version "1.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-1.7.0.tgz#2a5b03884d8d56adf9ad9864e9c036480fb629c9" - dependencies: - htmlparser2 "^3.8.2" - eslint-plugin-html@^4.0.1: version "4.0.1" resolved "http://registry.npm.taobao.org/eslint-plugin-html/download/eslint-plugin-html-4.0.1.tgz#fc70072263cc938496fbbc9cf648660e41fa269a" @@ -2488,20 +2407,6 @@ eslint-plugin-json@^1.2.0: dependencies: jshint "^2.8.0" -eslint-plugin-react@*, eslint-plugin-react@^6.2.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.8.0.tgz#741ab5438a094532e5ce1bbb935d6832356f492d" - dependencies: - doctrine "^1.2.2" - jsx-ast-utils "^1.3.4" - -eslint-plugin-vue@*: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-1.0.0.tgz#01b133cef42c40d807f535011715d3fd18795337" - dependencies: - eslint-plugin-html "^1.5.2" - eslint-plugin-react "^6.2.0" - eslint-scope@^3.7.1: version "3.7.1" resolved "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -2513,45 +2418,6 @@ eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@*: - version "3.12.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.1.tgz#507a609fe251dfefd58fda03e6dbd7e851c07581" - dependencies: - babel-code-frame "^6.16.0" - chalk "^1.1.3" - concat-stream "^1.4.6" - debug "^2.1.1" - doctrine "^1.2.2" - escope "^3.6.0" - espree "^3.3.1" - estraverse "^4.2.0" - esutils "^2.0.2" - file-entry-cache "^2.0.0" - glob "^7.0.3" - globals "^9.14.0" - ignore "^3.2.0" - imurmurhash "^0.1.4" - inquirer "^0.12.0" - is-my-json-valid "^2.10.0" - is-resolvable "^1.0.0" - js-yaml "^3.5.1" - json-stable-stringify "^1.0.0" - levn "^0.3.0" - lodash "^4.0.0" - mkdirp "^0.5.0" - natural-compare "^1.4.0" - optionator "^0.8.2" - path-is-inside "^1.0.1" - pluralize "^1.2.1" - progress "^1.1.8" - require-uncached "^1.0.2" - shelljs "^0.7.5" - strip-bom "^3.0.0" - strip-json-comments "~1.0.1" - table "^3.7.8" - text-table "~0.2.0" - user-home "^2.0.0" - eslint@4.14.0: version "4.14.0" resolved "http://registry.npm.taobao.org/eslint/download/eslint-4.14.0.tgz#96609768d1dd23304faba2d94b7fefe5a5447a82" @@ -2594,13 +2460,6 @@ eslint@4.14.0: table "^4.0.1" text-table "~0.2.0" -espree@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.3.2.tgz#dbf3fadeb4ecb4d4778303e50103b3d36c88b89c" - dependencies: - acorn "^4.0.1" - acorn-jsx "^3.0.0" - espree@^3.5.2: version "3.5.2" resolved "http://registry.npm.taobao.org/espree/download/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" @@ -2637,7 +2496,7 @@ estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -2649,12 +2508,6 @@ etag@~1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" -ev-store@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/ev-store/-/ev-store-7.0.0.tgz#1ab0c7f82136505dd74b31d17701cb2be6d26558" - dependencies: - individual "^3.0.0" - event-emitter@~0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" @@ -2666,10 +2519,6 @@ eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" -eventie@^1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/eventie/-/eventie-1.0.6.tgz#d4ffc8b0c2b5e493c2aa1b22cbe918d3aee74437" - events@^1.0.0, events@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" @@ -2913,6 +2762,14 @@ find-cache-dir@^0.1.1: mkdirp "^0.5.1" pkg-dir "^1.0.0" +find-cache-dir@^1.0.0: + version "1.0.0" + resolved "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" + dependencies: + commondir "^1.0.1" + make-dir "^1.0.0" + pkg-dir "^2.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" @@ -2924,9 +2781,9 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0: +find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + resolved "http://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" dependencies: locate-path "^2.0.0" @@ -3133,7 +2990,7 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -3329,7 +3186,7 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" -global@^4.3.0, global@^4.3.2: +global@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" dependencies: @@ -3340,7 +3197,7 @@ globals@^11.0.1: version "11.1.0" resolved "http://registry.npm.taobao.org/globals/download/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" -globals@^9.0.0, globals@^9.14.0: +globals@^9.0.0: version "9.14.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" @@ -3616,12 +3473,20 @@ has-flag@^2.0.0: version "2.0.0" resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" +has-flag@^3.0.0: + version "3.0.0" + resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + has-gulplog@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" dependencies: sparkles "^1.0.0" +has-symbols@^1.0.0: + version "1.0.0" + resolved "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -3711,10 +3576,6 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -hsl@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/hsl/-/hsl-0.1.1.tgz#328d5d7bead2feec37b75baf8d055b83648579b6" - html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" @@ -3853,10 +3714,6 @@ ieee754@^1.1.4: version "1.1.8" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" -ignore@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435" - ignore@^3.3.3: version "3.3.7" resolved "http://registry.npm.taobao.org/ignore/download/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" @@ -3889,10 +3746,6 @@ indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" -individual@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/individual/-/individual-3.0.0.tgz#e7ca4f85f8957b018734f285750dc22ec2f9862d" - inflight@^1.0.4: version "1.0.6" resolved "http://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -3998,18 +3851,6 @@ is-absolute@^0.2.3: is-relative "^0.2.1" is-windows "^0.2.0" -is-array-like@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-array-like/-/is-array-like-1.1.2.tgz#7f280aa777f53eb31f74e1dcd3e040923186c205" - dependencies: - is-array "^1.0.1" - is-function "^1.0.1" - is-window "^1.0.1" - -is-array@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-array/-/is-array-1.0.1.tgz#e9850cc2cc860c3bc0977e84ccf0dd464584279a" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4080,10 +3921,6 @@ is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" -is-function@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5" - is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -4102,13 +3939,7 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" -is-index@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-index/-/is-index-1.0.2.tgz#061485330cbc309e850e324ee2071454c11c6afb" - dependencies: - is-nil "^1.0.0" - -is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: +is-my-json-valid@^2.12.4: version "2.15.0" resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" dependencies: @@ -4117,10 +3948,6 @@ is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: jsonpointer "^4.0.0" xtend "^4.0.0" -is-nil@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-nil/-/is-nil-1.0.1.tgz#2daba29e0b585063875e7b539d071f5b15937969" - is-number@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806" @@ -4131,10 +3958,6 @@ is-number@^2.0.2, is-number@^2.1.0: dependencies: kind-of "^3.0.2" -is-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" - is-path-cwd@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -4221,10 +4044,6 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-window@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-window/-/is-window-1.0.2.tgz#2c896ca53db97de45d3c33133a65d8c9f563480d" - is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" @@ -4332,7 +4151,7 @@ js-tokens@^3.0.2: version "3.0.2" resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@3.6.1, js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@~3.6.1: +js-yaml@3.6.1, js-yaml@3.x, js-yaml@^3.4.3, js-yaml@~3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" dependencies: @@ -4413,7 +4232,7 @@ json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "http://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: +json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" dependencies: @@ -4467,13 +4286,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" -jsx-ast-utils@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.3.4.tgz#0257ed1cc4b1e65b39d7d9940f9fb4f20f7ba0a9" - dependencies: - acorn-jsx "^3.0.1" - object-assign "^4.1.0" - karma-chrome-launcher@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" @@ -4515,15 +4327,16 @@ karma-spec-reporter@0.0.26: dependencies: colors "~0.6.0" -karma-webpack@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.0.tgz#340c7999eb3745b47becab47d0d304dac2c55257" +karma-webpack@^3.0.0: + version "3.0.0" + resolved "http://registry.npm.taobao.org/karma-webpack/download/karma-webpack-3.0.0.tgz#bf009c5b73c667c11c015717e9e520f581317c44" dependencies: - async "~0.9.0" - loader-utils "^0.2.5" - lodash "^3.8.0" - source-map "^0.1.41" - webpack-dev-middleware "^1.0.11" + async "^2.0.0" + babel-runtime "^6.0.0" + loader-utils "^1.0.0" + lodash "^4.0.0" + source-map "^0.5.6" + webpack-dev-middleware "^2.0.6" karma@^1.3.0: version "1.3.0" @@ -4681,7 +4494,7 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@^0.2.7: +loader-utils@^0.2.15, loader-utils@^0.2.16: version "0.2.16" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" dependencies: @@ -4690,7 +4503,7 @@ loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^ json5 "^0.5.0" object-assign "^4.0.1" -loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: +loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" dependencies: @@ -4985,7 +4798,7 @@ lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.2.0: +lodash@^4.0.0, lodash@^4.2.0: version "4.17.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42" @@ -5005,6 +4818,12 @@ log-driver@1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056" +log-symbols@^2.1.0: + version "2.2.0" + resolved "http://registry.npm.taobao.org/log-symbols/download/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + dependencies: + chalk "^2.0.1" + log4js@^0.6.31: version "0.6.38" resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd" @@ -5016,6 +4835,13 @@ loglevel@^1.4.1: version "1.5.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" +loglevelnext@^1.0.1: + version "1.0.5" + resolved "http://registry.npm.taobao.org/loglevelnext/download/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2" + dependencies: + es6-symbol "^3.1.1" + object.assign "^4.1.0" + lolex@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31" @@ -5034,7 +4860,7 @@ loose-envify@^1.0.0: dependencies: js-tokens "^2.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: @@ -5060,6 +4886,12 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" +make-dir@^1.0.0: + version "1.3.0" + resolved "http://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + dependencies: + pify "^3.0.0" + map-cache@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -5126,13 +4958,6 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" -memory-fs@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - meow@^3.3.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -5209,6 +5034,10 @@ mime@^1.2.11, mime@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" +mime@^2.1.0: + version "2.3.1" + resolved "http://registry.npm.taobao.org/mime/download/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + mimeparse@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/mimeparse/-/mimeparse-0.1.4.tgz#dafb02752370fd226093ae3152c271af01ac254a" @@ -5358,9 +5187,9 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -next-tick@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d" +next-tick@1: + version "1.0.0" + resolved "http://registry.npm.taobao.org/next-tick/download/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" no-case@^2.2.0: version "2.3.0" @@ -5576,26 +5405,18 @@ object-hash@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.5.tgz#bdd844e030d0861b692ca175c6cab6868ec233d7" -object-keys@^1.0.10, object-keys@^1.0.11, object-keys@^1.0.8, object-keys@~1.0.0: +object-keys@^1.0.11, object-keys@^1.0.8, object-keys@~1.0.0: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" -object-set@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-set/-/object-set-1.0.1.tgz#f611222f68a2b04eb9826c2df70e00050f4d30a6" - dependencies: - is-index "^1.0.0" - is-nil "^1.0.0" - is-object "^1.0.1" - to-path "^1.0.0" - -object.assign@^4.0.1: - version "4.0.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc" +object.assign@^4.0.1, object.assign@^4.1.0: + version "4.1.0" + resolved "http://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" dependencies: define-properties "^1.1.2" - function-bind "^1.1.0" - object-keys "^1.0.10" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" object.omit@^2.0.0: version "2.0.1" @@ -5946,9 +5767,11 @@ pkg-dir@^1.0.0: dependencies: find-up "^1.0.0" -pluralize@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + dependencies: + find-up "^2.1.0" pluralize@^7.0.0: version "7.0.0" @@ -6607,9 +6430,9 @@ process@~0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" -progress-bar-webpack-plugin@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.0.tgz#efe9055ae03ed1a6a9864c104120ebfe5b7de341" +progress-bar-webpack-plugin@^1.11.0: + version "1.11.0" + resolved "http://registry.npm.taobao.org/progress-bar-webpack-plugin/download/progress-bar-webpack-plugin-1.11.0.tgz#4f801288443c55ec029b20cbfdcbf3e1dc17f852" dependencies: chalk "^1.1.1" object.assign "^4.0.1" @@ -6832,7 +6655,7 @@ readable-stream@^2.2.2, readable-stream@^2.2.9: string_decoder "~1.0.3" util-deprecate "~1.0.1" -readable-stream@~2.0.0, readable-stream@~2.0.5: +readable-stream@~2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" dependencies: @@ -7062,7 +6885,7 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -require-uncached@^1.0.2, require-uncached@^1.0.3: +require-uncached@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" dependencies: @@ -7332,7 +7155,7 @@ shelljs@0.3.x: version "0.3.0" resolved "http://registry.npm.taobao.org/shelljs/download/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1" -shelljs@^0.7.0, shelljs@^0.7.4, shelljs@^0.7.5: +shelljs@^0.7.0: version "0.7.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.5.tgz#2eef7a50a21e1ccf37da00df767ec69e30ad0675" dependencies: @@ -7369,10 +7192,6 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" - slice-ansi@1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/slice-ansi/download/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" @@ -7439,7 +7258,7 @@ socket.io@1.4.7: socket.io-client "1.4.6" socket.io-parser "2.2.6" -sockjs-client@1.1.4, sockjs-client@^1.1.0: +sockjs-client@1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12" dependencies: @@ -7483,12 +7302,6 @@ source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.1.41, source-map@~0.1.7: - version "0.1.43" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" - dependencies: - amdefine ">=0.0.4" - source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" @@ -7497,6 +7310,12 @@ source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" +source-map@~0.1.7: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + dependencies: + amdefine ">=0.0.4" + source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -7602,10 +7421,6 @@ string-hash@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.1.tgz#8e85bed291e0763b8f6809d9c3368fea048db3dc" -string-template@~0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" - string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -7695,7 +7510,7 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@1.0.x, strip-json-comments@~1.0.1, strip-json-comments@~1.0.4: +strip-json-comments@1.0.x, strip-json-comments@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" @@ -7736,6 +7551,12 @@ supports-color@^4.2.1: dependencies: has-flag "^2.0.0" +supports-color@^5.3.0: + version "5.4.0" + resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + svgo@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034" @@ -7756,17 +7577,6 @@ sync-exec@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105" -table@^3.7.8: - version "3.8.3" - resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" - dependencies: - ajv "^4.7.0" - ajv-keywords "^1.0.0" - chalk "^1.1.1" - lodash "^4.0.0" - slice-ansi "0.0.4" - string-width "^2.0.0" - table@^4.0.1: version "4.0.2" resolved "http://registry.npm.taobao.org/table/download/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" @@ -7820,7 +7630,7 @@ tempfile@~0.1.2: dependencies: uuid "~1.4.0" -text-table@^0.2.0, text-table@~0.2.0: +text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -7913,24 +7723,6 @@ to-fast-properties@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" -to-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-path/-/to-path-1.0.1.tgz#ade88449c855925aa6464e33ff92f0b8fc5bcb8a" - dependencies: - is-array-like "^1.0.3" - is-nil "^1.0.0" - is-symbol "^1.0.1" - to-str "^1.0.0" - -to-str@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-str/-/to-str-1.0.0.tgz#9034248f56f439804c1fd45a3cbe8195ecb608f1" - dependencies: - is-function "^1.0.1" - is-nil "^1.0.0" - is-object "^1.0.1" - is-symbol "^1.0.1" - toposort@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef" @@ -7994,7 +7786,7 @@ type-is@~1.6.13: media-typer "0.3.0" mime-types "~2.1.13" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -8092,6 +7884,10 @@ uppercamelcase@^1.1.0: dependencies: camelcase "^1.2.1" +url-join@^2.0.2: + version "2.0.5" + resolved "http://registry.npm.taobao.org/url-join/download/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" + url-loader@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" @@ -8129,12 +7925,6 @@ user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" -user-home@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" - dependencies: - os-homedir "^1.0.0" - useragent@^2.1.9: version "2.1.9" resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.9.tgz#4dba2bc4dad1875777ab15de3ff8098b475000b7" @@ -8175,6 +7965,10 @@ uuid@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.1.0: + version "3.2.1" + resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + uuid@~1.4.0: version "1.4.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc" @@ -8246,19 +8040,6 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" -virtual-dom@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/virtual-dom/-/virtual-dom-2.1.1.tgz#80eda2d481b9ede0c049118cefcb4a05f21d1375" - dependencies: - browser-split "0.0.1" - error "^4.3.0" - ev-store "^7.0.0" - global "^4.3.0" - is-object "^1.0.1" - next-tick "^0.2.2" - x-is-array "0.1.0" - x-is-string "0.1.0" - vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" @@ -8273,7 +8054,7 @@ vue-hot-reload-api@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz#9a21b35ced3634434a43ee80efb7350ea8fb206d" -vue-loader@>=9.4.2, vue-loader@^13.3.0: +vue-loader@^13.3.0: version "13.3.0" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.3.0.tgz#3bf837d490ba5dea6fc07e0835ffa6c688c8af33" dependencies: @@ -8348,15 +8129,6 @@ webidl-conversions@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506" -webpack-dev-middleware@^1.0.11: - version "1.8.4" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.8.4.tgz#e8765c9122887ce9e3abd4cc9c3eb31b61e0948d" - dependencies: - memory-fs "~0.3.0" - mime "^1.3.4" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - webpack-dev-middleware@^1.11.0: version "1.12.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" @@ -8367,6 +8139,18 @@ webpack-dev-middleware@^1.11.0: range-parser "^1.0.3" time-stamp "^2.0.0" +webpack-dev-middleware@^2.0.6: + version "2.0.6" + resolved "http://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4" + 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 "^2.0.2" + webpack-log "^1.0.1" + webpack-dev-server@^2.9.1: version "2.9.1" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.1.tgz#7ac9320b61b00eb65b2109f15c82747fc5b93585" @@ -8396,14 +8180,14 @@ webpack-dev-server@^2.9.1: webpack-dev-middleware "^1.11.0" yargs "^6.6.0" -webpack-hud@*: - version "0.0.10" - resolved "https://registry.yarnpkg.com/webpack-hud/-/webpack-hud-0.0.10.tgz#5acbd3435003144bc79c0c7a5081fcffada3ecec" +webpack-log@^1.0.1: + version "1.2.0" + resolved "http://registry.npm.taobao.org/webpack-log/download/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d" dependencies: - bottom-tip "0.0.4" - doc-ready "^1.0.4" - sockjs-client "^1.1.0" - strip-ansi "^3.0.1" + chalk "^2.1.0" + log-symbols "^2.1.0" + loglevelnext "^1.0.1" + uuid "^3.1.0" webpack-node-externals@^1.6.0: version "1.6.0" @@ -8537,14 +8321,6 @@ ws@1.0.1: options ">=0.0.5" ultron "1.0.x" -x-is-array@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/x-is-array/-/x-is-array-0.1.0.tgz#de520171d47b3f416f5587d629b89d26b12dc29d" - -x-is-string@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" - xml-char-classes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" @@ -8561,7 +8337,7 @@ xmlhttprequest-ssl@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"