fix merge + lint

Author: milahu

src/compiler/preprocess/index.ts

@@ -130,7 +130,7 @@ export default async function preprocess(
 	// sourcemap_list is sorted in reverse order from last map (index 0) to first map (index -1)
 	// so we use sourcemap_list.unshift() to add new maps
 	// https://github.com/ampproject/remapping#multiple-transformations-of-a-file
-	const sourcemap_list: (DecodedSourceMap | RawSourceMap)[] = [];
+	const sourcemap_list: Array<DecodedSourceMap | RawSourceMap> = [];
 
 	for (const fn of markup) {
 

test/sourcemaps/index.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as assert from "assert";
-import { loadConfig, svelte } from "../helpers.js";
+import { loadConfig, svelte } from "../helpers.ts";
 // keep source-map at version 0.7.x
 // https://github.com/mozilla/source-map/issues/400
 import { SourceMapConsumer } from "source-map";
@@ -50,7 +50,7 @@ describe("sourcemaps", () => {
 				sourcemap: preprocessed.map,
 				// filenames for sourcemaps
 				outputFilename: `${outputName}.js`,
-				cssOutputFilename: `${outputName}.css`,
+				cssOutputFilename: `${outputName}.css`
 			});
 
 			js.code = js.code.replace(
@@ -91,7 +91,7 @@ describe("sourcemaps", () => {
 					css.map.sources.slice().sort(),
 					(config.css_map_sources || ["input.svelte"]).sort()
 				);
-			};
+			}
 
 			// use locate_1 with mapConsumer:
 			// lines are one-based, columns are zero-based

test/sourcemaps/samples/sourcemap-sources/_config.js

@@ -4,8 +4,8 @@ function add(bundle, filename, source) {
 	bundle.addSource({
 		filename,
 		content: new MagicString(source),
-		separator: '\n',
-		//separator: '', // ERROR. probably a bug in magic-string
+		separator: '\n'
+		//separator: '' // ERROR. probably a bug in magic-string
 	});
 }
 
@@ -26,7 +26,7 @@ export default {
 		'foo.js',
 		'bar.js',
 		'foo2.js',
-		'bar2.js',
+		'bar2.js'
 	],
 	preprocess: [
 		{

test/sourcemaps/samples/sourcemap-sources/test.js

@@ -8,7 +8,7 @@ export function test({ assert, preprocessed, js }) {
 		[js, 'foo.js', 'answer = 42;'],
 		[js, 'bar.js', 'console.log(answer);'],
 		[js, 'foo2.js', 'answer2 = 84;'],
-		[js, 'bar2.js', 'console.log(answer2);'],
+		[js, 'bar2.js', 'console.log(answer2);']
 	]
 	.forEach(([where, sourcefile, content]) => {