diff --git a/packages/svelte/tests/helpers.js b/packages/svelte/tests/helpers.js index d08b81b570..8bf56b8fa9 100644 --- a/packages/svelte/tests/helpers.js +++ b/packages/svelte/tests/helpers.js @@ -73,7 +73,7 @@ export async function compile_directory( let text = fs.readFileSync(`${cwd}/${file}`, 'utf-8'); let opts = { - filename: path.join(cwd, file), + filename: file, ...compileOptions, generate }; @@ -117,8 +117,8 @@ export async function compile_directory( } const compiled = compile(text, { - outputFilename: `${output_dir}/${file}${file.endsWith('.js') ? '' : '.js'}`, - cssOutputFilename: `${output_dir}/${file}.css`, + outputFilename: `${file}${file.endsWith('.js') ? '' : '.js'}`, + cssOutputFilename: `${file}.css`, ...opts }); compiled.js.code = compiled.js.code.replace(`v${VERSION}`, 'VERSION'); diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js index 81b3782158..37b5394f81 100644 --- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-discouraged/_config.js @@ -41,7 +41,7 @@ export default test({ assert.htmlEqual(target.innerHTML, ``); assert.deepEqual(warnings, [ - 'Mutating a value outside the component that created it is strongly discouraged. Consider passing values to child components with `bind:`, or use callback instead.' + 'Counter.svelte mutated a value owned by main.svelte. This is strongly discouraged. Consider passing values to child components with `bind:`, or use a callback instead.' ]); } }); diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js index 0f261e1c81..33136e6faa 100644 --- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js @@ -3,7 +3,7 @@ import "svelte/internal/disclose-version"; import * as $ from "svelte/internal"; -export default function Bind_this($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, false); $.init(); diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js index 71b688fe37..838d15f2a5 100644 --- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Bind_this($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(false); const anchor = $.create_anchor($$payload); diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js index 38a74ef9bb..99d04e98a3 100644 --- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/client/index.svelte.js @@ -3,7 +3,7 @@ import "svelte/internal/disclose-version"; import * as $ from "svelte/internal"; -export default function Class_state_field_constructor_assignment($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, true); class Foo { diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js index 6ba11ebb16..4d99f0e9e7 100644 --- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Class_state_field_constructor_assignment($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(true); class Foo { diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js index 7bf677e7e9..8026752a3c 100644 --- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js @@ -3,7 +3,7 @@ import "svelte/internal/disclose-version"; import * as $ from "svelte/internal"; -export default function Each_string_template($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, false); $.init(); @@ -28,4 +28,4 @@ export default function Each_string_template($$anchor, $$props) { $.close_frag($$anchor, fragment); $.pop(); -} +} \ No newline at end of file diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js index b23b316e3d..1c23a0c032 100644 --- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Each_string_template($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(false); const anchor = $.create_anchor($$payload); diff --git a/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js index 4cc594e9d0..c9ba1e7c73 100644 --- a/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/export-state/_expected/client/index.svelte.js @@ -1,4 +1,4 @@ /* index.svelte.js generated by Svelte VERSION */ import * as $ from "svelte/internal"; -export const object = $.proxy({ ok: true }); \ No newline at end of file +export const object = $.proxy({ ok: true }); diff --git a/packages/svelte/tests/snapshot/samples/export-state/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/export-state/_expected/server/index.svelte.js index a3b619df6e..d7bc4c8f33 100644 --- a/packages/svelte/tests/snapshot/samples/export-state/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/export-state/_expected/server/index.svelte.js @@ -1,4 +1,4 @@ /* index.svelte.js generated by Svelte VERSION */ import * as $ from "svelte/internal/server"; -export const object = { ok: true }; \ No newline at end of file +export const object = { ok: true }; diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js index 12e7295f6a..db959fdee4 100644 --- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js @@ -3,7 +3,7 @@ import "svelte/internal/disclose-version"; import * as $ from "svelte/internal"; -export default function Function_prop_no_getter($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, true); let count = $.source(0); @@ -33,4 +33,4 @@ export default function Function_prop_no_getter($$anchor, $$props) { $.close_frag($$anchor, fragment); $.pop(); -} +} \ No newline at end of file diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js index f678bb6ad6..6c0d2e9922 100644 --- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Function_prop_no_getter($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(true); let count = 0; diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js index 7eb39880c4..749e8abd40 100644 --- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js @@ -5,7 +5,7 @@ import * as $ from "svelte/internal"; var frag = $.template(`

hello world

`); -export default function Hello_world($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, false); $.init(); @@ -14,4 +14,4 @@ export default function Hello_world($$anchor, $$props) { $.close($$anchor, h1); $.pop(); -} +} \ No newline at end of file diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js index 7007fe2b48..1e9394f59a 100644 --- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Hello_world($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(false); $$payload.out += `

hello world

`; $.pop(); diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js index 3da681ea53..984b485431 100644 --- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js @@ -12,7 +12,7 @@ function reset(_, str, tpl) { var frag = $.template(` `, true); -export default function State_proxy_literal($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, true); let str = $.source(''); diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js index c541299e36..69e294b76d 100644 --- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function State_proxy_literal($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(true); let str = ''; diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js index b2734b8c46..bcb630f928 100644 --- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js @@ -3,7 +3,7 @@ import "svelte/internal/disclose-version"; import * as $ from "svelte/internal"; -export default function Svelte_element($$anchor, $$props) { +export default function Index($$anchor, $$props) { $.push($$props, true); let tag = $.prop($$props, "tag", 3, 'hr'); diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js index 405a452271..51bb86c2b2 100644 --- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js @@ -2,7 +2,7 @@ // Note: compiler output will change before 5.0 is released! import * as $ from "svelte/internal/server"; -export default function Svelte_element($$payload, $$props) { +export default function Index($$payload, $$props) { $.push(true); let { tag = 'hr' } = $$props; 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 2699d350a8..ff2ec2e0c5 100644 --- a/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js +++ b/packages/svelte/tests/sourcemaps/samples/css-injected-map/_config.js @@ -42,7 +42,7 @@ export default test({ const css_map_json = Buffer.from(css_map_base64, 'base64').toString(); const map = new TraceMap(css_map_json); - const sourcefile = '../../input.svelte'; + const sourcefile = 'input.svelte'; const locate = getLocator( css.replace(/\\r/g, '\r').replace(/\\n/g, '\n').replace(/\\t/g, '\t'), { offsetLine: 1 } diff --git a/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js b/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js index 4c72229ea6..8a15daef7a 100644 --- a/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js +++ b/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js @@ -38,13 +38,7 @@ const FOO2 = 'var answer2 = 84; // foo2.js\n'; const BAR2 = 'console.log(answer2); // bar2.js\n'; export default test({ - js_map_sources: [ - '../../input.svelte', - '../../foo.js', - '../../bar.js', - '../../foo2.js', - '../../bar2.js' - ], + js_map_sources: ['input.svelte', 'foo.js', 'bar.js', 'foo2.js', 'bar2.js'], preprocess: [ { script: ({ content, filename = '' }) => { diff --git a/packages/svelte/tests/sourcemaps/samples/static-no-script/_config.js b/packages/svelte/tests/sourcemaps/samples/static-no-script/_config.js index 5cd3b335c9..268ed3c57e 100644 --- a/packages/svelte/tests/sourcemaps/samples/static-no-script/_config.js +++ b/packages/svelte/tests/sourcemaps/samples/static-no-script/_config.js @@ -2,7 +2,7 @@ import { test } from '../../test'; export default test({ test({ assert, map_client }) { - assert.deepEqual(map_client.sources, ['../../input.svelte']); + assert.deepEqual(map_client.sources, ['input.svelte']); // TODO do we need to set sourcesContent? We did it in Svelte 4, but why? // assert.deepEqual(js.map.sourcesContent, [ // fs.readFileSync(path.join(__dirname, 'input.svelte'), 'utf-8') diff --git a/packages/svelte/tests/sourcemaps/test.ts b/packages/svelte/tests/sourcemaps/test.ts index c654258b34..8ce4b9a4fc 100644 --- a/packages/svelte/tests/sourcemaps/test.ts +++ b/packages/svelte/tests/sourcemaps/test.ts @@ -198,7 +198,7 @@ const { test, run } = suite(async (config, cwd) => { map_client = JSON.parse(fs.readFileSync(`${cwd}/_output/client/input.svelte.js.map`, 'utf-8')); assert.deepEqual( map_client.sources.slice().sort(), - (config.js_map_sources || ['../../input.svelte']).sort(), + (config.js_map_sources || ['input.svelte']).sort(), 'js.map.sources is wrong' ); @@ -238,7 +238,7 @@ const { test, run } = suite(async (config, cwd) => { map_css = JSON.parse(fs.readFileSync(`${cwd}/_output/client/input.svelte.css.map`, 'utf-8')); assert.deepEqual( map_css.sources.slice().sort(), - (config.css_map_sources || ['../../input.svelte']).sort(), + (config.css_map_sources || ['input.svelte']).sort(), 'css.map.sources is wrong' ); compare('css', code_css, map_css, config.css);