fix error & crlf

pushkine · May 28, 2020 · 86323ad · 86323ad
1 parent d7708c5
commit 86323ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/js/update.ts b/test/js/update.ts
@@ -33,9 +33,9 @@ glob('samples/*/input.svelte', { cwd: __dirname })
 			`${__dirname}/${file.replace('input.svelte', 'expected.js')}`,
 			svelte
 				.compile(
-					readFileSync(`${__dirname}/${file}`, 'utf-8').replace(/\s+$/, ''),
+					readFileSync(`${__dirname}/${file}`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, ''),
 					loadConfig(`${__dirname}/${file.replace('input.svelte', '_config.js')}`).options
 				)
-				.js.code.replace(/generated by Svelte v\d+\.\d+\.\d+(-\w+\.\d+)?/, 'generated by Svelte vX.Y.Z')
+				.js.code.replace(/generated by Svelte v\d+\.\d+\.\d+(-\w+\.\d+)?/, 'generated by Svelte vX.Y.Z').replace(/\r/g, '')
 		);
 	});
diff --git a/test/parser/update.ts b/test/parser/update.ts
@@ -17,7 +17,7 @@ glob('samples/*/input.svelte', { cwd: __dirname })
 			writeFileSync(
 				`${__dirname}/${file.replace('input.svelte', 'output.json')}`,
 				JSON.stringify(
-					svelte.compile(readFileSync(`${__dirname}/${file}`, 'utf-8').replace(/\s+$/, ''), { generate: false }).ast,
+					svelte.compile(readFileSync(`${__dirname}/${file}`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, ''), { generate: false }).ast,
 					null,
 					'\t'
 				)
@@ -26,7 +26,7 @@ glob('samples/*/input.svelte', { cwd: __dirname })
 			if (e.name !== 'ParseError') throw e;
 			writeFileSync(
 				`${__dirname}/${file.replace('input.svelte', 'error.json')}`,
-				JSON.stringify({ ...e, message: e.message }, null, '\t')
+				JSON.stringify({ code:e.code, message: e.message, pos:e.pos, start:e.start, end:e.end }, null, '\t')
 			);
 		}
 	});