Upgrade svelte eslint config

package.json

@@ -31,7 +31,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^8.0.1",
     "@rollup/plugin-replace": "^2.3.3",
-    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.0.0",
+    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.1.0",
     "@types/cookie": "^0.4.0",
     "@types/mocha": "^8.0.0",
     "@types/node": "^10.0.0",
@@ -81,7 +81,7 @@
     "pretest": "npm run check",
     "build": "rm -rf dist && rollup -c",
     "check": "rm -rf dist && cross-env TS_CHECK_ENABLED=true rollup -c",
-    "lint": "eslint \"{src,runtime}/**/*.{ts,js}\"",
+    "lint": "npx eslint '{src,runtime}/**/*[!.d].{ts,js}'",
     "prepare": "npm run build",
     "dev": "rollup -cw",
     "prepublishOnly": "npm test"

runtime/src/app/app.ts

@@ -199,7 +199,7 @@ export async function hydrate_target(dest: Target): Promise<HydratedTarget> {
 		fetch: (url: string, opts?: any) => fetch(url, opts),
 		redirect: (statusCode: number, location: string) => {
 			if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
-				throw new Error(`Conflicting redirects`);
+				throw new Error('Conflicting redirects');
 			}
 			redirect = { statusCode, location };
 		},

runtime/src/server/middleware/get_page_handler.ts

