diff --git a/packages/svelte/package.json b/packages/svelte/package.json index f077729cda..8932e2e07a 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -131,7 +131,7 @@ "tiny-glob": "^0.2.9" }, "dependencies": { - "@ampproject/remapping": "^2.3.0", + "@ampproject/remapping": "2.2.1", "@jridgewell/sourcemap-codec": "^1.5.0", "@types/estree": "^1.0.5", "acorn": "^8.12.1", @@ -142,7 +142,7 @@ "esrap": "^1.2.2", "is-reference": "^3.0.2", "locate-character": "^3.0.0", - "magic-string": "^0.30.11", + "magic-string": "0.30.5", "zimmerframe": "^1.1.2" }, "knip": { diff --git a/packages/svelte/src/compiler/legacy.js b/packages/svelte/src/compiler/legacy.js index 9d4050eb62..2e50fb9e4b 100644 --- a/packages/svelte/src/compiler/legacy.js +++ b/packages/svelte/src/compiler/legacy.js @@ -354,8 +354,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/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js index b31ff0c3a8..10f2b7a3ea 100644 --- a/packages/svelte/src/compiler/utils/builders.js +++ b/packages/svelte/src/compiler/utils/builders.js @@ -352,7 +352,7 @@ export function prop(kind, key, value, computed = false) { * @returns {ESTree.PropertyDefinition} */ export function prop_def(key, value, computed = false, is_static = false) { - return { type: 'PropertyDefinition', key, value, computed, static: is_static }; + return { type: 'PropertyDefinition', key, value, computed, static: is_static, decorators: [] }; } /** @@ -541,7 +541,8 @@ export function method(kind, key, params, body, computed = false, is_static = fa kind, value: function_builder(null, params, block(body)), computed, - static: is_static + static: is_static, + decorators: [] }; } diff --git a/packages/svelte/src/internal/client/dom/css.js b/packages/svelte/src/internal/client/dom/css.js index dbf862543f..b4db8fe478 100644 --- a/packages/svelte/src/internal/client/dom/css.js +++ b/packages/svelte/src/internal/client/dom/css.js @@ -21,7 +21,8 @@ export function append_styles(anchor, css, is_custom_element = false) { var target = /** @type {ShadowRoot} */ (root).host ? /** @type {ShadowRoot} */ (root) - : /** @type {Document} */ (root).head ?? /** @type {Document} */ (root.ownerDocument).head; + : // prettier-ignore + /** @type {Document} */ (root).head ?? /** @type {Document} */ (root.ownerDocument).head; if (!target.querySelector('#' + css.hash)) { const style = document.createElement('style'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1803be83e0..44e80bcaea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,8 +63,8 @@ importers: packages/svelte: dependencies: '@ampproject/remapping': - specifier: ^2.3.0 - version: 2.3.0 + specifier: 2.2.1 + version: 2.2.1 '@jridgewell/sourcemap-codec': specifier: ^1.5.0 version: 1.5.0 @@ -96,8 +96,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 magic-string: - specifier: ^0.30.11 - version: 0.30.11 + specifier: 0.30.5 + version: 0.30.5 zimmerframe: specifier: ^1.1.2 version: 1.1.2 @@ -410,6 +410,10 @@ importers: packages: + '@ampproject/remapping@2.2.1': + resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} + engines: {node: '>=6.0.0'} + '@ampproject/remapping@2.3.0': resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} @@ -2886,6 +2890,10 @@ packages: magic-string@0.30.11: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} + magic-string@0.30.5: + resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} + engines: {node: '>=12'} + magicast@0.3.4: resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==} @@ -4119,6 +4127,11 @@ packages: snapshots: + '@ampproject/remapping@2.2.1': + dependencies: + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + '@ampproject/remapping@2.3.0': dependencies: '@jridgewell/gen-mapping': 0.3.5 @@ -6824,6 +6837,10 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 + magic-string@0.30.5: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 + magicast@0.3.4: dependencies: '@babel/parser': 7.25.3 @@ -7625,7 +7642,7 @@ snapshots: svelte@4.2.18: dependencies: - '@ampproject/remapping': 2.3.0 + '@ampproject/remapping': 2.2.1 '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping': 0.3.25 '@types/estree': 1.0.5