From a510c6a37f78cfaa43c9ed65683374af5baf4929 Mon Sep 17 00:00:00 2001 From: Tan Li Hau Date: Wed, 17 Apr 2024 17:10:24 +0800 Subject: [PATCH 1/2] fix: support attribute selector inside :global() (#11135) * fix: support attribute selector inside :global() * Update Selector.js --- .changeset/tricky-onions-double.md | 5 +++++ packages/svelte/src/compiler/compile/css/Selector.js | 2 +- .../test/css/samples/global-attribute-selctor/expected.css | 1 + .../test/css/samples/global-attribute-selctor/input.svelte | 6 ++++++ .../samples/css-invalid-global-placement-6/errors.json | 1 + .../samples/css-invalid-global-placement-6/input.svelte | 6 ++++++ 6 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .changeset/tricky-onions-double.md create mode 100644 packages/svelte/test/css/samples/global-attribute-selctor/expected.css create mode 100644 packages/svelte/test/css/samples/global-attribute-selctor/input.svelte create mode 100644 packages/svelte/test/validator/samples/css-invalid-global-placement-6/errors.json create mode 100644 packages/svelte/test/validator/samples/css-invalid-global-placement-6/input.svelte diff --git a/.changeset/tricky-onions-double.md b/.changeset/tricky-onions-double.md new file mode 100644 index 000000000000..4245e7814d88 --- /dev/null +++ b/.changeset/tricky-onions-double.md @@ -0,0 +1,5 @@ +--- +'svelte': patch +--- + +support attribute selector inside :global() diff --git a/packages/svelte/src/compiler/compile/css/Selector.js b/packages/svelte/src/compiler/compile/css/Selector.js index a1c58515d726..9593d1ed63bf 100644 --- a/packages/svelte/src/compiler/compile/css/Selector.js +++ b/packages/svelte/src/compiler/compile/css/Selector.js @@ -214,7 +214,7 @@ export default class Selector { index !== 0 && selector.children && selector.children.length > 0 && - !/[.:#\s]/.test(selector.children[0].value[0]) + !/[.:#[\s]/.test(selector.children[0].value[0]) ) { component.error(selector, compiler_errors.css_invalid_global_selector_position); } diff --git a/packages/svelte/test/css/samples/global-attribute-selctor/expected.css b/packages/svelte/test/css/samples/global-attribute-selctor/expected.css new file mode 100644 index 000000000000..f8ae79fe5024 --- /dev/null +++ b/packages/svelte/test/css/samples/global-attribute-selctor/expected.css @@ -0,0 +1 @@ +.anim-checkbox.svelte-xyz[data-state='checked']{background-color:red} \ No newline at end of file diff --git a/packages/svelte/test/css/samples/global-attribute-selctor/input.svelte b/packages/svelte/test/css/samples/global-attribute-selctor/input.svelte new file mode 100644 index 000000000000..f821f82fc65f --- /dev/null +++ b/packages/svelte/test/css/samples/global-attribute-selctor/input.svelte @@ -0,0 +1,6 @@ + +
\ No newline at end of file diff --git a/packages/svelte/test/validator/samples/css-invalid-global-placement-6/errors.json b/packages/svelte/test/validator/samples/css-invalid-global-placement-6/errors.json new file mode 100644 index 000000000000..fe51488c7066 --- /dev/null +++ b/packages/svelte/test/validator/samples/css-invalid-global-placement-6/errors.json @@ -0,0 +1 @@ +[] diff --git a/packages/svelte/test/validator/samples/css-invalid-global-placement-6/input.svelte b/packages/svelte/test/validator/samples/css-invalid-global-placement-6/input.svelte new file mode 100644 index 000000000000..f821f82fc65f --- /dev/null +++ b/packages/svelte/test/validator/samples/css-invalid-global-placement-6/input.svelte @@ -0,0 +1,6 @@ + +
\ No newline at end of file From 9f2341f3f2df992a81a84990e2e41e4036541088 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 08:47:36 -0400 Subject: [PATCH 2/2] Version Packages (#11202) Co-authored-by: github-actions[bot] --- .changeset/tricky-onions-double.md | 5 ----- packages/svelte/CHANGELOG.md | 6 ++++++ packages/svelte/package.json | 2 +- packages/svelte/src/shared/version.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .changeset/tricky-onions-double.md diff --git a/.changeset/tricky-onions-double.md b/.changeset/tricky-onions-double.md deleted file mode 100644 index 4245e7814d88..000000000000 --- a/.changeset/tricky-onions-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'svelte': patch ---- - -support attribute selector inside :global() diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md index 84337e2cced8..d53f8c2d2457 100644 --- a/packages/svelte/CHANGELOG.md +++ b/packages/svelte/CHANGELOG.md @@ -1,5 +1,11 @@ # svelte +## 4.2.15 + +### Patch Changes + +- support attribute selector inside :global() ([#11135](https://github.com/sveltejs/svelte/pull/11135)) + ## 4.2.14 ### Patch Changes diff --git a/packages/svelte/package.json b/packages/svelte/package.json index d538c1aec3e8..56c0bb8ee682 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -1,6 +1,6 @@ { "name": "svelte", - "version": "4.2.14", + "version": "4.2.15", "description": "Cybernetically enhanced web apps", "type": "module", "module": "src/runtime/index.js", diff --git a/packages/svelte/src/shared/version.js b/packages/svelte/src/shared/version.js index 7f761bed119f..bfea4c83a159 100644 --- a/packages/svelte/src/shared/version.js +++ b/packages/svelte/src/shared/version.js @@ -6,5 +6,5 @@ * https://svelte.dev/docs/svelte-compiler#svelte-version * @type {string} */ -export const VERSION = '4.2.14'; +export const VERSION = '4.2.15'; export const PUBLIC_VERSION = '4';