@@ -106,7 +106,7 @@ export function get_page_handler(
 		const preload_context = {
 			redirect: (statusCode: number, location: string) => {
 				if (redirect && (redirect.statusCode !== statusCode || redirect.location !== location)) {
-					throw new Error(`Conflicting redirects`);
+					throw new Error('Conflicting redirects');
 				}
 				location = location.replace(/^\//g, ''); // leading slash (only)
 				redirect = { statusCode, location };
@@ -239,7 +239,7 @@ export function get_page_handler(
 				error: error
 					? error instanceof Error
 						? error
-						: { message: error, name: "PreloadError" }
+						: { message: error, name: 'PreloadError' }
 					: null
 			};
 
@@ -410,7 +410,7 @@ function serialize_error(error: Error | { message: string }) {
 function escape_html(html: string) {
 	const chars: Record<string, string> = {
 		'"' : 'quot',
-		"'": '#39',
+		'\'': '#39',
 		'&': 'amp',
 		'<' : 'lt',
 		'>' : 'gt'

src/api/build.ts

@@ -46,7 +46,7 @@ export async function build({
 	static_files = path.resolve(cwd, static_files);
 
 	if (legacy && bundler === 'webpack') {
-		throw new Error(`Legacy builds are not supported for projects using webpack`);
+		throw new Error('Legacy builds are not supported for projects using webpack');
 	}
 
 	rimraf(output);

src/api/dev.ts

@@ -218,7 +218,7 @@ class Watcher extends EventEmitter {
 
 		const emitFatal = () => {
 			this.emit('fatal', {
-				message: `Server crashed`
+				message: 'Server crashed'
 			} as FatalEvent);
 
 			this.crashed = true;

src/api/export.ts

@@ -153,7 +153,7 @@ async function _export({
 			if (typeof body === 'string') {
 				body = minify_html(body);
 			} else {
-				oninfo({ message: `Content of {url} has content-type text/html but the content was received as a binary buffer. The HTML will not be minified.` });
+				oninfo({ message: `Content of ${url} has content-type text/html but the content was received as a binary buffer. The HTML will not be minified.` });
 			}
 		}
 

src/api/utils/export_queue.ts

@@ -30,7 +30,7 @@ type QueueOpts = {
 // determines current state of a promise
 function promiseState(p: Promise<any>) {
 	const t = {};
-	return Promise.race([p, t]).then(v => (v === t) ? "pending" : "fulfilled", () => "rejected");
+	return Promise.race([p, t]).then(v => (v === t) ? 'pending' : 'fulfilled', () => 'rejected');
 }
 
 // finds first non-pending promise in a list of promises

src/api/utils/validate_bundler.ts

@@ -12,7 +12,7 @@ export default function validate_bundler(bundler?: 'rollup' | 'webpack') {
 			deprecate_dir('rollup');
 			deprecate_dir('webpack');
 
-			throw new Error(`Could not find a configuration file for rollup or webpack`);
+			throw new Error('Could not find a configuration file for rollup or webpack');
 		}
 	}
 

src/cli.ts

@@ -10,8 +10,8 @@ const prog = sade('sapper').version(pkg.version);
 
 if (process.argv[2] === 'start') {
 	// remove this in a future version
-	console.error(colors.bold().red(`'sapper start' has been removed`));
-	console.error(`Use 'node [build_dir]' instead`);
+	console.error(colors.bold().red('"sapper start" has been removed'));
+	console.error('Use "node [build_dir]" instead');
 	process.exit(1);
 }
 
@@ -155,7 +155,7 @@ prog.command('build [dest]')
 	.option('--routes', 'Routes directory', 'src/routes')
 	.option('--output', 'Sapper intermediate file output directory', 'src/node_modules/@sapper')
 	.option('--ext', 'Custom page route extensions (space separated)', '.svelte .html')
-	.example(`build custom-dir -p 4567`)
+	.example('build custom-dir -p 4567')
 	.action(async (dest = '__sapper__/build', opts: {
 		port: string;
 		legacy: boolean;
@@ -166,7 +166,7 @@ prog.command('build [dest]')
 		output: string;
 		ext: string;
 	}) => {
-		console.log(`> Building...`);
+		console.log('> Building...');
 
 		try {
 			await _build(opts.bundler, opts.legacy, opts.cwd, opts.src, opts.routes, opts.output, dest, opts.ext);
@@ -226,7 +226,7 @@ prog.command('export [dest]')
 	}) => {
 		try {
 			if (opts.build) {
-				console.log(`> Building...`);
+				console.log('> Building...');
 				await _build(opts.bundler, opts.legacy, opts.cwd, opts.src, opts.routes, opts.output, opts['build-dir'], opts.ext);
 				console.error(`\n> Built in ${elapsed(start)}`);
 			}

src/config/rollup.ts

@@ -13,7 +13,7 @@ export default {
 
 		output: (): OutputOptions => {
 			let dir = `${dest}/client`;
-			if (process.env.SAPPER_LEGACY_BUILD) dir += `/legacy`;
+			if (process.env.SAPPER_LEGACY_BUILD) dir += '/legacy';
 
 			return {
 				dir,

src/config/webpack.ts

@@ -15,7 +15,7 @@ export default {
 				path: `${dest}/client`,
 				filename: '[hash]/[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
-				publicPath: `client/`
+				publicPath: 'client/'
 			};
 		}
 	},
@@ -32,7 +32,7 @@ export default {
 				path: `${dest}/server`,
 				filename: '[name].js',
 				chunkFilename: '[hash]/[name].[id].js',
-				publicPath: `client/`,
+				publicPath: 'client/',
 				libraryTarget: 'commonjs2'
 			};
 		}

src/core/create_app.ts

@@ -51,7 +51,7 @@ export function create_serviceworker_manifest({ manifest_data, output, client_fi
 	} else {
 		// TODO remove in a future version
 		if (fs.existsSync('assets')) {
-			throw new Error(`As of Sapper 0.21, the assets/ directory should become static/`);
+			throw new Error('As of Sapper 0.21, the assets/ directory should become static/');
 		}
 	}
 
@@ -197,7 +197,7 @@ function generate_server_manifest(
 					handlers: route_${i},
 					params: ${route.params.length > 0
 						? `match => ({ ${route.params.map(create_param_match).join(', ')} })`
-						: `() => ({})`}
+						: '() => ({})'}
 				}`).join(',\n\n\t\t\t\t')}
 			],
 

src/core/create_compilers/RollupCompiler.ts

@@ -45,7 +45,7 @@ export default function(files) {
 
 const get_entry_point_output_chunk = (bundle: OutputBundle, entry_point?: string) => {
 	if (entry_point === undefined) {
-		throw new Error("Internal error: entry_point cannot be undefined");
+		throw new Error('Internal error: entry_point cannot be undefined');
 	}
 
 	let entry_point_output_chunk: OutputChunk;

src/core/create_compilers/WebpackCompiler.ts

@@ -28,7 +28,7 @@ export class WebpackCompiler {
 
 				if (result.errors.length) {
 					console.error(stats.toString({ colors: true }));
-					reject(new Error(`Encountered errors while building app`));
+					reject(new Error('Encountered errors while building app'));
 				}
 
 				else {

src/core/create_manifest_data.ts

@@ -9,7 +9,7 @@ export default function create_manifest_data(cwd: string, extensions: string = '
 
 	// TODO remove in a future version
 	if (!fs.existsSync(cwd)) {
-		throw new Error(`As of Sapper 0.21, the routes/ directory should become src/routes/`);
+		throw new Error('As of Sapper 0.21, the routes/ directory should become src/routes/');
 	}
 
 	function find_layout(file_name: string, component_name: string, dir: string = '') {

src/core/read_template.ts

@@ -4,7 +4,7 @@ export default function read_template(dir: string) {
 	try {
 		return fs.readFileSync(`${dir}/template.html`, 'utf-8');
 	} catch (err) {
-		if (fs.existsSync(`app/template.html`)) {
+		if (fs.existsSync('app/template.html')) {
 			throw new Error(`As of Sapper 0.21, the default folder structure has been changed:
   app/    --> src/
   routes/ --> src/routes/