From df939be7129a17d985cb338f178d2e87a88db056 Mon Sep 17 00:00:00 2001 From: Clark Du Date: Wed, 21 Mar 2018 20:45:58 +0800 Subject: [PATCH] fix: not render all styles when css extracted --- lib/builder/webpack/style-loader.js | 20 +++++++++++--------- lib/core/renderer.mjs | 4 +++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/builder/webpack/style-loader.js b/lib/builder/webpack/style-loader.js index 023acc06d..86b6cf52d 100644 --- a/lib/builder/webpack/style-loader.js +++ b/lib/builder/webpack/style-loader.js @@ -67,15 +67,17 @@ export default ({isVueLoader = false, isServer}) => { }) // -- With extractCSS -- - if (!isServer && this.options.build.extractCSS) { - loaders.unshift(MiniCssExtractPlugin.loader) - if (this.options.dev) { - // css-hot-loader - // https://github.com/shepherdwind/css-hot-loader - loaders.unshift({ - loader: 'css-hot-loader', - options: { sourceMap } - }) + if (this.options.build.extractCSS) { + if (!isServer) { + loaders.unshift(MiniCssExtractPlugin.loader) + if (this.options.dev) { + // css-hot-loader + // https://github.com/shepherdwind/css-hot-loader + loaders.unshift({ + loader: 'css-hot-loader', + options: { sourceMap } + }) + } } } else { // Prepare vue-style-loader diff --git a/lib/core/renderer.mjs b/lib/core/renderer.mjs index 0bf106320..a3c9b2f27 100644 --- a/lib/core/renderer.mjs +++ b/lib/core/renderer.mjs @@ -376,7 +376,9 @@ export default class Renderer { APP += m.script.text({ body: true }) APP += m.noscript.text({ body: true }) - HEAD += context.renderStyles() + if (!this.options.build.extractCSS) { + HEAD += context.renderStyles() + } let html = this.resources.ssrTemplate({ HTML_ATTRS: 'data-n-head-ssr ' + m.htmlAttrs.text(),