fix: override style issues (close: #637) (#638)

1. duplicated generated override style 2. unexpected style order, override style should be at the end of the extracted style bundle. (ref: webpack-contrib/mini-css-extract-plugin#130)
shaun554 · Jul 8, 2018 · 39a1b2b · 39a1b2b
1 parent ebf8c1b
commit 39a1b2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/app/app.js b/lib/app/app.js
@@ -7,6 +7,9 @@ import { siteData } from '@temp/siteData'
 import enhanceApp from '@temp/enhanceApp'
 import themeEnhanceApp from '@temp/themeEnhanceApp'
 
+// generated from user config
+import('@temp/override.styl')
+
 // built-in components
 import Content from './components/Content'
 import OutboundLink from './components/OutboundLink.vue'

diff --git a/lib/default-theme/styles/config.styl b/lib/default-theme/styles/config.styl
@@ -17,5 +17,3 @@ $MQMobileNarrow = 419px
 
 // code
 $lineNumbersWrapperWidth = 3.5rem
-
-@import '~@temp/override.styl' // generated from user config
diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js
@@ -49,7 +49,7 @@ module.exports = function createBaseConfig ({
         : path.resolve(__dirname, './noopModule.js'))
       .end()
     .extensions
-      .merge(['.js', '.jsx', '.vue', '.json'])
+      .merge(['.js', '.jsx', '.vue', '.json', '.styl'])
       .end()
     .modules
       // prioritize our own