diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js index d94f784139..d573913d58 100644 --- a/test/server-side-rendering/index.js +++ b/test/server-side-rendering/index.js @@ -19,11 +19,13 @@ function tryToReadFile(file) { } } +const sveltePath = process.cwd(); + describe.only("ssr", () => { before(() => { require("../../register")({ extensions: ['.svelte', '.html'], - sveltePath: process.cwd() + sveltePath }); return setupHtmlEqual(); @@ -44,22 +46,22 @@ describe.only("ssr", () => { (solo ? it.only : it)(dir, () => { dir = path.resolve("test/server-side-rendering/samples", dir); try { - let $render; + let Component; const mainHtmlFile = `${dir}/main.html`; const mainSvelteFile = `${dir}/main.svelte`; if (fs.existsSync(mainHtmlFile)) { - $render = require(mainHtmlFile).$render; + Component = require(mainHtmlFile).default; } else if (fs.existsSync(mainSvelteFile)) { - $render = require(mainSvelteFile).$render; + Component = require(mainSvelteFile).default; } const expectedHtml = tryToReadFile(`${dir}/_expected.html`); const expectedCss = tryToReadFile(`${dir}/_expected.css`) || ""; - const data = tryToLoadJson(`${dir}/data.json`); + const props = tryToLoadJson(`${dir}/data.json`) || undefined; - const rendered = $render(data); + const rendered = Component.render(props); const { html, css, head } = rendered; // rendered.toString() === rendered.html @@ -110,13 +112,13 @@ describe.only("ssr", () => { delete require.cache[resolved]; }); - const compileOptions = config.compileOptions || {}; + const compileOptions = Object.assign({ sveltePath }, config.compileOptions); require("../../register")(compileOptions); try { - const component = require(`../runtime/samples/${dir}/main.html`); - const { html } = component.render(config.data, { + const Component = require(`../runtime/samples/${dir}/main.html`).default; + const { html } = Component.render(config.data, { store: (config.store !== true) && config.store }); diff --git a/test/server-side-rendering/samples/attribute-boolean/_actual.html b/test/server-side-rendering/samples/attribute-boolean/_actual.html deleted file mode 100644 index 1536f3e1e8..0000000000 --- a/test/server-side-rendering/samples/attribute-boolean/_actual.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/test/server-side-rendering/samples/attribute-dynamic/_actual.html b/test/server-side-rendering/samples/attribute-dynamic/_actual.html deleted file mode 100644 index 8960382913..0000000000 --- a/test/server-side-rendering/samples/attribute-dynamic/_actual.html +++ /dev/null @@ -1 +0,0 @@ -
aquamarine sans-serif
\ No newline at end of file diff --git a/test/server-side-rendering/samples/attribute-static/_actual.html b/test/server-side-rendering/samples/attribute-static/_actual.html deleted file mode 100644 index 99ed594ea6..0000000000 --- a/test/server-side-rendering/samples/attribute-static/_actual.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/test/server-side-rendering/samples/comment/_actual.html b/test/server-side-rendering/samples/comment/_actual.html deleted file mode 100644 index 0dfdacc02b..0000000000 --- a/test/server-side-rendering/samples/comment/_actual.html +++ /dev/null @@ -1,3 +0,0 @@ -

before

- -

after

\ No newline at end of file diff --git a/test/server-side-rendering/samples/component-binding-renamed/_actual.html b/test/server-side-rendering/samples/component-binding-renamed/_actual.html deleted file mode 100644 index 8009a9607c..0000000000 --- a/test/server-side-rendering/samples/component-binding-renamed/_actual.html +++ /dev/null @@ -1 +0,0 @@ -1:foo:1 \ No newline at end of file diff --git a/test/server-side-rendering/samples/component-binding/_actual.html b/test/server-side-rendering/samples/component-binding/_actual.html deleted file mode 100644 index 8009a9607c..0000000000 --- a/test/server-side-rendering/samples/component-binding/_actual.html +++ /dev/null @@ -1 +0,0 @@ -1:foo:1 \ No newline at end of file diff --git a/test/server-side-rendering/samples/component-data-dynamic/_actual.html b/test/server-side-rendering/samples/component-data-dynamic/_actual.html deleted file mode 100644 index e8984936d9..0000000000 --- a/test/server-side-rendering/samples/component-data-dynamic/_actual.html +++ /dev/null @@ -1,6 +0,0 @@ -
-

foo: lol

-

baz: 42 (number)

-

qux: this is a piece of string

-

quux: core

-
\ No newline at end of file diff --git a/test/server-side-rendering/samples/component-data-empty/_actual.html b/test/server-side-rendering/samples/component-data-empty/_actual.html deleted file mode 100644 index 85fe1fe733..0000000000 --- a/test/server-side-rendering/samples/component-data-empty/_actual.html +++ /dev/null @@ -1,3 +0,0 @@ -
-

foo: ''

-
\ No newline at end of file diff --git a/test/server-side-rendering/samples/component-refs-and-attributes/_actual.html b/test/server-side-rendering/samples/component-refs-and-attributes/_actual.html deleted file mode 100644 index bc50561da1..0000000000 --- a/test/server-side-rendering/samples/component-refs-and-attributes/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

42

\ No newline at end of file diff --git a/test/server-side-rendering/samples/component-refs/_actual.html b/test/server-side-rendering/samples/component-refs/_actual.html deleted file mode 100644 index d355c1968c..0000000000 --- a/test/server-side-rendering/samples/component-refs/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

widget

\ No newline at end of file diff --git a/test/server-side-rendering/samples/component-yield/_actual.html b/test/server-side-rendering/samples/component-yield/_actual.html deleted file mode 100644 index 49139417a2..0000000000 --- a/test/server-side-rendering/samples/component-yield/_actual.html +++ /dev/null @@ -1,3 +0,0 @@ -
-

Hello

-
\ No newline at end of file diff --git a/test/server-side-rendering/samples/component/_actual.html b/test/server-side-rendering/samples/component/_actual.html deleted file mode 100644 index 88145945c3..0000000000 --- a/test/server-side-rendering/samples/component/_actual.html +++ /dev/null @@ -1,3 +0,0 @@ -
-

i am a widget

-
\ No newline at end of file diff --git a/test/server-side-rendering/samples/computed/_actual.html b/test/server-side-rendering/samples/computed/_actual.html deleted file mode 100644 index 6386593ee9..0000000000 --- a/test/server-side-rendering/samples/computed/_actual.html +++ /dev/null @@ -1,2 +0,0 @@ -

1 + 2 = 3

-

3 * 3 = 9

\ No newline at end of file diff --git a/test/server-side-rendering/samples/default-data-override/_actual.html b/test/server-side-rendering/samples/default-data-override/_actual.html deleted file mode 100644 index cfe6edcec5..0000000000 --- a/test/server-side-rendering/samples/default-data-override/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

2

\ No newline at end of file diff --git a/test/server-side-rendering/samples/default-data/_actual.html b/test/server-side-rendering/samples/default-data/_actual.html deleted file mode 100644 index 40001b6811..0000000000 --- a/test/server-side-rendering/samples/default-data/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

1

\ No newline at end of file diff --git a/test/server-side-rendering/samples/directives/_actual.html b/test/server-side-rendering/samples/directives/_actual.html deleted file mode 100644 index 13cd34a990..0000000000 --- a/test/server-side-rendering/samples/directives/_actual.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/test/server-side-rendering/samples/dynamic-text-escaped/_actual.html b/test/server-side-rendering/samples/dynamic-text-escaped/_actual.html deleted file mode 100644 index cd875b439e..0000000000 --- a/test/server-side-rendering/samples/dynamic-text-escaped/_actual.html +++ /dev/null @@ -1 +0,0 @@ -<p>this should be <em>escaped</em> & so should 'this'</p> \ No newline at end of file diff --git a/test/server-side-rendering/samples/dynamic-text/_actual.html b/test/server-side-rendering/samples/dynamic-text/_actual.html deleted file mode 100644 index 85c8829392..0000000000 --- a/test/server-side-rendering/samples/dynamic-text/_actual.html +++ /dev/null @@ -1 +0,0 @@ -it works \ No newline at end of file diff --git a/test/server-side-rendering/samples/each-block/_actual.html b/test/server-side-rendering/samples/each-block/_actual.html deleted file mode 100644 index 9f0c3c2b55..0000000000 --- a/test/server-side-rendering/samples/each-block/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

1: alligator

2: beetle

3: cuckoo

\ No newline at end of file diff --git a/test/server-side-rendering/samples/empty-elements-closed/_actual.html b/test/server-side-rendering/samples/empty-elements-closed/_actual.html deleted file mode 100644 index cb9b2cdcad..0000000000 --- a/test/server-side-rendering/samples/empty-elements-closed/_actual.html +++ /dev/null @@ -1,2 +0,0 @@ - -

\ No newline at end of file diff --git a/test/server-side-rendering/samples/entities/_actual.html b/test/server-side-rendering/samples/entities/_actual.html deleted file mode 100644 index a7d44dafd3..0000000000 --- a/test/server-side-rendering/samples/entities/_actual.html +++ /dev/null @@ -1 +0,0 @@ -it's working \ No newline at end of file diff --git a/test/server-side-rendering/samples/helpers/_actual.html b/test/server-side-rendering/samples/helpers/_actual.html deleted file mode 100644 index 4b5c34ffb9..0000000000 --- a/test/server-side-rendering/samples/helpers/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

3

\ No newline at end of file diff --git a/test/server-side-rendering/samples/if-block-false/_actual.html b/test/server-side-rendering/samples/if-block-false/_actual.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/server-side-rendering/samples/if-block-true/_actual.html b/test/server-side-rendering/samples/if-block-true/_actual.html deleted file mode 100644 index df979b8d53..0000000000 --- a/test/server-side-rendering/samples/if-block-true/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

foo is true

\ No newline at end of file diff --git a/test/server-side-rendering/samples/import-non-component/_actual.html b/test/server-side-rendering/samples/import-non-component/_actual.html deleted file mode 100644 index 9e9b43e236..0000000000 --- a/test/server-side-rendering/samples/import-non-component/_actual.html +++ /dev/null @@ -1,2 +0,0 @@ -
i got undefined problems
-
the answer is undefined
\ No newline at end of file diff --git a/test/server-side-rendering/samples/raw-mustaches/_actual.html b/test/server-side-rendering/samples/raw-mustaches/_actual.html deleted file mode 100644 index c44897a0c2..0000000000 --- a/test/server-side-rendering/samples/raw-mustaches/_actual.html +++ /dev/null @@ -1 +0,0 @@ -beforeraw html!!!\o/after \ No newline at end of file diff --git a/test/server-side-rendering/samples/static-div/_actual.html b/test/server-side-rendering/samples/static-div/_actual.html deleted file mode 100644 index 281c6866c3..0000000000 --- a/test/server-side-rendering/samples/static-div/_actual.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/test/server-side-rendering/samples/static-text/_actual.html b/test/server-side-rendering/samples/static-text/_actual.html deleted file mode 100644 index b649a9bf89..0000000000 --- a/test/server-side-rendering/samples/static-text/_actual.html +++ /dev/null @@ -1 +0,0 @@ -some text \ No newline at end of file diff --git a/test/server-side-rendering/samples/styles-nested/_actual.html b/test/server-side-rendering/samples/styles-nested/_actual.html deleted file mode 100644 index 2227662e25..0000000000 --- a/test/server-side-rendering/samples/styles-nested/_actual.html +++ /dev/null @@ -1,8 +0,0 @@ -
red
-
green: foo
- - - -
green: bar
- - diff --git a/test/server-side-rendering/samples/styles/_actual.html b/test/server-side-rendering/samples/styles/_actual.html deleted file mode 100644 index 4c164bd844..0000000000 --- a/test/server-side-rendering/samples/styles/_actual.html +++ /dev/null @@ -1 +0,0 @@ -
red
\ No newline at end of file diff --git a/test/server-side-rendering/samples/triple/_actual.html b/test/server-side-rendering/samples/triple/_actual.html deleted file mode 100644 index 924d26dd6a..0000000000 --- a/test/server-side-rendering/samples/triple/_actual.html +++ /dev/null @@ -1 +0,0 @@ -

html

\ No newline at end of file