Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-12 03:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move extractText to base.config

Browse Source 
fixes test/fixtures/ssr.
This commit is contained in:
Pooya Parsa 2018-03-19 19:50:45 +03:30
parent 3eea48899b
commit 03f3ff4517
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/builder/webpack/base.config.mjs
View File

@ -1,5 +1,6 @@
import path from 'path' import path from 'path'
import ExtractTextPlugin from 'extract-text-webpack-plugin'
import FriendlyErrorsWebpackPlugin from '@nuxtjs/friendly-errors-webpack-plugin' import FriendlyErrorsWebpackPlugin from '@nuxtjs/friendly-errors-webpack-plugin'
import TimeFixPlugin from 'time-fix-plugin' import TimeFixPlugin from 'time-fix-plugin'
import webpack from 'webpack' import webpack from 'webpack'
@ -156,6 +157,22 @@ export default function webpackBaseConfig({ name, isServer }) {
new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole }) new FriendlyErrorsWebpackPlugin({ clearConsole: shouldClearConsole })
) )
// CSS extraction
const extractCSS = this.options.build.extractCSS
// TODO: Temporary disabled in dev mode for fixing source maps
// (We need `source-map` devtool for *.css modules)
if (extractCSS && !this.options.dev) {
config.plugins.push(new ExtractTextPlugin(Object.assign({
filename: this.getFileName('css')
// When using optimization.splitChunks and there are
// extracted chunks in the commons chunk,
// allChunks *must* be set to true
// TODO: For nuxt this makes duplicate css assets!
// allChunks: true
}, typeof extractCSS === 'object' ? extractCSS : {})))
}
// Clone deep avoid leaking config between Client and Server // Clone deep avoid leaking config between Client and Server
return _.cloneDeep(config) return _.cloneDeep(config)
} }

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

@ -3,7 +3,6 @@ import path from 'path'
import _ from 'lodash' import _ from 'lodash'
import webpack from 'webpack' import webpack from 'webpack'
import ExtractTextPlugin from 'extract-text-webpack-plugin'
import HTMLPlugin from 'html-webpack-plugin' import HTMLPlugin from 'html-webpack-plugin'
import StylishPlugin from 'webpack-stylish' import StylishPlugin from 'webpack-stylish'
import BundleAnalyzer from 'webpack-bundle-analyzer' import BundleAnalyzer from 'webpack-bundle-analyzer'
@ -122,22 +121,6 @@ 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
const extractCSS = this.options.build.extractCSS
// TODO: Temporary disabled in dev mode for fixing source maps
// (We need `source-map` devtool for *.css modules)
if (extractCSS && !this.options.dev) {
config.plugins.push(new ExtractTextPlugin(Object.assign({
filename: this.getFileName('css')
// When using optimization.splitChunks and there are
// extracted chunks in the commons chunk,
// allChunks *must* be set to true
// TODO: For nuxt this makes duplicate css assets!
// allChunks: true
}, typeof extractCSS === 'object' ? extractCSS : {})))
}
// -------------------------------------- // --------------------------------------
// Dev specific config // Dev specific config
// -------------------------------------- // --------------------------------------