Merge branch 'main' into renovate/all-minor-patch

bluwy · bluwy · commit 627fb81ffd49 · 2024-11-15T20:05:22.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,3 @@
-# build and test on linux, windows, mac with node  18,20
 name: CI
 
 on:
@@ -22,15 +21,15 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  # "checks" job runs on linux + 16 only and checks that install, build, lint and audit work
+  # "checks" job runs on linux + node lts only and checks that install, build, lint and audit work
   # it also primes the pnpm store cache for linux, important for downstream tests
   checks:
     timeout-minutes: 5
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # pseudo-matrix for convenience, NEVER use more than a single combination
-        node: [20]
+        node: [22]
         os: [ubuntu-latest]
     steps:
       - uses: actions/checkout@v4
@@ -68,18 +67,19 @@ jobs:
         if: (${{ success() }} || ${{ failure() }})
         run: pnpm generate:types && [ "`git status --porcelain=v1`" == "" ]
 
+  # "test" job runs on linux, windows, mac with node active lts and linux with node maintenance lts
   test:
     timeout-minutes: 10
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        node: [20]
+        node: [22]
         os: [ubuntu-latest, macos-latest, windows-latest]
         include:
           - node: 18
             os: ubuntu-latest
-          - node: 22
+          - node: 20
             os: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         # pseudo-matrix for convenience, NEVER use more than a single combination
-        node: [20]
+        node: [22]
         os: [ubuntu-latest]
     steps:
       - name: checkout
diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-css.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-css.txt
@@ -2,4 +2,4 @@ button.svelte-d8vj6a {
   color: #000099;
 }
 
-/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHVtbXkuc3ZlbHRlIiwibWFwcGluZ3MiOiJBQVdrQiIsIm5hbWVzIjpbXSwic291cmNlcyI6WyJEdW1teS5zdmVsdGUiXX0= */
+/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHVtbXkuc3ZlbHRlIiwibWFwcGluZ3MiOiJBQVdrQiIsIm5hbWVzIjpbXSwiaWdub3JlTGlzdCI6W10sInNvdXJjZXMiOlsiRHVtbXkuc3ZlbHRlIl19 */
diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-js.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-js.txt
@@ -4,23 +4,19 @@ import * as $ from "/node_modules/.vite/deps/svelte_internal_client.js?v=XXX";
 var root = $.template(`<button class="svelte-d8vj6a"> </button>`);
 
 export default function Dummy($$anchor, $$props) {
-	let name = $.prop($$props, "name");
-	let clicks = $.mutable_source(0);
+	let name = $.prop($$props, "name", 8);
+	let clicks = $.mutable_state(0);
 	var button = root();
 	var text = $.child(button);
 
+	$.reset(button);
 	$.template_effect(() => $.set_text(text, `${name() ?? ""} clicks: ${$.get(clicks) ?? ""}`));
 
-	$.event(
-		"click",
-		button,
-		() => {
-			$.update(clicks);
-		},
-		false
-	);
+	$.event("click", button, () => {
+		$.update(clicks);
+	});
 
 	$.append($$anchor, button);
 }
 
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJtYXBwaW5ncyI6Ijs7Ozs7O0tBQ1ksSUFBWTtLQUNuQixNQUFNLG9CQUFHLENBQUM7Ozs7NkNBTVYsSUFBSSwwQkFBVyxNQUFNIiwibmFtZXMiOltdLCJzb3VyY2VzIjpbIkR1bW15LnN2ZWx0ZSJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJtYXBwaW5ncyI6Ijs7Ozs7O0tBQ1ksSUFBWTtLQUNuQixNQUFNLG1CQUFHLENBQUM7Ozs7OzZDQU1WLElBQUksMEJBQVcsTUFBTTs7O1dBRHhCLE1BQU0iLCJuYW1lcyI6W10sImlnbm9yZUxpc3QiOltdLCJzb3VyY2VzIjpbIkR1bW15LnN2ZWx0ZSJdfQ==
diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-custom-element.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-custom-element.txt
@@ -3,27 +3,28 @@ import * as $ from "svelte/internal/client";
 
 var root = $.template(`<button class="svelte-d8vj6a"> </button>`);
 
