Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-31 07:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into feat/esm

Browse Source
This commit is contained in:
Clark Du 2018-03-19 20:46:58 +08:00
commit d4f0a6f59a
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -22,7 +22,7 @@ test_script:
- npm --version - npm --version
- yarn --version - yarn --version
# run tests # run tests
- yarn test-appveyor - yarn test
# Don't actually build. # Don't actually build.
build: off build: off

6
lib/builder/webpack/client.config.mjs
View File

@ -17,8 +17,6 @@ import VueSSRClientPlugin from './plugins/vue/client'
const debug = Debug('nuxt:build') const debug = Debug('nuxt:build')
debug.color = 2 // Force green color debug.color = 2 // Force green color
const isWindows = /^win/.test(process.platform)
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Webpack Client Config | Webpack Client Config
@ -94,7 +92,7 @@ export default function webpackClientConfig() {
config.optimization.splitChunks = { config.optimization.splitChunks = {
chunks: 'all', chunks: 'all',
// TODO: remove spa after https://github.com/jantimon/html-webpack-plugin/issues/878 solved // TODO: remove spa after https://github.com/jantimon/html-webpack-plugin/issues/878 solved
name: this.options.dev || (this.options.mode === 'spa' && isWindows), name: this.options.dev || this.options.mode === 'spa',
// Explicit cache groups // Explicit cache groups
cacheGroups: { cacheGroups: {
@ -131,7 +129,7 @@ export default function webpackClientConfig() {
} }
// Create additional runtime chunk for cache boosting // Create additional runtime chunk for cache boosting
config.optimization.runtimeChunk = true // config.optimization.runtimeChunk = true
// CSS extraction // CSS extraction
const extractCSS = this.options.build.extractCSS const extractCSS = this.options.build.extractCSS

3
package.json
View File

@ -46,8 +46,7 @@
] ]
}, },
"scripts": { "scripts": {
"test": "npm run lint && nyc ava --fail-fast -v -T 60000 test/ -- && nyc report --reporter=html", "test": "npm run lint && nyc ava -v test -- && nyc report --reporter=html",
"test-appveyor": "yarn test",
"coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov", "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
"lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/", "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
"precommit": "npm run lint", "precommit": "npm run lint",