From 59035c89d53dfc608b8d19ce1aa57cf25f7ac0bb Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sat, 21 Sep 2019 22:38:26 -0400 Subject: [PATCH] all runtime tests passing --- src/compiler/compile/render_ssr/Renderer.ts | 3 ++- test/helpers.js | 2 +- test/server-side-rendering/index.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/compile/render_ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts index 096257d22e..1f89919955 100644 --- a/src/compiler/compile/render_ssr/Renderer.ts +++ b/src/compiler/compile/render_ssr/Renderer.ts @@ -14,6 +14,7 @@ import Title from './handlers/Title'; import { AppendTarget, CompileOptions } from '../../interfaces'; import { INode } from '../nodes/interfaces'; import { Expression, TemplateLiteral } from 'estree'; +import { escape_template } from '../utils/stringify'; type Handler = (node: any, renderer: Renderer, options: CompileOptions) => void; @@ -67,7 +68,7 @@ export default class Renderer { } add_string(str: string) { - this.current.value += str; + this.current.value += escape_template(str); } add_expression(node: Expression) { diff --git a/test/helpers.js b/test/helpers.js index 2a40851cd6..480b28948b 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -47,7 +47,7 @@ export function tryToReadFile(file) { const virtualConsole = new jsdom.VirtualConsole(); virtualConsole.sendTo(console); -global.window = new jsdom.JSDOM('
', {virtualConsole}).window; +const window = new jsdom.JSDOM('
', {virtualConsole}).window; global.document = window.document; global.navigator = window.navigator; global.getComputedStyle = window.getComputedStyle; diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js index 3e2c812b6c..eb2303a794 100644 --- a/test/server-side-rendering/index.js +++ b/test/server-side-rendering/index.js @@ -20,7 +20,7 @@ function tryToReadFile(file) { const sveltePath = process.cwd().split('\\').join('/'); -describe.only("ssr", () => { +describe("ssr", () => { before(() => { require("../../register")({ extensions: ['.svelte', '.html'],