diff --git a/package.json b/package.json index 5ccfe0ab9..333e5fb63 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "prettier": "^3.5.3", "prettier-plugin-svelte": "^3.4.0", "publint": "^0.3.12", - "svelte": "^5.32.1", + "svelte": "^5.33.2", "svelte-eslint-parser": "^1.2.0", "typescript": "^5.8.3", "typescript-eslint": "^8.32.1", diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/all.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/all.txt deleted file mode 100644 index 392926c2d..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/all.txt +++ /dev/null @@ -1,531 +0,0 @@ -{ - "ast": { - "html": { - "type": "Fragment", - "start": 73, - "end": 149, - "children": [ - { - "type": "Text", - "start": 71, - "end": 73, - "raw": "\n\n", - "data": "\n\n" - }, - { - "type": "Element", - "start": 73, - "end": 149, - "name": "button", - "attributes": [ - { - "start": 82, - "end": 115, - "type": "EventHandler", - "name": "click", - "expression": { - "type": "ArrowFunctionExpression", - "start": 92, - "end": 114, - "loc": { - "start": { - "line": 7, - "column": 11 - }, - "end": { - "line": 9, - "column": 2 - } - }, - "id": null, - "expression": false, - "generator": false, - "async": false, - "params": [], - "body": { - "type": "BlockStatement", - "start": 98, - "end": 114, - "loc": { - "start": { - "line": 7, - "column": 17 - }, - "end": { - "line": 9, - "column": 2 - } - }, - "body": [ - { - "type": "ExpressionStatement", - "start": 102, - "end": 111, - "loc": { - "start": { - "line": 8, - "column": 2 - }, - "end": { - "line": 8, - "column": 11 - } - }, - "expression": { - "type": "UpdateExpression", - "start": 102, - "end": 110, - "loc": { - "start": { - "line": 8, - "column": 2 - }, - "end": { - "line": 8, - "column": 10 - } - }, - "operator": "++", - "prefix": false, - "argument": { - "type": "Identifier", - "start": 102, - "end": 108, - "loc": { - "start": { - "line": 8, - "column": 2 - }, - "end": { - "line": 8, - "column": 8 - } - }, - "name": "clicks" - } - } - } - ] - }, - "metadata": { - "hoisted": false, - "hoisted_params": [], - "scope": { - "root": { - "conflicts": {} - }, - "parent": { - "root": { - "conflicts": {} - }, - "parent": { - "root": { - "conflicts": {} - }, - "parent": { - "root": { - "conflicts": {} - }, - "parent": { - "root": { - "conflicts": {} - }, - "parent": { - "root": { - "conflicts": {} - }, - "parent": null, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 0, - "tracing": null - }, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 1, - "tracing": null - }, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 2, - "tracing": null - }, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 3, - "tracing": null - }, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 4, - "tracing": null - }, - "declarations": {}, - "declarators": {}, - "references": {}, - "function_depth": 5, - "tracing": null - } - } - }, - "modifiers": [] - }, - { - "type": "Attribute", - "start": -1, - "end": -1, - "name": "class", - "value": [ - { - "type": "Text", - "data": "", - "raw": "", - "start": -1, - "end": -1 - } - ] - } - ], - "children": [ - { - "type": "MustacheTag", - "start": 116, - "end": 122, - "expression": { - "type": "Identifier", - "start": 117, - "end": 121, - "loc": { - "start": { - "line": 9, - "column": 5 - }, - "end": { - "line": 9, - "column": 9 - } - }, - "name": "name" - } - }, - { - "type": "Text", - "start": 122, - "end": 131, - "raw": " clicks: ", - "data": " clicks: " - }, - { - "type": "MustacheTag", - "start": 131, - "end": 139, - "expression": { - "type": "Identifier", - "start": 132, - "end": 138, - "loc": { - "start": { - "line": 9, - "column": 20 - }, - "end": { - "line": 9, - "column": 26 - } - }, - "name": "clicks" - } - } - ] - }, - { - "type": "Text", - "start": 149, - "end": 151, - "raw": "\n\n", - "data": "\n\n" - } - ] - }, - "instance": { - "type": "Script", - "start": 0, - "end": 71, - "context": "default", - "content": { - "type": "Program", - "start": 18, - "end": 62, - "loc": { - "start": { - "line": 1, - "column": 0 - }, - "end": { - "line": 4, - "column": 0 - } - }, - "body": [ - { - "type": "ExportNamedDeclaration", - "start": 20, - "end": 44, - "loc": { - "start": { - "line": 2, - "column": 1 - }, - "end": { - "line": 2, - "column": 25 - } - }, - "exportKind": "value", - "declaration": { - "type": "VariableDeclaration", - "start": 27, - "end": 44, - "loc": { - "start": { - "line": 2, - "column": 8 - }, - "end": { - "line": 2, - "column": 25 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 31, - "end": 43, - "loc": { - "start": { - "line": 2, - "column": 12 - }, - "end": { - "line": 2, - "column": 24 - } - }, - "id": { - "type": "Identifier", - "start": 31, - "end": 43, - "loc": { - "start": { - "line": 2, - "column": 12 - }, - "end": { - "line": 2, - "column": 24 - } - }, - "name": "name" - }, - "init": null - } - ], - "kind": "let" - }, - "specifiers": [], - "source": null - }, - { - "type": "VariableDeclaration", - "start": 46, - "end": 61, - "loc": { - "start": { - "line": 3, - "column": 1 - }, - "end": { - "line": 3, - "column": 16 - } - }, - "declarations": [ - { - "type": "VariableDeclarator", - "start": 50, - "end": 60, - "loc": { - "start": { - "line": 3, - "column": 5 - }, - "end": { - "line": 3, - "column": 15 - } - }, - "id": { - "type": "Identifier", - "start": 50, - "end": 56, - "loc": { - "start": { - "line": 3, - "column": 5 - }, - "end": { - "line": 3, - "column": 11 - } - }, - "name": "clicks" - }, - "init": { - "type": "Literal", - "start": 59, - "end": 60, - "loc": { - "start": { - "line": 3, - "column": 14 - }, - "end": { - "line": 3, - "column": 15 - } - }, - "value": 0, - "raw": "0" - } - } - ], - "kind": "let" - } - ], - "sourceType": "module" - } - }, - "css": { - "type": "Style", - "start": 151, - "end": 206, - "attributes": [ - { - "type": "Attribute", - "start": 158, - "end": 169, - "name": "lang", - "value": [ - { - "start": 164, - "end": 168, - "type": "Text", - "raw": "scss", - "data": "scss" - } - ] - } - ], - "children": [ - { - "type": "Rule", - "prelude": { - "type": "SelectorList", - "start": 170, - "end": 176, - "children": [ - { - "type": "Selector", - "start": 170, - "end": 176, - "children": [ - { - "type": "TypeSelector", - "name": "button", - "start": 170, - "end": 176 - } - ] - } - ] - }, - "block": { - "type": "Block", - "start": 177, - "end": 198, - "children": [ - { - "type": "Declaration", - "start": 181, - "end": 195, - "property": "color", - "value": "#000099" - } - ] - }, - "start": 170, - "end": 198 - } - ], - "content": { - "start": 170, - "end": 198, - "styles": "button {\n color: #000099;\n}", - "comment": null - } - } - }, - "css": { - "code": "button.svelte-d8vj6a {\n color: #000099;\n}", - "map": { - "version": 3, - "file": "Dummy.svelte", - "mappings": "AAWkB", - "names": [], - "ignoreList": [], - "sources": [ - "Dummy.svelte" - ] - }, - "hasGlobal": false - }, - "dependencies": [], - "js": { - "code": "import 'svelte/internal/disclose-version';\nimport 'svelte/internal/flags/legacy';\nimport * as $ from 'svelte/internal/client';\n\nvar root = $.template(``);\n\nexport default function Dummy($$anchor, $$props) {\n\tlet name = $.prop($$props, 'name', 8);\n\tlet clicks = $.mutable_source(0);\n\tvar button = root();\n\tvar text = $.child(button);\n\n\t$.reset(button);\n\t$.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`));\n\n\t$.event('click', button, () => {\n\t\t$.update(clicks);\n\t});\n\n\t$.append($$anchor, button);\n}", - "map": { - "version": 3, - "mappings": ";;;;;;;KACY,IAAY;KACnB,MAAM,oBAAG,CAAC;;;;;6CAMV,IAAI,0BAAW,MAAM;;gCAFT;WACf,MAAM;CACP,CAAC", - "names": [], - "ignoreList": [], - "sources": [ - "Dummy.svelte" - ] - } - }, - "lang": "ts", - "metadata": { - "runes": false - }, - "normalizedFilename": "/src/Dummy.svelte", - "preprocessed": { - "code": "\n\n {\n\t\tclicks++;\n\t}}>{name} clicks: {clicks}\n\n\n", - "dependencies": [], - "map": { - "version": 3, - "mappings": "AAAA,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AACjB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM;AACxB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACf,CAAC,CAAC,MAAM;;AAER,CAAC;AACD,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjB,EAAE,MAAM,CAAC,CAAC;AACV,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7B;;AAEA,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;;CAMlB,CAAC,CAAC,KAAK", - "names": [], - "ignoreList": [], - "sources": [ - "Dummy.svelte" - ] - } - }, - "source": "\n\n {\n\t\tclicks++;\n\t}}>{name} clicks: {clicks}\n\n\n", - "ssr": false, - "warnings": [] -} \ No newline at end of file diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/custom-element.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/custom-element.txt deleted file mode 100644 index 97ab65eae..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/custom-element.txt +++ /dev/null @@ -1,41 +0,0 @@ -import 'svelte/internal/disclose-version'; -import 'svelte/internal/flags/legacy'; -import * as $ from 'svelte/internal/client'; - -var root = $.template(``); - -const $$css = { - hash: 'svelte-d8vj6a', - code: 'button.svelte-d8vj6a {color:#000099;}' -}; - -export default function Dummy($$anchor, $$props) { - $.push($$props, false); - $.append_styles($$anchor, $$css); - - let name = $.prop($$props, 'name', 12); - let clicks = $.mutable_source(0); - var button = root(); - var text = $.child(button); - - $.reset(button); - $.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`)); - - $.event('click', button, () => { - $.update(clicks); - }); - - $.append($$anchor, button); - - return $.pop({ - get name() { - return name(); - }, - set name($$value) { - name($$value); - $.flush(); - } - }); -} - -$.create_custom_element(Dummy, { name: {} }, [], [], true); \ No newline at end of file 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 deleted file mode 100644 index e001ded47..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-css.txt +++ /dev/null @@ -1,5 +0,0 @@ -button.svelte-d8vj6a { - color: #000099; -} - -/*# 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 deleted file mode 100644 index e46eac330..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/direct-js.txt +++ /dev/null @@ -1,23 +0,0 @@ -import "/node_modules/.vite/deps/svelte_internal_disclose-version.js?v=XXX"; -import "/node_modules/.vite/deps/svelte_internal_flags_legacy.js?v=XXX"; -import * as $ from "/node_modules/.vite/deps/svelte_internal_client.js?v=XXX"; - -var root = $.template(``); - -export default function Dummy($$anchor, $$props) { - let name = $.prop($$props, 'name', 8); - let clicks = $.mutable_source(0); - var button = root(); - var text = $.child(button); - - $.reset(button); - $.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`)); - - $.event('click', button, () => { - $.update(clicks); - }); - - $.append($$anchor, button); -} - -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJtYXBwaW5ncyI6Ijs7Ozs7OztLQUNZLElBQVk7S0FDbkIsTUFBTSxvQkFBRyxDQUFDOzs7Ozs2Q0FNVixJQUFJLDBCQUFXLE1BQU07O2dDQUZUO1dBQ2YsTUFBTTtDQUNQLENBQUMiLCJuYW1lcyI6W10sImlnbm9yZUxpc3QiOltdLCJzb3VyY2VzIjpbIkR1bW15LnN2ZWx0ZSJdfQ== diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-all.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-all.txt deleted file mode 100644 index 29abe354b..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-all.txt +++ /dev/null @@ -1,11 +0,0 @@ -export const ast={"html":{"type":"Fragment","start":73,"end":149,"children":[{"type":"Text","start":71,"end":73,"raw":"\n\n","data":"\n\n"},{"type":"Element","start":73,"end":149,"name":"button","attributes":[{"start":82,"end":115,"type":"EventHandler","name":"click","expression":{"type":"ArrowFunctionExpression","start":92,"end":114,"loc":{"start":{"line":7,"column":11},"end":{"line":9,"column":2}},"id":null,"expression":false,"generator":false,"async":false,"params":[],"body":{"type":"BlockStatement","start":98,"end":114,"loc":{"start":{"line":7,"column":17},"end":{"line":9,"column":2}},"body":[{"type":"ExpressionStatement","start":102,"end":111,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":11}},"expression":{"type":"UpdateExpression","start":102,"end":110,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":10}},"operator":"++","prefix":false,"argument":{"type":"Identifier","start":102,"end":108,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":8}},"name":"clicks"}}}]},"metadata":{"hoisted":false,"hoisted_params":[],"scope":{"root":{"conflicts":{}},"parent":{"root":{"conflicts":{}},"parent":{"root":{"conflicts":{}},"parent":{"root":{"conflicts":{}},"parent":{"root":{"conflicts":{}},"parent":{"root":{"conflicts":{}},"parent":null,"declarations":{},"declarators":{},"references":{},"function_depth":0,"tracing":null},"declarations":{},"declarators":{},"references":{},"function_depth":1,"tracing":null},"declarations":{},"declarators":{},"references":{},"function_depth":2,"tracing":null},"declarations":{},"declarators":{},"references":{},"function_depth":3,"tracing":null},"declarations":{},"declarators":{},"references":{},"function_depth":4,"tracing":null},"declarations":{},"declarators":{},"references":{},"function_depth":5,"tracing":null}}},"modifiers":[]},{"type":"Attribute","start":-1,"end":-1,"name":"class","value":[{"type":"Text","data":"","raw":"","start":-1,"end":-1}]}],"children":[{"type":"MustacheTag","start":116,"end":122,"expression":{"type":"Identifier","start":117,"end":121,"loc":{"start":{"line":9,"column":5},"end":{"line":9,"column":9}},"name":"name"}},{"type":"Text","start":122,"end":131,"raw":" clicks: ","data":" clicks: "},{"type":"MustacheTag","start":131,"end":139,"expression":{"type":"Identifier","start":132,"end":138,"loc":{"start":{"line":9,"column":20},"end":{"line":9,"column":26}},"name":"clicks"}}]},{"type":"Text","start":149,"end":151,"raw":"\n\n","data":"\n\n"}]},"instance":{"type":"Script","start":0,"end":71,"context":"default","content":{"type":"Program","start":18,"end":62,"loc":{"start":{"line":1,"column":0},"end":{"line":4,"column":0}},"body":[{"type":"ExportNamedDeclaration","start":20,"end":44,"loc":{"start":{"line":2,"column":1},"end":{"line":2,"column":25}},"exportKind":"value","declaration":{"type":"VariableDeclaration","start":27,"end":44,"loc":{"start":{"line":2,"column":8},"end":{"line":2,"column":25}},"declarations":[{"type":"VariableDeclarator","start":31,"end":43,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":24}},"id":{"type":"Identifier","start":31,"end":43,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":24}},"name":"name"},"init":null}],"kind":"let"},"specifiers":[],"source":null},{"type":"VariableDeclaration","start":46,"end":61,"loc":{"start":{"line":3,"column":1},"end":{"line":3,"column":16}},"declarations":[{"type":"VariableDeclarator","start":50,"end":60,"loc":{"start":{"line":3,"column":5},"end":{"line":3,"column":15}},"id":{"type":"Identifier","start":50,"end":56,"loc":{"start":{"line":3,"column":5},"end":{"line":3,"column":11}},"name":"clicks"},"init":{"type":"Literal","start":59,"end":60,"loc":{"start":{"line":3,"column":14},"end":{"line":3,"column":15}},"value":0,"raw":"0"}}],"kind":"let"}],"sourceType":"module"}},"css":{"type":"Style","start":151,"end":206,"attributes":[{"type":"Attribute","start":158,"end":169,"name":"lang","value":[{"start":164,"end":168,"type":"Text","raw":"scss","data":"scss"}]}],"children":[{"type":"Rule","prelude":{"type":"SelectorList","start":170,"end":176,"children":[{"type":"Selector","start":170,"end":176,"children":[{"type":"TypeSelector","name":"button","start":170,"end":176}]}]},"block":{"type":"Block","start":177,"end":198,"children":[{"type":"Declaration","start":181,"end":195,"property":"color","value":"#000099"}]},"start":170,"end":198}],"content":{"start":170,"end":198,"styles":"button {\n color: #000099;\n}","comment":null}}} -export const css={"code":"button.svelte-d8vj6a {\n color: #000099;\n}","map":{"version":3,"file":"Dummy.svelte","mappings":"AAWkB","names":[],"ignoreList":[],"sources":["Dummy.svelte"]},"hasGlobal":false} -export const dependencies=[] -export const js={"code":"import 'svelte/internal/disclose-version';\nimport 'svelte/internal/flags/legacy';\nimport * as $ from 'svelte/internal/client';\n\nvar root = $.template(``);\n\nexport default function Dummy($$anchor, $$props) {\n\tlet name = $.prop($$props, 'name', 8);\n\tlet clicks = $.mutable_source(0);\n\tvar button = root();\n\tvar text = $.child(button);\n\n\t$.reset(button);\n\t$.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`));\n\n\t$.event('click', button, () => {\n\t\t$.update(clicks);\n\t});\n\n\t$.append($$anchor, button);\n}","map":{"version":3,"mappings":";;;;;;;KACY,IAAY;KACnB,MAAM,oBAAG,CAAC;;;;;6CAMV,IAAI,0BAAW,MAAM;;gCAFT;WACf,MAAM;CACP,CAAC","names":[],"ignoreList":[],"sources":["Dummy.svelte"]}} -export const lang="ts" -export const metadata={"runes":false} -export const normalizedFilename="/src/Dummy.svelte" -export const preprocessed={"code":"\n\n {\n\t\tclicks++;\n\t}}>{name} clicks: {clicks}\n\n\n","dependencies":[],"map":{"version":3,"mappings":"AAAA,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AACjB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM;AACxB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACf,CAAC,CAAC,MAAM;;AAER,CAAC;AACD,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjB,EAAE,MAAM,CAAC,CAAC;AACV,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7B;;AAEA,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;;CAMlB,CAAC,CAAC,KAAK","names":[],"ignoreList":[],"sources":["Dummy.svelte"]}} -export const source="\n\n {\n\t\tclicks++;\n\t}}>{name} clicks: {clicks}\n\n\n" -export const ssr=false -export const warnings=[] diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-preprocessed.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-preprocessed.txt deleted file mode 100644 index 5cc295f30..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-preprocessed.txt +++ /dev/null @@ -1,4 +0,0 @@ -export const code="\n\n {\n\t\tclicks++;\n\t}}>{name} clicks: {clicks}\n\n\n" -export const dependencies=[] -export const map={"version":3,"mappings":"AAAA,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AACjB,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM;AACxB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACf,CAAC,CAAC,MAAM;;AAER,CAAC;AACD,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjB,EAAE,MAAM,CAAC,CAAC;AACV,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAC7B;;AAEA,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;;CAMlB,CAAC,CAAC,KAAK","names":[],"ignoreList":[],"sources":["Dummy.svelte"]} -export default code diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-script.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-script.txt deleted file mode 100644 index cee2f4689..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-script.txt +++ /dev/null @@ -1,3 +0,0 @@ -export const code="import 'svelte/internal/disclose-version';\nimport 'svelte/internal/flags/legacy';\nimport * as $ from 'svelte/internal/client';\n\nvar root = $.template(``);\n\nexport default function Dummy($$anchor, $$props) {\n\tlet name = $.prop($$props, 'name', 8);\n\tlet clicks = $.mutable_source(0);\n\tvar button = root();\n\tvar text = $.child(button);\n\n\t$.reset(button);\n\t$.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`));\n\n\t$.event('click', button, () => {\n\t\t$.update(clicks);\n\t});\n\n\t$.append($$anchor, button);\n}" -export const map={"version":3,"mappings":";;;;;;;KACY,IAAY;KACnB,MAAM,oBAAG,CAAC;;;;;6CAMV,IAAI,0BAAW,MAAM;;gCAFT;WACf,MAAM;CACP,CAAC","names":[],"ignoreList":[],"sources":["Dummy.svelte"]} -export default code diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-style.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-style.txt deleted file mode 100644 index a0067cb00..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/mixed-style.txt +++ /dev/null @@ -1,4 +0,0 @@ -export const code="button.svelte-d8vj6a {\n color: #000099;\n}" -export const hasGlobal=false -export const map={"version":3,"file":"Dummy.svelte","mappings":"AAWkB","names":[],"ignoreList":[],"sources":["Dummy.svelte"]} -export default code diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/script.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/script.txt deleted file mode 100644 index b3c63c967..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/script.txt +++ /dev/null @@ -1,21 +0,0 @@ -import 'svelte/internal/disclose-version'; -import 'svelte/internal/flags/legacy'; -import * as $ from 'svelte/internal/client'; - -var root = $.template(``); - -export default function Dummy($$anchor, $$props) { - let name = $.prop($$props, 'name', 8); - let clicks = $.mutable_source(0); - var button = root(); - var text = $.child(button); - - $.reset(button); - $.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`)); - - $.event('click', button, () => { - $.update(clicks); - }); - - $.append($$anchor, button); -} \ No newline at end of file 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 deleted file mode 100644 index 97ab65eae..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-custom-element.txt +++ /dev/null @@ -1,41 +0,0 @@ -import 'svelte/internal/disclose-version'; -import 'svelte/internal/flags/legacy'; -import * as $ from 'svelte/internal/client'; - -var root = $.template(``); - -const $$css = { - hash: 'svelte-d8vj6a', - code: 'button.svelte-d8vj6a {color:#000099;}' -}; - -export default function Dummy($$anchor, $$props) { - $.push($$props, false); - $.append_styles($$anchor, $$css); - - let name = $.prop($$props, 'name', 12); - let clicks = $.mutable_source(0); - var button = root(); - var text = $.child(button); - - $.reset(button); - $.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`)); - - $.event('click', button, () => { - $.update(clicks); - }); - - $.append($$anchor, button); - - return $.pop({ - get name() { - return name(); - }, - set name($$value) { - name($$value); - $.flush(); - } - }); -} - -$.create_custom_element(Dummy, { name: {} }, [], [], true); \ No newline at end of file diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-inline-style.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-inline-style.txt deleted file mode 100644 index 2e590fb1d..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-inline-style.txt +++ /dev/null @@ -1,3 +0,0 @@ -button.svelte-d8vj6a { - color: #000099; -} \ No newline at end of file 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 deleted file mode 100644 index b3c63c967..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-script.txt +++ /dev/null @@ -1,21 +0,0 @@ -import 'svelte/internal/disclose-version'; -import 'svelte/internal/flags/legacy'; -import * as $ from 'svelte/internal/client'; - -var root = $.template(``); - -export default function Dummy($$anchor, $$props) { - let name = $.prop($$props, 'name', 8); - let clicks = $.mutable_source(0); - var button = root(); - var text = $.child(button); - - $.reset(button); - $.template_effect(() => $.set_text(text, `${name() ?? ''} clicks: ${$.get(clicks) ?? ''}`)); - - $.event('click', button, () => { - $.update(clicks); - }); - - $.append($$anchor, button); -} \ No newline at end of file diff --git a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-style.txt b/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-style.txt deleted file mode 100644 index 2e590fb1d..000000000 --- a/packages/e2e-tests/import-queries/__tests__/__snapshots__/svelte-5/ssr-style.txt +++ /dev/null @@ -1,3 +0,0 @@ -button.svelte-d8vj6a { - color: #000099; -} \ No newline at end of file diff --git a/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts b/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts index 698eabb19..74c680808 100644 --- a/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts +++ b/packages/e2e-tests/import-queries/__tests__/import-queries.spec.ts @@ -2,15 +2,6 @@ import { browserLogs, fetchFromPage, getText, isBuild, testDir } from '~utils'; import { createServer, ViteDevServer } from 'vite'; import { VERSION } from 'svelte/compiler'; -function normalizeSnapshot(result: string) { - // during dev, the import is rewritten but can vary on the v= hash. replace with stable short import - return result - .replace(/\(Svelte v\d+.\d+.\d+-next\.\d+\)/, '(Svelte vXXX)') // stable svelte5 compiler comment - .replace('// Note: compiler output will change before 5.0 is released!', '') // strip svelte5 compiler hint - .replace(/\.js\?v=[0-9a-f]{8}/g, '.js?v=XXX') // vite import analysis import rewrite version query - .replace(/"total": *\d+\.\d+/g, '"total":0.123456789'); // svelte compile stats -} - const svelteMajor = VERSION.split('.', 1)[0]; function snapshotFilename(name: string) { return `./__snapshots__/svelte-${svelteMajor}/${name}.txt`; @@ -39,13 +30,12 @@ describe('raw', () => { test('Dummy.svelte?raw&svelte&type=script', async () => { const result = await getText('#script'); - await expect(normalizeSnapshot(result)).toMatchFileSnapshot(snapshotFilename('script')); + expect(result).toContain('export default function Dummy'); }); test('Dummy.svelte?raw&svelte&type=script&compilerOptions={"customElement":true}', async () => { const result = await getText('#wcScript'); - - await expect(normalizeSnapshot(result)).toMatchFileSnapshot(snapshotFilename('custom-element')); + expect(result).toContain('$.create_custom_element(Dummy,'); }); test('Dummy.svelte?raw&svelte&type=style', async () => { @@ -54,8 +44,17 @@ describe('raw', () => { }); test('Dummy.svelte?raw&svelte&type=all&sourcemap', async () => { - const result = await getText('#all'); - await expect(normalizeSnapshot(result)).toMatchFileSnapshot(snapshotFilename('all')); + const result = JSON.parse(await getText('#all')); + expect(result.ast).toBeDefined(); + expect(result.js).toBeDefined(); + expect(result.js.code).toBeDefined(); + expect(result.js.map).toBeDefined(); + expect(result.css).toBeDefined(); + expect(result.css.code).toBeDefined(); + expect(result.css.map).toBeDefined(); + expect(result.preprocessed).toBeDefined(); + expect(result.preprocessed.code).toBeDefined(); + expect(result.preprocessed.map).toBeDefined(); }); describe.runIf(!isBuild)('mixed exports', () => { @@ -63,27 +62,43 @@ describe('raw', () => { const module = await fetchFromPage('src/Dummy.svelte?raw&svelte&type=preprocessed').then( (res) => res.text() ); - await expect(normalizeSnapshot(module)).toMatchFileSnapshot( - snapshotFilename('mixed-preprocessed') - ); + expect(module).toContain('export const code="