From 5e59855a1546749840a728c4a81e84e377979d5c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 7 Oct 2018 18:23:43 -0400 Subject: [PATCH] overhaul tests --- cypress.json | 9 - mocha.opts | 2 +- package-lock.json | 1764 +++-------------- package.json | 16 +- rollup.config.js | 8 +- src/cli/build.ts | 4 +- src/core/create_manifests.ts | 6 +- src/interfaces.ts | 4 +- templates/src/client/prefetch/index.ts | 8 +- templates/src/client/start/index.ts | 2 +- .../src/server/middleware/get_page_handler.ts | 69 +- test/app/.gitignore | 7 - test/app/README.md | 81 - test/app/src/client.js | 12 - test/app/src/routes/_error.html | 6 - test/app/src/routes/about.html | 19 - test/app/src/routes/blog/[slug].html | 36 - test/app/src/routes/blog/[slug].json.js | 23 - test/app/src/routes/blog/_posts.js | 151 -- test/app/src/routes/blog/index.html | 25 - test/app/src/routes/blog/index.json.js | 17 - test/app/src/routes/index.html | 31 - test/app/src/routes/missing-index/ok.html | 1 - .../src/routes/non-sapper-redirect-to.html | 1 - test/app/src/routes/throw-an-error.js | 3 - test/app/src/server.js | 126 -- test/app/src/template.html | 33 - test/app/static/favicon.png | Bin 1917 -> 0 bytes test/app/static/global.css | 45 - test/app/static/great-success.png | Bin 81921 -> 0 bytes test/app/static/manifest.json | 20 - test/app/static/svelte-logo-192.png | Bin 20180 -> 0 bytes test/app/static/svelte-logo-512.png | Bin 6448 -> 0 bytes test/app/webpack.config.js | 84 - test/apps/AppRunner.ts | 122 ++ test/apps/basics/__test__.ts | 270 +++ test/apps/basics/rollup.config.js | 64 + test/apps/basics/src/client.js | 9 + test/apps/basics/src/routes/[slug].html | 1 + test/apps/basics/src/routes/_error.html | 3 + test/apps/basics/src/routes/a.html | 1 + .../basics/src/routes/ambiguous/[slug].html | 0 .../src/routes/ambiguous/[slug].json.js | 3 + test/apps/basics/src/routes/b/index.html | 11 + test/apps/basics/src/routes/b/index.json.js | 3 + .../basics}/src/routes/const.html | 0 .../src/routes/delete-test/[id].json.js} | 0 .../basics/src/routes/delete-test/index.html} | 6 +- .../basics/src/routes/echo-query/index.html | 9 + test/apps/basics/src/routes/index.html | 7 + .../src/routes/unsafe-replacement.html | 0 test/apps/basics/src/server.js | 8 + .../basics}/src/service-worker.js | 21 +- test/apps/basics/src/template.html | 14 + test/apps/credentials/__test__.ts | 83 + test/apps/credentials/rollup.config.js | 64 + test/apps/credentials/src/client.js | 9 + test/apps/credentials/src/routes/_error.html | 3 + .../src/routes/credentials/index.html | 0 .../src/routes/credentials/test.json.js | 0 test/apps/credentials/src/routes/index.html | 3 + test/apps/credentials/src/server.js | 13 + test/apps/credentials/src/service-worker.js | 82 + test/apps/credentials/src/template.html | 14 + test/apps/encoding/__test__.ts | 92 + test/apps/encoding/rollup.config.js | 64 + test/apps/encoding/src/client.js | 9 + test/apps/encoding/src/routes/_error.html | 3 + .../src/routes/echo/page/[slug].html | 0 .../src/routes/echo/server-route/[slug].js | 0 .../encoding}/src/routes/fünke.html | 0 .../encoding}/src/routes/fünke.json.js | 0 test/apps/encoding/src/routes/index.html | 3 + test/apps/encoding/src/server.js | 8 + test/apps/encoding/src/service-worker.js | 82 + test/apps/encoding/src/template.html | 14 + test/apps/errors/__test__.ts | 137 ++ test/apps/errors/rollup.config.js | 64 + test/apps/errors/src/client.js | 9 + test/apps/errors/src/routes/_error.html | 3 + test/apps/errors/src/routes/blog/[slug].html | 19 + .../errors/src/routes/blog/[slug].json.js | 9 + test/apps/errors/src/routes/index.html | 5 + test/apps/errors/src/routes/nope.json.js | 4 + test/apps/errors/src/routes/throw.html | 7 + test/apps/errors/src/routes/throw.json.js | 3 + test/apps/errors/src/server.js | 8 + test/apps/errors/src/service-worker.js | 82 + test/apps/errors/src/template.html | 14 + test/apps/export/__test__.ts | 70 + test/apps/export/rollup.config.js | 64 + test/apps/export/src/client.js | 9 + test/apps/export/src/routes/_error.html | 3 + test/apps/export/src/routes/blog/[slug].html | 11 + .../export/src/routes/blog/[slug].json.js | 19 + test/apps/export/src/routes/blog/_posts.js | 5 + test/apps/export/src/routes/blog/index.html | 15 + .../apps/export/src/routes/blog/index.json.js | 9 + test/apps/export/src/routes/index.html | 3 + test/apps/export/src/server.js | 15 + test/apps/export/src/service-worker.js | 82 + test/apps/export/src/template.html | 14 + test/apps/export/static/global.css | 3 + test/apps/ignore/__test__.ts | 82 + test/apps/ignore/rollup.config.js | 64 + test/apps/ignore/src/client.js | 9 + test/apps/ignore/src/routes/[slug].html | 1 + test/apps/ignore/src/routes/_error.html | 3 + test/apps/ignore/src/routes/a.html | 1 + test/apps/ignore/src/routes/b/index.html | 11 + test/apps/ignore/src/routes/b/index.json.js | 3 + test/apps/ignore/src/routes/index.html | 3 + test/apps/ignore/src/server.js | 19 + test/apps/ignore/src/service-worker.js | 82 + test/apps/ignore/src/template.html | 14 + test/apps/layout/__test__.ts | 74 + test/apps/layout/rollup.config.js | 64 + test/apps/layout/src/client.js | 9 + test/apps/layout/src/routes/[slug].html | 1 + .../layout}/src/routes/[x]/[y]/[z].html | 2 +- .../layout}/src/routes/[x]/[y]/_layout.html | 0 .../layout}/src/routes/[x]/_counts.js | 0 test/apps/layout/src/routes/_error.html | 3 + test/apps/layout/src/routes/index.html | 1 + test/apps/layout/src/server.js | 8 + test/apps/layout/src/service-worker.js | 82 + test/apps/layout/src/template.html | 14 + test/apps/preloading/__test__.ts | 109 + test/apps/preloading/rollup.config.js | 64 + test/apps/preloading/src/client.js | 9 + test/apps/preloading/src/routes/_error.html | 3 + .../preloading}/src/routes/_layout.html | 0 test/apps/preloading/src/routes/foo.html | 1 + test/apps/preloading/src/routes/index.html | 4 + .../src/routes/preload-root/index.html | 0 .../routes/preload-values/custom-class.html | 0 .../src/routes/preload-values/index.html | 0 .../src/routes/preload-values/set.html | 0 .../preloading}/src/routes/slow-preload.html | 0 test/apps/preloading/src/server.js | 8 + test/apps/preloading/src/service-worker.js | 82 + test/apps/preloading/src/template.html | 14 + test/apps/redirects/__test__.ts | 117 ++ test/apps/redirects/rollup.config.js | 64 + test/apps/redirects/src/client.js | 9 + test/apps/redirects/src/routes/_error.html | 3 + test/apps/redirects/src/routes/index.html | 4 + .../redirects}/src/routes/redirect-from.html | 2 + .../src/routes/redirect-to-root.html} | 4 +- .../redirects}/src/routes/redirect-to.html | 0 test/apps/redirects/src/server.js | 8 + test/apps/redirects/src/service-worker.js | 82 + test/apps/redirects/src/template.html | 14 + test/apps/scroll/__test__.ts | 86 + test/apps/scroll/rollup.config.js | 64 + test/apps/scroll/src/client.js | 9 + test/apps/scroll/src/routes/_error.html | 3 + .../scroll/src/routes/another-tall-page.html | 1 + test/apps/scroll/src/routes/index.html | 1 + test/apps/scroll/src/routes/tall-page.html | 6 + test/apps/scroll/src/server.js | 8 + test/apps/scroll/src/service-worker.js | 82 + test/apps/scroll/src/template.html | 14 + test/apps/store/__test__.ts | 60 + test/apps/store/rollup.config.js | 64 + test/apps/store/src/client.js | 11 + test/apps/store/src/routes/_error.html | 3 + test/apps/store/src/routes/index.html | 7 + .../{app => apps/store}/src/routes/store.html | 0 test/apps/store/src/server.js | 22 + test/apps/store/src/service-worker.js | 82 + test/apps/store/src/template.html | 14 + test/apps/with-basepath/__test__.ts | 97 + test/apps/with-basepath/rollup.config.js | 64 + test/apps/with-basepath/src/client.js | 9 + .../apps/with-basepath/src/routes/_error.html | 3 + test/apps/with-basepath/src/routes/index.html | 1 + test/apps/with-basepath/src/server.js | 16 + test/apps/with-basepath/src/service-worker.js | 82 + test/apps/with-basepath/src/template.html | 14 + test/apps/with-basepath/static/global.css | 3 + test/common/test.js | 874 -------- test/utils.ts | 23 + 183 files changed, 4145 insertions(+), 3126 deletions(-) delete mode 100644 cypress.json delete mode 100644 test/app/.gitignore delete mode 100644 test/app/README.md delete mode 100644 test/app/src/client.js delete mode 100644 test/app/src/routes/_error.html delete mode 100644 test/app/src/routes/about.html delete mode 100644 test/app/src/routes/blog/[slug].html delete mode 100644 test/app/src/routes/blog/[slug].json.js delete mode 100644 test/app/src/routes/blog/_posts.js delete mode 100644 test/app/src/routes/blog/index.html delete mode 100644 test/app/src/routes/blog/index.json.js delete mode 100644 test/app/src/routes/index.html delete mode 100644 test/app/src/routes/missing-index/ok.html delete mode 100644 test/app/src/routes/non-sapper-redirect-to.html delete mode 100644 test/app/src/routes/throw-an-error.js delete mode 100644 test/app/src/server.js delete mode 100644 test/app/src/template.html delete mode 100644 test/app/static/favicon.png delete mode 100644 test/app/static/global.css delete mode 100644 test/app/static/great-success.png delete mode 100644 test/app/static/manifest.json delete mode 100644 test/app/static/svelte-logo-192.png delete mode 100644 test/app/static/svelte-logo-512.png delete mode 100644 test/app/webpack.config.js create mode 100644 test/apps/AppRunner.ts create mode 100644 test/apps/basics/__test__.ts create mode 100644 test/apps/basics/rollup.config.js create mode 100644 test/apps/basics/src/client.js create mode 100644 test/apps/basics/src/routes/[slug].html create mode 100644 test/apps/basics/src/routes/_error.html create mode 100644 test/apps/basics/src/routes/a.html create mode 100644 test/apps/basics/src/routes/ambiguous/[slug].html create mode 100644 test/apps/basics/src/routes/ambiguous/[slug].json.js create mode 100644 test/apps/basics/src/routes/b/index.html create mode 100644 test/apps/basics/src/routes/b/index.json.js rename test/{app => apps/basics}/src/routes/const.html (100%) rename test/{app/src/routes/api/delete/[id].js => apps/basics/src/routes/delete-test/[id].json.js} (100%) rename test/{app/src/routes/delete-test.html => apps/basics/src/routes/delete-test/index.html} (67%) create mode 100644 test/apps/basics/src/routes/echo-query/index.html create mode 100644 test/apps/basics/src/routes/index.html rename test/{app => apps/basics}/src/routes/unsafe-replacement.html (100%) create mode 100644 test/apps/basics/src/server.js rename test/{app => apps/basics}/src/service-worker.js (75%) create mode 100644 test/apps/basics/src/template.html create mode 100644 test/apps/credentials/__test__.ts create mode 100644 test/apps/credentials/rollup.config.js create mode 100644 test/apps/credentials/src/client.js create mode 100644 test/apps/credentials/src/routes/_error.html rename test/{app => apps/credentials}/src/routes/credentials/index.html (100%) rename test/{app => apps/credentials}/src/routes/credentials/test.json.js (100%) create mode 100644 test/apps/credentials/src/routes/index.html create mode 100644 test/apps/credentials/src/server.js create mode 100644 test/apps/credentials/src/service-worker.js create mode 100644 test/apps/credentials/src/template.html create mode 100644 test/apps/encoding/__test__.ts create mode 100644 test/apps/encoding/rollup.config.js create mode 100644 test/apps/encoding/src/client.js create mode 100644 test/apps/encoding/src/routes/_error.html rename test/{app => apps/encoding}/src/routes/echo/page/[slug].html (100%) rename test/{app => apps/encoding}/src/routes/echo/server-route/[slug].js (100%) rename test/{app => apps/encoding}/src/routes/fünke.html (100%) rename test/{app => apps/encoding}/src/routes/fünke.json.js (100%) create mode 100644 test/apps/encoding/src/routes/index.html create mode 100644 test/apps/encoding/src/server.js create mode 100644 test/apps/encoding/src/service-worker.js create mode 100644 test/apps/encoding/src/template.html create mode 100644 test/apps/errors/__test__.ts create mode 100644 test/apps/errors/rollup.config.js create mode 100644 test/apps/errors/src/client.js create mode 100644 test/apps/errors/src/routes/_error.html create mode 100644 test/apps/errors/src/routes/blog/[slug].html create mode 100644 test/apps/errors/src/routes/blog/[slug].json.js create mode 100644 test/apps/errors/src/routes/index.html create mode 100644 test/apps/errors/src/routes/nope.json.js create mode 100644 test/apps/errors/src/routes/throw.html create mode 100644 test/apps/errors/src/routes/throw.json.js create mode 100644 test/apps/errors/src/server.js create mode 100644 test/apps/errors/src/service-worker.js create mode 100644 test/apps/errors/src/template.html create mode 100644 test/apps/export/__test__.ts create mode 100644 test/apps/export/rollup.config.js create mode 100644 test/apps/export/src/client.js create mode 100644 test/apps/export/src/routes/_error.html create mode 100644 test/apps/export/src/routes/blog/[slug].html create mode 100644 test/apps/export/src/routes/blog/[slug].json.js create mode 100644 test/apps/export/src/routes/blog/_posts.js create mode 100644 test/apps/export/src/routes/blog/index.html create mode 100644 test/apps/export/src/routes/blog/index.json.js create mode 100644 test/apps/export/src/routes/index.html create mode 100644 test/apps/export/src/server.js create mode 100644 test/apps/export/src/service-worker.js create mode 100644 test/apps/export/src/template.html create mode 100644 test/apps/export/static/global.css create mode 100644 test/apps/ignore/__test__.ts create mode 100644 test/apps/ignore/rollup.config.js create mode 100644 test/apps/ignore/src/client.js create mode 100644 test/apps/ignore/src/routes/[slug].html create mode 100644 test/apps/ignore/src/routes/_error.html create mode 100644 test/apps/ignore/src/routes/a.html create mode 100644 test/apps/ignore/src/routes/b/index.html create mode 100644 test/apps/ignore/src/routes/b/index.json.js create mode 100644 test/apps/ignore/src/routes/index.html create mode 100644 test/apps/ignore/src/server.js create mode 100644 test/apps/ignore/src/service-worker.js create mode 100644 test/apps/ignore/src/template.html create mode 100644 test/apps/layout/__test__.ts create mode 100644 test/apps/layout/rollup.config.js create mode 100644 test/apps/layout/src/client.js create mode 100644 test/apps/layout/src/routes/[slug].html rename test/{app => apps/layout}/src/routes/[x]/[y]/[z].html (87%) rename test/{app => apps/layout}/src/routes/[x]/[y]/_layout.html (100%) rename test/{app => apps/layout}/src/routes/[x]/_counts.js (100%) create mode 100644 test/apps/layout/src/routes/_error.html create mode 100644 test/apps/layout/src/routes/index.html create mode 100644 test/apps/layout/src/server.js create mode 100644 test/apps/layout/src/service-worker.js create mode 100644 test/apps/layout/src/template.html create mode 100644 test/apps/preloading/__test__.ts create mode 100644 test/apps/preloading/rollup.config.js create mode 100644 test/apps/preloading/src/client.js create mode 100644 test/apps/preloading/src/routes/_error.html rename test/{app => apps/preloading}/src/routes/_layout.html (100%) create mode 100644 test/apps/preloading/src/routes/foo.html create mode 100644 test/apps/preloading/src/routes/index.html rename test/{app => apps/preloading}/src/routes/preload-root/index.html (100%) rename test/{app => apps/preloading}/src/routes/preload-values/custom-class.html (100%) rename test/{app => apps/preloading}/src/routes/preload-values/index.html (100%) rename test/{app => apps/preloading}/src/routes/preload-values/set.html (100%) rename test/{app => apps/preloading}/src/routes/slow-preload.html (100%) create mode 100644 test/apps/preloading/src/server.js create mode 100644 test/apps/preloading/src/service-worker.js create mode 100644 test/apps/preloading/src/template.html create mode 100644 test/apps/redirects/__test__.ts create mode 100644 test/apps/redirects/rollup.config.js create mode 100644 test/apps/redirects/src/client.js create mode 100644 test/apps/redirects/src/routes/_error.html create mode 100644 test/apps/redirects/src/routes/index.html rename test/{app => apps/redirects}/src/routes/redirect-from.html (80%) rename test/{app/src/routes/redirect-root.html => apps/redirects/src/routes/redirect-to-root.html} (70%) rename test/{app => apps/redirects}/src/routes/redirect-to.html (100%) create mode 100644 test/apps/redirects/src/server.js create mode 100644 test/apps/redirects/src/service-worker.js create mode 100644 test/apps/redirects/src/template.html create mode 100644 test/apps/scroll/__test__.ts create mode 100644 test/apps/scroll/rollup.config.js create mode 100644 test/apps/scroll/src/client.js create mode 100644 test/apps/scroll/src/routes/_error.html create mode 100644 test/apps/scroll/src/routes/another-tall-page.html create mode 100644 test/apps/scroll/src/routes/index.html create mode 100644 test/apps/scroll/src/routes/tall-page.html create mode 100644 test/apps/scroll/src/server.js create mode 100644 test/apps/scroll/src/service-worker.js create mode 100644 test/apps/scroll/src/template.html create mode 100644 test/apps/store/__test__.ts create mode 100644 test/apps/store/rollup.config.js create mode 100644 test/apps/store/src/client.js create mode 100644 test/apps/store/src/routes/_error.html create mode 100644 test/apps/store/src/routes/index.html rename test/{app => apps/store}/src/routes/store.html (100%) create mode 100644 test/apps/store/src/server.js create mode 100644 test/apps/store/src/service-worker.js create mode 100644 test/apps/store/src/template.html create mode 100644 test/apps/with-basepath/__test__.ts create mode 100644 test/apps/with-basepath/rollup.config.js create mode 100644 test/apps/with-basepath/src/client.js create mode 100644 test/apps/with-basepath/src/routes/_error.html create mode 100644 test/apps/with-basepath/src/routes/index.html create mode 100644 test/apps/with-basepath/src/server.js create mode 100644 test/apps/with-basepath/src/service-worker.js create mode 100644 test/apps/with-basepath/src/template.html create mode 100644 test/apps/with-basepath/static/global.css delete mode 100644 test/common/test.js create mode 100644 test/utils.ts diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 7288d9f..0000000 --- a/cypress.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "baseUrl": "http://localhost:3000", - "videoRecording": false, - "fixturesFolder": "test/cypress/fixtures", - "integrationFolder": "test/cypress/integration", - "pluginsFile": false, - "screenshotsFolder": "test/cypress/screenshots", - "supportFile": "test/cypress/support/index.js" -} diff --git a/mocha.opts b/mocha.opts index 985f08b..e793278 100644 --- a/mocha.opts +++ b/mocha.opts @@ -2,4 +2,4 @@ --require ts-node/register --recursive test/unit/*/*.ts -test/common/test.js \ No newline at end of file +test/apps/*/__test__.ts \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 568af3a..8a86dca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sapper", - "version": "0.22.3", + "version": "0.22.10", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10,6 +10,12 @@ "integrity": "sha1-MU+BaPUK5IoDLP2tX9tDb0ZKl6w=", "dev": true }, + "@polka/url": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-0.5.0.tgz", + "integrity": "sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==", + "dev": true + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -55,11 +61,20 @@ "dev": true }, "@types/node": { - "version": "10.11.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz", - "integrity": "sha512-3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ==", + "version": "10.11.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz", + "integrity": "sha512-ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==", "dev": true }, + "@types/puppeteer": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-1.9.0.tgz", + "integrity": "sha512-ZP3wL4Lqpgu4xZbz/0vQhbIZnllNEawVW3oTpEXyJg+uhf/YQgL8oeTrfoUwj9JXE9UUe53eqmgLl29/d2gjqQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/rimraf": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.2.tgz", @@ -254,16 +269,6 @@ "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==", "dev": true }, - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "dev": true, - "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" - } - }, "acorn": { "version": "5.7.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", @@ -318,6 +323,15 @@ } } }, + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", @@ -682,18 +696,6 @@ "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", "dev": true }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, "array-map": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", @@ -733,15 +735,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, "asn1.js": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", @@ -779,12 +772,6 @@ } } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -797,10 +784,10 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", "dev": true }, "atob": { @@ -809,18 +796,6 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true - }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -935,16 +910,6 @@ "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "big.js": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", @@ -969,32 +934,6 @@ "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "dev": true }, - "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.1", - "http-errors": "~1.6.2", - "iconv-lite": "0.4.19", - "on-finished": "~2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "~1.6.15" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - } - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1133,12 +1072,6 @@ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, "cacache": { "version": "10.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", @@ -1209,28 +1142,6 @@ "upper-case": "^1.1.1" } }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chalk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", @@ -1476,24 +1387,12 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -1519,15 +1418,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "commander": { "version": "2.17.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", @@ -1551,30 +1441,6 @@ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true }, - "compressible": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", - "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", - "dev": true, - "requires": { - "mime-db": ">= 1.36.0 < 2" - } - }, - "compression": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", - "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.14", - "debug": "2.6.9", - "on-headers": "~1.0.1", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - } - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1614,30 +1480,12 @@ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true }, - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, "cookie": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -1731,30 +1579,12 @@ "randomfill": "^1.0.3" } }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -1770,48 +1600,18 @@ "ms": "2.0.0" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "deep-defaults": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/deep-defaults/-/deep-defaults-1.0.5.tgz", - "integrity": "sha512-5ev/sNkiHTmeTqbDJEDgdQa/Ub0eOMQNix9l+dLLGbwOos7/in5HdvHXI014wqxsET4YeJG9Eq4qj0PJRL8rSw==", - "dev": true, - "requires": { - "lodash": "^4.17.5" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "^1.0.2" - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -1897,18 +1697,6 @@ "rimraf": "^2.2.8" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, "des.js": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", @@ -1919,12 +1707,6 @@ "minimalistic-assert": "^1.0.0" } }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, "devalue": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/devalue/-/devalue-1.0.4.tgz", @@ -1981,67 +1763,6 @@ "stream-shift": "^1.0.0" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "optional": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "electron": { - "version": "1.8.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.8.tgz", - "integrity": "sha512-1f9zJehcTTGjrkb06o6ds+gsRq6SYhZJyxOk6zIWjRH8hVy03y/RzUDELzNas71f5vcvXmfGVvyjeEsadDI8tg==", - "dev": true, - "requires": { - "@types/node": "^8.0.24", - "electron-download": "^3.0.1", - "extract-zip": "^1.0.3" - }, - "dependencies": { - "@types/node": { - "version": "8.10.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz", - "integrity": "sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==", - "dev": true - } - } - }, - "electron-download": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", - "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", - "dev": true, - "requires": { - "debug": "^2.2.0", - "fs-extra": "^0.30.0", - "home-path": "^1.0.1", - "minimist": "^1.2.0", - "nugget": "^2.0.0", - "path-exists": "^2.1.0", - "rc": "^1.1.2", - "semver": "^5.3.0", - "sumchecker": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "elliptic": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", @@ -2063,12 +1784,6 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true - }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -2089,29 +1804,6 @@ "tapable": "^1.0.0" } }, - "enqueue": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/enqueue/-/enqueue-1.0.2.tgz", - "integrity": "sha1-kBTpvOVw7pPKlubI5jrVTBkra8g=", - "dev": true, - "requires": { - "sliced": "0.0.5" - }, - "dependencies": { - "sliced": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz", - "integrity": "sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8=", - "dev": true - } - } - }, - "ensure-posix-path": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz", - "integrity": "sha1-pls+QtC3HPxYXrd0+ZQ8jZuRsMI=", - "dev": true - }, "errno": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", @@ -2160,11 +1852,14 @@ "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==", "dev": true }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "requires": { + "es6-promise": "^4.0.3" + } }, "escape-string-regexp": { "version": "1.0.5", @@ -2353,12 +2048,6 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, "event-stream": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz", @@ -2409,58 +2098,6 @@ "fill-range": "^2.1.0" } }, - "express": { - "version": "4.16.3", - "resolved": "http://registry.npmjs.org/express/-/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "array-flatten": "1.1.1", - "body-parser": "1.18.2", - "content-disposition": "0.5.2", - "content-type": "~1.0.4", - "cookie": "0.3.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.1.1", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.3", - "qs": "6.5.1", - "range-parser": "~1.2.0", - "safe-buffer": "5.1.1", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", @@ -2514,12 +2151,6 @@ "yauzl": "2.4.1" } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, "fast-deep-equal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", @@ -2585,21 +2216,6 @@ "repeat-string": "^1.5.2" } }, - "finalhandler": { - "version": "1.1.1", - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", - "unpipe": "~1.0.0" - } - }, "find-cache-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", @@ -2654,9 +2270,9 @@ } }, "flatmap-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz", - "integrity": "sha512-Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz", + "integrity": "sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==", "dev": true }, "flush-write-stream": { @@ -2684,40 +2300,6 @@ "for-in": "^1.0.1" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "1.0.6", - "mime-types": "^2.1.12" - }, - "dependencies": { - "combined-stream": { - "version": "1.0.6", - "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - } - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -2727,12 +2309,6 @@ "map-cache": "^0.2.2" } }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, "from": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", @@ -2749,19 +2325,6 @@ "readable-stream": "^2.0.0" } }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", @@ -2793,24 +2356,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", "dev": true, "optional": true, "requires": { @@ -2820,12 +2387,14 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -2834,34 +2403,40 @@ }, "chownr": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -2870,25 +2445,29 @@ }, "deep-extend": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -2897,13 +2476,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -2919,7 +2500,8 @@ }, "glob": { "version": "7.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "optional": true, "requires": { @@ -2933,13 +2515,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.21", - "bundled": true, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", + "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", "dev": true, "optional": true, "requires": { @@ -2948,7 +2532,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -2957,7 +2542,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -2967,18 +2553,21 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { "number-is-nan": "^1.0.0" @@ -2986,13 +2575,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -3000,12 +2591,14 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "minipass": { "version": "2.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz", + "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", "dev": true, "requires": { "safe-buffer": "^5.1.1", @@ -3014,7 +2607,8 @@ }, "minizlib": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", + "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", "dev": true, "optional": true, "requires": { @@ -3023,7 +2617,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -3031,13 +2626,15 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz", + "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==", "dev": true, "optional": true, "requires": { @@ -3048,7 +2645,8 @@ }, "node-pre-gyp": { "version": "0.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz", + "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==", "dev": true, "optional": true, "requires": { @@ -3066,7 +2664,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -3076,13 +2675,15 @@ }, "npm-bundled": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", + "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.1.10", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", + "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", "dev": true, "optional": true, "requires": { @@ -3092,7 +2693,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -3104,18 +2706,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" @@ -3123,19 +2728,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -3145,19 +2753,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "dev": true, "optional": true, "requires": { @@ -3169,7 +2780,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -3177,7 +2789,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -3192,7 +2805,8 @@ }, "rimraf": { "version": "2.6.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "optional": true, "requires": { @@ -3201,42 +2815,49 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.5.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "^1.0.0", @@ -3246,7 +2867,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -3255,7 +2877,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { "ansi-regex": "^2.0.0" @@ -3263,13 +2886,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz", + "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==", "dev": true, "optional": true, "requires": { @@ -3284,13 +2909,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", "dev": true, "optional": true, "requires": { @@ -3299,12 +2926,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "yallist": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", "dev": true } } @@ -3315,39 +2944,18 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "function-source": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/function-source/-/function-source-0.1.0.tgz", - "integrity": "sha1-2RBL8+RniLVUaMAr8bL6vPj8Ga8=", - "dev": true - }, "functional-red-black-tree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", @@ -3382,9 +2990,9 @@ } }, "globals": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", - "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", + "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==", "dev": true }, "globalyzer": { @@ -3425,22 +3033,6 @@ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", - "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", - "dev": true, - "requires": { - "ajv": "^5.3.0", - "har-schema": "^2.0.0" - } - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3567,12 +3159,6 @@ "minimalistic-crypto-utils": "^1.0.1" } }, - "home-path": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz", - "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==", - "dev": true - }, "hosted-git-info": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", @@ -3593,35 +3179,39 @@ "uglify-js": "3.4.x" } }, - "http-errors": { - "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "https-proxy-agent": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", + "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "dev": true, + "requires": { + "agent-base": "^4.1.0", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz", + "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3655,15 +3245,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -3686,12 +3267,6 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", @@ -3714,12 +3289,6 @@ "through": "^2.3.6" } }, - "ipaddr.js": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", - "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=", - "dev": true - }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -3826,15 +3395,6 @@ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -3948,18 +3508,6 @@ "has-symbols": "^1.0.0" } }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -3987,12 +3535,6 @@ "isarray": "1.0.0" } }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", @@ -4009,31 +3551,12 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, - "optional": true - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", @@ -4046,51 +3569,18 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "json5": { "version": "0.5.1", "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, - "jsonfile": { - "version": "2.4.0", - "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", "dev": true }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "keypress": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz", - "integrity": "sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo=", - "dev": true - }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -4100,15 +3590,6 @@ "is-buffer": "^1.1.5" } }, - "klaw": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.9" - } - }, "kleur": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz", @@ -4184,16 +3665,6 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, "lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", @@ -4247,12 +3718,6 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, "map-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", @@ -4268,15 +3733,6 @@ "object-visit": "^1.0.0" } }, - "matcher-collection": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz", - "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==", - "dev": true, - "requires": { - "minimatch": "^3.0.2" - } - }, "matchit": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/matchit/-/matchit-1.0.6.tgz", @@ -4293,21 +3749,16 @@ "dev": true }, "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -4324,98 +3775,6 @@ "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", "dev": true }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "load-json-file": { - "version": "1.1.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", @@ -4447,27 +3806,6 @@ "brorand": "^1.0.1" } }, - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true - }, - "mime-db": { - "version": "1.36.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz", - "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==", - "dev": true - }, - "mime-types": { - "version": "2.1.20", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz", - "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==", - "dev": true, - "requires": { - "mime-db": "~1.36.0" - } - }, "mimic-fn": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", @@ -4501,26 +3839,6 @@ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, - "minstache": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minstache/-/minstache-1.2.0.tgz", - "integrity": "sha1-/xzEA6woRPaNvxjGYhKb5+sO/EE=", - "dev": true, - "requires": { - "commander": "1.0.4" - }, - "dependencies": { - "commander": { - "version": "1.0.4", - "resolved": "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz", - "integrity": "sha1-Xt6xruI8T7VBprcNaSq+8ZZpotM=", - "dev": true, - "requires": { - "keypress": "0.1.x" - } - } - } - }, "mississippi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", @@ -4672,15 +3990,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "multiline": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/multiline/-/multiline-1.0.2.tgz", - "integrity": "sha1-abHyX/B00oKJBPJE3dBrfZbvbJM=", - "dev": true, - "requires": { - "strip-indent": "^1.0.0" - } - }, "mute-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", @@ -4739,12 +4048,6 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", - "dev": true - }, "neo-async": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.2.tgz", @@ -4757,28 +4060,6 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "nightmare": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nightmare/-/nightmare-3.0.1.tgz", - "integrity": "sha512-WptvyPfp5mHRRYHzt6+4xazaR9cc437BuLJI6cLFnqwwgxgdtsFImfBVDeTUCPAeLrkp5VryX5jlw7Wwg+UnFQ==", - "dev": true, - "requires": { - "debug": "^2.2.0", - "deep-defaults": "^1.0.3", - "defaults": "^1.0.2", - "electron": "^1.8.4", - "enqueue": "^1.0.2", - "function-source": "^0.1.0", - "jsesc": "^0.5.0", - "minstache": "^1.2.0", - "mkdirp": "^0.5.1", - "multiline": "^1.0.2", - "once": "^1.3.3", - "rimraf": "^2.4.3", - "sliced": "1.0.1", - "split2": "^2.0.1" - } - }, "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", @@ -4934,51 +4215,6 @@ } } }, - "nugget": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz", - "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=", - "dev": true, - "requires": { - "debug": "^2.1.3", - "minimist": "^1.1.0", - "pretty-bytes": "^1.0.2", - "progress-stream": "^1.1.0", - "request": "^2.45.0", - "single-line-log": "^1.1.2", - "throttleit": "0.0.2" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "pretty-bytes": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", - "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1", - "meow": "^3.1.0" - } - } - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -5007,12 +4243,6 @@ } } }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", - "dev": true - }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -5057,21 +4287,6 @@ } } }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5271,12 +4486,6 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, "path-type": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", @@ -5314,12 +4523,6 @@ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", "dev": true }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -5423,31 +4626,17 @@ "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", "dev": true }, - "progress-stream": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz", - "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=", - "dev": true, - "requires": { - "speedometer": "~0.1.2", - "through2": "~0.2.3" - } - }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "proxy-addr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", - "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", - "dev": true, - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.8.0" - } + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=", + "dev": true }, "prr": { "version": "1.0.1", @@ -5470,23 +4659,18 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, - "psl": { - "version": "1.1.29", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", - "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==", - "dev": true - }, "public-encrypt": { - "version": "4.0.2", - "resolved": "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", - "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { "bn.js": "^4.1.0", "browserify-rsa": "^4.0.0", "create-hash": "^1.1.0", "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1" + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "pump": { @@ -5516,11 +4700,44 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true + "puppeteer": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.9.0.tgz", + "integrity": "sha512-GH4PmhJf9wBRAPvtJkEJLAvdNNOofZortmBZSj8cGWYni98GUFqsf66blOEfJbo5B8l0KG5HR2d/W2MejnUrzg==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "extract-zip": "^1.6.6", + "https-proxy-agent": "^2.2.1", + "mime": "^2.0.3", + "progress": "^2.0.0", + "proxy-from-env": "^1.0.0", + "rimraf": "^2.6.1", + "ws": "^5.1.1" + }, + "dependencies": { + "debug": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz", + "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "mime": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", + "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", + "dev": true + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } + } }, "querystring": { "version": "0.2.0", @@ -5578,76 +4795,6 @@ "safe-buffer": "^5.1.0" } }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", - "dev": true - }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - }, - "dependencies": { - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": ">= 1.3.1 < 2" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", - "dev": true - } - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "read-pkg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", @@ -5982,16 +5129,6 @@ } } }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", @@ -6013,7 +5150,7 @@ }, "regexpp": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", "dev": true }, @@ -6040,51 +5177,6 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - } - } - }, "require-relative": { "version": "0.8.7", "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz", @@ -6207,6 +5299,17 @@ } } }, + "rollup-plugin-replace": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.0.0.tgz", + "integrity": "sha512-pK9mTd/FNrhtBxcTBXoh0YOwRIShV0gGhv9qvUtNcXHxIMRZMXqfiZKVBmCRGp8/2DJRy62z2JUE7/5tP6WxOQ==", + "dev": true, + "requires": { + "magic-string": "^0.22.4", + "minimatch": "^3.0.2", + "rollup-pluginutils": "^2.0.1" + } + }, "rollup-plugin-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/rollup-plugin-string/-/rollup-plugin-string-2.0.2.tgz", @@ -6234,6 +5337,17 @@ } } }, + "rollup-plugin-svelte": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-4.3.2.tgz", + "integrity": "sha512-aGFuB+hc9c5pmPCgnXiJCbRwrDw7sdPia+WBRKTMEwVv3ygiSOi5gIlGHIPRMvMisioOk0ns5Bu5Gz57JxEZTg==", + "dev": true, + "requires": { + "require-relative": "^0.8.7", + "rollup-pluginutils": "^2.3.0", + "sourcemap-codec": "^1.4.1" + } + }, "rollup-plugin-typescript": { "version": "0.8.1", "resolved": "http://registry.npmjs.org/rollup-plugin-typescript/-/rollup-plugin-typescript-0.8.1.tgz", @@ -6410,45 +5524,12 @@ "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==", "dev": true }, - "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" - } - }, "serialize-javascript": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", "dev": true }, - "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" - } - }, "set-value": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", @@ -6478,12 +5559,6 @@ "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", "dev": true }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, "sha.js": { "version": "2.4.11", "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", @@ -6532,43 +5607,22 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "single-line-log": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz", - "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=", + "sirv": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.2.2.tgz", + "integrity": "sha512-X0UjfTc32MeK+rkhgdQK/blQ5ysC0CfLF9OH9d8x2RnpaD2D5BDLMeox79utmhxai4T+/VCahK5pDgAEnG/tNQ==", "dev": true, "requires": { - "string-width": "^1.0.1" + "@polka/url": "^0.5.0", + "mime": "^2.3.1", + "tiny-glob": "^0.2.0" }, "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } + "mime": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", + "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", + "dev": true } } }, @@ -6581,12 +5635,6 @@ "is-fullwidth-code-point": "^2.0.0" } }, - "sliced": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", - "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=", - "dev": true - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -6746,9 +5794,9 @@ "integrity": "sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==" }, "spdx-correct": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz", - "integrity": "sha512-hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz", + "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==", "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", @@ -6756,9 +5804,9 @@ } }, "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", "dev": true }, "spdx-expression-parse": { @@ -6777,12 +5825,6 @@ "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==", "dev": true }, - "speedometer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz", - "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=", - "dev": true - }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -6801,56 +5843,12 @@ "extend-shallow": "^3.0.0" } }, - "split2": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz", - "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==", - "dev": true, - "requires": { - "through2": "^2.0.2" - }, - "dependencies": { - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - } - } - }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "ssri": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", @@ -6881,12 +5879,6 @@ } } }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true - }, "stream-browserify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", @@ -7002,31 +5994,12 @@ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, - "sumchecker": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", - "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", - "dev": true, - "requires": { - "debug": "^2.2.0", - "es6-promise": "^4.0.5" - } - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -7082,54 +6055,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "throttleit": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", - "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=", - "dev": true - }, "through": { "version": "2.3.8", "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, - "through2": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", - "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", - "dev": true, - "requires": { - "readable-stream": "~1.1.9", - "xtend": "~2.1.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, "timers-browserify": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", @@ -7212,22 +6143,6 @@ } } }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - } - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, "trouter": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/trouter/-/trouter-1.1.0.tgz", @@ -7272,22 +6187,6 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, - "optional": true - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -7297,16 +6196,6 @@ "prelude-ls": "~1.1.2" } }, - "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.18" - } - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -7415,12 +6304,6 @@ "imurmurhash": "^0.1.4" } }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -7540,18 +6423,6 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -7562,23 +6433,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vlq": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz", @@ -7594,16 +6448,6 @@ "indexof": "0.0.1" } }, - "walk-sync": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.3.tgz", - "integrity": "sha512-jQgTHmCazUngGqvHZFlr30u2VLKEKErBMLFe+fBl5mn4rh9aI/QVRog8PT1hv2vaOu4EBwigfmpRTyZrbnpRVA==", - "dev": true, - "requires": { - "ensure-posix-path": "^1.0.0", - "matcher-collection": "^1.0.0" - } - }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", @@ -8021,13 +6865,13 @@ "mkdirp": "^0.5.1" } }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "ws": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", + "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", "dev": true, "requires": { - "object-keys": "~0.4.0" + "async-limiter": "~1.0.0" } }, "y18n": { diff --git a/package.json b/package.json index 24c46c8..528ff2a 100644 --- a/package.json +++ b/package.json @@ -25,58 +25,56 @@ "tslib": "^1.9.1" }, "devDependencies": { - "@types/glob": "^5.0.34", "@types/mkdirp": "^0.5.2", "@types/mocha": "^5.2.5", "@types/node": "^10.7.1", + "@types/puppeteer": "^1.9.0", "@types/rimraf": "^2.0.2", "agadoo": "^1.0.1", "cheap-watch": "^0.3.0", - "compression": "^1.7.1", "cookie": "^0.3.1", "devalue": "^1.0.4", "eslint": "^4.13.1", "eslint-plugin-import": "^2.12.0", - "express": "^4.16.3", "kleur": "^2.0.1", "mkdirp": "^0.5.1", "mocha": "^5.2.0", - "nightmare": "^3.0.0", "node-fetch": "^2.1.1", "npm-run-all": "^4.1.3", "polka": "^0.4.0", "port-authority": "^1.0.5", "pretty-bytes": "^5.0.0", "pretty-ms": "^3.1.0", + "puppeteer": "^1.9.0", "require-relative": "^0.8.7", "rimraf": "^2.6.2", "rollup": "^0.65.0", "rollup-plugin-commonjs": "^9.1.3", "rollup-plugin-json": "^3.0.0", - "rollup-plugin-node-resolve": "^3.3.0", + "rollup-plugin-node-resolve": "^3.4.0", + "rollup-plugin-replace": "^2.0.0", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-svelte": "^4.3.2", "rollup-plugin-typescript": "^0.8.1", "sade": "^1.4.1", "sander": "^0.6.0", - "serve-static": "^1.13.2", + "sirv": "^0.2.2", "svelte": "^2.6.3", "svelte-loader": "^2.9.0", "tiny-glob": "^0.2.2", "ts-node": "^7.0.1", "typescript": "^2.8.3", - "walk-sync": "^0.3.2", "webpack": "^4.8.3", "webpack-format-messages": "^2.0.1" }, "scripts": { - "cy:open": "cypress open", "test": "mocha --opts mocha.opts", "pretest": "npm run build", "build": "rm -rf dist && rollup -c", "prepare": "npm run build", "dev": "rollup -cw", "prepublishOnly": "npm test", - "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > src/middleware/mime-types.md" + "update_mime_types": "curl http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types | grep -e \"^[^#]\" > templates/src/server/middleware/mime-types.md" }, "repository": "https://github.com/sveltejs/sapper", "keywords": [ diff --git a/rollup.config.js b/rollup.config.js index 22c13b8..8fd7c4b 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -12,7 +12,7 @@ const external = [].concat( 'sapper/core.js' ); -function template(kind, external) { +function template(kind, external, target) { return { input: `templates/src/${kind}/index.ts`, output: { @@ -28,15 +28,15 @@ function template(kind, external) { }), typescript({ typescript: require('typescript'), - target: "ES2017" + target }) ] }; } export default [ - template('client', ['__ROOT__', '__ERROR__']), - template('server', builtinModules), + template('client', ['__ROOT__', '__ERROR__'], 'ES2017'), + template('server', builtinModules, 'ES2015'), { input: [ diff --git a/src/cli/build.ts b/src/cli/build.ts index 5f47eb1..20051bb 100644 --- a/src/cli/build.ts +++ b/src/cli/build.ts @@ -19,9 +19,7 @@ export function build(opts: { bundler?: string, legacy?: boolean }) { }, { dest: locations.dest(), src: locations.src(), - routes: locations.routes(), - webpack: 'webpack', - rollup: 'rollup' + routes: locations.routes() }); emitter.on('build', event => { diff --git a/src/core/create_manifests.ts b/src/core/create_manifests.ts index a71ae52..6354dfb 100644 --- a/src/core/create_manifests.ts +++ b/src/core/create_manifests.ts @@ -10,7 +10,7 @@ export function create_main_manifests({ bundler, manifest_data, dev_port }: { manifest_data: ManifestData; dev_port?: number; }) { - const manifest_dir = '__sapper__'; + const manifest_dir = path.resolve('__sapper__'); if (!fs.existsSync(manifest_dir)) fs.mkdirSync(manifest_dir); const path_to_routes = path.relative(manifest_dir, locations.routes()); @@ -19,7 +19,7 @@ export function create_main_manifests({ bundler, manifest_data, dev_port }: { const server_manifest = generate_server(manifest_data, path_to_routes); write_if_changed( - `${manifest_dir}/default-layout.html`, + `${manifest_dir}/_layout.html`, `` ); write_if_changed(`${manifest_dir}/client.js`, client_manifest); @@ -218,7 +218,7 @@ function generate_server( function get_file(path_to_routes: string, component: PageComponent) { if (component.default) { - return `./default-layout.html`; + return `./_layout.html`; } return posixify(`${path_to_routes}/${component.file}`); diff --git a/src/interfaces.ts b/src/interfaces.ts index a123903..7776f5c 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -44,9 +44,7 @@ export type ServerRoute = { export type Dirs = { dest: string, src: string, - routes: string, - webpack: string, - rollup: string + routes: string }; export type ManifestData = { diff --git a/templates/src/client/prefetch/index.ts b/templates/src/client/prefetch/index.ts index 4b601d2..cd22c63 100644 --- a/templates/src/client/prefetch/index.ts +++ b/templates/src/client/prefetch/index.ts @@ -4,7 +4,11 @@ import { Target } from '../types'; export default function prefetch(href: string) { const target: Target = select_route(new URL(href, document.baseURI)); - if (target && (!prefetching || href !== prefetching.href)) { - set_prefetching(href, prepare_page(target)); + if (target) { + if (!prefetching || href !== prefetching.href) { + set_prefetching(href, prepare_page(target)); + } + + return prefetching.promise; } } \ No newline at end of file diff --git a/templates/src/client/start/index.ts b/templates/src/client/start/index.ts index 4d64506..17979a3 100644 --- a/templates/src/client/start/index.ts +++ b/templates/src/client/start/index.ts @@ -103,7 +103,7 @@ function handle_click(event: MouseEvent) { const target = select_route(url); if (target) { - const noscroll = a.hasAttribute('sapper-noscroll') + const noscroll = a.hasAttribute('sapper-noscroll'); navigate(target, null, noscroll); event.preventDefault(); history.pushState({ id: cid }, '', url.href); diff --git a/templates/src/server/middleware/get_page_handler.ts b/templates/src/server/middleware/get_page_handler.ts index 421a2d1..c2049f2 100644 --- a/templates/src/server/middleware/get_page_handler.ts +++ b/templates/src/server/middleware/get_page_handler.ts @@ -33,7 +33,7 @@ export function get_page_handler( }, req, res, statusCode, error || new Error('Unknown error in preload function')); } - function handle_page(page: Page, req: Req, res: Res, status = 200, error: Error | string = null) { + async function handle_page(page: Page, req: Req, res: Res, status = 200, error: Error | string = null) { const build_info: { bundler: 'rollup' | 'webpack', shimport: string | null, @@ -56,12 +56,22 @@ export function get_page_handler( }); } - const link = preloaded_chunks - .filter(file => file && !file.match(/\.map$/)) - .map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`) - .join(', '); + if (build_info.bundler === 'rollup') { + // TODO add dependencies and CSS + const link = preloaded_chunks + .filter(file => file && !file.match(/\.map$/)) + .map(file => `<${req.baseUrl}/client/${file}>;rel="modulepreload"`) + .join(', '); - res.setHeader('Link', link); + res.setHeader('Link', link); + } else { + const link = preloaded_chunks + .filter(file => file && !file.match(/\.map$/)) + .map(file => `<${req.baseUrl}/client/${file}>;rel="preload";as="script"`) + .join(', '); + + res.setHeader('Link', link); + } const store = store_getter ? store_getter(req, res) : null; @@ -118,30 +128,37 @@ export function get_page_handler( store }; - const root_preloaded = manifest.root.preload - ? manifest.root.preload.call(preload_context, { - path: req.path, - query: req.query, - params: {} - }) - : {}; + let preloaded; + let match; - const match = error ? null : page.pattern.exec(req.path); - - Promise.all([root_preloaded].concat(page.parts.map(part => { - if (!part) return null; - - return part.component.preload - ? part.component.preload.call(preload_context, { + try { + const root_preloaded = manifest.root.preload + ? manifest.root.preload.call(preload_context, { path: req.path, query: req.query, - params: part.params ? part.params(match) : {} + params: {} }) : {}; - }))).catch(err => { + + match = error ? null : page.pattern.exec(req.path); + + preloaded = await Promise.all([root_preloaded].concat(page.parts.map(part => { + if (!part) return null; + + return part.component.preload + ? part.component.preload.call(preload_context, { + path: req.path, + query: req.query, + params: part.params ? part.params(match) : {} + }) + : {}; + }))); + } catch (err) { preload_error = { statusCode: 500, message: err }; - return []; // appease TypeScript - }).then(preloaded => { + preloaded = []; // appease TypeScript + } + + try { if (redirect) { const location = `${req.baseUrl}/${redirect.location}`; @@ -269,7 +286,7 @@ export function get_page_handler( res.statusCode = status; res.end(body); - }).catch(err => { + } catch(err) { if (error) { // we encountered an error while rendering the error page — oops res.statusCode = 500; @@ -277,7 +294,7 @@ export function get_page_handler( } else { handle_error(req, res, 500, err); } - }); + } } return function find_route(req: Req, res: Res, next: () => void) { diff --git a/test/app/.gitignore b/test/app/.gitignore deleted file mode 100644 index 9f3fcfb..0000000 --- a/test/app/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.DS_Store -node_modules -.sapper -yarn.lock -cypress/screenshots -templates/.* -dist diff --git a/test/app/README.md b/test/app/README.md deleted file mode 100644 index ea2230e..0000000 --- a/test/app/README.md +++ /dev/null @@ -1,81 +0,0 @@ -# sapper-template - -The default [Sapper](https://github.com/sveltejs/sapper) template. To clone it and get started: - -```bash -npx degit sveltejs/sapper-template my-app -cd my-app -npm install # or yarn! -npm run dev -``` - -Open up [localhost:3000](http://localhost:3000) and start clicking around. - - -## Structure - -Sapper expects to find three directories in the root of your project — `assets`, `routes` and `templates`. - - -### assets - -The [assets](assets) directory contains any static assets that should be available. These are served using [serve-static](https://github.com/expressjs/serve-static). - -In your [service-worker.js](templates/service-worker.js) file, Sapper makes these files available as `__assets__` so that you can cache them (though you can choose not to, for example if you don't want to cache very large files). - - -### routes - -This is the heart of your Sapper app. There are two kinds of routes — *pages*, and *server routes*. - -**Pages** are Svelte components written in `.html` files. When a user first visits the application, they will be served a server-rendered version of the route in question, plus some JavaScript that 'hydrates' the page and initialises a client-side router. From that point forward, navigating to other pages is handled entirely on the client for a fast, app-like feel. (Sapper will preload and cache the code for these subsequent pages, so that navigation is instantaneous.) - -**Server routes** are modules written in `.js` files, that export functions corresponding to HTTP methods. Each function receives Express `request` and `response` objects as arguments, plus a `next` function. This is useful for creating a JSON API, for example. - -There are three simple rules for naming the files that define your routes: - -* A file called `routes/about.html` corresponds to the `/about` route. A file called `routes/blog/[slug].html` corresponds to the `/blog/:slug` route, in which case `params.slug` is available to the route -* The file `routes/index.html` (or `routes/index.js`) corresponds to the root of your app. `routes/about/index.html` is treated the same as `routes/about.html`. -* Files and directories with a leading underscore do *not* create routes. This allows you to colocate helper modules and components with the routes that depend on them — for example you could have a file called `routes/_helpers/datetime.js` and it would *not* create a `/_helpers/datetime` route - - -### templates - -This directory should contain the following files at a minimum: - -* [2xx.html](templates/2xx.html) — a template for the page to serve for valid requests -* [4xx.html](templates/4xx.html) — a template for 4xx-range errors (such as 404 Not Found) -* [5xx.html](templates/5xx.html) — a template for 5xx-range errors (such as 500 Internal Server Error) -* [main.js](templates/main.js) — this module initialises Sapper -* [service-worker.js](templates/service-worker.js) — your app's service worker - -Inside the HTML templates, Sapper will inject various values as indicated by `%sapper.xxxx%` tags. Inside JavaScript files, Sapper will replace strings like `__dev__` with the appropriate value. - -In lieu of documentation (bear with us), consult the files to see what variables are available and how they're used. - - -## Webpack config - -Sapper uses webpack to provide code-splitting, dynamic imports and hot module reloading, as well as compiling your Svelte components. As long as you don't do anything daft, you can edit the configuration files to add whatever loaders and plugins you'd like. - - -## Production mode and deployment - -To start a production version of your app, run `npm start`. This will disable hot module replacement, and activate the appropriate webpack plugins. - -You can deploy your application to any environment that supports Node 8 or above. As an example, to deploy to [Now](https://zeit.co/now), run these commands: - -```bash -npm install -g now -now -``` - - -## Bugs and feedback - -Sapper is in early development, and may have the odd rough edge here and there. Please be vocal over on the [Sapper issue tracker](https://github.com/sveltejs/sapper/issues). - - -## License - -[LIL](LICENSE) diff --git a/test/app/src/client.js b/test/app/src/client.js deleted file mode 100644 index 39aeea7..0000000 --- a/test/app/src/client.js +++ /dev/null @@ -1,12 +0,0 @@ -import { Store } from 'svelte/store.js'; -import * as sapper from '../__sapper__/client.js'; - -window.init = () => { - return sapper.start({ - target: document.querySelector('#sapper'), - store: data => new Store(data) - }); -}; - -window.prefetchRoutes = sapper.prefetchRoutes; -window.goto = sapper.goto; \ No newline at end of file diff --git a/test/app/src/routes/_error.html b/test/app/src/routes/_error.html deleted file mode 100644 index 9974a17..0000000 --- a/test/app/src/routes/_error.html +++ /dev/null @@ -1,6 +0,0 @@ - - {status} - - -

{status}

-

{error.message}

\ No newline at end of file diff --git a/test/app/src/routes/about.html b/test/app/src/routes/about.html deleted file mode 100644 index af0dd1d..0000000 --- a/test/app/src/routes/about.html +++ /dev/null @@ -1,19 +0,0 @@ - - About - - -

About this site

- -

This is the 'about' page. There's not much here.

- - - - \ No newline at end of file diff --git a/test/app/src/routes/blog/[slug].html b/test/app/src/routes/blog/[slug].html deleted file mode 100644 index 7fdc8b4..0000000 --- a/test/app/src/routes/blog/[slug].html +++ /dev/null @@ -1,36 +0,0 @@ - - {post.title} - - -

{post.title}

- -
- {@html post.html} -
- - \ No newline at end of file diff --git a/test/app/src/routes/blog/[slug].json.js b/test/app/src/routes/blog/[slug].json.js deleted file mode 100644 index 61ebee8..0000000 --- a/test/app/src/routes/blog/[slug].json.js +++ /dev/null @@ -1,23 +0,0 @@ -import posts from './_posts.js'; - -const lookup = {}; -posts.forEach(post => { - lookup[post.slug] = JSON.stringify(post); -}); - -export function get(req, res, next) { - // the `slug` parameter is available because this file - // is called [slug].js - const { slug } = req.params; - - if (slug in lookup) { - res.writeHead(200, { - 'Content-Type': 'application/json', - 'Cache-Control': `no-cache` - }); - - res.end(lookup[slug]); - } else { - next(); - } -} \ No newline at end of file diff --git a/test/app/src/routes/blog/_posts.js b/test/app/src/routes/blog/_posts.js deleted file mode 100644 index a9a9717..0000000 --- a/test/app/src/routes/blog/_posts.js +++ /dev/null @@ -1,151 +0,0 @@ -// Ordinarily, you'd generate this data from markdown files in your -// repo, or fetch them from a database of some kind. But in order to -// avoid unnecessary dependencies in the starter template, and in the -// service of obviousness, we're just going to leave it here. - -// This file is called `_posts.js` rather than `posts.js`, because -// we don't want to create an `/api/blog/posts` route — the leading -// underscore tells Sapper not to do that. - -const posts = [ - { - title: 'What is Sapper?', - slug: 'what-is-sapper', - html: ` -

First, you have to know what Svelte is. Svelte is a UI framework with a bold new idea: rather than providing a library that you write code with (like React or Vue, for example), it's a compiler that turns your components into highly optimized vanilla JavaScript. If you haven't already read the introductory blog post, you should!

- -

Sapper is a Next.js-style framework (more on that here) built around Svelte. It makes it embarrassingly easy to create extremely high performance web apps. Out of the box, you get:

- - - -

It's implemented as Express middleware. Everything is set up and waiting for you to get started, but you keep complete control over the server, service worker, webpack config and everything else, so it's as flexible as you need it to be.

- ` - }, - - { - title: 'How to use Sapper', - slug: 'how-to-use-sapper', - html: ` -

Step one

-

Create a new project, using degit:

- - 
npx degit sveltejs/sapper-template my-app
-			cd my-app
-			npm install # or yarn!
-			npm run dev
-
- -

Step two

-

Go to localhost:3000. Open my-app in your editor. Edit the files in the routes directory or add new ones.

- -

Step three

-

...

- -

Step four

-

Resist overdone joke formats.

- ` - }, - - { - title: 'Why the name?', - slug: 'why-the-name', - html: ` -

In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as sappers.

- -

For web developers, the stakes are generally lower than those for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for Svelte app maker, is your courageous and dutiful ally.

- ` - }, - - { - title: 'How is Sapper different from Next.js?', - slug: 'how-is-sapper-different-from-next', - html: ` -

Next.js is a React framework from Zeit, and is the inspiration for Sapper. There are a few notable differences, however:

- - - ` - }, - - { - title: 'How can I get involved?', - slug: 'how-can-i-get-involved', - html: ` -

We're so glad you asked! Come on over to the Svelte and Sapper repos, and join us in the Gitter chatroom. Everyone is welcome, especially you!

- ` - }, - - { - title: 'A very long post with deep links', - slug: 'a-very-long-post', - html: ` -

One

-

I'll have a vodka rocks. (Mom, it's breakfast time.) And a piece of toast. Let me out that Queen. Fried cheese… with club sauce.

-

Her lawyers are claiming the seal is worth $250,000. And that's not even including Buster's Swatch. This was a big get for God. What, so the guy we are meeting with can't even grow his own hair? COME ON! She's always got to wedge herself in the middle of us so that she can control everything. Yeah. Mom's awesome. It's, like, Hey, you want to go down to the whirlpool? Yeah, I don't have a husband. I call it Swing City. The CIA should've just Googled for his hideout, evidently. There are dozens of us! DOZENS! Yeah, like I'm going to take a whiz through this $5,000 suit. COME ON.

- -

Two

-

Tobias Fünke costume. Heart attack never stopped old big bear.

-

Nellie is blowing them all AWAY. I will be a bigger and hairier mole than the one on your inner left thigh! I'll sacrifice anything for my children.

-

Up yours, granny! You couldn't handle it! Hey, Dad. Look at you. You're a year older…and a year closer to death. Buster: Oh yeah, I guess that's kind of funny. Bob Loblaw Law Blog. The guy runs a prison, he can have any piece of ass he wants.

- -

clicking this link should reset scroll

-

clicking this link should not affect scroll

- -

Three

-

I prematurely shot my wad on what was supposed to be a dry run, so now I'm afraid I have something of a mess on my hands. Dead Dove DO NOT EAT. Never once touched my per diem. I'd go to Craft Service, get some raw veggies, bacon, Cup-A-Soup…baby, I got a stew goin'. You're losing blood, aren't you? Gob: Probably, my socks are wet. Sure, let the little fruit do it. HUZZAH! Although George Michael had only got to second base, he'd gone in head first, like Pete Rose. I will pack your sweet pink mouth with so much ice cream you'll be the envy of every Jerry and Jane on the block!

-

Gosh Mom… after all these years, God's not going to take a call from you. Come on, this is a Bluth family celebration. It's no place for children.

-

And I wouldn't just lie there, if that's what you're thinking. That's not what I WAS thinking. Who? i just dont want him to point out my cracker ass in front of ann. When a man needs to prove to a woman that he's actually… When a man loves a woman… Heyyyyyy Uncle Father Oscar. [Stabbing Gob] White power! Gob: I'm white! Let me take off my assistant's skirt and put on my Barbra-Streisand-in-The-Prince-of-Tides ass-masking therapist pantsuit. In the mid '90s, Tobias formed a folk music band with Lindsay and Maebe which he called Dr. Funke's 100 Percent Natural Good Time Family Band Solution. The group was underwritten by the Natural Food Life Company, a division of Chem-Grow, an Allen Crayne acqusition, which was part of the Squimm Group. Their motto was simple: We keep you alive.

- -

Four

-

If you didn't have adult onset diabetes, I wouldn't mind giving you a little sugar. Everybody dance NOW. And the soup of the day is bread. Great, now I'm gonna smell to high heaven like a tuna melt!

-

That's how Tony Wonder lost a nut. She calls it a Mayonegg. Go ahead, touch the Cornballer. There's a new daddy in town. A discipline daddy.

- ` - }, - - { - title: 'Another long post', - slug: 'another-long-post', - html: ` -

One

-

I'll have a vodka rocks. (Mom, it's breakfast time.) And a piece of toast. Let me out that Queen. Fried cheese… with club sauce.

