Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into sinon_console

This commit is contained in:
Sébastien Chopin 2017-12-15 10:53:29 +01:00 committed by GitHub
parent ff53769829 2d45dc44b2
commit 747371e79d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 121 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/builder/builder.js
View File

@ -530,8 +530,7 @@ module.exports = class Builder {
this.webpackDevMiddleware = promisify(webpackDevMiddleware(compiler, Object.assign({
publicPath: this.options.build.publicPath,
stats: this.webpackStats,
noInfo: true,
quiet: true,
logLevel: 'silent',
watchOptions: this.options.watchers.webpack
}, this.options.build.devMiddleware)))

9
lib/builder/webpack/client.config.js
View File

@ -92,9 +92,6 @@ module.exports = function webpackClientConfig() {
}))
)
// Add friendly error plugin
config.plugins.push(new FriendlyErrorsWebpackPlugin())
// Build progress bar
if (this.options.build.profile) {
config.plugins.push(new ProgressPlugin({
@ -104,10 +101,14 @@ module.exports = function webpackClientConfig() {
config.plugins.push(new ProgressBarPlugin({
complete: Chalk.green('█'),
incomplete: Chalk.white('█'),
format: ' :bar ' + Chalk.green.bold(':percent') + ' :msg'
format: ' :bar ' + Chalk.green.bold(':percent') + ' :msg',
clear: false
}))
}
// Add friendly error plugin
config.plugins.push(new FriendlyErrorsWebpackPlugin())
// --------------------------------------
// Dev specific config
// --------------------------------------

16
package.json
View File

@ -58,11 +58,11 @@
"dependencies": {
"@nuxtjs/youch": "^3.1.0",
"ansi-html": "^0.0.7",
"autoprefixer": "^7.2.2",
"autoprefixer": "^7.2.3",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-vue-app": "^2.0.0",
"caniuse-lite": "^1.0.30000782",
"caniuse-lite": "^1.0.30000783",
"chalk": "^2.3.0",
"chokidar": "^1.7.0",
"clone": "^2.1.1",
@ -99,18 +99,18 @@
"server-destroy": "^1.0.1",
"source-map": "^0.6.1",
"style-resources-loader": "^1.0.0",
"uglifyjs-webpack-plugin": "^1.1.2",
"uglifyjs-webpack-plugin": "^1.1.4",
"url-loader": "^0.6.2",
"vue": "^2.5.9",
"vue": "^2.5.11",
"vue-loader": "^13.5.0",
"vue-meta": "^1.4.0",
"vue-router": "^3.0.1",
"vue-server-renderer": "^2.5.9",
"vue-template-compiler": "^2.5.9",
"vue-server-renderer": "^2.5.11",
"vue-template-compiler": "^2.5.11",
"vuex": "^3.0.1",
"webpack": "^3.10.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-dev-middleware": "^2.0.1",
"webpack-hot-middleware": "^2.21.0",
"webpack-node-externals": "^1.6.0"
},
@ -121,7 +121,7 @@
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-istanbul": "^4.1.5",
"codecov": "^3.0.0",
"copy-webpack-plugin": "^4.2.0",
"copy-webpack-plugin": "^4.3.0",
"cross-env": "^5.1.1",
"eslint": "^4.13.1",
"eslint-config-standard": "^11.0.0-beta.0",

3
test/basic.dev.test.js
View File

@ -17,6 +17,9 @@ test.before('Init Nuxt.js', async t => {
const options = {
rootDir,
dev: true,
build: {
profile: true
},
plugins: [
'~/plugins/watch.js'
]

135
yarn.lock
View File

@ -400,7 +400,7 @@ autoprefixer@^6.3.1:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
autoprefixer@^7.1.1, autoprefixer@^7.2.2:
autoprefixer@^7.1.1:
version "7.2.2"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.2.tgz#082293b964be00602efacc59aa4aa7df5158bb6e"
dependencies:
@ -411,6 +411,17 @@ autoprefixer@^7.1.1, autoprefixer@^7.2.2:
postcss "^6.0.14"
postcss-value-parser "^3.2.3"
autoprefixer@^7.2.3:
version "7.2.3"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8"
dependencies:
browserslist "^2.10.0"
caniuse-lite "^1.0.30000783"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.14"
postcss-value-parser "^3.2.3"
ava-init@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ava-init/-/ava-init-0.2.1.tgz#75ac4c8553326290d2866e63b62fa7035684bd58"
@ -1142,7 +1153,7 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@ -1316,7 +1327,7 @@ bytes@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
cacache@^10.0.0:
cacache@^10.0.0, cacache@^10.0.1:
version "10.0.1"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.1.tgz#3e05f6e616117d9b54665b1b20c8aeb93ea5d36f"
dependencies:
@ -1413,10 +1424,14 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000782"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000782.tgz#d8815bce1578c350aced1132507301205e0fab53"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000782:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
version "1.0.30000782"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000782.tgz#5b82b8c385f25348745c471ca51320afb1b7f254"
caniuse-lite@^1.0.30000783:
version "1.0.30000783"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000783.tgz#9b5499fb1b503d2345d12aa6b8612852f4276ffd"
capture-stack-trace@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@ -1796,16 +1811,20 @@ copy-concurrently@^1.0.0:
rimraf "^2.5.4"
run-queue "^1.0.0"
copy-webpack-plugin@^4.2.0:
version "4.2.3"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.2.3.tgz#4a3c61089f3b635777f0f0af346c338b39d63755"
copy-webpack-plugin@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.3.0.tgz#cfdf4d131c78d66917a1bb863f86630497aacf42"
dependencies:
bluebird "^3.5.1"
glob "^7.1.2"
cacache "^10.0.1"
find-cache-dir "^1.0.0"
globby "^7.1.1"
is-glob "^4.0.0"
loader-utils "^0.2.15"
lodash "^4.3.0"
minimatch "^3.0.4"
p-limit "^1.0.0"
pify "^3.0.0"
serialize-javascript "^1.4.0"
core-assert@^0.2.0:
version "0.2.1"
@ -2198,6 +2217,13 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
dir-glob@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
dependencies:
arrify "^1.0.1"
path-type "^3.0.0"
doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@ -3175,6 +3201,17 @@ globby@^6.0.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
globby@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
dependencies:
array-union "^1.0.1"
dir-glob "^2.0.0"
glob "^7.1.2"
ignore "^3.3.5"
pify "^3.0.0"
slash "^1.0.0"
got@^6.7.1:
version "6.7.1"
resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@ -3481,7 +3518,7 @@ ignore-by-default@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
ignore@^3.3.3, ignore@^3.3.6:
ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
version "3.3.7"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@ -4200,6 +4237,20 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, l
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
log-symbols@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
dependencies:
chalk "^2.0.1"
loglevel-plugin-prefix@^0.5.3:
version "0.5.3"
resolved "https://registry.yarnpkg.com/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.5.3.tgz#8e9131b96e4697a0dba517996f76b9e6c3f43210"
loglevel@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
lolex@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
@ -4218,7 +4269,7 @@ loose-envify@^1.0.0, loose-envify@^1.3.1:
dependencies:
js-tokens "^3.0.0"
loud-rejection@^1.0.0, loud-rejection@^1.2.0:
loud-rejection@^1.0.0, loud-rejection@^1.2.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:
@ -4376,10 +4427,14 @@ mime@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
mime@^1.3.4, mime@^1.4.1, mime@^1.5.0:
mime@^1.3.4, mime@^1.4.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
mime@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
mimic-fn@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@ -4807,7 +4862,7 @@ p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
p-limit@^1.1.0:
p-limit@^1.0.0, p-limit@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@ -4956,6 +5011,12 @@ path-type@^2.0.0:
dependencies:
pify "^2.0.0"
path-type@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
dependencies:
pify "^3.0.0"
pbkdf2@^3.0.3:
version "3.0.14"
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
@ -6794,7 +6855,7 @@ ua-parser-js@^0.7.9:
version "0.7.17"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
uglify-es@^3.2.0:
uglify-es@^3.2.1:
version "3.2.2"
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.2.2.tgz#15c62b7775002c81b7987a1c49ecd3f126cace73"
dependencies:
@ -6829,15 +6890,16 @@ uglifyjs-webpack-plugin@^0.4.6:
uglify-js "^2.8.29"
webpack-sources "^1.0.1"
uglifyjs-webpack-plugin@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.2.tgz#8a9abc238d01a33daaf86fa9a84c7ebc1e67b0f9"
uglifyjs-webpack-plugin@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.4.tgz#e43ad6e736c315024eb99481a7cc9362d6a066be"
dependencies:
cacache "^10.0.0"
find-cache-dir "^1.0.0"
schema-utils "^0.3.0"
serialize-javascript "^1.4.0"
source-map "^0.6.1"
uglify-es "^3.2.0"
uglify-es "^3.2.1"
webpack-sources "^1.0.1"
worker-farm "^1.4.1"
@ -6930,6 +6992,10 @@ upper-case@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
url-join@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.2.tgz#c072756967ad24b8b59e5741551caac78f50b8b7"
url-loader@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
@ -7048,9 +7114,9 @@ vue-router@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"
vue-server-renderer@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.9.tgz#936e42ba9a8d31ada2da36f29b7386c787908489"
vue-server-renderer@^2.5.11:
version "2.5.11"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.11.tgz#82ab4d9a538b252f1a1333862fbbc99595c5f184"
dependencies:
chalk "^1.1.3"
hash-sum "^1.0.2"
@ -7068,9 +7134,9 @@ vue-style-loader@^3.0.0:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-template-compiler@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.9.tgz#7fabc73c8d3d12d32340cd86c5fc33e00e86d686"
vue-template-compiler@^2.5.11:
version "2.5.11"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.11.tgz#7dda6905e464ff173c8e70e1dfd1769a7888b7e8"
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
@ -7079,9 +7145,9 @@ vue-template-es2015-compiler@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
vue@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.9.tgz#b2380cd040915dca69881dafd121d760952e65f7"
vue@^2.5.11:
version "2.5.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.11.tgz#80ca2657aa81f03545cd8dd5a2f55454641e6405"
vuex@^3.0.1:
version "3.0.1"
@ -7115,15 +7181,22 @@ webpack-bundle-analyzer@^2.9.0:
opener "^1.4.3"
ws "^3.3.1"
webpack-dev-middleware@^1.12.2:
version "1.12.2"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
webpack-dev-middleware@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.1.tgz#22c8ecef27f08fca6dfa95504d57f66a8f37cc13"
dependencies:
chalk "^2.3.0"
log-symbols "^2.1.0"
loglevel "^1.6.0"
loglevel-plugin-prefix "^0.5.3"
loud-rejection "^1.6.0"
memory-fs "~0.4.1"
mime "^1.5.0"
mime "^2.0.3"
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
time-stamp "^2.0.0"
url-join "^2.0.2"
uuid "^3.1.0"
webpack-hot-middleware@^2.21.0:
version "2.21.0"