From d13d6209edec127d12ae34af8cf018da66d1db0d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 10 May 2019 08:52:01 -0400 Subject: [PATCH] use sapper.server() in tests --- test/apps/css/src/server.js | 7 ++----- test/apps/encoding/src/server.js | 7 ++----- test/apps/errors/src/server.js | 7 ++----- test/apps/export-webpack/src/server.js | 13 +++---------- test/apps/export/src/server.js | 13 +++---------- test/apps/layout/src/server.js | 7 ++----- test/apps/preloading/src/server.js | 7 ++----- test/apps/redirects/src/server.js | 7 ++----- test/apps/scroll/src/server.js | 7 ++----- test/apps/with-sourcemaps-webpack/src/server.js | 7 ++----- test/apps/with-sourcemaps/src/server.js | 7 ++----- 11 files changed, 24 insertions(+), 65 deletions(-) diff --git a/test/apps/css/src/server.js b/test/apps/css/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/css/src/server.js +++ b/test/apps/css/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/encoding/src/server.js b/test/apps/encoding/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/encoding/src/server.js +++ b/test/apps/encoding/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/errors/src/server.js b/test/apps/errors/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/errors/src/server.js +++ b/test/apps/errors/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/export-webpack/src/server.js b/test/apps/export-webpack/src/server.js index 4ccaf34..917a0f7 100644 --- a/test/apps/export-webpack/src/server.js +++ b/test/apps/export-webpack/src/server.js @@ -1,13 +1,6 @@ -import sirv from 'sirv'; -import polka from 'polka'; import * as sapper from '@sapper/server'; +import { start } from '../../common.js'; -import { start, dev } from '../../common.js'; +const server = sapper.server(); -const app = polka() - .use( - sirv('static', { dev }), - sapper.middleware() - ); - -start(app); +start(server); diff --git a/test/apps/export/src/server.js b/test/apps/export/src/server.js index 4ccaf34..917a0f7 100644 --- a/test/apps/export/src/server.js +++ b/test/apps/export/src/server.js @@ -1,13 +1,6 @@ -import sirv from 'sirv'; -import polka from 'polka'; import * as sapper from '@sapper/server'; +import { start } from '../../common.js'; -import { start, dev } from '../../common.js'; +const server = sapper.server(); -const app = polka() - .use( - sirv('static', { dev }), - sapper.middleware() - ); - -start(app); +start(server); diff --git a/test/apps/layout/src/server.js b/test/apps/layout/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/layout/src/server.js +++ b/test/apps/layout/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/preloading/src/server.js b/test/apps/preloading/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/preloading/src/server.js +++ b/test/apps/preloading/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/redirects/src/server.js b/test/apps/redirects/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/redirects/src/server.js +++ b/test/apps/redirects/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/scroll/src/server.js b/test/apps/scroll/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/scroll/src/server.js +++ b/test/apps/scroll/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/with-sourcemaps-webpack/src/server.js b/test/apps/with-sourcemaps-webpack/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/with-sourcemaps-webpack/src/server.js +++ b/test/apps/with-sourcemaps-webpack/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server); diff --git a/test/apps/with-sourcemaps/src/server.js b/test/apps/with-sourcemaps/src/server.js index e33d804..917a0f7 100644 --- a/test/apps/with-sourcemaps/src/server.js +++ b/test/apps/with-sourcemaps/src/server.js @@ -1,9 +1,6 @@ -import polka from 'polka'; import * as sapper from '@sapper/server'; - import { start } from '../../common.js'; -const app = polka() - .use(sapper.middleware()); +const server = sapper.server(); -start(app); +start(server);