-

Her lawyers are claiming the seal is worth $250,000. And that's not even including Buster's Swatch. This was a big get for God. What, so the guy we are meeting with can't even grow his own hair? COME ON! She's always got to wedge herself in the middle of us so that she can control everything. Yeah. Mom's awesome. It's, like, Hey, you want to go down to the whirlpool? Yeah, I don't have a husband. I call it Swing City. The CIA should've just Googled for his hideout, evidently. There are dozens of us! DOZENS! Yeah, like I'm going to take a whiz through this $5,000 suit. COME ON.

- -

Two

-

Tobias Fünke costume. Heart attack never stopped old big bear.

-

Nellie is blowing them all AWAY. I will be a bigger and hairier mole than the one on your inner left thigh! I'll sacrifice anything for my children.

-

Up yours, granny! You couldn't handle it! Hey, Dad. Look at you. You're a year older…and a year closer to death. Buster: Oh yeah, I guess that's kind of funny. Bob Loblaw Law Blog. The guy runs a prison, he can have any piece of ass he wants.

- -

Three

-

I prematurely shot my wad on what was supposed to be a dry run, so now I'm afraid I have something of a mess on my hands. Dead Dove DO NOT EAT. Never once touched my per diem. I'd go to Craft Service, get some raw veggies, bacon, Cup-A-Soup…baby, I got a stew goin'. You're losing blood, aren't you? Gob: Probably, my socks are wet. Sure, let the little fruit do it. HUZZAH! Although George Michael had only got to second base, he'd gone in head first, like Pete Rose. I will pack your sweet pink mouth with so much ice cream you'll be the envy of every Jerry and Jane on the block!

