Skip to content
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.

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

fix: PostCSS mixins cause style parsing to break #425

Merged
merged 1 commit into from
Feb 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 6 deletions e2e/2.x/custom-transformers/scss-transformer.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
const cssExtract = require('extract-from-css')
const cssTree = require('css-tree')

module.exports = {
preprocess: function preprocess(src, filepath, config, attrs) {
return `${src}\n .g{width: 10px}`
},
postprocess: function postprocess(src, filepath, config, attrs) {
const cssNames = cssExtract.extractClasses(src)
const obj = {}
for (let i = 0, l = cssNames.length; i < l; i++) {
obj[cssNames[i]] = cssNames[i]
}
const ast = cssTree.parse(src)
const obj = cssTree
.findAll(ast, node => node.type === 'ClassSelector')
.reduce((acc, cssNode) => {
acc[cssNode.name] = cssNode.name

return acc
}, {})

if (!attrs.themed) {
return JSON.stringify(obj)
Expand Down
17 changes: 15 additions & 2 deletions e2e/2.x/style/components/PostCss.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
<template>
<section>
<div :class="$style.a"></div>
<div :class="$style.b"></div>
<div :class="$style.a" />
<div :class="$style.b" />
</section>
</template>

<style module lang="postcss">
:root {
--theme_color_background_base: #f00;
}

@define-mixin hover {
outline: none;
box-shadow: 0 0 0 2px var(--theme_color_background_base);
}

.a {
background: color(purple a(90%));
}

.a:hover {
@mixin hover;
}
</style>

<style module lang="pcss">
Expand Down
6 changes: 3 additions & 3 deletions e2e/3.x/custom-transformers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@vue/test-utils": "^2.0.0-rc.10",
"@vue/vue3-jest": "^27.0.0-alpha.1",
"babel-jest": "^27.0.0",
"extract-from-css": "^0.4.4",
"css-tree": "^2.0.1",
"jest": "^27.0.0",
"postcss": "^7.0.13",
"postcss-color-function": "^4.0.1",
"sass": "^1.23.7",
"@vue/vue3-jest": "^27.0.0-alpha.1"
"sass": "^1.23.7"
},
"jest": {
"testEnvironment": "jsdom",
Expand Down
16 changes: 10 additions & 6 deletions e2e/3.x/custom-transformers/scss-transformer.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
const cssExtract = require('extract-from-css')
const cssTree = require('css-tree')

module.exports = {
preprocess: function preprocess(src, filepath, config, attrs) {
return `${src}\n .g{width: 10px}`
},
postprocess: function postprocess(src, filepath, config, attrs) {
const cssNames = cssExtract.extractClasses(src)
const obj = {}
for (let i = 0, l = cssNames.length; i < l; i++) {
obj[cssNames[i]] = cssNames[i]
}
const ast = cssTree.parse(src)
const obj = cssTree
.findAll(ast, node => node.type === 'ClassSelector')
.reduce((acc, cssNode) => {
acc[cssNode.name] = cssNode.name

return acc
}, {})

if (!attrs.themed) {
return JSON.stringify(obj)
Expand Down
17 changes: 15 additions & 2 deletions e2e/3.x/style/components/PostCss.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<section>
<div :class="$style.c"></div>
<div :class="style.d"></div>
<div :class="$style.c" />
<div :class="style.d" />
</section>
</template>

Expand All @@ -18,9 +18,22 @@ export default defineComponent({
</script>

<style module lang="postcss">
:root {
--theme_color_background_base: #f00;
}

@define-mixin hover {
outline: none;
box-shadow: 0 0 0 2px var(--theme_color_background_base);
}

.c {
background: color(purple a(90%));
}

.c:hover {
@mixin hover;
}
</style>

<style module lang="pcss">
Expand Down
17 changes: 10 additions & 7 deletions packages/vue2-jest/lib/process-style.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const fs = require('fs')
const cssExtract = require('extract-from-css')
const cssTree = require('css-tree')
const getVueJestConfig = require('./utils').getVueJestConfig
const compileStyle = require('@vue/component-compiler-utils').compileStyle
const applyModuleNameMapper = require('./module-name-mapper-helper')
Expand All @@ -21,12 +21,15 @@ function getGlobalResources(resources, lang) {
}

function extractClassMap(cssCode) {
const cssNames = cssExtract.extractClasses(cssCode)
const cssMap = {}
for (let i = 0, l = cssNames.length; i < l; i++) {
cssMap[cssNames[i]] = cssNames[i]
}
return cssMap
const ast = cssTree.parse(cssCode)

return cssTree
.findAll(ast, node => node.type === 'ClassSelector')
.reduce((acc, cssNode) => {
acc[cssNode.name] = cssNode.name

return acc
}, {})
}

function getPreprocessOptions(lang, filePath, jestConfig) {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue2-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.2.0",
"@vue/component-compiler-utils": "^3.1.0",
"chalk": "^2.1.0",
"extract-from-css": "^0.4.4",
"css-tree": "^2.0.1",
"source-map": "0.5.6"
},
"repository": {
Expand Down
17 changes: 10 additions & 7 deletions packages/vue3-jest/lib/process-style.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { compileStyle } = require('@vue/compiler-sfc')
const path = require('path')
const fs = require('fs')
const cssExtract = require('extract-from-css')
const cssTree = require('css-tree')
const getVueJestConfig = require('./utils').getVueJestConfig
const applyModuleNameMapper = require('./module-name-mapper-helper')
const getCustomTransformer = require('./utils').getCustomTransformer
Expand All @@ -21,12 +21,15 @@ function getGlobalResources(resources, lang) {
}

function extractClassMap(cssCode) {
const cssNames = cssExtract.extractClasses(cssCode)
const cssMap = {}
for (let i = 0, l = cssNames.length; i < l; i++) {
cssMap[cssNames[i]] = cssNames[i]
}
return cssMap
const ast = cssTree.parse(cssCode)

return cssTree
.findAll(ast, node => node.type === 'ClassSelector')
.reduce((acc, cssNode) => {
acc[cssNode.name] = cssNode.name

return acc
}, {})
}

function getPreprocessOptions(lang, filePath, jestConfig) {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue3-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.2.0",
"chalk": "^2.1.0",
"convert-source-map": "^1.6.0",
"extract-from-css": "^0.4.4",
"css-tree": "^2.0.1",
"source-map": "0.5.6",
"tsconfig": "^7.0.0"
},
Expand Down
Loading