Skip to content

Commit

Permalink
fix: override style issues (close: #637) (#638)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
ulivz authored Jul 8, 2018
1 parent 76d12e7 commit f998802
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 3 additions & 0 deletions lib/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions lib/default-theme/styles/config.styl
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ $MQMobileNarrow = 419px

// code
$lineNumbersWrapperWidth = 3.5rem

@import '~@temp/override.styl' // generated from user config
2 changes: 1 addition & 1 deletion lib/webpack/createBaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f998802

Please sign in to comment.