-

Gosh Mom… after all these years, God's not going to take a call from you. Come on, this is a Bluth family celebration. It's no place for children.

-

And I wouldn't just lie there, if that's what you're thinking. That's not what I WAS thinking. Who? i just dont want him to point out my cracker ass in front of ann. When a man needs to prove to a woman that he's actually… When a man loves a woman… Heyyyyyy Uncle Father Oscar. [Stabbing Gob] White power! Gob: I'm white! Let me take off my assistant's skirt and put on my Barbra-Streisand-in-The-Prince-of-Tides ass-masking therapist pantsuit. In the mid '90s, Tobias formed a folk music band with Lindsay and Maebe which he called Dr. Funke's 100 Percent Natural Good Time Family Band Solution. The group was underwritten by the Natural Food Life Company, a division of Chem-Grow, an Allen Crayne acqusition, which was part of the Squimm Group. Their motto was simple: We keep you alive.

- -

Four

-

If you didn't have adult onset diabetes, I wouldn't mind giving you a little sugar. Everybody dance NOW. And the soup of the day is bread. Great, now I'm gonna smell to high heaven like a tuna melt!

-

That's how Tony Wonder lost a nut. She calls it a Mayonegg. Go ahead, touch the Cornballer. There's a new daddy in town. A discipline daddy.