+const $$css = {
+	hash: "svelte-d8vj6a",
+	code: "button.svelte-d8vj6a {\n  color: #000099;\n}"
+};
+
 export default function Dummy($$anchor, $$props) {
 	$.push($$props, false);
+	$.append_styles($$anchor, $$css);
 
-	let name = $.prop($$props, "name", 4);
-	let clicks = $.mutable_source(0);
+	let name = $.prop($$props, "name", 12);
+	let clicks = $.mutable_state(0);
 	var button = root();
 	var text = $.child(button);
 
+	$.reset(button);
 	$.template_effect(() => $.set_text(text, `${name() ?? ""} clicks: ${$.get(clicks) ?? ""}`));
 
-	$.event(
-		"click",
-		button,
-		() => {
-			$.update(clicks);
-		},
-		false
-	);
+	$.event("click", button, () => {
+		$.update(clicks);
+	});
 
 	$.append($$anchor, button);
-	$.append_styles($$anchor, "svelte-d8vj6a", "button.svelte-d8vj6a {\n  color: #000099;\n}");
 
 	return $.pop({
 		get name() {
diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-raw.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-raw.txt
@@ -10,8 +10,9 @@
 >
 
 <style lang="scss">
+	@use 'sass:color';
 	$blue: blue;
 	button {
-		color: darken($blue, 20);
+		color: color.adjust($blue, $lightness: -20%);
 	}
 </style>
diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-script.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-script.txt
@@ -4,21 +4,17 @@ import * as $ from "svelte/internal/client";
 var root = $.template(`<button class="svelte-d8vj6a"> </button>`);
 
 export default function Dummy($$anchor, $$props) {
-	let name = $.prop($$props, "name");
-	let clicks = $.mutable_source(0);
+	let name = $.prop($$props, "name", 8);
+	let clicks = $.mutable_state(0);
 	var button = root();
 	var text = $.child(button);
 
+	$.reset(button);
 	$.template_effect(() => $.set_text(text, `${name() ?? ""} clicks: ${$.get(clicks) ?? ""}`));
 
-	$.event(
-		"click",
-		button,
-		() => {
-			$.update(clicks);
-		},
-		false
-	);
+	$.event("click", button, () => {
+		$.update(clicks);
+	});
 
 	$.append($$anchor, button);
 }
diff --git a/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts b/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts
@@ -88,7 +88,7 @@ describe('raw', () => {
 	});
 });
 
-describe.runIf(!isBuild).skip('direct', () => {
+describe.runIf(!isBuild)('direct', () => {
 	test('Dummy.svelte?direct&svelte&type=style&sourcemap&lang.css', async () => {
 		const response = await fetchFromPage(
 			'src/Dummy.svelte?direct&svelte&type=style&sourcemap&lang.css',
@@ -116,7 +116,7 @@ describe.runIf(!isBuild).skip('direct', () => {
 	});
 });
 
-describe.runIf(!isBuild).skip('ssrLoadModule', () => {
+describe.runIf(!isBuild)('ssrLoadModule', () => {
 	let vite: ViteDevServer;
 	let ssrLoadDummy;
 	beforeAll(async () => {
diff --git a/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts b/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts
@@ -1,7 +1,6 @@
 import { getEl, getText, isBuild, page, isCI } from '~utils';
 
-// TODO reenable when inspector works for svelte5
-describe.skip('inspector-kit', () => {
+describe('inspector-kit', () => {
 	it('should render page', async () => {
 		expect(await getText('h1')).toBe('Hello Inspector!');
 	});
diff --git a/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts b/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts
@@ -1,7 +1,6 @@
 import { getEl, getText, isBuild, page, isCI } from '~utils';
 
-// TODO reenable when inspector works for svelte5
-describe.skip('inspector-vite', () => {
+describe('inspector-vite', () => {
 	it('should render page', async () => {
 		expect(await getText('h1')).toBe('Hello Inspector!');
 	});

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ button.svelte-d8vj6a {`
`2`	`2`	`color: #000099;`
`3`	`3`	`}`
`4`	`4`
`5`		`-/# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHVtbXkuc3ZlbHRlIiwibWFwcGluZ3MiOiJBQVdrQiIsIm5hbWVzIjpbXSwic291cmNlcyI6WyJEdW1teS5zdmVsdGUiXX0= /`
	`5`	`+/# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHVtbXkuc3ZlbHRlIiwibWFwcGluZ3MiOiJBQVdrQiIsIm5hbWVzIjpbXSwiaWdub3JlTGlzdCI6W10sInNvdXJjZXMiOlsiRHVtbXkuc3ZlbHRlIl19 /`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,9 @@`
`10`	`10`	`>`
`11`	`11`
`12`	`12`	`<style lang="scss">`
	`13`	`+ @use 'sass:color';`
`13`	`14`	`$blue: blue;`
`14`	`15`	`button {`
`15`		`- color: darken($blue, 20);`
	`16`	`+ color: color.adjust($blue, $lightness: -20%);`
`16`	`17`	`}`
`17`	`18`	`</style>`