From 4e5fd7fdfd3ec9623240438f11ab4399a6fcf703 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 1 Dec 2018 17:37:33 -0500
Subject: [PATCH] rewrite imports from svelte when testing

---
 src/compile/Component.ts            |  2 +-
 src/compile/wrapModule.ts           | 34 +++++++++++++++++++++--------
 test/server-side-rendering/index.js |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index 21321e732a..7e58d95ac4 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -225,7 +225,7 @@ export default class Component {
 			name,
 			options,
 			banner,
-			options.sveltePath ? `${options.sveltePath}/internal.js` : `svelte/internal.js`,
+			options.sveltePath,
 			importedHelpers,
 			this.imports,
 			this.module_exports,
diff --git a/src/compile/wrapModule.ts b/src/compile/wrapModule.ts
index dfbd262030..90eee257e5 100644
--- a/src/compile/wrapModule.ts
+++ b/src/compile/wrapModule.ts
@@ -21,17 +21,19 @@ export default function wrapModule(
 	name: string,
 	options: CompileOptions,
 	banner: string,
-	sharedPath: string,
+	sveltePath = 'svelte',
 	helpers: { name: string, alias: string }[],
 	imports: Node[],
 	module_exports: Export[],
 	source: string
 ): string {
+	const internalPath = `${sveltePath}/internal.js`;
+
 	if (format === 'esm') {
-		return esm(code, name, options, banner, sharedPath, helpers, imports, module_exports, source);
+		return esm(code, name, options, banner, sveltePath, internalPath, helpers, imports, module_exports, source);
 	}
 
-	if (format === 'cjs') return cjs(code, name, banner, sharedPath, helpers, imports, module_exports);
+	if (format === 'cjs') return cjs(code, name, banner, sveltePath, internalPath, helpers, imports, module_exports);
 	if (format === 'eval') return expr(code, name, options, banner, imports);
 
 	throw new Error(`options.format is invalid (must be ${list(Object.keys(wrappers))})`);
@@ -42,19 +44,28 @@ function esm(
 	name: string,
 	options: CompileOptions,
 	banner: string,
-	sharedPath: string,
+	sveltePath: string,
+	internalPath: string,
 	helpers: { name: string, alias: string }[],
 	imports: Node[],
 	module_exports: Export[],
 	source: string
 ) {
 	const importHelpers = helpers.length > 0 && (
-		`import { ${helpers.map(h => h.name === h.alias ? h.name : `${h.name} as ${h.alias}`).join(', ')} } from ${JSON.stringify(sharedPath)};`
+		`import { ${helpers.map(h => h.name === h.alias ? h.name : `${h.name} as ${h.alias}`).join(', ')} } from ${JSON.stringify(internalPath)};`
 	);
 
 	const importBlock = imports.length > 0 && (
 		imports
-			.map((declaration: Node) => source.slice(declaration.start, declaration.end))
+			.map((declaration: Node) => {
+				const import_source = declaration.source.value === 'svelte' ? sveltePath : declaration.source.value;
+
+				return (
+					source.slice(declaration.start, declaration.source.start) +
+					JSON.stringify(import_source) +
+					source.slice(declaration.source.end, declaration.end)
+				);
+			})
 			.join('\n')
 	);
 
@@ -72,7 +83,8 @@ function cjs(
 	code: string,
 	name: string,
 	banner: string,
-	sharedPath: string,
+	sveltePath: string,
+	internalPath: string,
 	helpers: { name: string, alias: string }[],
 	imports: Node[],
 	module_exports: Export[]
@@ -80,7 +92,7 @@ function cjs(
 	const helperDeclarations = helpers.map(h => `${h.alias === h.name ? h.name : `${h.name}: ${h.alias}`}`).join(', ');
 
 	const helperBlock = helpers.length > 0 && (
-		`const { ${helperDeclarations} } = require(${JSON.stringify(sharedPath)});\n`
+		`const { ${helperDeclarations} } = require(${JSON.stringify(internalPath)});\n`
 	);
 
 	const requires = imports.map(node => {
@@ -102,7 +114,11 @@ function cjs(
 			lhs = `{ ${properties.join(', ')} }`;
 		}
 
-		return `const ${lhs} = require("${node.source.value}");`
+		const source = node.source.value === 'svelte'
+			? sveltePath
+			: node.source.value;
+
+		return `const ${lhs} = require("${source}");`
 	});
 
 	const exports = [`exports.default = ${name};`].concat(
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index de57f49090..a8d68aeaca 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -21,7 +21,7 @@ function tryToReadFile(file) {
 
 const sveltePath = process.cwd();
 
-describe("ssr", () => {
+describe.only("ssr", () => {
 	before(() => {
 		require("../../register")({
 			extensions: ['.svelte', '.html'],