- ` - }, - - { - title: 'Encödïng test', - slug: 'encödïng-test', - html: ` -

It works

- ` - } -]; - -posts.forEach(post => { - post.html = post.html.replace(/^\t{3}/gm, ''); -}); - -export default posts; \ No newline at end of file diff --git a/test/app/src/routes/blog/index.html b/test/app/src/routes/blog/index.html deleted file mode 100644 index 2e9f428..0000000 --- a/test/app/src/routes/blog/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - Blog - - -

Recent posts

- - - - \ No newline at end of file diff --git a/test/app/src/routes/blog/index.json.js b/test/app/src/routes/blog/index.json.js deleted file mode 100644 index 9d73d78..0000000 --- a/test/app/src/routes/blog/index.json.js +++ /dev/null @@ -1,17 +0,0 @@ -import posts from './_posts.js'; - -const contents = JSON.stringify(posts.map(post => { - return { - title: post.title, - slug: post.slug - }; -})); - -export function get(req, res) { - res.writeHead(200, { - 'Content-Type': 'application/json', - 'Cache-Control': `max-age=${30 * 60 * 1e3}` // cache for 30 minutes - }); - - res.end(contents); -} \ No newline at end of file diff --git a/test/app/src/routes/index.html b/test/app/src/routes/index.html deleted file mode 100644 index 65c7e59..0000000 --- a/test/app/src/routes/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - Sapper project template - - -

Great success!

- -home -about -slow preload -redirect -redirect -redirect (root) -broken link -error link -credentials -blog -const -echo/page/encöded?message=hëllö+wörld -echo/page/empty?message - -
- - \ No newline at end of file diff --git a/test/app/src/routes/missing-index/ok.html b/test/app/src/routes/missing-index/ok.html deleted file mode 100644 index 7cc8f66..0000000 --- a/test/app/src/routes/missing-index/ok.html +++ /dev/null @@ -1 +0,0 @@ -

it works

\ No newline at end of file diff --git a/test/app/src/routes/non-sapper-redirect-to.html b/test/app/src/routes/non-sapper-redirect-to.html deleted file mode 100644 index eeb0dfc..0000000 --- a/test/app/src/routes/non-sapper-redirect-to.html +++ /dev/null @@ -1 +0,0 @@ -

redirected

\ No newline at end of file diff --git a/test/app/src/routes/throw-an-error.js b/test/app/src/routes/throw-an-error.js deleted file mode 100644 index 523f2bc..0000000 --- a/test/app/src/routes/throw-an-error.js +++ /dev/null @@ -1,3 +0,0 @@ -export function get() { - throw new Error('nope'); -} \ No newline at end of file diff --git a/test/app/src/server.js b/test/app/src/server.js deleted file mode 100644 index b75ceeb..0000000 --- a/test/app/src/server.js +++ /dev/null @@ -1,126 +0,0 @@ -import fs from 'fs'; -import { resolve } from 'url'; -import express from 'express'; -import serve from 'serve-static'; -import { Store } from 'svelte/store.js'; -import * as sapper from '../__sapper__/server.js'; - -let pending; -let ended; - -process.on('message', message => { - if (message.action === 'start') { - if (pending) { - throw new Error(`Already capturing`); - } - - pending = new Set(); - ended = false; - process.send({ type: 'ready' }); - } - - if (message.action === 'end') { - ended = true; - if (pending.size === 0) { - process.send({ type: 'done' }); - pending = null; - } - } -}); - -const app = express(); - -const { PORT = 3000, BASEPATH = '' } = process.env; -const base = `http://localhost:${PORT}${BASEPATH}/`; - -// this allows us to do e.g. `fetch('/api/blog')` on the server -const fetch = require('node-fetch'); -global.fetch = (url, opts) => { - return fetch(resolve(base, url), opts); -}; - -const middlewares = [ - serve('assets'), - - // set test cookie - (req, res, next) => { - res.setHeader('Set-Cookie', ['a=1; Path=/', 'b=2; Path=/']); - next(); - }, - - // emit messages so we can capture requests - (req, res, next) => { - if (!pending) return next(); - - pending.add(req.url); - - const { write, end } = res; - const chunks = []; - - res.write = function(chunk) { - chunks.push(new Buffer(chunk)); - write.apply(res, arguments); - }; - - res.end = function(chunk) { - if (chunk) chunks.push(new Buffer(chunk)); - end.apply(res, arguments); - - if (pending) pending.delete(req.url); - - process.send({ - method: req.method, - url: req.url, - status: res.statusCode, - headers: res._headers, - body: Buffer.concat(chunks).toString() - }); - - if (pending && pending.size === 0 && ended) { - process.send({ type: 'done' }); - } - }; - - next(); - }, - - // set up some values for the store - (req, res, next) => { - req.hello = 'hello'; - res.locals = { name: 'world' }; - next(); - }, - - sapper.middleware({ - store: (req, res) => { - return new Store({ - title: `${req.hello} ${res.locals.name}` - }); - }, - ignore: [ - /foobar/i, - '/buzz', - 'fizz', - x => x === '/hello' - ] - }), -]; - -app.get(`${BASEPATH}/non-sapper-redirect-from`, (req, res) => { - res.writeHead(301, { - Location: `${BASEPATH}/non-sapper-redirect-to` - }); - res.end(); -}); - -if (BASEPATH) { - app.use(BASEPATH, ...middlewares); -} else { - app.use(...middlewares); -} - -['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => { - app.get('/'+uri, (req, res) => res.end(uri)); -}); - -app.listen(PORT); diff --git a/test/app/src/template.html b/test/app/src/template.html deleted file mode 100644 index 0ea5e17..0000000 --- a/test/app/src/template.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - %sapper.base% - - - - - - - %sapper.styles% - - - %sapper.head% - - - -
%sapper.html%
- - - %sapper.scripts% - - \ No newline at end of file diff --git a/test/app/static/favicon.png b/test/app/static/favicon.png deleted file mode 100644 index f76753e93c0acc317d3c56ed4b2a6251a9ca5d9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1917 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℞l)kuUgdlWUl+YT#& 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

