Skip to content

Commit

Permalink
feat: css modules + hmr
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Mar 20, 2018
1 parent 234d48b commit 99754c0
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
1 change: 0 additions & 1 deletion lib/hotReload.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const hotReloadAPIPath = require.resolve('vue-hot-reload-api')

exports.genHotReloadCode = (id, functional) => {
// TODO handle CSSModules and style injection disposal
return wrap(`
if (!module.hot.data) {
api.createRecord('${id}', component.options)
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ module.exports = function (source) {
if (descriptor.template) {
const src = descriptor.template.src || resourcePath
const langQuery = getLangQuery(descriptor.template)
const idQuery = hasScoped ? `&id=${id}` : ``
const idQuery = `&id=${id}`
const fnQuery = hasFunctional ? `&functional` : ``
const commentQuery = hasComment ? `&comment` : ``
const query = `?vue&type=template${idQuery}${langQuery}${fnQuery}${commentQuery}`
Expand Down
4 changes: 3 additions & 1 deletion lib/styleInjection.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function genStyleInjectionCode (
let styleInjectionCode = ``
let cssModulesHotReloadCode = ``

const hasCSSModules = false
let hasCSSModules = false
const cssModuleNames = new Map()

function genStyleRequest (style, i) {
Expand All @@ -26,6 +26,8 @@ module.exports = function genStyleInjectionCode (
}

function genCSSModulesCode (style, request, i) {
hasCSSModules = true

const moduleName = style.module === true ? '$style' : style.module
if (cssModuleNames.has(moduleName)) {
loaderContext.emitError(`CSS module name ${moduleName} is not unique!`)
Expand Down
33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"scripts": {
"test": "jest --env node",
"lint": "eslint lib test --fix",
"build": "webpack --config exploration/webpack.config.js"
"build": "webpack --config exploration/webpack.config.js",
"dev": "webpack-dev-server --config exploration/webpack.config.js --inline --hot"
},
"author": "Evan You",
"license": "MIT",
Expand All @@ -31,6 +32,21 @@
"css-loader": "*",
"vue-template-compiler": "^2.0.0"
},
"dependencies": {
"consolidate": "^0.15.0",
"debug": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"lru-cache": "^4.1.2",
"postcss": "^6.0.20",
"postcss-selector-parser": "^3.1.1",
"prettier": "^1.11.1",
"source-map": "^0.5.6",
"vue-component-compiler": "vuejs/vue-component-compiler#master",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0",
"vue-template-es2015-compiler": "^1.6.0"
},
"devDependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
Expand Down Expand Up @@ -61,20 +77,5 @@
"webpack-dev-server": "^3.1.1",
"webpack-merge": "^4.1.2",
"yorkie": "^1.0.3"
},
"dependencies": {
"consolidate": "^0.15.0",
"debug": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"lru-cache": "^4.1.2",
"postcss": "^6.0.20",
"postcss-selector-parser": "^3.1.1",
"prettier": "^1.11.1",
"source-map": "^0.5.6",
"vue-component-compiler": "vuejs/vue-component-compiler#master",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0",
"vue-template-es2015-compiler": "^1.6.0"
}
}

0 comments on commit 99754c0

Please sign in to comment.