From 6105607a177689a55cced65c0b3f42a8d289a5ec Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 30 Sep 2018 21:17:30 -0400 Subject: [PATCH] update for 0.22 --- .gitignore | 6 +---- package-lock.json | 59 ++++++++++++++++++++++++++++--------------- package.json | 2 +- src/client.js | 8 +++--- src/server.js | 5 ++-- src/service-worker.js | 4 +-- 6 files changed, 48 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 9869aa9..dbcbde0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,6 @@ .DS_Store node_modules -/.sapper/ yarn.lock yarn-error.log /cypress/screenshots/ -/templates/.* -/export/ -/build/ -/src/manifest/ +/__sapper__ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 04f622c..e54d986 100644 --- a/package-lock.json +++ b/package-lock.json @@ -653,7 +653,8 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true }, "buffer-xor": { "version": "1.0.3", @@ -720,6 +721,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "dev": true, "requires": { "no-case": "^2.2.0", "upper-case": "^1.1.1" @@ -809,6 +811,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", + "dev": true, "requires": { "source-map": "~0.6.0" } @@ -841,7 +844,8 @@ "commander": { "version": "2.17.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==" + "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "dev": true }, "commondir": { "version": "1.0.1", @@ -1110,7 +1114,7 @@ }, "duplexer": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "dev": true }, @@ -2168,7 +2172,8 @@ "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true }, "hmac-drbg": { "version": "1.0.1", @@ -2191,6 +2196,7 @@ "version": "3.5.20", "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.20.tgz", "integrity": "sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==", + "dev": true, "requires": { "camel-case": "3.0.x", "clean-css": "4.2.x", @@ -2290,7 +2296,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -2451,7 +2457,7 @@ }, "json5": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, @@ -2521,7 +2527,8 @@ "lower-case": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", + "dev": true }, "lru-cache": { "version": "4.1.3", @@ -2793,6 +2800,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "dev": true, "requires": { "lower-case": "^1.1.1" } @@ -2994,6 +3002,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "dev": true, "requires": { "no-case": "^2.2.0" } @@ -3073,7 +3082,7 @@ }, "pause-stream": { "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "dev": true, "requires": { @@ -3246,7 +3255,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -3284,7 +3293,8 @@ "relateurl": { "version": "0.2.7", "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "dev": true }, "remove-trailing-separator": { "version": "1.1.0", @@ -3365,9 +3375,10 @@ } }, "sapper": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.21.0.tgz", - "integrity": "sha512-uhie/KdZmozvXc4c6j+Zehw/jtxP3claCma22wO/e8fYMm/yw0vffQi2T/Jp8TPDI+GbNiF+tQKkX8axszym2g==", + "version": "0.22.1", + "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.22.1.tgz", + "integrity": "sha512-0gxt7xkKxbxYJslOuudbS+U39elKle7IV+g/wH+B5m4crMcXiW8LZbhiKw85I2fxfxq2e4Aor55HH0AN9nMIAg==", + "dev": true, "requires": { "html-minifier": "^3.5.16", "shimport": "0.0.11", @@ -3474,7 +3485,8 @@ "shimport": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/shimport/-/shimport-0.0.11.tgz", - "integrity": "sha512-wRlG/wMuV/czrzJEWBUPjydU/Ve0kTrTH8wHLRjuY6S2BDB+qDDXkTY/WrNc/7t5jnd0LPVO1sRIE7Ga6uXTpw==" + "integrity": "sha512-wRlG/wMuV/czrzJEWBUPjydU/Ve0kTrTH8wHLRjuY6S2BDB+qDDXkTY/WrNc/7t5jnd0LPVO1sRIE7Ga6uXTpw==", + "dev": true }, "sirv": { "version": "0.2.1", @@ -3608,7 +3620,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-resolve": { "version": "0.5.2", @@ -3627,6 +3640,7 @@ "version": "0.5.9", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", + "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -3641,7 +3655,8 @@ "sourcemap-codec": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz", - "integrity": "sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==" + "integrity": "sha512-vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==", + "dev": true }, "spdx-correct": { "version": "3.0.0", @@ -3774,7 +3789,8 @@ "string-hash": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz", - "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=" + "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=", + "dev": true }, "string.prototype.padend": { "version": "3.0.0", @@ -3842,7 +3858,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -3933,7 +3949,8 @@ "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "dev": true }, "tty-browserify": { "version": "0.0.0", @@ -3951,6 +3968,7 @@ "version": "3.4.9", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "dev": true, "requires": { "commander": "~2.17.1", "source-map": "~0.6.1" @@ -4092,7 +4110,8 @@ "upper-case": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", + "dev": true }, "uri-js": { "version": "4.2.2", diff --git a/package.json b/package.json index 8da42ca..3f04c48 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,11 @@ "dependencies": { "compression": "^1.7.1", "polka": "^0.4.0", - "sapper": "^0.21.0", "sirv": "^0.2.0" }, "devDependencies": { "npm-run-all": "^4.1.2", + "sapper": "^0.22.1", "svelte": "^2.0.0", "svelte-loader": "^2.9.0", "webpack": "^4.7.0" diff --git a/src/client.js b/src/client.js index b83ce1a..4a61c78 100644 --- a/src/client.js +++ b/src/client.js @@ -1,7 +1,5 @@ -import { init } from 'sapper/runtime.js'; -import { manifest } from './manifest/client.js'; +import * as sapper from '../__sapper__/client.js'; -init({ - target: document.querySelector('#sapper'), - manifest +sapper.start({ + target: document.querySelector('#sapper') }); \ No newline at end of file diff --git a/src/server.js b/src/server.js index f248e34..e8247c2 100644 --- a/src/server.js +++ b/src/server.js @@ -1,8 +1,7 @@ import sirv from 'sirv'; import polka from 'polka'; -import sapper from 'sapper'; import compression from 'compression'; -import { manifest } from './manifest/server.js'; +import * as sapper from '../__sapper__/server.js'; const { PORT, NODE_ENV } = process.env; const dev = NODE_ENV === 'development'; @@ -11,7 +10,7 @@ polka() // You can also use Express .use( compression({ threshold: 0 }), sirv('static', { dev }), - sapper({ manifest }) + sapper.middleware() ) .listen(PORT, err => { if (err) console.log('error', err); diff --git a/src/service-worker.js b/src/service-worker.js index c102c12..a3e1e1c 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -1,9 +1,9 @@ -import { timestamp, assets, shell, routes } from './manifest/service-worker.js'; +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, -// `assets` is an array of everything in the `assets` directory +// `files` is an array of everything in the `static` directory const to_cache = shell.concat(assets); const cached = new Set(to_cache);