-1PVL#&`- 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 J-{^MkzW_VDgRcMp diff --git a/test/app/webpack.config.js b/test/app/webpack.config.js deleted file mode 100644 index 78d0c85..0000000 --- a/test/app/webpack.config.js +++ /dev/null @@ -1,84 +0,0 @@ -const path = require('path'); -const webpack = require('webpack'); -const config = require('../../config/webpack.js'); -const sapper_pkg = require('../../package.json'); - -const mode = process.env.NODE_ENV; -const isDev = mode === 'development'; - -module.exports = { - client: { - entry: config.client.entry(), - output: config.client.output(), - resolve: { - extensions: ['.js', '.html'] - }, - module: { - rules: [ - { - test: /\.html$/, - exclude: /node_modules/, - use: { - loader: 'svelte-loader', - options: { - hydratable: true, - cascade: false, - store: true - } - } - } - ] - }, - mode, - optimization: { - minimize: false - }, - plugins: [ - isDev && new webpack.HotModuleReplacementPlugin() - ].filter(Boolean), - devtool: isDev && 'inline-source-map' - }, - - server: { - entry: config.server.entry(), - output: config.server.output(), - target: 'node', - resolve: { - extensions: ['.js', '.html'] - }, - externals: [].concat( - Object.keys(sapper_pkg.dependencies), - Object.keys(sapper_pkg.devDependencies) - ), - module: { - rules: [ - { - test: /\.html$/, - exclude: /node_modules/, - use: { - loader: 'svelte-loader', - options: { - css: false, - cascade: false, - store: true, - generate: 'ssr' - } - } - } - ] - }, - mode, - optimization: { - minimize: false - }, - performance: { - hints: false // it doesn't matter if server.js is large - } - }, - - serviceworker: { - entry: config.serviceworker.entry(), - output: config.serviceworker.output(), - mode - } -}; \ No newline at end of file diff --git a/test/apps/AppRunner.ts b/test/apps/AppRunner.ts new file mode 100644 index 0000000..6a1a48c --- /dev/null +++ b/test/apps/AppRunner.ts @@ -0,0 +1,122 @@ +import * as path from 'path'; +import * as puppeteer from 'puppeteer'; +import * as ports from 'port-authority'; +import { fork, ChildProcess } from 'child_process'; + +declare const start: () => Promise; +declare const prefetchRoutes: () => Promise; +declare const prefetch: (href: string) => Promise; +declare const goto: (href: string) => Promise; + +export class AppRunner { + cwd: string; + entry: string; + port: number; + proc: ChildProcess; + messages: any[]; + + browser: puppeteer.Browser; + page: puppeteer.Page; + + constructor(cwd: string, entry: string) { + this.cwd = cwd; + this.entry = path.join(cwd, entry); + this.messages = []; + } + + async start() { + this.port = await ports.find(3000); + + this.proc = fork(this.entry, [], { + cwd: this.cwd, + env: { + PORT: String(this.port) + } + }); + + this.proc.on('message', message => { + if (!message.__sapper__) return; + this.messages.push(message); + }); + + this.browser = await puppeteer.launch({ args: ['--no-sandbox'] }); + + this.page = await this.browser.newPage(); + this.page.on('console', msg => { + const text = msg.text(); + + if (!text.startsWith('Failed to load resource')) { + console.log(text); + } + }); + + return { + page: this.page, + base: `http://localhost:${this.port}`, + + // helpers + start: () => this.page.evaluate(() => start()), + prefetchRoutes: () => this.page.evaluate(() => prefetchRoutes()), + prefetch: (href: string) => this.page.evaluate((href: string) => prefetch(href), href), + goto: (href: string) => this.page.evaluate((href: string) => goto(href), href) + }; + } + + capture(fn: () => any): Promise { + return new Promise((fulfil, reject) => { + const requests: string[] = []; + const pending: Set = new Set(); + let done = false; + + function handle_request(request: puppeteer.Request) { + const url = request.url(); + requests.push(url); + pending.add(url); + } + + function handle_requestfinished(request: puppeteer.Request) { + const url = request.url(); + pending.delete(url); + + if (done && pending.size === 0) { + cleanup(); + fulfil(requests); + } + } + + function handle_requestfailed(request: puppeteer.Request) { + cleanup(); + reject(new Error(`failed to fetch ${request.url()}`)) + } + + const cleanup = () => { + this.page.removeListener('request', handle_request); + this.page.removeListener('requestfinished', handle_requestfinished); + this.page.removeListener('requestfailed', handle_requestfailed); + }; + + this.page.on('request', handle_request); + this.page.on('requestfinished', handle_requestfinished); + this.page.on('requestfailed', handle_requestfailed); + + return Promise.resolve(fn()).then(() => { + if (pending.size === 0) { + cleanup(); + fulfil(requests); + } + + done = true; + }); + }); + } + + end() { + return Promise.all([ + this.browser.close(), + new Promise(fulfil => { + this.proc.once('exit', fulfil); + this.proc.kill(); + }) + ]); + } +} \ No newline at end of file diff --git a/test/apps/basics/__test__.ts b/test/apps/basics/__test__.ts new file mode 100644 index 0000000..5f35532 --- /dev/null +++ b/test/apps/basics/__test__.ts @@ -0,0 +1,270 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import * as http from 'http'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; +import { wait } from '../../utils'; + +declare let deleted: { id: number }; +declare let el: any; + +describe('basics', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + let prefetchRoutes: () => Promise; + let prefetch: (href: string) => Promise; + let goto: (href: string) => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start, prefetchRoutes, prefetch, goto } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + const title = () => page.$eval('h1', node => node.textContent); + + it('serves /', async () => { + await page.goto(base); + + assert.equal( + await title(), + 'Great success!' + ); + }); + + it('serves /?', async () => { + await page.goto(`${base}?`); + + assert.equal( + await title(), + 'Great success!' + ); + }); + + it('serves static route', async () => { + await page.goto(`${base}/a`); + + assert.equal( + await title(), + 'a' + ); + }); + + it('serves static route from dir/index.html file', async () => { + await page.goto(`${base}/b`); + + assert.equal( + await title(), + 'b' + ); + }); + + it('serves dynamic route', async () => { + await page.goto(`${base}/test-slug`); + + assert.equal( + await title(), + 'TEST-SLUG' + ); + }); + + it('navigates to a new page without reloading', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + const requests: string[] = await runner.capture(async () => { + await page.click('a[href="a"]'); + }); + + assert.deepEqual(requests, []); + + assert.equal( + await title(), + 'a' + ); + }); + + it('navigates programmatically', async () => { + await page.goto(`${base}/a`); + await start(); + + await goto('b'); + + assert.equal( + await title(), + 'b' + ); + }); + + it('prefetches programmatically', async () => { + await page.goto(`${base}/a`); + await start(); + + const requests = await runner.capture(() => prefetch('b')); + + assert.equal(requests.length, 2); + assert.equal(requests[1], `${base}/b.json`); + }); + + + // TODO equivalent test for a webpack app + it('sets Content-Type, Link...modulepreload, and Cache-Control headers', () => { + return new Promise((fulfil, reject) => { + const req = http.get(base, res => { + try { + const { headers } = res; + + assert.equal( + headers['content-type'], + 'text/html' + ); + + assert.equal( + headers['cache-control'], + 'max-age=600' + ); + + // TODO preload more than just the entry point + const regex = /<\/client\/client\.\w+\.js>;rel="modulepreload"/; + const link = headers['link']; + + assert.ok(regex.test(link), link); + + fulfil(); + } catch (err) { + reject(err); + } + }); + + req.on('error', reject); + }); + }); + + it('calls a delete handler', async () => { + await page.goto(`${base}/delete-test`); + await start(); + + await page.click('.del'); + await page.waitForFunction(() => deleted); + + assert.equal(await page.evaluate(() => deleted.id), 42); + }); + + it('hydrates initial route', async () => { + await page.goto(base); + + await page.evaluate(() => { + el = document.querySelector('.hydrate-test'); + }); + + await start(); + + assert.ok(await page.evaluate(() => { + return document.querySelector('.hydrate-test') === el; + })); + }); + + it('does not attempt client-side navigation to server routes', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click(`[href="ambiguous/ok.json"]`); + await wait(50); + + assert.equal( + await page.evaluate(() => document.body.textContent), + 'ok' + ); + }); + + it('allows reserved words as route names', async () => { + await page.goto(`${base}/const`); + await start(); + + assert.equal( + await title(), + 'reserved words are okay as routes' + ); + }); + + it('accepts value-less query string parameter on server', async () => { + await page.goto(`${base}/echo-query?message`); + + assert.equal( + await title(), + 'message: ""' + ); + }); + + it('accepts value-less query string parameter on client', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click('a[href="echo-query?message"]') + + assert.equal( + await title(), + 'message: ""' + ); + }); + + // skipped because Nightmare doesn't seem to focus the correctly + it('resets the active element after navigation', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click('[href="a"]'); + await wait(50); + + assert.equal( + await page.evaluate(() => document.activeElement.nodeName), + 'BODY' + ); + }); + + it('replaces %sapper.xxx% tags safely', async () => { + await page.goto(`${base}/unsafe-replacement`); + await start(); + + const html = await page.evaluate(() => document.body.innerHTML); + assert.equal(html.indexOf('%sapper'), -1); + }); +}); \ No newline at end of file diff --git a/test/apps/basics/rollup.config.js b/test/apps/basics/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/basics/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/basics/src/client.js b/test/apps/basics/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/basics/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/basics/src/routes/[slug].html b/test/apps/basics/src/routes/[slug].html new file mode 100644 index 0000000..ade66de --- /dev/null +++ b/test/apps/basics/src/routes/[slug].html @@ -0,0 +1 @@ +

{params.slug.toUpperCase()}

\ No newline at end of file diff --git a/test/apps/basics/src/routes/_error.html b/test/apps/basics/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/basics/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/basics/src/routes/a.html b/test/apps/basics/src/routes/a.html new file mode 100644 index 0000000..0e6757b --- /dev/null +++ b/test/apps/basics/src/routes/a.html @@ -0,0 +1 @@ +

a

\ No newline at end of file diff --git a/test/apps/basics/src/routes/ambiguous/[slug].html b/test/apps/basics/src/routes/ambiguous/[slug].html new file mode 100644 index 0000000..e69de29 diff --git a/test/apps/basics/src/routes/ambiguous/[slug].json.js b/test/apps/basics/src/routes/ambiguous/[slug].json.js new file mode 100644 index 0000000..adc3102 --- /dev/null +++ b/test/apps/basics/src/routes/ambiguous/[slug].json.js @@ -0,0 +1,3 @@ +export function get(req, res) { + res.end(req.params.slug); +} \ No newline at end of file diff --git a/test/apps/basics/src/routes/b/index.html b/test/apps/basics/src/routes/b/index.html new file mode 100644 index 0000000..d93079d --- /dev/null +++ b/test/apps/basics/src/routes/b/index.html @@ -0,0 +1,11 @@ +

{letter}

+ + \ No newline at end of file diff --git a/test/apps/basics/src/routes/b/index.json.js b/test/apps/basics/src/routes/b/index.json.js new file mode 100644 index 0000000..29b7ede --- /dev/null +++ b/test/apps/basics/src/routes/b/index.json.js @@ -0,0 +1,3 @@ +export function get(req, res) { + res.end(JSON.stringify('b')); +} \ No newline at end of file diff --git a/test/app/src/routes/const.html b/test/apps/basics/src/routes/const.html similarity index 100% rename from test/app/src/routes/const.html rename to test/apps/basics/src/routes/const.html diff --git a/test/app/src/routes/api/delete/[id].js b/test/apps/basics/src/routes/delete-test/[id].json.js similarity index 100% rename from test/app/src/routes/api/delete/[id].js rename to test/apps/basics/src/routes/delete-test/[id].json.js diff --git a/test/app/src/routes/delete-test.html b/test/apps/basics/src/routes/delete-test/index.html similarity index 67% rename from test/app/src/routes/delete-test.html rename to test/apps/basics/src/routes/delete-test/index.html index 428ab3c..a5280cb 100644 --- a/test/app/src/routes/delete-test.html +++ b/test/apps/basics/src/routes/delete-test/index.html @@ -2,9 +2,13 @@ \ No newline at end of file diff --git a/test/apps/basics/src/routes/index.html b/test/apps/basics/src/routes/index.html new file mode 100644 index 0000000..221c0f5 --- /dev/null +++ b/test/apps/basics/src/routes/index.html @@ -0,0 +1,7 @@ +

Great success!

+ +a +ok +ok + +
\ No newline at end of file diff --git a/test/app/src/routes/unsafe-replacement.html b/test/apps/basics/src/routes/unsafe-replacement.html similarity index 100% rename from test/app/src/routes/unsafe-replacement.html rename to test/apps/basics/src/routes/unsafe-replacement.html diff --git a/test/apps/basics/src/server.js b/test/apps/basics/src/server.js new file mode 100644 index 0000000..0e7741c --- /dev/null +++ b/test/apps/basics/src/server.js @@ -0,0 +1,8 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/app/src/service-worker.js b/test/apps/basics/src/service-worker.js similarity index 75% rename from test/app/src/service-worker.js rename to test/apps/basics/src/service-worker.js index b19f2d6..9d2ac9d 100644 --- a/test/app/src/service-worker.js +++ b/test/apps/basics/src/service-worker.js @@ -1,10 +1,10 @@ -import { files, shell, timestamp, routes } from '../__sapper__/service-worker.js'; +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; -const ASSETS = `cachetimestamp`; +const ASSETS = `cache${timestamp}`; // `shell` is an array of all the files generated by webpack, -// `assets` is an array of everything in the `assets` directory -const to_cache = shell.concat(files); +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); const cached = new Set(to_cache); self.addEventListener('install', event => { @@ -26,19 +26,24 @@ self.addEventListener('activate', event => { if (key !== ASSETS) await caches.delete(key); } - await self.clients.claim(); + self.clients.claim(); }) ); }); self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + const url = new URL(event.request.url); // don't try to handle e.g. data: URIs if (!url.protocol.startsWith('http')) return; + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + // always serve assets and webpack-generated files from cache - if (cached.has(url.pathname)) { + if (url.host === self.location.host && cached.has(url.pathname)) { event.respondWith(caches.match(event.request)); return; } @@ -53,12 +58,14 @@ self.addEventListener('fetch', event => { } */ + if (event.request.cache === 'only-if-cached') return; + // for everything else, try the network first, falling back to // cache if the user is offline. (If the pages never change, you // might prefer a cache-first approach to a network-first one.) event.respondWith( caches - .open('offline') + .open(`offline${timestamp}`) .then(async cache => { try { const response = await fetch(event.request); diff --git a/test/apps/basics/src/template.html b/test/apps/basics/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/basics/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/credentials/__test__.ts b/test/apps/credentials/__test__.ts new file mode 100644 index 0000000..0f755d2 --- /dev/null +++ b/test/apps/credentials/__test__.ts @@ -0,0 +1,83 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { wait } from '../../utils'; +import { AppRunner } from '../AppRunner'; + +describe('credentials', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + let prefetchRoutes: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start, prefetchRoutes } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('sends cookies when using this.fetch with credentials: "include"', async () => { + await page.goto(`${base}/credentials?creds=include`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'a: 1, b: 2, max-age: undefined' + ); + }); + + it('does not send cookies when using this.fetch without credentials', async () => { + await page.goto(`${base}/credentials`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'unauthorized' + ); + }); + + it('delegates to fetch on the client', async () => { + await page.goto(base) + await start(); + await prefetchRoutes(); + + await page.click('[href="credentials?creds=include"]'); + await wait(50); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'a: 1, b: 2, max-age: undefined' + ); + }); +}); \ No newline at end of file diff --git a/test/apps/credentials/rollup.config.js b/test/apps/credentials/rollup.config.js new file mode 100644 index 0000000..045746e --- /dev/null +++ b/test/apps/credentials/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka', 'cookie'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/credentials/src/client.js b/test/apps/credentials/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/credentials/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/credentials/src/routes/_error.html b/test/apps/credentials/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/credentials/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/app/src/routes/credentials/index.html b/test/apps/credentials/src/routes/credentials/index.html similarity index 100% rename from test/app/src/routes/credentials/index.html rename to test/apps/credentials/src/routes/credentials/index.html diff --git a/test/app/src/routes/credentials/test.json.js b/test/apps/credentials/src/routes/credentials/test.json.js similarity index 100% rename from test/app/src/routes/credentials/test.json.js rename to test/apps/credentials/src/routes/credentials/test.json.js diff --git a/test/apps/credentials/src/routes/index.html b/test/apps/credentials/src/routes/index.html new file mode 100644 index 0000000..fdd338f --- /dev/null +++ b/test/apps/credentials/src/routes/index.html @@ -0,0 +1,3 @@ +

Great success!

