Skip to content

CSS modules changes to allow plugins more control #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2018
Merged

CSS modules changes to allow plugins more control #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions packages/vue-component/plugin/tag-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,17 +380,12 @@ VueComponentTagHandler = class VueComponentTagHandler {
inputFile: this.inputFile,
dependencyManager: this.dependencyManager,
tag: styleTag,
cssModules,
})
// console.log('Css result', result)
css = result.css
cssMap = result.map
if (result.cssModules) {
const moduleName = typeof styleTag.attribs.module === 'string' ? styleTag.attribs.module : defaultModuleName
if (cssModules === undefined) {
cssModules = {}
}
cssModules[moduleName] = { ...(cssModules[moduleName] || {}), ...result.cssModules }
}
cssModules = result.cssModules
if (result.js) {
js += result.js
}
Expand Down Expand Up @@ -448,6 +443,13 @@ VueComponentTagHandler = class VueComponentTagHandler {
}
}

if (cssModules && !global.vue.cssModules) {
cssModules = Object.keys(cssModules).reduce((result, key) => {
result[key] = JSON.stringify(cssModules[key]);
return result;
}, {});
}

let compileResult = {
code: js,
map,
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-component/plugin/vue-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
if(compileResult.cssModules) {
const modules = Object.keys(compileResult.cssModules)
const modulesCode = '__vue_options__.computed = __vue_options__.computed || {};\n' +
modules.map(module=>`__vue_options__.computed['${module}'] = function() {\n return ${JSON.stringify(compileResult.cssModules[module])}\n};\n`).join('\n')
modules.map(module=>`__vue_options__.computed['${module}'] = function() {\n return ${compileResult.cssModules[module]}\n};\n`).join('\n')
js += modulesCode
// console.log(modulesCode)
}
Expand Down