rebase and fix lint

src/compiler/preprocess/index.ts

@@ -104,8 +104,9 @@ function get_replacement(
 	let decoded_map: DecodedSourceMap;
 	if (processed.map) {
 		decoded_map = typeof processed.map === 'string' ? JSON.parse(processed.map) : processed.map;
-		if (typeof(decoded_map.mappings) === 'string')
+		if (typeof(decoded_map.mappings) === 'string') {
 			decoded_map.mappings = decode_mappings(decoded_map.mappings);
+		}
 		sourcemap_add_offset(decoded_map, get_location(offset + prefix.length));
 	}
 	const processed_with_map = StringWithSourcemap.from_processed(processed.code, decoded_map);
@@ -146,13 +147,14 @@ export default async function preprocess(
 
 		if (processed && processed.dependencies) dependencies.push(...processed.dependencies);
 		source = processed ? processed.code : source;
-		if (processed && processed.map)
+		if (processed && processed.map) {
 			sourcemap_list.unshift(
 				typeof(processed.map) === 'string'
 					? JSON.parse(processed.map)
 					: processed.map
 			);
 		}
+	}
 
 	for (const fn of script) {
 		const get_location = getLocator(source);

src/compiler/utils/string_with_sourcemap.ts

@@ -59,9 +59,10 @@ function merge_tables<T>(this_table: T[], other_table): [T[], number[], boolean,
 }
 
 function pushArray<T>(_this: T[], other: T[]) {
-	for (let i = 0; i < other.length; i++)
+	for (let i = 0; i < other.length; i++) {
 		_this.push(other[i]);
 	}
+}
 
 export class StringWithSourcemap {
 	string: string;
@@ -69,9 +70,9 @@ export class StringWithSourcemap {
 
 	constructor(string = '', map = null) {
 		this.string = string;
-		if (map)
+		if (map) {
 			this.map = map as DecodedSourceMap;
-		else
+		} else {
 			this.map = {
 				version: 3,
 				mappings: [],
@@ -79,6 +80,7 @@ export class StringWithSourcemap {
 				names: []
 			};
 		}
+	}
 
 	// concat in-place (mutable), return this (chainable)
 	// will also mutate the `other` object