+ +link \ No newline at end of file diff --git a/test/apps/credentials/src/server.js b/test/apps/credentials/src/server.js new file mode 100644 index 0000000..2761f50 --- /dev/null +++ b/test/apps/credentials/src/server.js @@ -0,0 +1,13 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use((req, res, next) => { + // set test cookie + res.setHeader('Set-Cookie', ['a=1; Max-Age=3600', 'b=2; Max-Age=3600']); + next(); + }) + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/apps/credentials/src/service-worker.js b/test/apps/credentials/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/credentials/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/credentials/src/template.html b/test/apps/credentials/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/credentials/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/encoding/__test__.ts b/test/apps/encoding/__test__.ts new file mode 100644 index 0000000..c63e029 --- /dev/null +++ b/test/apps/encoding/__test__.ts @@ -0,0 +1,92 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; +import { wait } from '../../utils'; + +describe('encoding', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + let prefetchRoutes: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start, prefetchRoutes } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('encodes routes', async () => { + await page.goto(`${base}/fünke`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + `I'm afraid I just blue myself` + ); + }); + + it('encodes req.params and req.query for server-rendered pages', async () => { + await page.goto(`${base}/echo/page/encöded?message=hëllö+wörld`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'encöded (hëllö wörld)' + ); + }); + + it('encodes req.params and req.query for client-rendered pages', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click('a[href="echo/page/encöded?message=hëllö+wörld"]'); + await wait(50); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'encöded (hëllö wörld)' + ); + }); + + it('encodes req.params for server routes', async () => { + await page.goto(`${base}/echo/server-route/encöded`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'encöded' + ); + }); +}); \ No newline at end of file diff --git a/test/apps/encoding/rollup.config.js b/test/apps/encoding/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/encoding/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/encoding/src/client.js b/test/apps/encoding/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/encoding/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/encoding/src/routes/_error.html b/test/apps/encoding/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/encoding/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/app/src/routes/echo/page/[slug].html b/test/apps/encoding/src/routes/echo/page/[slug].html similarity index 100% rename from test/app/src/routes/echo/page/[slug].html rename to test/apps/encoding/src/routes/echo/page/[slug].html diff --git a/test/app/src/routes/echo/server-route/[slug].js b/test/apps/encoding/src/routes/echo/server-route/[slug].js similarity index 100% rename from test/app/src/routes/echo/server-route/[slug].js rename to test/apps/encoding/src/routes/echo/server-route/[slug].js diff --git a/test/app/src/routes/fünke.html b/test/apps/encoding/src/routes/fünke.html similarity index 100% rename from test/app/src/routes/fünke.html rename to test/apps/encoding/src/routes/fünke.html diff --git a/test/app/src/routes/fünke.json.js b/test/apps/encoding/src/routes/fünke.json.js similarity index 100% rename from test/app/src/routes/fünke.json.js rename to test/apps/encoding/src/routes/fünke.json.js diff --git a/test/apps/encoding/src/routes/index.html b/test/apps/encoding/src/routes/index.html new file mode 100644 index 0000000..bedde7e --- /dev/null +++ b/test/apps/encoding/src/routes/index.html @@ -0,0 +1,3 @@ +

Great success!

+ +link \ No newline at end of file diff --git a/test/apps/encoding/src/server.js b/test/apps/encoding/src/server.js new file mode 100644 index 0000000..0e7741c --- /dev/null +++ b/test/apps/encoding/src/server.js @@ -0,0 +1,8 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/apps/encoding/src/service-worker.js b/test/apps/encoding/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/encoding/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/encoding/src/template.html b/test/apps/encoding/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/encoding/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/errors/__test__.ts b/test/apps/errors/__test__.ts new file mode 100644 index 0000000..f718b06 --- /dev/null +++ b/test/apps/errors/__test__.ts @@ -0,0 +1,137 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; +import { wait } from '../../utils'; + +describe('errors', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + let prefetchRoutes: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start, prefetchRoutes } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('handles missing route on server', async () => { + await page.goto(`${base}/nope`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '404' + ); + }); + + it('handles missing route on client', async () => { + await page.goto(base); + await start(); + + await page.click('[href="nope"]'); + await wait(50); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '404' + ); + }); + + it('handles explicit 4xx on server', async () => { + await page.goto(`${base}/blog/nope`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '404' + ); + }); + + it('handles explicit 4xx on client', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click('[href="blog/nope"]'); + await wait(50); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '404' + ); + }); + + it('handles error on server', async () => { + await page.goto(`${base}/throw`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '500' + ); + }); + + it('handles error on client', async () => { + await page.goto(base); + await start(); + await prefetchRoutes(); + + await page.click('[href="throw"]'); + await wait(50); + + assert.equal( + await page.$eval('h1', node => node.textContent), + '500' + ); + }); + + it('does not serve error page for explicit non-page errors', async () => { + await page.goto(`${base}/nope.json`); + + assert.equal( + await page.evaluate(() => document.body.textContent), + 'nope' + ); + }); + + it('does not serve error page for thrown non-page errors', async () => { + await page.goto(`${base}/throw.json`); + + assert.equal( + await page.evaluate(() => document.body.textContent), + 'oops' + ); + }); +}); \ No newline at end of file diff --git a/test/apps/errors/rollup.config.js b/test/apps/errors/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/errors/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/errors/src/client.js b/test/apps/errors/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/errors/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/errors/src/routes/_error.html b/test/apps/errors/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/errors/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/errors/src/routes/blog/[slug].html b/test/apps/errors/src/routes/blog/[slug].html new file mode 100644 index 0000000..8a304d0 --- /dev/null +++ b/test/apps/errors/src/routes/blog/[slug].html @@ -0,0 +1,19 @@ +

{post.title}

+ + \ No newline at end of file diff --git a/test/apps/errors/src/routes/blog/[slug].json.js b/test/apps/errors/src/routes/blog/[slug].json.js new file mode 100644 index 0000000..5e2e2a7 --- /dev/null +++ b/test/apps/errors/src/routes/blog/[slug].json.js @@ -0,0 +1,9 @@ +export function get(req, res) { + res.writeHead(404, { + 'Content-Type': 'application/json' + }); + + res.end(JSON.stringify({ + message: 'not found' + })); +} \ No newline at end of file diff --git a/test/apps/errors/src/routes/index.html b/test/apps/errors/src/routes/index.html new file mode 100644 index 0000000..a6b7896 --- /dev/null +++ b/test/apps/errors/src/routes/index.html @@ -0,0 +1,5 @@ +

root

+ +nope +blog/nope +throw \ No newline at end of file diff --git a/test/apps/errors/src/routes/nope.json.js b/test/apps/errors/src/routes/nope.json.js new file mode 100644 index 0000000..3813784 --- /dev/null +++ b/test/apps/errors/src/routes/nope.json.js @@ -0,0 +1,4 @@ +export function get(req, res) { + res.writeHead(500); + res.end('nope'); +} \ No newline at end of file diff --git a/test/apps/errors/src/routes/throw.html b/test/apps/errors/src/routes/throw.html new file mode 100644 index 0000000..16b4131 --- /dev/null +++ b/test/apps/errors/src/routes/throw.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/test/apps/errors/src/routes/throw.json.js b/test/apps/errors/src/routes/throw.json.js new file mode 100644 index 0000000..5247b57 --- /dev/null +++ b/test/apps/errors/src/routes/throw.json.js @@ -0,0 +1,3 @@ +export function get(req, res) { + throw new Error('oops'); +} \ No newline at end of file diff --git a/test/apps/errors/src/server.js b/test/apps/errors/src/server.js new file mode 100644 index 0000000..0e7741c --- /dev/null +++ b/test/apps/errors/src/server.js @@ -0,0 +1,8 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/apps/errors/src/service-worker.js b/test/apps/errors/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/errors/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/errors/src/template.html b/test/apps/errors/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/errors/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/export/__test__.ts b/test/apps/export/__test__.ts new file mode 100644 index 0000000..9d422e3 --- /dev/null +++ b/test/apps/export/__test__.ts @@ -0,0 +1,70 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import { walk } from '../../utils'; +import * as api from '../../../api'; + +describe('export', function() { + this.timeout(10000); + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const builder = api.build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + builder.on('error', reject); + builder.on('done', () => { + // TODO it'd be nice if build and export returned promises. + // not sure how best to combine promise and event emitter + const exporter = api.exporter({ + build: '__sapper__/build', + dest: '__sapper__/export', + static: 'static', + basepath: '', + timeout: 5000 + }); + + exporter.on('error', (err: Error) => { + console.error(err); + reject(err); + }); + exporter.on('done', () => fulfil()); + }); + }); + }); + + it('crawls a site', () => { + const files = walk('__sapper__/export'); + + const client_assets = files.filter(file => file.startsWith('client/')); + const non_client_assets = files.filter(file => !file.startsWith('client/')).sort(); + + assert.ok(client_assets.length > 0); + + assert.deepEqual(non_client_assets, [ + 'blog.json', + 'blog/bar.json', + 'blog/bar/index.html', + 'blog/baz.json', + 'blog/baz/index.html', + 'blog/foo.json', + 'blog/foo/index.html', + 'blog/index.html', + 'global.css', + 'index.html', + 'service-worker.js' + ]); + }); + + // TODO test timeout, basepath +}); \ No newline at end of file diff --git a/test/apps/export/rollup.config.js b/test/apps/export/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/export/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/export/src/client.js b/test/apps/export/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/export/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/export/src/routes/_error.html b/test/apps/export/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/export/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/export/src/routes/blog/[slug].html b/test/apps/export/src/routes/blog/[slug].html new file mode 100644 index 0000000..f44adaa --- /dev/null +++ b/test/apps/export/src/routes/blog/[slug].html @@ -0,0 +1,11 @@ +

{post.title}

+ + \ No newline at end of file diff --git a/test/apps/export/src/routes/blog/[slug].json.js b/test/apps/export/src/routes/blog/[slug].json.js new file mode 100644 index 0000000..66781ad --- /dev/null +++ b/test/apps/export/src/routes/blog/[slug].json.js @@ -0,0 +1,19 @@ +import posts from './_posts.js'; + +export function get(req, res) { + const post = posts.find(post => post.slug === req.params.slug); + + if (post) { + res.writeHead(200, { + 'Content-Type': 'application/json' + }); + + res.end(JSON.stringify(post)); + } else { + res.writeHead(404, { + 'Content-Type': 'application/json' + }); + + res.end(JSON.stringify({ message: 'not found' })); + } +} \ No newline at end of file diff --git a/test/apps/export/src/routes/blog/_posts.js b/test/apps/export/src/routes/blog/_posts.js new file mode 100644 index 0000000..d283aa6 --- /dev/null +++ b/test/apps/export/src/routes/blog/_posts.js @@ -0,0 +1,5 @@ +export default [ + { slug: 'foo', title: 'once upon a foo' }, + { slug: 'bar', title: 'a bar is born' }, + { slug: 'baz', title: 'bazzily ever after' } +]; \ No newline at end of file diff --git a/test/apps/export/src/routes/blog/index.html b/test/apps/export/src/routes/blog/index.html new file mode 100644 index 0000000..2eea681 --- /dev/null +++ b/test/apps/export/src/routes/blog/index.html @@ -0,0 +1,15 @@ +

blog

+ +{#each posts as post} +

{post.title}

+{/each} + + \ No newline at end of file diff --git a/test/apps/export/src/routes/blog/index.json.js b/test/apps/export/src/routes/blog/index.json.js new file mode 100644 index 0000000..0097f77 --- /dev/null +++ b/test/apps/export/src/routes/blog/index.json.js @@ -0,0 +1,9 @@ +import posts from './_posts.js'; + +export function get(req, res) { + res.writeHead(200, { + 'Content-Type': 'application/json' + }); + + res.end(JSON.stringify(posts)); +} \ No newline at end of file diff --git a/test/apps/export/src/routes/index.html b/test/apps/export/src/routes/index.html new file mode 100644 index 0000000..37f82e0 --- /dev/null +++ b/test/apps/export/src/routes/index.html @@ -0,0 +1,3 @@ +

Great success!

+ +blog \ No newline at end of file diff --git a/test/apps/export/src/server.js b/test/apps/export/src/server.js new file mode 100644 index 0000000..d5a668b --- /dev/null +++ b/test/apps/export/src/server.js @@ -0,0 +1,15 @@ +import sirv from 'sirv'; +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT, NODE_ENV } = process.env; +const dev = NODE_ENV === 'development'; + +polka() + .use( + sirv('static', { dev }), + sapper.middleware() + ) + .listen(PORT, err => { + if (err) console.log('error', err); + }); diff --git a/test/apps/export/src/service-worker.js b/test/apps/export/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/export/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/export/src/template.html b/test/apps/export/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/export/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/export/static/global.css b/test/apps/export/static/global.css new file mode 100644 index 0000000..800f57a --- /dev/null +++ b/test/apps/export/static/global.css @@ -0,0 +1,3 @@ +body { + font-family: 'Comic Sans MS'; +} \ No newline at end of file diff --git a/test/apps/ignore/__test__.ts b/test/apps/ignore/__test__.ts new file mode 100644 index 0000000..b38423b --- /dev/null +++ b/test/apps/ignore/__test__.ts @@ -0,0 +1,82 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; + +describe('ignore', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('respects `options.ignore` values (RegExp)', async () => { + await page.goto(`${base}/foobar`); + + assert.equal( + await page.evaluate(() => document.documentElement.textContent), + 'foobar' + ); + }); + + it('respects `options.ignore` values (String #1)', async () => { + await page.goto(`${base}/buzz`); + + assert.equal( + await page.evaluate(() => document.documentElement.textContent), + 'buzz' + ); + }); + + it('respects `options.ignore` values (String #2)', async () => { + await page.goto(`${base}/fizzer`); + + assert.equal( + await page.evaluate(() => document.documentElement.textContent), + 'fizzer' + ); + }); + + it('respects `options.ignore` values (Function)', async () => { + await page.goto(`${base}/hello`); + + assert.equal( + await page.evaluate(() => document.documentElement.textContent), + 'hello' + ); + }); +}); \ No newline at end of file diff --git a/test/apps/ignore/rollup.config.js b/test/apps/ignore/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/ignore/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/ignore/src/client.js b/test/apps/ignore/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/ignore/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/ignore/src/routes/[slug].html b/test/apps/ignore/src/routes/[slug].html new file mode 100644 index 0000000..ade66de --- /dev/null +++ b/test/apps/ignore/src/routes/[slug].html @@ -0,0 +1 @@ +

{params.slug.toUpperCase()}

\ No newline at end of file diff --git a/test/apps/ignore/src/routes/_error.html b/test/apps/ignore/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/ignore/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/ignore/src/routes/a.html b/test/apps/ignore/src/routes/a.html new file mode 100644 index 0000000..0e6757b --- /dev/null +++ b/test/apps/ignore/src/routes/a.html @@ -0,0 +1 @@ +

a

\ No newline at end of file diff --git a/test/apps/ignore/src/routes/b/index.html b/test/apps/ignore/src/routes/b/index.html new file mode 100644 index 0000000..d93079d --- /dev/null +++ b/test/apps/ignore/src/routes/b/index.html @@ -0,0 +1,11 @@ +

{letter}

+ + \ No newline at end of file diff --git a/test/apps/ignore/src/routes/b/index.json.js b/test/apps/ignore/src/routes/b/index.json.js new file mode 100644 index 0000000..29b7ede --- /dev/null +++ b/test/apps/ignore/src/routes/b/index.json.js @@ -0,0 +1,3 @@ +export function get(req, res) { + res.end(JSON.stringify('b')); +} \ No newline at end of file diff --git a/test/apps/ignore/src/routes/index.html b/test/apps/ignore/src/routes/index.html new file mode 100644 index 0000000..e08c0cb --- /dev/null +++ b/test/apps/ignore/src/routes/index.html @@ -0,0 +1,3 @@ +

Great success!

+ +a \ No newline at end of file diff --git a/test/apps/ignore/src/server.js b/test/apps/ignore/src/server.js new file mode 100644 index 0000000..f987e4a --- /dev/null +++ b/test/apps/ignore/src/server.js @@ -0,0 +1,19 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +const app = polka().use(sapper.middleware({ + ignore: [ + /foobar/i, + '/buzz', + 'fizz', + x => x === '/hello' + ] +})); + +['foobar', 'buzz', 'fizzer', 'hello'].forEach(uri => { + app.get('/'+uri, (req, res) => res.end(uri)); +}); + +app.listen(PORT); diff --git a/test/apps/ignore/src/service-worker.js b/test/apps/ignore/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/ignore/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/ignore/src/template.html b/test/apps/ignore/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/ignore/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/layout/__test__.ts b/test/apps/layout/__test__.ts new file mode 100644 index 0000000..7edc390 --- /dev/null +++ b/test/apps/layout/__test__.ts @@ -0,0 +1,74 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; +import { wait } from '../../utils'; + +describe('layout', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('only recreates components when necessary', async () => { + await page.goto(`${base}/foo/bar/baz`); + await start(); + + const text1 = await page.evaluate(() => document.querySelector('#sapper').textContent); + assert.deepEqual(text1.split('\n').filter(Boolean), [ + 'y: bar 1', + 'z: baz 1', + 'click me', + 'child segment: baz' + ]); + + await page.click('[href="foo/bar/qux"]'); + await wait(50); + + const text2 = await page.evaluate(() => document.querySelector('#sapper').textContent); + assert.deepEqual(text2.split('\n').filter(Boolean), [ + 'y: bar 1', + 'z: qux 2', + 'click me', + 'child segment: qux' + ]); + }); +}); \ No newline at end of file diff --git a/test/apps/layout/rollup.config.js b/test/apps/layout/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/layout/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/layout/src/client.js b/test/apps/layout/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/layout/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/layout/src/routes/[slug].html b/test/apps/layout/src/routes/[slug].html new file mode 100644 index 0000000..ade66de --- /dev/null +++ b/test/apps/layout/src/routes/[slug].html @@ -0,0 +1 @@ +

{params.slug.toUpperCase()}

\ No newline at end of file diff --git a/test/app/src/routes/[x]/[y]/[z].html b/test/apps/layout/src/routes/[x]/[y]/[z].html similarity index 87% rename from test/app/src/routes/[x]/[y]/[z].html rename to test/apps/layout/src/routes/[x]/[y]/[z].html index 787e413..018f001 100644 --- a/test/app/src/routes/[x]/[y]/[z].html +++ b/test/apps/layout/src/routes/[x]/[y]/[z].html @@ -1,5 +1,5 @@ z: {segment} {count} - +click me + \ No newline at end of file diff --git a/test/app/src/routes/redirect-to.html b/test/apps/redirects/src/routes/redirect-to.html similarity index 100% rename from test/app/src/routes/redirect-to.html rename to test/apps/redirects/src/routes/redirect-to.html diff --git a/test/apps/redirects/src/server.js b/test/apps/redirects/src/server.js new file mode 100644 index 0000000..0e7741c --- /dev/null +++ b/test/apps/redirects/src/server.js @@ -0,0 +1,8 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/apps/redirects/src/service-worker.js b/test/apps/redirects/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/redirects/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/redirects/src/template.html b/test/apps/redirects/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/redirects/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/scroll/__test__.ts b/test/apps/scroll/__test__.ts new file mode 100644 index 0000000..4e6e403 --- /dev/null +++ b/test/apps/scroll/__test__.ts @@ -0,0 +1,86 @@ +import * as assert from 'assert'; +import * as path from 'path'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; +import { wait } from '../../utils'; + +describe('scroll', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + let prefetchRoutes: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start, prefetchRoutes } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + it('scrolls to active deeplink', async () => { + await page.goto(`${base}/tall-page#foo`); + await start(); + + const scrollY = await page.evaluate(() => window.scrollY); + assert.ok(scrollY > 0, scrollY); + }); + + it('resets scroll when a link is clicked', async () => { + await page.goto(`${base}/tall-page#foo`); + await start(); + await prefetchRoutes(); + + await page.click('[href="another-tall-page"]'); + await wait(50); + + assert.equal( + await page.evaluate(() => window.scrollY), + 0 + ); + }); + + it('preserves scroll when a link with sapper-noscroll is clicked', async () => { + await page.goto(`${base}/tall-page#foo`); + await start(); + await prefetchRoutes(); + + await page.click('[href="another-tall-page"][sapper-noscroll]'); + await wait(50); + + const scrollY = await page.evaluate(() => window.scrollY); + + assert.ok(scrollY > 0); + }); +}); \ No newline at end of file diff --git a/test/apps/scroll/rollup.config.js b/test/apps/scroll/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/scroll/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/scroll/src/client.js b/test/apps/scroll/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/scroll/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/scroll/src/routes/_error.html b/test/apps/scroll/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/scroll/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/scroll/src/routes/another-tall-page.html b/test/apps/scroll/src/routes/another-tall-page.html new file mode 100644 index 0000000..d3e148c --- /dev/null +++ b/test/apps/scroll/src/routes/another-tall-page.html @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/test/apps/scroll/src/routes/index.html b/test/apps/scroll/src/routes/index.html new file mode 100644 index 0000000..0cc4b72 --- /dev/null +++ b/test/apps/scroll/src/routes/index.html @@ -0,0 +1 @@ +

