From adf542a8e27d5c1ba223801481431b1576372bf2 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 20 Feb 2024 06:19:09 -0500
Subject: [PATCH] undo change to sourcemap tests

---
 packages/svelte/tests/helpers.js                          | 4 ++--
 .../tests/sourcemaps/samples/css-injected-map/_config.js  | 2 +-
 .../tests/sourcemaps/samples/sourcemap-sources/_config.js | 8 +++++++-
 .../tests/sourcemaps/samples/static-no-script/_config.js  | 2 +-
 packages/svelte/tests/sourcemaps/test.ts                  | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/svelte/tests/helpers.js b/packages/svelte/tests/helpers.js
index 8bf56b8fa9..5f85c7f59f 100644
--- a/packages/svelte/tests/helpers.js
+++ b/packages/svelte/tests/helpers.js
@@ -117,8 +117,8 @@ export async function compile_directory(
 			}
 
 			const compiled = compile(text, {
-				outputFilename: `${file}${file.endsWith('.js') ? '' : '.js'}`,
-				cssOutputFilename: `${file}.css`,
+				outputFilename: `_output/${generate}/${file}${file.endsWith('.js') ? '' : '.js'}`,
+				cssOutputFilename: `_output/${generate}/${file}.css`,
 				...opts
 			});
 			compiled.js.code = compiled.js.code.replace(`v${VERSION}`, 'VERSION');
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 ff2ec2e0c5..2699d350a8 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 8a15daef7a..4c72229ea6 100644
--- a/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js
+++ b/packages/svelte/tests/sourcemaps/samples/sourcemap-sources/_config.js
@@ -38,7 +38,13 @@ 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 268ed3c57e..5cd3b335c9 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 8ce4b9a4fc..c654258b34 100644
--- a/packages/svelte/tests/sourcemaps/test.ts
+++ b/packages/svelte/tests/sourcemaps/test.ts
@@ -198,7 +198,7 @@ const { test, run } = suite<SourcemapTest>(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<SourcemapTest>(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);