michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix nested parens bug (#39)

Browse source
This commit is contained in:
Drew Powers 2021-03-30 10:37:04 -06:00 • committed by GitHub
parent ee6ef81cf3
commit 7334a550d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/snowpack/package-lock.json generated
View file

@ -1010,6 +1010,7 @@
"postcss": "^8.2.8", "postcss": "^8.2.8",
"react": "^17.0.1", "react": "^17.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"rollup": "^2.43.1",
"sass": "^1.32.8", "sass": "^1.32.8",
"snowpack": "^3.1.2", "snowpack": "^3.1.2",
"svelte": "^3.35.0", "svelte": "^3.35.0",
@ -4096,9 +4097,9 @@
} }
}, },
"rollup": { "rollup": {
"version": "2.42.3", "version": "2.44.0",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.42.3.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.44.0.tgz",
"integrity": "sha512-JjaT9WaUS5vmjy6xUrnPOskjkQg2cN4WSACNCwbOvBz8VDmbiKVdmTFUoMPRqTud0tsex8Xy9/boLbDW9HKD1w==", "integrity": "sha512-rGSF4pLwvuaH/x4nAS+zP6UNn5YUDWf/TeEU5IoXSZKBbKRNTCI3qMnYXKZgrC0D2KzS2baiOZt1OlqhMu5rnQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"fsevents": "~2.3.1" "fsevents": "~2.3.1"

8
src/compiler/optimize/postcss-scoped-styles/index.ts
View file

@ -50,7 +50,13 @@ export function scopeSelectors(selector: string, className: string) {
// leave :global() alone! // leave :global() alone!
if (value.startsWith(':global(')) { if (value.startsWith(':global(')) {
ss = head + ss.substring(start, end).replace(':global(', '').replace(')', '') + tail; ss =
head +
ss
.substring(start, end)
.replace(/^:global\(/, '')
.replace(/\)$/, '') +
tail;
continue; continue;
} }

1
src/compiler/optimize/styles.ts
View file

@ -205,7 +205,6 @@ export default function ({ filename, fileID }: { filename: string; fileID: strin
// 3b. Update <style> attributes // 3b. Update <style> attributes
const styleTypeIndex = styleNodes[n].attributes.findIndex(({ name }: any) => name === 'type'); const styleTypeIndex = styleNodes[n].attributes.findIndex(({ name }: any) => name === 'type');
if (styleTypeIndex !== -1) { if (styleTypeIndex !== -1) {
console.log(styleNodes[n].attributes[styleTypeIndex]);
styleNodes[n].attributes[styleTypeIndex].value[0].raw = 'text/css'; styleNodes[n].attributes[styleTypeIndex].value[0].raw = 'text/css';
styleNodes[n].attributes[styleTypeIndex].value[0].data = 'text/css'; styleNodes[n].attributes[styleTypeIndex].value[0].data = 'text/css';
} else { } else {

1
test/astro-scoped-styles.test.js
View file

@ -16,6 +16,7 @@ const tests = {
'.class *': `.class${className} ${className}`, '.class *': `.class${className} ${className}`,
'.class>*': `.class${className}>${className}`, '.class>*': `.class${className}>${className}`,
'.class :global(*)': `.class${className} *`, '.class :global(*)': `.class${className} *`,
'.class :global(.nav:not(.is-active))': `.class${className} .nav:not(.is-active)`, // preserve nested parens
'.class:not(.is-active)': `.class${className}:not(.is-active)`, // Note: the :not() selector can NOT contain multiple classes, so this is correct; if this causes issues for some people then it‘s worth a discussion '.class:not(.is-active)': `.class${className}:not(.is-active)`, // Note: the :not() selector can NOT contain multiple classes, so this is correct; if this causes issues for some people then it‘s worth a discussion
}; };