Great success!

\ No newline at end of file diff --git a/test/apps/scroll/src/routes/tall-page.html b/test/apps/scroll/src/routes/tall-page.html new file mode 100644 index 0000000..7e42ff9 --- /dev/null +++ b/test/apps/scroll/src/routes/tall-page.html @@ -0,0 +1,6 @@ +
+ +
+ link + link +
\ No newline at end of file diff --git a/test/apps/scroll/src/server.js b/test/apps/scroll/src/server.js new file mode 100644 index 0000000..0e7741c --- /dev/null +++ b/test/apps/scroll/src/server.js @@ -0,0 +1,8 @@ +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use(sapper.middleware()) + .listen(PORT); diff --git a/test/apps/scroll/src/service-worker.js b/test/apps/scroll/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/scroll/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/scroll/src/template.html b/test/apps/scroll/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/scroll/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/store/__test__.ts b/test/apps/store/__test__.ts new file mode 100644 index 0000000..c61f3c0 --- /dev/null +++ b/test/apps/store/__test__.ts @@ -0,0 +1,60 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import { build } from '../../../api'; +import { AppRunner } from '../AppRunner'; + +describe('store', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // helpers + let start: () => Promise; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const emitter = build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + emitter.on('error', reject); + + emitter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page, start } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + + after(() => runner.end()); + + const title = () => page.$eval('h1', node => node.textContent); + + it('renders store props', async () => { + await page.goto(`${base}/store`); + + assert.equal(await title(), 'hello world'); + + await start(); + assert.equal(await title(), 'hello world'); + }); +}); \ No newline at end of file diff --git a/test/apps/store/rollup.config.js b/test/apps/store/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/store/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/store/src/client.js b/test/apps/store/src/client.js new file mode 100644 index 0000000..df66471 --- /dev/null +++ b/test/apps/store/src/client.js @@ -0,0 +1,11 @@ +import { Store } from 'svelte/store.js'; +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper'), + store: data => new Store(data) +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/store/src/routes/_error.html b/test/apps/store/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/store/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/store/src/routes/index.html b/test/apps/store/src/routes/index.html new file mode 100644 index 0000000..221c0f5 --- /dev/null +++ b/test/apps/store/src/routes/index.html @@ -0,0 +1,7 @@ +

Great success!

+ +a +ok +ok + +
\ No newline at end of file diff --git a/test/app/src/routes/store.html b/test/apps/store/src/routes/store.html similarity index 100% rename from test/app/src/routes/store.html rename to test/apps/store/src/routes/store.html diff --git a/test/apps/store/src/server.js b/test/apps/store/src/server.js new file mode 100644 index 0000000..c40e690 --- /dev/null +++ b/test/apps/store/src/server.js @@ -0,0 +1,22 @@ +import polka from 'polka'; +import { Store } from 'svelte/store.js'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT } = process.env; + +polka() + .use((req, res, next) => { + req.hello = 'hello'; + res.locals = { name: 'world' }; + next(); + }) + .use( + sapper.middleware({ + store: (req, res) => { + return new Store({ + title: `${req.hello} ${res.locals.name}` + }); + } + }) + ) + .listen(PORT); diff --git a/test/apps/store/src/service-worker.js b/test/apps/store/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/store/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/store/src/template.html b/test/apps/store/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/store/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/with-basepath/__test__.ts b/test/apps/with-basepath/__test__.ts new file mode 100644 index 0000000..83a4916 --- /dev/null +++ b/test/apps/with-basepath/__test__.ts @@ -0,0 +1,97 @@ +import * as path from 'path'; +import * as assert from 'assert'; +import * as puppeteer from 'puppeteer'; +import * as api from '../../../api'; +import { walk } from '../../utils'; +import { AppRunner } from '../AppRunner'; + +describe('with-basepath', function() { + this.timeout(10000); + + let runner: AppRunner; + let page: puppeteer.Page; + let base: string; + + // hooks + before(() => { + return new Promise((fulfil, reject) => { + // TODO this is brittle. Make it unnecessary + process.chdir(__dirname); + process.env.NODE_ENV = 'production'; + + // TODO this API isn't great. Rethink it + const builder = api.build({ + bundler: 'rollup' + }, { + src: path.join(__dirname, 'src'), + routes: path.join(__dirname, 'src/routes'), + dest: path.join(__dirname, '__sapper__/build') + }); + + builder.on('error', reject); + builder.on('done', () => { + // TODO it'd be nice if build and export returned promises. + // not sure how best to combine promise and event emitter + const exporter = api.exporter({ + build: '__sapper__/build', + dest: '__sapper__/export', + static: 'static', + basepath: 'custom-basepath', + timeout: 5000 + }); + + exporter.on('error', (err: Error) => { + console.error(err); + reject(err); + }); + + exporter.on('done', async () => { + try { + runner = new AppRunner(__dirname, '__sapper__/build/server/server.js'); + ({ base, page } = await runner.start()); + + fulfil(); + } catch (err) { + reject(err); + } + }); + }); + }); + }); + + after(() => runner.end()); + + it('serves /custom-basepath', async () => { + await page.goto(`${base}/custom-basepath`); + + assert.equal( + await page.$eval('h1', node => node.textContent), + 'Great success!' + ); + }); + + it('emits a basepath message', async () => { + await page.goto(`${base}/custom-basepath`); + + assert.deepEqual(runner.messages, [{ + __sapper__: true, + event: 'basepath', + basepath: '/custom-basepath' + }]); + }); + + it('crawls an exported site with basepath', () => { + const files = walk('__sapper__/export'); + + const client_assets = files.filter(file => file.startsWith('custom-basepath/client/')); + const non_client_assets = files.filter(file => !file.startsWith('custom-basepath/client/')).sort(); + + assert.ok(client_assets.length > 0); + + assert.deepEqual(non_client_assets, [ + 'custom-basepath/global.css', + 'custom-basepath/index.html', + 'custom-basepath/service-worker.js' + ]); + }); +}); \ No newline at end of file diff --git a/test/apps/with-basepath/rollup.config.js b/test/apps/with-basepath/rollup.config.js new file mode 100644 index 0000000..943b676 --- /dev/null +++ b/test/apps/with-basepath/rollup.config.js @@ -0,0 +1,64 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import svelte from 'rollup-plugin-svelte'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; + +const config = require('../../../config/rollup.js'); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + dev, + hydratable: true, + emitCss: true + }), + resolve() + ], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode) + }), + svelte({ + generate: 'ssr', + dev + }), + resolve({ + preferBuiltins: true + }) + ], + external: ['sirv', 'polka'], + + // temporary, pending Rollup 1.0 + experimentalCodeSplitting: true + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode) + }) + ] + } +}; \ No newline at end of file diff --git a/test/apps/with-basepath/src/client.js b/test/apps/with-basepath/src/client.js new file mode 100644 index 0000000..0865a4a --- /dev/null +++ b/test/apps/with-basepath/src/client.js @@ -0,0 +1,9 @@ +import * as sapper from '../__sapper__/client.js'; + +window.start = () => sapper.start({ + target: document.querySelector('#sapper') +}); + +window.prefetchRoutes = () => sapper.prefetchRoutes(); +window.prefetch = href => sapper.prefetch(href); +window.goto = href => sapper.goto(href); \ No newline at end of file diff --git a/test/apps/with-basepath/src/routes/_error.html b/test/apps/with-basepath/src/routes/_error.html new file mode 100644 index 0000000..4cd55d2 --- /dev/null +++ b/test/apps/with-basepath/src/routes/_error.html @@ -0,0 +1,3 @@ +

{status}

+ +

{error.message}

\ No newline at end of file diff --git a/test/apps/with-basepath/src/routes/index.html b/test/apps/with-basepath/src/routes/index.html new file mode 100644 index 0000000..0cc4b72 --- /dev/null +++ b/test/apps/with-basepath/src/routes/index.html @@ -0,0 +1 @@ +

Great success!

\ No newline at end of file diff --git a/test/apps/with-basepath/src/server.js b/test/apps/with-basepath/src/server.js new file mode 100644 index 0000000..b187dad --- /dev/null +++ b/test/apps/with-basepath/src/server.js @@ -0,0 +1,16 @@ +import sirv from 'sirv'; +import polka from 'polka'; +import * as sapper from '../__sapper__/server.js'; + +const { PORT, NODE_ENV } = process.env; +const dev = NODE_ENV === 'development'; + +polka() + .use( + 'custom-basepath', + sirv('static', { dev }), + sapper.middleware() + ) + .listen(PORT, err => { + if (err) console.log('error', err); + }); diff --git a/test/apps/with-basepath/src/service-worker.js b/test/apps/with-basepath/src/service-worker.js new file mode 100644 index 0000000..9d2ac9d --- /dev/null +++ b/test/apps/with-basepath/src/service-worker.js @@ -0,0 +1,82 @@ +import { timestamp, files, shell, routes } from '../__sapper__/service-worker.js'; + +const ASSETS = `cache${timestamp}`; + +// `shell` is an array of all the files generated by webpack, +// `files` is an array of everything in the `static` directory +const to_cache = shell.concat(ASSETS); +const cached = new Set(to_cache); + +self.addEventListener('install', event => { + event.waitUntil( + caches + .open(ASSETS) + .then(cache => cache.addAll(to_cache)) + .then(() => { + self.skipWaiting(); + }) + ); +}); + +self.addEventListener('activate', event => { + event.waitUntil( + caches.keys().then(async keys => { + // delete old caches + for (const key of keys) { + if (key !== ASSETS) await caches.delete(key); + } + + self.clients.claim(); + }) + ); +}); + +self.addEventListener('fetch', event => { + if (event.request.method !== 'GET') return; + + const url = new URL(event.request.url); + + // don't try to handle e.g. data: URIs + if (!url.protocol.startsWith('http')) return; + + // ignore dev server requests + if (url.hostname === self.location.hostname && url.port !== self.location.port) return; + + // always serve assets and webpack-generated files from cache + if (url.host === self.location.host && cached.has(url.pathname)) { + event.respondWith(caches.match(event.request)); + return; + } + + // for pages, you might want to serve a shell `index.html` file, + // which Sapper has generated for you. It's not right for every + // app, but if it's right for yours then uncomment this section + /* + if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) { + event.respondWith(caches.match('/index.html')); + return; + } + */ + + if (event.request.cache === 'only-if-cached') return; + + // for everything else, try the network first, falling back to + // cache if the user is offline. (If the pages never change, you + // might prefer a cache-first approach to a network-first one.) + event.respondWith( + caches + .open(`offline${timestamp}`) + .then(async cache => { + try { + const response = await fetch(event.request); + cache.put(event.request, response.clone()); + return response; + } catch(err) { + const response = await cache.match(event.request); + if (response) return response; + + throw err; + } + }) + ); +}); diff --git a/test/apps/with-basepath/src/template.html b/test/apps/with-basepath/src/template.html new file mode 100644 index 0000000..0eb1f3b --- /dev/null +++ b/test/apps/with-basepath/src/template.html @@ -0,0 +1,14 @@ + + + + + + %sapper.base% + %sapper.styles% + %sapper.head% + + +
%sapper.html%
+ %sapper.scripts% + + diff --git a/test/apps/with-basepath/static/global.css b/test/apps/with-basepath/static/global.css new file mode 100644 index 0000000..800f57a --- /dev/null +++ b/test/apps/with-basepath/static/global.css @@ -0,0 +1,3 @@ +body { + font-family: 'Comic Sans MS'; +} \ No newline at end of file diff --git a/test/common/test.js b/test/common/test.js deleted file mode 100644 index b48303b..0000000 --- a/test/common/test.js +++ /dev/null @@ -1,874 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const assert = require('assert'); -const Nightmare = require('nightmare'); -const walkSync = require('walk-sync'); -const rimraf = require('rimraf'); -const ports = require('port-authority'); -const fetch = require('node-fetch'); - -Nightmare.action('page', { - title(done) { - this.evaluate_now(() => document.querySelector('h1').textContent, done); - }, - - html(done) { - this.evaluate_now(() => document.documentElement.innerHTML, done); - }, - - text(done) { - this.evaluate_now(() => document.body.textContent, done); - } -}); - -Nightmare.action('init', function(done) { - this.evaluate_now(() => window.init(), done); -}); - -Nightmare.action('prefetchRoutes', function(done) { - this.evaluate_now(() => window.prefetchRoutes(), done); -}); - -const cli = path.resolve(__dirname, '../../sapper'); - -const wait = ms => new Promise(f => setTimeout(f, ms)); - -describe('sapper', function() { - process.chdir(path.resolve(__dirname, '../app')); - - // clean up after previous test runs - rimraf.sync('__sapper__'); - - this.timeout(process.env.CI ? 30000 : 15000); - - // TODO reinstate dev tests - // run({ - // mode: 'development' - // }); - - run({ - mode: 'production' - }); - - run({ - mode: 'production', - basepath: '/custom-basepath' - }); - - testExport({}); - - testExport({ basepath: '/custom-basepath' }); -}); - -function testExport({ basepath = '' }) { - describe(basepath ? `export --basepath ${basepath}` : 'export', () => { - before(() => { - if (basepath) { - process.env.BASEPATH = basepath; - } - - return exec(`node ${cli} export ${basepath ? `--basepath ${basepath}` : ''}`); - }); - - it('export all pages', () => { - const dest = path.resolve(__dirname, '../app/__sapper__/export'); - - // Pages that should show up in the extraction directory. - const expectedPages = [ - 'index.html', - 'about/index.html', - 'slow-preload/index.html', - - 'redirect-from/index.html', - 'redirect-to/index.html', - 'non-sapper-redirect-from/index.html', - 'non-sapper-redirect-to/index.html', - - 'blog/index.html', - 'blog/a-very-long-post/index.html', - 'blog/how-can-i-get-involved/index.html', - 'blog/how-is-sapper-different-from-next/index.html', - 'blog/how-to-use-sapper/index.html', - 'blog/what-is-sapper/index.html', - 'blog/why-the-name/index.html', - 'blog/encödïng-test/index.html', - - 'blog.json', - 'blog/a-very-long-post.json', - 'blog/how-can-i-get-involved.json', - 'blog/how-is-sapper-different-from-next.json', - 'blog/how-to-use-sapper.json', - 'blog/what-is-sapper.json', - 'blog/why-the-name.json', - 'blog/encödïng-test.json', - - 'favicon.png', - 'global.css', - 'great-success.png', - 'manifest.json', - 'service-worker.js', - 'svelte-logo-192.png', - 'svelte-logo-512.png', - ].map(file => { - return basepath ? `${basepath.replace(/^[\/\\]/, '')}/${file}` : file; - }); - - // Client scripts that should show up in the extraction directory. - const expectedClientRegexes = [ - /client\/[^/]+\/main(\.\d+)?\.js/, - /client\/[^/]+\/index(\.\d+)?\.js/, - /client\/[^/]+\/about(\.\d+)?\.js/, - /client\/[^/]+\/blog_\$slug(\.\d+)?\.js/, - /client\/[^/]+\/blog(\.\d+)?\.js/, - /client\/[^/]+\/slow\$45preload(\.\d+)?\.js/, - ]; - const allPages = walkSync(dest); - - expectedPages.forEach((expectedPage) => { - assert.ok(allPages.includes(expectedPage),`Could not find page matching ${expectedPage}`); - }); - - expectedClientRegexes.forEach((expectedRegex) => { - // Ensure each client page regular expression matches at least one - // generated page. - let matched = false; - for (const page of allPages) { - if (expectedRegex.test(page)) { - matched = true; - break; - } - } - assert.ok(matched, `Could not find client page matching ${expectedRegex}`); - }); - }); - }); -} - -function run({ mode, basepath = '' }) { - describe(`mode=${mode}`, function () { - let proc; - let capture; - - let base; - let captured_basepath; - - const nightmare = new Nightmare(); - - nightmare.on('console', (type, ...args) => { - console[type](...args); - }); - - nightmare.on('page', (type, ...args) => { - if (type === 'error') { - console.error(args[1]); - } else { - console.warn(type, args); - } - }); - - before(() => { - const promise = mode === 'production' - ? exec(`node ${cli} build -l`).then(() => ports.find(3000)) - : ports.find(3000).then(port => { - exec(`node ${cli} dev`); - return ports.wait(port).then(() => port); - }); - - return promise.then(port => { - base = `http://localhost:${port}`; - if (basepath) base += basepath; - - const dir = mode === 'production' ? '__sapper__/build' : '__sapper__/dev'; - - if (mode === 'production') { - assert.ok(fs.existsSync('__sapper__/build/index.js')); - } - - proc = require('child_process').fork(`${dir}/server/server.js`, { - cwd: process.cwd(), - env: { - NODE_ENV: mode, - BASEPATH: basepath, - SAPPER_DEST: dir, - PORT: port - } - }); - - let handler; - - proc.on('message', message => { - if (message.__sapper__) { - if (message.event === 'basepath') { - captured_basepath = basepath; - } - return; - } - - if (handler) handler(message); - }); - - capture = fn => { - return new Promise((fulfil, reject) => { - const captured = []; - - let start = Date.now(); - - handler = message => { - if (message.type === 'ready') { - fn().then(() => { - proc.send({ - action: 'end' - }); - }, reject); - } - - else if (message.type === 'done') { - fulfil(captured); - handler = null; - } - - else { - captured.push(message); - } - }; - - proc.send({ - action: 'start' - }); - }); - }; - }); - }); - - after(() => { - // give a chance to clean up - return Promise.all([ - nightmare.end(), - new Promise(fulfil => { - proc.on('exit', fulfil); - proc.kill(); - }) - ]); - }); - - describe('basic functionality', () => { - it('serves /', () => { - return nightmare.goto(base).page.title().then(title => { - assert.equal(title, 'Great success!'); - }); - }); - - it('serves /?', () => { - return nightmare.goto(`${base}?`).page.title().then(title => { - assert.equal(title, 'Great success!'); - }); - }); - - it('serves static route', () => { - return nightmare.goto(`${base}/about`).page.title().then(title => { - assert.equal(title, 'About this site'); - }); - }); - - it('serves dynamic route', () => { - return nightmare.goto(`${base}/blog/what-is-sapper`).page.title().then(title => { - assert.equal(title, 'What is Sapper?'); - }); - }); - - it('navigates to a new page without reloading', () => { - return nightmare.goto(base).init().prefetchRoutes() - .then(() => { - return capture(() => nightmare.click('a[href="about"]')); - }) - .then(requests => { - assert.deepEqual(requests.map(r => r.url), []); - }) - .then(() => wait(100)) - .then(() => nightmare.path()) - .then(path => { - assert.equal(path, `${basepath}/about`); - return nightmare.title(); - }) - .then(title => { - assert.equal(title, 'About'); - }); - }); - - it('navigates programmatically', () => { - return nightmare - .goto(`${base}/about`) - .init() - .evaluate(() => window.goto('blog/what-is-sapper')) - .title() - .then(title => { - assert.equal(title, 'What is Sapper?'); - }); - }); - - it('prefetches programmatically', () => { - return capture(() => nightmare.goto(`${base}/about`).init()) - .then(() => { - return capture(() => { - return nightmare - .click('.prefetch') - .wait(200); - }); - }) - .then(requests => { - assert.ok(!!requests.find(r => r.url === `/blog/why-the-name.json`)); - }); - }); - - it('scrolls to active deeplink', () => { - return nightmare - .goto(`${base}/blog/a-very-long-post#four`) - .init() - .evaluate(() => window.scrollY) - .then(scrollY => { - assert.ok(scrollY > 0, scrollY); - }); - }); - - it.skip('reuses prefetch promise', () => { - return nightmare - .goto(`${base}/blog`) - .init() - .then(() => { - return capture(() => { - return nightmare - .evaluate(() => { - const a = document.querySelector('[href="blog/what-is-sapper"]'); - a.dispatchEvent(new MouseEvent('mousemove')); - }) - .wait(200); - }); - }) - .then(mouseover_requests => { - assert.ok(mouseover_requests.findIndex(r => r.url === `/blog/what-is-sapper.json`) !== -1); - - return capture(() => { - return nightmare - .click('[href="blog/what-is-sapper"]') - .wait(200); - }); - }) - .then(click_requests => { - assert.ok(click_requests.findIndex(r => r.url === `/blog/what-is-sapper.json`) === -1); - }); - }); - - it('cancels navigation if subsequent navigation occurs during preload', () => { - return nightmare - .goto(base) - .init() - .click('a[href="slow-preload"]') - .wait(100) - .click('a[href="about"]') - .wait(100) - .then(() => nightmare.path()) - .then(path => { - assert.equal(path, `${basepath}/about`); - return nightmare.title(); - }) - .then(title => { - assert.equal(title, 'About'); - return nightmare.evaluate(() => window.fulfil({})).wait(100); - }) - .then(() => nightmare.path()) - .then(path => { - assert.equal(path, `${basepath}/about`); - return nightmare.title(); - }) - .then(title => { - assert.equal(title, 'About'); - }); - }); - - it('calls a delete handler', () => { - return nightmare - .goto(`${base}/delete-test`) - .init() - .click('.del') - .wait(() => window.deleted) - .evaluate(() => window.deleted.id) - .then(id => { - assert.equal(id, 42); - }); - }); - - it('hydrates initial route', () => { - return nightmare.goto(base) - .wait('.hydrate-test') - .evaluate(() => { - window.el = document.querySelector('.hydrate-test'); - }) - .init() - .evaluate(() => { - return document.querySelector('.hydrate-test') === window.el; - }) - .then(matches => { - assert.ok(matches); - }); - }); - - it('redirects on server', () => { - return nightmare.goto(`${base}/redirect-from`) - .path() - .then(path => { - assert.equal(path, `${basepath}/redirect-to`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, 'redirected'); - }); - }); - - it('redirects in client', () => { - return nightmare.goto(base) - .wait('[href="redirect-from"]') - .click('[href="redirect-from"]') - .wait(200) - .path() - .then(path => { - assert.equal(path, `${basepath}/redirect-to`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, 'redirected'); - }); - }); - - it('redirects on server (root)', () => { - return nightmare.goto(`${base}/redirect-root`) - .path() - .then(path => { - assert.equal(path, `${basepath}/`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, 'Great success!'); - }); - }); - - it('redirects in client (root)', () => { - return nightmare.goto(base) - .wait('[href="redirect-root"]') - .click('[href="redirect-root"]') - .wait(200) - .path() - .then(path => { - assert.equal(path, `${basepath}/`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, 'Great success!'); - }); - }); - - it('handles 4xx error on server', () => { - return nightmare.goto(`${base}/blog/nope`) - .path() - .then(path => { - assert.equal(path, `${basepath}/blog/nope`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, '404') - }); - }); - - it('handles 4xx error in client', () => { - return nightmare.goto(base) - .init() - .click('[href="blog/nope"]') - .wait(200) - .path() - .then(path => { - assert.equal(path, `${basepath}/blog/nope`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, '404'); - }); - }); - - it('handles non-4xx error on server', () => { - return nightmare.goto(`${base}/blog/throw-an-error`) - .path() - .then(path => { - assert.equal(path, `${basepath}/blog/throw-an-error`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, '500') - }); - }); - - it('handles non-4xx error in client', () => { - return nightmare.goto(base) - .init() - .click('[href="blog/throw-an-error"]') - .wait(200) - .path() - .then(path => { - assert.equal(path, `${basepath}/blog/throw-an-error`); - }) - .then(() => nightmare.page.title()) - .then(title => { - assert.equal(title, '500'); - }); - }); - - // Ignores are meant for top-level escape. - // ~> Sapper **should** own the entire {basepath} when designated. - if (!basepath) { - it('respects `options.ignore` values (RegExp)', () => { - return nightmare.goto(`${base}/foobar`) - .evaluate(() => document.documentElement.textContent) - .then(text => { - assert.equal(text, 'foobar'); - }); - }); - - it('respects `options.ignore` values (String #1)', () => { - return nightmare.goto(`${base}/buzz`) - .evaluate(() => document.documentElement.textContent) - .then(text => { - assert.equal(text, 'buzz'); - }); - }); - - it('respects `options.ignore` values (String #2)', () => { - return nightmare.goto(`${base}/fizzer`) - .evaluate(() => document.documentElement.textContent) - .then(text => { - assert.equal(text, 'fizzer'); - }); - }); - - it('respects `options.ignore` values (Function)', () => { - return nightmare.goto(`${base}/hello`) - .evaluate(() => document.documentElement.textContent) - .then(text => { - assert.equal(text, 'hello'); - }); - }); - } - - it('does not attempt client-side navigation to server routes', () => { - return nightmare.goto(`${base}/blog/how-is-sapper-different-from-next`) - .init() - .click(`[href="blog/how-is-sapper-different-from-next.json"]`) - .wait(200) - .page.text() - .then(text => { - JSON.parse(text); - }); - }); - - it('does not serve error page for non-page errors', () => { - return nightmare.goto(`${base}/throw-an-error`) - .page.text() - .then(text => { - assert.equal(text, 'nope'); - }); - }); - - it('encodes routes', () => { - return nightmare.goto(`${base}/fünke`) - .page.title() - .then(title => { - assert.equal(title, `I'm afraid I just blue myself`); - }); - }); - - it('serializes Set objects returned from preload', () => { - return nightmare.goto(`${base}/preload-values/set`) - .page.title() - .then(title => { - assert.equal(title, 'true'); - return nightmare.init().page.title(); - }) - .then(title => { - assert.equal(title, 'true'); - }); - }); - - it('bails on custom classes returned from preload', () => { - return nightmare.goto(`${base}/preload-values/custom-class`) - .page.title() - .then(title => { - assert.equal(title, '42'); - return nightmare.init().page.title(); - }) - .then(title => { - assert.equal(title, '42'); - }); - }); - - it('renders store props', () => { - return nightmare.goto(`${base}/store`) - .page.title() - .then(title => { - assert.equal(title, 'hello world'); - return nightmare.init().page.title(); - }) - .then(title => { - assert.equal(title, 'hello world'); - }); - }); - - it('sends cookies when using this.fetch with credentials: "include"', () => { - return nightmare.goto(`${base}/credentials?creds=include`) - .page.title() - .then(title => { - assert.equal(title, 'a: 1, b: 2, max-age: undefined'); - }); - }); - - it('does not send cookies when using this.fetch without credentials', () => { - return nightmare.goto(`${base}/credentials`) - .page.title() - .then(title => { - assert.equal(title, 'unauthorized'); - }); - }); - - it('delegates to fetch on the client', () => { - return nightmare.goto(base).init() - .click('[href="credentials?creds=include"]') - .wait(100) - .page.title() - .then(title => { - assert.equal(title, 'a: 1, b: 2, max-age: undefined'); - }); - }); - - it('includes service worker', () => { - return nightmare.goto(base).page.html().then(html => { - assert.ok(html.indexOf('service-worker.js') !== -1); - }); - }); - - it('sets preloading true when appropriate', () => { - return nightmare - .goto(base) - .init() - .click('a[href="slow-preload"]') - .wait(100) - .evaluate(() => { - const progress = document.querySelector('progress'); - return !!progress; - }) - .then(hasProgressIndicator => { - assert.ok(hasProgressIndicator); - }) - .then(() => nightmare.evaluate(() => window.fulfil())) - .then(() => nightmare.evaluate(() => { - const progress = document.querySelector('progress'); - return !!progress; - })) - .then(hasProgressIndicator => { - assert.ok(!hasProgressIndicator); - }); - }); - - it('emits a basepath', () => { - assert.equal(captured_basepath, basepath); - }); - - // skipped because Nightmare doesn't seem to focus the correctly - it.skip('resets the active element after navigation', () => { - return nightmare - .goto(base) - .init() - .click('a[href="about"]') - .wait(100) - .evaluate(() => document.activeElement.nodeName) - .then(name => { - assert.equal(name, 'BODY'); - }); - }); - - it('replaces %sapper.xxx% tags safely', () => { - return nightmare - .goto(`${base}/unsafe-replacement`) - .init() - .page.html() - .then(html => { - assert.equal(html.indexOf('%sapper'), -1); - }); - }); - - it('only recreates components when necessary', () => { - return nightmare - .goto(`${base}/foo/bar/baz`) - .init() - .evaluate(() => document.querySelector('#sapper').textContent) - .then(text => { - assert.deepEqual(text.split('\n').filter(Boolean), [ - 'y: bar 1', - 'z: baz 1', - 'child segment: baz' - ]); - - return nightmare.click(`a`) - .then(() => wait(100)) - .then(() => { - return nightmare.evaluate(() => document.querySelector('#sapper').textContent); - }); - }) - .then(text => { - assert.deepEqual(text.split('\n').filter(Boolean), [ - 'y: bar 1', - 'z: qux 2', - 'child segment: qux' - ]); - }); - }); - - it('uses a fallback index component if none is provided', () => { - return nightmare.goto(`${base}/missing-index/ok`) - .page.title() - .then(title => { - assert.equal(title, 'it works'); - }); - }); - - it('runs preload in root component', () => { - return nightmare.goto(`${base}/preload-root`) - .page.title() - .then(title => { - assert.equal(title, 'root preload function ran: true'); - }); - }); - - it('allows reserved words as route names', () => { - return nightmare.goto(`${base}/const`).init() - .page.title() - .then(title => { - assert.equal(title, 'reserved words are okay as routes'); - }); - }); - - it('encodes req.params and req.query for server-rendered pages', () => { - return nightmare.goto(`${base}/echo/page/encöded?message=hëllö+wörld`) - .page.title() - .then(title => { - assert.equal(title, 'encöded (hëllö wörld)'); - }); - }); - - it('encodes req.params and req.query for client-rendered pages', () => { - return nightmare.goto(base).init() - .click('a[href="echo/page/encöded?message=hëllö+wörld"]') - .wait(100) - .page.title() - .then(title => { - assert.equal(title, 'encöded (hëllö wörld)'); - }); - }); - - it('accepts value-less query string parameter on server', () => { - return nightmare.goto(`${base}/echo/page/empty?message`) - .page.title() - .then(title => { - assert.equal(title, 'empty ()'); - }); - }); - - it('accepts value-less query string parameter on client', () => { - return nightmare.goto(base).init() - .click('a[href="echo/page/empty?message"]') - .wait(100) - .page.title() - .then(title => { - assert.equal(title, 'empty ()'); - }); - }); - - it('encodes req.params for server routes', () => { - return nightmare.goto(`${base}/echo/server-route/encöded`) - .page.title() - .then(title => { - assert.equal(title, 'encöded'); - }); - }); - - it('resets scroll when a link is clicked', () => { - return nightmare.goto(`${base}/blog/a-very-long-post`) - .init() - .evaluate(() => window.scrollTo(0, 200)) - .click('[href="blog/another-long-post"]') - .wait(100) - .evaluate(() => window.scrollY) - .then(scrollY => { - assert.equal(scrollY, 0); - }); - }); - - it('preserves scroll when a link with sapper-noscroll is clicked', () => { - return nightmare.goto(`${base}/blog/a-very-long-post`) - .init() - .evaluate(() => window.scrollTo(0, 200)) - .click('[href="blog/another-long-post"][sapper-noscroll]') - .wait(100) - .evaluate(() => window.scrollY) - .then(scrollY => { - assert.equal(scrollY, 200); - }); - }); - }); - - describe('headers', () => { - it('sets Content-Type, Link...preload, and Cache-Control headers', () => { - return capture(() => fetch(base)).then(responses => { - const { headers } = responses[0]; - - assert.equal( - headers['content-type'], - 'text/html' - ); - - assert.equal( - headers['cache-control'], - 'max-age=600' - ); - - const str = ['main', '.+?\\.\\d+'] - .map(file => { - return `<${basepath}/client/[^/]+/${file}\\.js>;rel="preload";as="script"`; - }) - .join(', '); - - const regex = new RegExp(str); - - assert.ok( - regex.test(headers['link']), - headers['link'] - ); - }); - }); - }); - }); -} - -function exec(cmd) { - return new Promise((fulfil, reject) => { - const parts = cmd.trim().split(' '); - const proc = require('child_process').spawn(parts.shift(), parts); - - proc.stdout.on('data', data => { - process.stdout.write(data); - }); - - proc.stderr.on('data', data => { - process.stderr.write(data); - }); - - proc.on('error', reject); - - proc.on('close', () => fulfil()); - }); -} diff --git a/test/utils.ts b/test/utils.ts new file mode 100644 index 0000000..fa802fa --- /dev/null +++ b/test/utils.ts @@ -0,0 +1,23 @@ +import * as fs from 'fs'; +import * as path from 'path'; + +export function wait(ms: number) { + return new Promise(fulfil => setTimeout(fulfil, ms)); +} + +export function walk(cwd: string, dir = cwd, files: string[] = []) { + fs.readdirSync(dir).forEach(file => { + const resolved = path.resolve(dir, file); + if (fs.statSync(resolved).isDirectory()) { + walk(cwd, resolved, files); + } else { + files.push(posixify(path.relative(cwd, resolved))); + } + }); + + return files; +} + +function posixify(str: string) { + return str.replace(/\\/g, '/'); +} \ No newline at end of file