From c030cbb6c6708b6b9e7fa4fdfd0a37c1c4159780 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 16 Jul 2026 07:22:18 -0700 Subject: [PATCH] chore: switch to oxfmt --- .github/workflows/autofix.yml | 2 +- .oxfmtrc.json | 61 +++++ .prettierignore | 46 ---- .prettierrc | 22 -- benchmarking/utils.js | 2 +- package.json | 7 +- packages/svelte/src/compiler/legacy.js | 4 +- .../phases/2-analyze/css/css-prune.js | 4 +- .../server/visitors/shared/component.js | 5 +- .../svelte/src/compiler/validate-options.js | 2 +- packages/svelte/src/index-client.js | 7 +- .../svelte/src/internal/client/dom/css.js | 2 +- .../src/internal/client/dom/legacy/misc.js | 5 +- packages/svelte/src/legacy/legacy-client.js | 7 +- packages/svelte/src/reactivity/date.test.ts | 2 +- packages/svelte/src/reactivity/map.js | 4 +- .../svelte/tests/runtime-legacy/shared.ts | 5 +- .../samples/css-injected-map/_config.js | 5 +- playgrounds/sandbox/demo.css | 9 +- pnpm-lock.yaml | 244 ++++++++++++++++-- vitest.config.js | 2 +- 21 files changed, 318 insertions(+), 129 deletions(-) create mode 100644 .oxfmtrc.json delete mode 100644 .prettierignore delete mode 100644 .prettierrc diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index b6c26e0792..1ac8db652e 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -58,7 +58,7 @@ jobs: - run: pnpm install --frozen-lockfile - name: Build run: pnpm -F svelte build - - name: Run prettier + - name: Run oxfmt run: pnpm format - name: Commit changes run: | diff --git a/.oxfmtrc.json b/.oxfmtrc.json new file mode 100644 index 0000000000..1445ef9289 --- /dev/null +++ b/.oxfmtrc.json @@ -0,0 +1,61 @@ +{ + "$schema": "./node_modules/oxfmt/configuration_schema.json", + "useTabs": true, + "singleQuote": true, + "trailingComma": "none", + "printWidth": 100, + "sortPackageJson": false, + "svelte": {}, + "overrides": [ + { + "files": ["README.md", "packages/*/README.md", "**/package.json"], + "options": { + "useTabs": false, + "tabWidth": 2 + } + } + ], + "ignorePatterns": [ + "documentation/docs/", + "packages/**/dist/*.js", + "packages/**/build/*.js", + "packages/**/npm/**/*", + "packages/**/config/*.js", + "packages/svelte/messages/**/*.md", + "packages/svelte/scripts/_bundle.js", + "packages/svelte/scripts/_baseline/*.ts", + "packages/svelte/src/compiler/errors.js", + "packages/svelte/src/compiler/warnings.js", + "packages/svelte/src/internal/client/errors.js", + "packages/svelte/src/internal/client/warnings.js", + "packages/svelte/src/internal/shared/errors.js", + "packages/svelte/src/internal/shared/warnings.js", + "packages/svelte/src/internal/server/errors.js", + "packages/svelte/src/internal/server/warnings.js", + "packages/svelte/tests/migrate/samples/*/output.svelte", + "packages/svelte/tests/**/*.svelte", + "packages/svelte/tests/**/_expected*", + "packages/svelte/tests/**/_actual*", + "packages/svelte/tests/**/expected*", + "packages/svelte/tests/**/_output", + "packages/svelte/tests/**/shards/*.test.js", + "packages/svelte/tests/hydration/samples/*/_expected.html", + "packages/svelte/tests/hydration/samples/*/_override.html", + "packages/svelte/tests/parser-legacy/samples/*/_actual.json", + "packages/svelte/tests/parser-legacy/samples/*/output.json", + "packages/svelte/tests/parser-modern/samples/*/_actual.json", + "packages/svelte/tests/parser-modern/samples/*/output.json", + "packages/svelte/types", + "packages/svelte/compiler/index.js", + "playgrounds/sandbox/dist/*", + "playgrounds/sandbox/output/*", + "playgrounds/sandbox/src/*", + "**/node_modules", + "**/.svelte-kit", + "**/.vercel", + ".github/CODEOWNERS", + ".changeset", + "pnpm-lock.yaml", + "pnpm-workspace.yaml" + ] +} diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 28f447f359..0000000000 --- a/.prettierignore +++ /dev/null @@ -1,46 +0,0 @@ -documentation/docs/ - -packages/**/dist/*.js -packages/**/build/*.js -packages/**/npm/**/* -packages/**/config/*.js - -# packages/svelte -packages/svelte/messages/**/*.md -packages/svelte/scripts/_bundle.js -packages/svelte/scripts/_baseline/*.ts -packages/svelte/src/compiler/errors.js -packages/svelte/src/compiler/warnings.js -packages/svelte/src/internal/client/errors.js -packages/svelte/src/internal/client/warnings.js -packages/svelte/src/internal/shared/errors.js -packages/svelte/src/internal/shared/warnings.js -packages/svelte/src/internal/server/errors.js -packages/svelte/src/internal/server/warnings.js -packages/svelte/tests/migrate/samples/*/output.svelte -packages/svelte/tests/**/*.svelte -packages/svelte/tests/**/_expected* -packages/svelte/tests/**/_actual* -packages/svelte/tests/**/expected* -packages/svelte/tests/**/_output -packages/svelte/tests/**/shards/*.test.js -packages/svelte/tests/hydration/samples/*/_expected.html -packages/svelte/tests/hydration/samples/*/_override.html -packages/svelte/tests/parser-legacy/samples/*/_actual.json -packages/svelte/tests/parser-legacy/samples/*/output.json -packages/svelte/tests/parser-modern/samples/*/_actual.json -packages/svelte/tests/parser-modern/samples/*/output.json -packages/svelte/types -packages/svelte/compiler/index.js -playgrounds/sandbox/dist/* -playgrounds/sandbox/output/* -playgrounds/sandbox/src/* - -**/node_modules -**/.svelte-kit -**/.vercel -.github/CODEOWNERS -.prettierignore -.changeset -pnpm-lock.yaml -pnpm-workspace.yaml diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index c2d09a4289..0000000000 --- a/.prettierrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-svelte"], - "overrides": [ - { - "files": ["*.svelte"], - "options": { - "bracketSameLine": false - } - }, - { - "files": ["README.md", "packages/*/README.md", "**/package.json"], - "options": { - "useTabs": false, - "tabWidth": 2 - } - } - ] -} diff --git a/benchmarking/utils.js b/benchmarking/utils.js index 2f4be3c567..53c0791619 100644 --- a/benchmarking/utils.js +++ b/benchmarking/utils.js @@ -268,7 +268,7 @@ function profile_to_markdown(profile) { const id = typeof node.id === 'number' ? node.id : ''; const parentId = typeof id === 'number' && included_node_ids.has(parent_by_id.get(id) ?? NaN) - ? parent_by_id.get(id) ?? '' + ? (parent_by_id.get(id) ?? '') : ''; const functionName = typeof callFrame.functionName === 'string' && callFrame.functionName.length > 0 diff --git a/package.json b/package.json index 0d2fbc7fd6..9c7a057353 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "scripts": { "build": "pnpm -r --filter=./packages/* build", "check": "cd packages/svelte && pnpm build && cd ../../ && pnpm -r check", - "lint": "eslint && prettier --check .", - "format": "prettier --write .", + "lint": "eslint && oxfmt --check .", + "format": "oxfmt --write .", "test": "vitest run", "changeset:version": "changeset version && pnpm -r generate:version && git add --all", "changeset:publish": "changeset publish", @@ -37,9 +37,8 @@ "eslint-plugin-lube": "^0.5.1", "eslint-plugin-svelte": "^3.15.0", "jsdom": "25.0.1", + "oxfmt": "^0.59.0", "playwright": "^1.60.0", - "prettier": "^3.2.4", - "prettier-plugin-svelte": "^3.4.0", "svelte": "workspace:^", "typescript": "^5.5.4", "typescript-eslint": "^8.56.0", diff --git a/packages/svelte/src/compiler/legacy.js b/packages/svelte/src/compiler/legacy.js index c51cd8434b..467e5bcc2c 100644 --- a/packages/svelte/src/compiler/legacy.js +++ b/packages/svelte/src/compiler/legacy.js @@ -359,8 +359,8 @@ export function convert(source, ast) { } const start = node.elseif - ? node.consequent.nodes[0]?.start ?? - source.lastIndexOf('{', /** @type {number} */ (node.end) - 1) + ? (node.consequent.nodes[0]?.start ?? + source.lastIndexOf('{', /** @type {number} */ (node.end) - 1)) : node.start; remove_surrounding_whitespace_nodes(node.consequent.nodes); diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js index 39f485a9f7..cbe4016908 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js +++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js @@ -464,8 +464,8 @@ function relative_selector_might_apply_to_node(relative_selector, rule, element, // :has(...) is special in that it means "look downwards in the CSS tree". Since our matching algorithm goes // upwards and back-to-front, we need to first check the selectors inside :has(...), then check the rest of the // selector in a way that is similar to ancestor matching. In a sense, we're treating `.x:has(.y)` as `.x .y`. - const complex_selectors = /** @type {Compiler.AST.CSS.SelectorList} */ (selector.args) - .children; + const complex_selectors = + /** @type {Compiler.AST.CSS.SelectorList} */ (selector.args).children; let matched = false; for (const complex_selector of complex_selectors) { diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js index b0e086b7ad..f4554f1127 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js @@ -119,8 +119,9 @@ export function build_inline_component(node, expression, context) { } if (attribute.expression.type === 'SequenceExpression') { - const [get, set] = /** @type {SequenceExpression} */ (context.visit(attribute.expression)) - .expressions; + const [get, set] = /** @type {SequenceExpression} */ ( + context.visit(attribute.expression) + ).expressions; const get_id = b.id(context.state.scope.generate('bind_get')); const set_id = b.id(context.state.scope.generate('bind_set')); diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js index f7c56aa33c..e9cab91f6e 100644 --- a/packages/svelte/src/compiler/validate-options.js +++ b/packages/svelte/src/compiler/validate-options.js @@ -75,7 +75,7 @@ const component_options = { ), cssHash: fun(({ css, filename, hash }) => { - return `svelte-${hash(filename === '(unknown)' ? css : filename ?? css)}`; + return `svelte-${hash(filename === '(unknown)' ? css : (filename ?? css))}`; }), // TODO this is a sourcemap option, would be good to put under a sourcemap namespace diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js index 0eb1b80315..3ba652a630 100644 --- a/packages/svelte/src/index-client.js +++ b/packages/svelte/src/index-client.js @@ -165,9 +165,10 @@ export function createEventDispatcher() { * @param [options] */ return (type, detail, options) => { - const events = /** @type {Record} */ ( - active_component_context.s.$$events - )?.[/** @type {string} */ (type)]; + const events = + /** @type {Record} */ (active_component_context.s.$$events)?.[ + /** @type {string} */ (type) + ]; if (events) { const callbacks = is_array(events) ? events.slice() : [events]; diff --git a/packages/svelte/src/internal/client/dom/css.js b/packages/svelte/src/internal/client/dom/css.js index 74bf2d49f9..0338df0829 100644 --- a/packages/svelte/src/internal/client/dom/css.js +++ b/packages/svelte/src/internal/client/dom/css.js @@ -14,7 +14,7 @@ export function append_styles(anchor, css) { var target = /** @type {ShadowRoot} */ (root).host ? /** @type {ShadowRoot} */ (root) - : /** @type {Document} */ (root).head ?? /** @type {Document} */ (root.ownerDocument).head; + : (/** @type {Document} */ (root).head ?? /** @type {Document} */ (root.ownerDocument).head); // Always querying the DOM is roughly the same perf as additionally checking for presence in a map first assuming // that you'll get cache hits half of the time, so we just always query the dom for simplicity and code savings. diff --git a/packages/svelte/src/internal/client/dom/legacy/misc.js b/packages/svelte/src/internal/client/dom/legacy/misc.js index f09a01e364..1b5711ab6e 100644 --- a/packages/svelte/src/internal/client/dom/legacy/misc.js +++ b/packages/svelte/src/internal/client/dom/legacy/misc.js @@ -28,9 +28,8 @@ export function reactive_import(fn) { * @returns {void} */ export function bubble_event($$props, event) { - var events = /** @type {Record} */ ($$props.$$events)?.[ - event.type - ]; + var events = + /** @type {Record} */ ($$props.$$events)?.[event.type]; var callbacks = is_array(events) ? events.slice() : events == null ? [] : [events]; diff --git a/packages/svelte/src/legacy/legacy-client.js b/packages/svelte/src/legacy/legacy-client.js index 801c126b2c..03f9f0df52 100644 --- a/packages/svelte/src/legacy/legacy-client.js +++ b/packages/svelte/src/legacy/legacy-client.js @@ -254,9 +254,10 @@ export function createBubbler() { } return (/**@type {string}*/ type) => (/**@type {Event}*/ event) => { - const events = /** @type {Record} */ ( - active_component_context.s.$$events - )?.[/** @type {any} */ (type)]; + const events = + /** @type {Record} */ (active_component_context.s.$$events)?.[ + /** @type {any} */ (type) + ]; if (events) { const callbacks = is_array(events) ? events.slice() : [events]; diff --git a/packages/svelte/src/reactivity/date.test.ts b/packages/svelte/src/reactivity/date.test.ts index f90c5a102c..053a270887 100644 --- a/packages/svelte/src/reactivity/date.test.ts +++ b/packages/svelte/src/reactivity/date.test.ts @@ -652,7 +652,7 @@ test('Date methods shared between deriveds', () => { return date.getFullYear(); }); const year2 = derived(() => { - return date.getTime(), date.getFullYear(); + return (date.getTime(), date.getFullYear()); }); render_effect(() => { diff --git a/packages/svelte/src/reactivity/map.js b/packages/svelte/src/reactivity/map.js index 48d06a05a7..feed35b33b 100644 --- a/packages/svelte/src/reactivity/map.js +++ b/packages/svelte/src/reactivity/map.js @@ -181,8 +181,8 @@ export class SvelteMap extends Map { var v_reactions = version.reactions === null ? null : new Set(version.reactions); var needs_version_increase = v_reactions === null || - !s.reactions?.every((r) => - /** @type {NonNullable} */ (v_reactions).has(r) + !s.reactions?.every( + (r) => /** @type {NonNullable} */ (v_reactions).has(r) ); if (needs_version_increase) { increment(version); diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts index 5c2d0dfe1c..f5642d12bf 100644 --- a/packages/svelte/tests/runtime-legacy/shared.ts +++ b/packages/svelte/tests/runtime-legacy/shared.ts @@ -58,8 +58,9 @@ Promise.withResolvers = () => { return { promise, resolve, reject }; }; -export interface RuntimeTest = Record> - extends BaseTest { +export interface RuntimeTest< + Props extends Record = Record +> extends BaseTest { /** Use e.g. `mode: ['client']` to indicate that this test should never run in server/hydrate modes */ mode?: Array<'server' | 'async-server' | 'client' | 'hydrate'>; /** Temporarily skip specific modes, without skipping the entire test */ diff --git a/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js b/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js index c2b2fe766a..ea0010cb43 100644 --- a/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js +++ b/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js @@ -35,9 +35,8 @@ export default test({ assert.ok(match); - const [css, mime_type, encoding, css_map_base64] = /** @type {RegExpMatchArray} */ ( - match - ).slice(1); + const [css, mime_type, encoding, css_map_base64] = + /** @type {RegExpMatchArray} */ (match).slice(1); assert.equal(mime_type, 'application/json'); assert.equal(encoding, 'utf-8'); diff --git a/playgrounds/sandbox/demo.css b/playgrounds/sandbox/demo.css index 5cfdeb0dd6..d13c767112 100644 --- a/playgrounds/sandbox/demo.css +++ b/playgrounds/sandbox/demo.css @@ -9,10 +9,11 @@ body { --link-hover: hsl(208, 77%, 55%); --link-active: hsl(208, 77%, 40%); --border-radius: 4px; - --font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, - 'Open Sans', 'Helvetica Neue', sans-serif; - --font-mono: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', - monospace; + --font: + -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', + 'Helvetica Neue', sans-serif; + --font-mono: + ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace; background: var(--bg-1); color: var(--fg-1); font-family: var(--font); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6331fd0789..b79332165b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,15 +41,12 @@ importers: jsdom: specifier: 25.0.1 version: 25.0.1 + oxfmt: + specifier: ^0.59.0 + version: 0.59.0(svelte@packages+svelte) playwright: specifier: ^1.60.0 version: 1.60.0 - prettier: - specifier: ^3.2.4 - version: 3.2.4 - prettier-plugin-svelte: - specifier: ^3.4.0 - version: 3.4.0(prettier@3.2.4)(svelte@packages+svelte) svelte: specifier: workspace:^ version: link:packages/svelte @@ -714,6 +711,120 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} + '@oxfmt/binding-android-arm-eabi@0.59.0': + resolution: {integrity: sha512-bNTnfbuG7sAwb2PakMNaDukx5kXeW9duXOBeWtTOiLz3fXz3q2DlWguufPZ+c2IHEVrRXHD+M4aUgEWm841LDA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@oxfmt/binding-android-arm64@0.59.0': + resolution: {integrity: sha512-R/Sn7z52QtdAKNqQLLY0EK7hVMjXiz3XUlvoCFCm/60jgIzAnQtiqLKBCFaBkimCQL5rs2ezPMcicpjCsrl54Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + + '@oxfmt/binding-darwin-arm64@0.59.0': + resolution: {integrity: sha512-vm/ynUqE4HjC0ZIEjmXv1UJu1/GngccQ+T+TJudTMxUxm6r+GQTg1TO3E5jJfI71pBaXxSzs1+vWHIwuilGHhw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + + '@oxfmt/binding-darwin-x64@0.59.0': + resolution: {integrity: sha512-uTtYDpLN/obfKVWGpgEc8BqYlLZBQTPz2uYEvLRy3HPZxjZ34wiFzukUBU2bf64JuCYZI//GTV1EOMmWlPjf/w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + + '@oxfmt/binding-freebsd-x64@0.59.0': + resolution: {integrity: sha512-e2UnxL/ifStSPy8ffBCDbdy595SYsGy+U1pur4G65TuMmWxAMBzYGG7atZo/3mp515p8rZdsflxVD/E1FAdPLQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + + '@oxfmt/binding-linux-arm-gnueabihf@0.59.0': + resolution: {integrity: sha512-LtdeZ1l0urxte3VNi3g8cocZwv1xGM1NKHSgF/fJEEVhyQmlgGh7WFWKFd/pNuO7djfvPNtNO1+MS+FEWkgVSA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm-musleabihf@0.59.0': + resolution: {integrity: sha512-dBTciSsj9GTMl7p+h2gMSI0hoPn2ijfc/dUsbnWsP0RbwgPl2r0C/5zkMb3Pb+gGj17LH7f1o4qLo9aes/pAvA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm64-gnu@0.59.0': + resolution: {integrity: sha512-tXVdJ/JINsNWdponPHN0OuKHtC+HdpyoS9sd6IDPNiiEYsRki8b7tefRZ1iMnRkdbyT4SEbguWsr6o+5awvbPQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-arm64-musl@0.59.0': + resolution: {integrity: sha512-RRTq38i2zT5fnw6XGHjvT6w2mh6x/G3m6AZcAZ56OTDTT/lsOeYnG3SVjwmH40z5kPqF+lf+o35e6m6PpKy9Dw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-ppc64-gnu@0.59.0': + resolution: {integrity: sha512-lD3k7glAJSaXW0D6xzu8VOZbYbosvy+0ktOVkfLEoQF5HJlMSxTQ2KNW0JO+08ccP/1ElOKktVEMI0fqRbVB4w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-gnu@0.59.0': + resolution: {integrity: sha512-WH5ZP1RbuHKBO/yfPRQKpNO/ijHcEDNbnmC4VPf/Bcd3+mbMAZpRiJWRa1PL5bREdIZZHo343mk3sqlc9x7Usw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-musl@0.59.0': + resolution: {integrity: sha512-743wOiaI9RZY4QVGkWkfGRavD5ZJUJ6gscFjVrVu1dP8AZh9jM+a6v3NhlR+OIzHdS6DhLM96w+gcVskskz7rw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-s390x-gnu@0.59.0': + resolution: {integrity: sha512-xjRXQsRnrRZCcCkIEnbd2lmsQNobtwwkJxdy2bWXhZ1lIN0ouZwsBXRsoovW3yATuziAYwr9HMiQuR/Cc75NIw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + + '@oxfmt/binding-linux-x64-gnu@0.59.0': + resolution: {integrity: sha512-4hNjqq/Rbr9B+StY9zMMAfm72+mtM4v80xYL5Qkb59Qd72g2vJMI0iFlPj3kf6miMsie/yJ7rt4urJT292HBgA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-linux-x64-musl@0.59.0': + resolution: {integrity: sha512-NH579iN8EVQYsWowUB8B5vFchcylJtwPVJ7NmUAqEQHNLfhPbDT3K56KrECNAkUN4QpF4qiMgN2vsfZwVvjm7g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-openharmony-arm64@0.59.0': + resolution: {integrity: sha512-mzZy3Z5Aj1D75Aq9FVlmoRQH5ei8Ga4o/NZmlXkKyeZ5EmPrUXRR7c6BMBteV1ZuZ/356UYDuLRLjAMxTDTiBA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + + '@oxfmt/binding-win32-arm64-msvc@0.59.0': + resolution: {integrity: sha512-0CpDJ1gE3jN1Gk6xms1Ie6LPfPcOtY4FAtoOmVLHQoAf8DvO2wd0DW2dIX2f7YTp5dxrr0ND8JeUEjm3DP3k5g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + + '@oxfmt/binding-win32-ia32-msvc@0.59.0': + resolution: {integrity: sha512-zwdKBu3pt87uW0bRcywZb0oGMS7C6n87qogwRYFUgmk44T90ZzYlPjtlFYXs/DnBFrgNCvlHwCuWKfVWLeE7kw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ia32] + os: [win32] + + '@oxfmt/binding-win32-x64-msvc@0.59.0': + resolution: {integrity: sha512-dUUbZkKgWrmAeI/puzv4bxN8lzcYaFnQVwFTFtwO2Gp8M7lZGSE2qJjC58g518+1bltJ8mizjYwD0BGHym0l/w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@playwright/test@1.60.0': resolution: {integrity: sha512-O71yZIbAh/PxDMNGns37GHBIfrVkEVyn+AXyIa5dOTfb4/xNvRWV+Vv/NMbNCtODB/pO7vLlF2OTmMVLhmr7Ag==} engines: {node: '>=18'} @@ -1886,6 +1997,19 @@ packages: outdent@0.5.0: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} + oxfmt@0.59.0: + resolution: {integrity: sha512-Xqk6cPZS1yMvVa7OAuenaDZUsgMDutvvbZ9/L5gSvAfW64+WN4HVhgipLj5rVERbYQt8fLs9TopyZ1rU1XEG/w==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + peerDependencies: + svelte: ^5.0.0 + vite-plus: '*' + peerDependenciesMeta: + svelte: + optional: true + vite-plus: + optional: true + p-filter@2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} @@ -2006,22 +2130,11 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier-plugin-svelte@3.4.0: - resolution: {integrity: sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==} - peerDependencies: - prettier: ^3.0.0 - svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0 - prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - prettier@3.2.4: - resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} - engines: {node: '>=14'} - hasBin: true - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -2214,6 +2327,10 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} + tinypool@2.1.0: + resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==} + engines: {node: ^20.0.0 || >=22.0.0} + tinyrainbow@3.1.0: resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} @@ -2940,6 +3057,63 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.16.0 + '@oxfmt/binding-android-arm-eabi@0.59.0': + optional: true + + '@oxfmt/binding-android-arm64@0.59.0': + optional: true + + '@oxfmt/binding-darwin-arm64@0.59.0': + optional: true + + '@oxfmt/binding-darwin-x64@0.59.0': + optional: true + + '@oxfmt/binding-freebsd-x64@0.59.0': + optional: true + + '@oxfmt/binding-linux-arm-gnueabihf@0.59.0': + optional: true + + '@oxfmt/binding-linux-arm-musleabihf@0.59.0': + optional: true + + '@oxfmt/binding-linux-arm64-gnu@0.59.0': + optional: true + + '@oxfmt/binding-linux-arm64-musl@0.59.0': + optional: true + + '@oxfmt/binding-linux-ppc64-gnu@0.59.0': + optional: true + + '@oxfmt/binding-linux-riscv64-gnu@0.59.0': + optional: true + + '@oxfmt/binding-linux-riscv64-musl@0.59.0': + optional: true + + '@oxfmt/binding-linux-s390x-gnu@0.59.0': + optional: true + + '@oxfmt/binding-linux-x64-gnu@0.59.0': + optional: true + + '@oxfmt/binding-linux-x64-musl@0.59.0': + optional: true + + '@oxfmt/binding-openharmony-arm64@0.59.0': + optional: true + + '@oxfmt/binding-win32-arm64-msvc@0.59.0': + optional: true + + '@oxfmt/binding-win32-ia32-msvc@0.59.0': + optional: true + + '@oxfmt/binding-win32-x64-msvc@0.59.0': + optional: true + '@playwright/test@1.60.0': dependencies: playwright: 1.60.0 @@ -4126,6 +4300,31 @@ snapshots: outdent@0.5.0: {} + oxfmt@0.59.0(svelte@packages+svelte): + dependencies: + tinypool: 2.1.0 + optionalDependencies: + '@oxfmt/binding-android-arm-eabi': 0.59.0 + '@oxfmt/binding-android-arm64': 0.59.0 + '@oxfmt/binding-darwin-arm64': 0.59.0 + '@oxfmt/binding-darwin-x64': 0.59.0 + '@oxfmt/binding-freebsd-x64': 0.59.0 + '@oxfmt/binding-linux-arm-gnueabihf': 0.59.0 + '@oxfmt/binding-linux-arm-musleabihf': 0.59.0 + '@oxfmt/binding-linux-arm64-gnu': 0.59.0 + '@oxfmt/binding-linux-arm64-musl': 0.59.0 + '@oxfmt/binding-linux-ppc64-gnu': 0.59.0 + '@oxfmt/binding-linux-riscv64-gnu': 0.59.0 + '@oxfmt/binding-linux-riscv64-musl': 0.59.0 + '@oxfmt/binding-linux-s390x-gnu': 0.59.0 + '@oxfmt/binding-linux-x64-gnu': 0.59.0 + '@oxfmt/binding-linux-x64-musl': 0.59.0 + '@oxfmt/binding-openharmony-arm64': 0.59.0 + '@oxfmt/binding-win32-arm64-msvc': 0.59.0 + '@oxfmt/binding-win32-ia32-msvc': 0.59.0 + '@oxfmt/binding-win32-x64-msvc': 0.59.0 + svelte: link:packages/svelte + p-filter@2.1.0: dependencies: p-map: 2.1.0 @@ -4219,15 +4418,8 @@ snapshots: prelude-ls@1.2.1: {} - prettier-plugin-svelte@3.4.0(prettier@3.2.4)(svelte@packages+svelte): - dependencies: - prettier: 3.2.4 - svelte: link:packages/svelte - prettier@2.8.8: {} - prettier@3.2.4: {} - punycode@2.3.1: {} quansync@0.2.11: {} @@ -4404,7 +4596,7 @@ snapshots: terser@5.27.0: dependencies: '@jridgewell/source-map': 0.3.6 - acorn: 8.16.0 + acorn: 8.17.0 commander: 2.20.3 source-map-support: 0.5.21 @@ -4417,6 +4609,8 @@ snapshots: fdir: 6.5.0(picomatch@4.0.4) picomatch: 4.0.4 + tinypool@2.1.0: {} + tinyrainbow@3.1.0: {} tldts-core@6.1.64: {} diff --git a/vitest.config.js b/vitest.config.js index 116dfae9d8..2eaa4c7124 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -20,7 +20,7 @@ export default defineConfig({ 'packages/svelte', importer?.includes('_output/server') ? exported.default - : exported.browser ?? exported.default + : (exported.browser ?? exported.default) ); } }