Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ESLint Fixes

Browse Source
This commit is contained in:
Pooya Parsa 2017-05-05 18:45:00 +04:30
parent e2e849fbd2
commit 6504b0666a
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/generate.js
View File

@ -100,18 +100,18 @@ export default function () {
yield waitFor(n++ * self.options.generate.interval)
try {
var { html, error } = yield self.renderRoute(route, { _generate: true })
if(error) {
errors.push({ type : 'handled', route, error })
if (error) {
errors.push({type: 'handled', route, error})
}
} catch (err) {
errors.push({ type : 'unhandled', route, error: err })
errors.push({type: 'unhandled', route, error: err})
return
}
try {
var minifiedHtml = minify(html, self.options.generate.minify)
} catch(err) {
} catch (err) {
let minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
errors.push({ type : 'unhandled', route, error: minifyErr })
errors.push({type: 'unhandled', route, error: minifyErr})
return
}
var path = join(route, sep, 'index.html') // /about -> /about/index.html
@ -136,8 +136,9 @@ export default function () {
debug(`HTML Files generated in ${duration}s`)
if (errors.length) {
console.error('==== Error report ==== \n' + errors.map( ({type, route, error}) => {
if(type === 'unhandled') {
/* eslint-disable no-console */
console.error('==== Error report ==== \n' + errors.map(({type, route, error}) => {
if (type === 'unhandled') {
return `Route: '${route}'\n${error.stack}`
} else {
return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)

2
lib/webpack/client.config.js
View File

@ -3,14 +3,12 @@
import { each, defaults } from 'lodash'
import webpack from 'webpack'
import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
import ExtractTextPlugin from 'extract-text-webpack-plugin'
import HTMLPlugin from 'html-webpack-plugin'
import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
import ProgressBarPlugin from 'progress-bar-webpack-plugin'
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
import OfflinePlugin from 'offline-plugin'
import base from './base.config.js'
import { extractStyles } from './helpers'
import { resolve } from 'path'
/*

4
lib/webpack/helpers.js
View File

@ -1,10 +1,10 @@
import ExtractTextPlugin from 'extract-text-webpack-plugin'
export function extractStyles(ext) {
export function extractStyles (ext) {
return !this.dev && !!this.options.build.extractCSS && this.options.build.extractCSS[ext] !== false
}
export function styleLoader(ext, loader = []) {
export function styleLoader (ext, loader = []) {
if (!extractStyles.call(this, ext)) {
return ['vue-style-loader', 'css-loader'].concat(loader)
}