diff --git a/example/package.json b/example/package.json index 60349df..502d440 100644 --- a/example/package.json +++ b/example/package.json @@ -9,16 +9,16 @@ "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch" }, "devDependencies": { - "@sveltejs/adapter-node": "^1.0.0-next.66", + "@sveltejs/adapter-node": "^1.0.0-next.68", "@sveltejs/kit": "next", - "svelte": "^3.46.2", - "svelte-check": "^2.3.0", - "svelte-preprocess": "^4.10.2", + "svelte": "^3.46.4", + "svelte-check": "^2.4.5", + "svelte-preprocess": "^4.10.3", "tslib": "^2.3.1", "typescript": "^4.5.5" }, "type": "module", "dependencies": { - "svelte-kit-cookie-session": "^2.0.1" + "svelte-kit-cookie-session": "^2.0.5" } } \ No newline at end of file diff --git a/example/pnpm-lock.yaml b/example/pnpm-lock.yaml index 2ce7ac1..d4b2593 100644 --- a/example/pnpm-lock.yaml +++ b/example/pnpm-lock.yaml @@ -1,24 +1,24 @@ lockfileVersion: 5.3 specifiers: - '@sveltejs/adapter-node': ^1.0.0-next.66 + '@sveltejs/adapter-node': ^1.0.0-next.68 '@sveltejs/kit': next - svelte: ^3.46.2 - svelte-check: ^2.3.0 - svelte-kit-cookie-session: ^2.0.1 - svelte-preprocess: ^4.10.2 + svelte: ^3.46.4 + svelte-check: ^2.4.5 + svelte-kit-cookie-session: ^2.0.5 + svelte-preprocess: ^4.10.3 tslib: ^2.3.1 typescript: ^4.5.5 dependencies: - svelte-kit-cookie-session: 2.0.1 + svelte-kit-cookie-session: 2.0.5 devDependencies: - '@sveltejs/adapter-node': 1.0.0-next.66 - '@sveltejs/kit': 1.0.0-next.236_svelte@3.46.2 - svelte: 3.46.2 - svelte-check: 2.3.0_svelte@3.46.2 - svelte-preprocess: 4.10.2_svelte@3.46.2+typescript@4.5.5 + '@sveltejs/adapter-node': 1.0.0-next.68 + '@sveltejs/kit': 1.0.0-next.276_svelte@3.46.4 + svelte: 3.46.4 + svelte-check: 2.4.5_svelte@3.46.4 + svelte-preprocess: 4.10.3_svelte@3.46.4+typescript@4.5.5 tslib: 2.3.1 typescript: 4.5.5 @@ -53,23 +53,23 @@ packages: picomatch: 2.3.1 dev: true - /@sveltejs/adapter-node/1.0.0-next.66: - resolution: {integrity: sha512-CtBRv7TAo0tuPm+noYXMYHz7jeUSZlT3+eAmsBMeM+B0oB5yEyZGycAyLbMykrp1PlWgN3jg1oK6gpwHIbxrJA==} + /@sveltejs/adapter-node/1.0.0-next.68: + resolution: {integrity: sha512-MiEjtl15Aupm6bjirVlq0kkc9AL8qDXz/blsh4jYMsaiidmcEHeDgfZQFM5YiXy95DbxV30MAkhwCQiYK/J8Kw==} dependencies: tiny-glob: 0.2.9 dev: true - /@sveltejs/kit/1.0.0-next.236_svelte@3.46.2: - resolution: {integrity: sha512-V/K6KZwZlfM2jDiL7luisRkPujf/pAT2SUpgOEONk44WwUwYwd928qN2u0Z6SAfQFCDAxUI8pMHP2OC1bm352Q==} + /@sveltejs/kit/1.0.0-next.276_svelte@3.46.4: + resolution: {integrity: sha512-LuTnN1Nod+Eub7izlyWYRmoSrJD236fBOxNmOMsiaPDQhcHSbnOpaE9WJPWzQeDPm+E3b4u+mNUOfclXabQSlg==} engines: {node: '>=14.13'} hasBin: true peerDependencies: svelte: ^3.44.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.0-next.34_svelte@3.46.2+vite@2.7.13 + '@sveltejs/vite-plugin-svelte': 1.0.0-next.37_svelte@3.46.4+vite@2.8.3 sade: 1.8.1 - svelte: 3.46.2 - vite: 2.7.13 + svelte: 3.46.4 + vite: 2.8.3 transitivePeerDependencies: - diff-match-patch - less @@ -78,8 +78,8 @@ packages: - supports-color dev: true - /@sveltejs/vite-plugin-svelte/1.0.0-next.34_svelte@3.46.2+vite@2.7.13: - resolution: {integrity: sha512-qZH2jndijrdkvevgbO7OH3iQsviM5Kz7h5APiNP4yEMZTrwq9bifzYvco6BprwtPvLb5wYlRVFZUOdusY6AovQ==} + /@sveltejs/vite-plugin-svelte/1.0.0-next.37_svelte@3.46.4+vite@2.8.3: + resolution: {integrity: sha512-EdSXw2rXeOahNrQfMJVZxa/NxZxW1a0TiBI3s+pVxnxU14hEQtnkLtdbTFhnceu22gJpNPFSIJRcIwRBBDQIeA==} engines: {node: ^14.13.1 || >= 16} peerDependencies: diff-match-patch: ^1.0.5 @@ -93,16 +93,15 @@ packages: debug: 4.3.3 kleur: 4.1.4 magic-string: 0.25.7 - require-relative: 0.8.7 - svelte: 3.46.2 - svelte-hmr: 0.14.9_svelte@3.46.2 - vite: 2.7.13 + svelte: 3.46.4 + svelte-hmr: 0.14.9_svelte@3.46.4 + vite: 2.8.3 transitivePeerDependencies: - supports-color dev: true - /@types/node/17.0.10: - resolution: {integrity: sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==} + /@types/node/17.0.18: + resolution: {integrity: sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==} dev: true /@types/pug/2.0.6: @@ -112,7 +111,7 @@ packages: /@types/sass/1.43.1: resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==} dependencies: - '@types/node': 17.0.10 + '@types/node': 17.0.18 dev: true /anymatch/3.1.2: @@ -195,164 +194,202 @@ packages: resolution: {integrity: sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=} dev: true - /esbuild-android-arm64/0.13.15: - resolution: {integrity: sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==} + /esbuild-android-arm64/0.14.22: + resolution: {integrity: sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==} + engines: {node: '>=12'} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /esbuild-darwin-64/0.13.15: - resolution: {integrity: sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==} + /esbuild-darwin-64/0.14.22: + resolution: {integrity: sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==} + engines: {node: '>=12'} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /esbuild-darwin-arm64/0.13.15: - resolution: {integrity: sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==} + /esbuild-darwin-arm64/0.14.22: + resolution: {integrity: sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==} + engines: {node: '>=12'} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /esbuild-freebsd-64/0.13.15: - resolution: {integrity: sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==} + /esbuild-freebsd-64/0.14.22: + resolution: {integrity: sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==} + engines: {node: '>=12'} cpu: [x64] os: [freebsd] requiresBuild: true dev: true optional: true - /esbuild-freebsd-arm64/0.13.15: - resolution: {integrity: sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==} + /esbuild-freebsd-arm64/0.14.22: + resolution: {integrity: sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==} + engines: {node: '>=12'} cpu: [arm64] os: [freebsd] requiresBuild: true dev: true optional: true - /esbuild-linux-32/0.13.15: - resolution: {integrity: sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==} + /esbuild-linux-32/0.14.22: + resolution: {integrity: sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==} + engines: {node: '>=12'} cpu: [ia32] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-linux-64/0.13.15: - resolution: {integrity: sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==} + /esbuild-linux-64/0.14.22: + resolution: {integrity: sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==} + engines: {node: '>=12'} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-linux-arm/0.13.15: - resolution: {integrity: sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==} + /esbuild-linux-arm/0.14.22: + resolution: {integrity: sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==} + engines: {node: '>=12'} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-linux-arm64/0.13.15: - resolution: {integrity: sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==} + /esbuild-linux-arm64/0.14.22: + resolution: {integrity: sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==} + engines: {node: '>=12'} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-linux-mips64le/0.13.15: - resolution: {integrity: sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==} + /esbuild-linux-mips64le/0.14.22: + resolution: {integrity: sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==} + engines: {node: '>=12'} cpu: [mips64el] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-linux-ppc64le/0.13.15: - resolution: {integrity: sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==} + /esbuild-linux-ppc64le/0.14.22: + resolution: {integrity: sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==} + engines: {node: '>=12'} cpu: [ppc64] os: [linux] requiresBuild: true dev: true optional: true - /esbuild-netbsd-64/0.13.15: - resolution: {integrity: sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==} + /esbuild-linux-riscv64/0.14.22: + resolution: {integrity: sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.14.22: + resolution: {integrity: sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.14.22: + resolution: {integrity: sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==} + engines: {node: '>=12'} cpu: [x64] os: [netbsd] requiresBuild: true dev: true optional: true - /esbuild-openbsd-64/0.13.15: - resolution: {integrity: sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==} + /esbuild-openbsd-64/0.14.22: + resolution: {integrity: sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==} + engines: {node: '>=12'} cpu: [x64] os: [openbsd] requiresBuild: true dev: true optional: true - /esbuild-sunos-64/0.13.15: - resolution: {integrity: sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==} + /esbuild-sunos-64/0.14.22: + resolution: {integrity: sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==} + engines: {node: '>=12'} cpu: [x64] os: [sunos] requiresBuild: true dev: true optional: true - /esbuild-windows-32/0.13.15: - resolution: {integrity: sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==} + /esbuild-windows-32/0.14.22: + resolution: {integrity: sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==} + engines: {node: '>=12'} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /esbuild-windows-64/0.13.15: - resolution: {integrity: sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==} + /esbuild-windows-64/0.14.22: + resolution: {integrity: sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==} + engines: {node: '>=12'} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /esbuild-windows-arm64/0.13.15: - resolution: {integrity: sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==} + /esbuild-windows-arm64/0.14.22: + resolution: {integrity: sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==} + engines: {node: '>=12'} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /esbuild/0.13.15: - resolution: {integrity: sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==} + /esbuild/0.14.22: + resolution: {integrity: sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==} + engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-arm64: 0.13.15 - esbuild-darwin-64: 0.13.15 - esbuild-darwin-arm64: 0.13.15 - esbuild-freebsd-64: 0.13.15 - esbuild-freebsd-arm64: 0.13.15 - esbuild-linux-32: 0.13.15 - esbuild-linux-64: 0.13.15 - esbuild-linux-arm: 0.13.15 - esbuild-linux-arm64: 0.13.15 - esbuild-linux-mips64le: 0.13.15 - esbuild-linux-ppc64le: 0.13.15 - esbuild-netbsd-64: 0.13.15 - esbuild-openbsd-64: 0.13.15 - esbuild-sunos-64: 0.13.15 - esbuild-windows-32: 0.13.15 - esbuild-windows-64: 0.13.15 - esbuild-windows-arm64: 0.13.15 + esbuild-android-arm64: 0.14.22 + esbuild-darwin-64: 0.14.22 + esbuild-darwin-arm64: 0.14.22 + esbuild-freebsd-64: 0.14.22 + esbuild-freebsd-arm64: 0.14.22 + esbuild-linux-32: 0.14.22 + esbuild-linux-64: 0.14.22 + esbuild-linux-arm: 0.14.22 + esbuild-linux-arm64: 0.14.22 + esbuild-linux-mips64le: 0.14.22 + esbuild-linux-ppc64le: 0.14.22 + esbuild-linux-riscv64: 0.14.22 + esbuild-linux-s390x: 0.14.22 + esbuild-netbsd-64: 0.14.22 + esbuild-openbsd-64: 0.14.22 + esbuild-sunos-64: 0.14.22 + esbuild-windows-32: 0.14.22 + esbuild-windows-64: 0.14.22 + esbuild-windows-arm64: 0.14.22 dev: true /estree-walker/2.0.2: @@ -412,7 +449,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.0.4 + minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 dev: true @@ -514,8 +551,8 @@ packages: engines: {node: '>=4'} dev: true - /minimatch/3.0.4: - resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} + /minimatch/3.1.2: + resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 dev: true @@ -540,8 +577,8 @@ packages: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: true - /nanoid/3.2.0: - resolution: {integrity: sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==} + /nanoid/3.3.1: + resolution: {integrity: sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true dev: true @@ -582,11 +619,11 @@ packages: engines: {node: '>=8.6'} dev: true - /postcss/8.4.5: - resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==} + /postcss/8.4.6: + resolution: {integrity: sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.2.0 + nanoid: 3.3.1 picocolors: 1.0.0 source-map-js: 1.0.2 dev: true @@ -602,17 +639,13 @@ packages: picomatch: 2.3.1 dev: true - /require-relative/0.8.7: - resolution: {integrity: sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=} - dev: true - /resolve-from/4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} dev: true - /resolve/1.21.0: - resolution: {integrity: sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==} + /resolve/1.22.0: + resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==} hasBin: true dependencies: is-core-module: 2.8.1 @@ -632,8 +665,8 @@ packages: glob: 7.2.0 dev: true - /rollup/2.64.0: - resolution: {integrity: sha512-+c+lbw1lexBKSMb1yxGDVfJ+vchJH3qLbmavR+awDinTDA2C5Ug9u7lkOzj62SCu0PKUExsW36tpgW7Fmpn3yQ==} + /rollup/2.67.2: + resolution: {integrity: sha512-hoEiBWwZtf1QdK3jZIq59L0FJj4Fiv4RplCO4pvCRC86qsoFurWB4hKQIjoRf3WvJmk5UZ9b0y5ton+62fC7Tw==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -698,8 +731,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check/2.3.0_svelte@3.46.2: - resolution: {integrity: sha512-SBKdJyUmxzPmJf/ZPqDSQOoa9JzOcgEpV7u3UaYcgVn7fA0veZ3FA5JgLU8KYtf84Gp6guBVcrC7XKLjJa5SXQ==} + /svelte-check/2.4.5_svelte@3.46.4: + resolution: {integrity: sha512-nRft8BbG2wcxyCdHDZ7X43xLcvDzua3xLwq6wzHGcAF3ka3Jyhv2rvgq0+SF9NwHLMefp9C2XkM6etzsxK/cMQ==} hasBin: true peerDependencies: svelte: ^3.24.0 @@ -711,8 +744,8 @@ packages: picocolors: 1.0.0 sade: 1.8.1 source-map: 0.7.3 - svelte: 3.46.2 - svelte-preprocess: 4.10.2_svelte@3.46.2+typescript@4.5.5 + svelte: 3.46.4 + svelte-preprocess: 4.10.3_svelte@3.46.4+typescript@4.5.5 typescript: 4.5.5 transitivePeerDependencies: - '@babel/core' @@ -727,20 +760,20 @@ packages: - sugarss dev: true - /svelte-hmr/0.14.9_svelte@3.46.2: + /svelte-hmr/0.14.9_svelte@3.46.4: resolution: {integrity: sha512-bKE9+4qb4sAnA+TKHiYurUl970rjA0XmlP9TEP7K/ncyWz3m81kA4HOgmlZK/7irGK7gzZlaPDI3cmf8fp/+tg==} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.46.2 + svelte: 3.46.4 dev: true - /svelte-kit-cookie-session/2.0.1: - resolution: {integrity: sha512-6LInGya8+cauMHletYb7z8wsYfY4bPVL3kI72B4+RueT9lFammYWMI1eyrhCnoQrs9HzsJOLhKKWz/Yv007XOQ==} + /svelte-kit-cookie-session/2.0.5: + resolution: {integrity: sha512-IX1IXtn42UTz/isem1LqH0SAZdCx6Z6Iu2V4Q83V2EScFbXZWfeFY08Azl8ZrPKdIDhSNHBLAAumRjA6TBxCvQ==} dev: false - /svelte-preprocess/4.10.2_svelte@3.46.2+typescript@4.5.5: - resolution: {integrity: sha512-aPpkCreSo8EL/y8kJSa1trhiX0oyAtTjlNNM7BNjRAsMJ8Yy2LtqHt0zyd4pQPXt+D4PzbO3qTjjio3kwOxDlA==} + /svelte-preprocess/4.10.3_svelte@3.46.4+typescript@4.5.5: + resolution: {integrity: sha512-ttw17lJfb/dx2ZJT9sesaXT5l7mPQ9Apx1H496Kli3Hkk7orIRGpOw6rCPkRNzr6ueVPqb4vzodS5x7sBFhKHw==} engines: {node: '>= 9.11.2'} requiresBuild: true peerDependencies: @@ -755,7 +788,7 @@ packages: stylus: ^0.55.0 sugarss: ^2.0.0 svelte: ^3.23.0 - typescript: ^4.5.2 + typescript: ^3.9.5 || ^4.0.0 peerDependenciesMeta: '@babel/core': optional: true @@ -786,12 +819,12 @@ packages: magic-string: 0.25.7 sorcery: 0.10.0 strip-indent: 3.0.0 - svelte: 3.46.2 + svelte: 3.46.4 typescript: 4.5.5 dev: true - /svelte/3.46.2: - resolution: {integrity: sha512-RXSAtYNefe01Sb1lXtZ2I+gzn3t/h/59hoaRNeRrm8IkMIu6BSiAkbpi41xb+C44x54YKnbk9+dtfs3pM4hECA==} + /svelte/3.46.4: + resolution: {integrity: sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==} engines: {node: '>= 8'} dev: true @@ -819,8 +852,8 @@ packages: hasBin: true dev: true - /vite/2.7.13: - resolution: {integrity: sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==} + /vite/2.8.3: + resolution: {integrity: sha512-967klrEiG7HEsN7fQYYVETs5495Iu6GpI7YyxoO5yVTJCRxjV8HhWgNWKgrbazjoOB9DQuztL53/nUoNqHNsWg==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: @@ -835,10 +868,10 @@ packages: stylus: optional: true dependencies: - esbuild: 0.13.15 - postcss: 8.4.5 - resolve: 1.21.0 - rollup: 2.64.0 + esbuild: 0.14.22 + postcss: 8.4.6 + resolve: 1.22.0 + rollup: 2.67.2 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/example/src/app.html b/example/src/app.html index 9cdc2f5..9f578be 100644 --- a/example/src/app.html +++ b/example/src/app.html @@ -7,6 +7,6 @@ %svelte.head% -
%svelte.body%
+ %svelte.body% diff --git a/example/src/global.d.ts b/example/src/global.d.ts index 3d2b4d7..0967501 100644 --- a/example/src/global.d.ts +++ b/example/src/global.d.ts @@ -1,8 +1,20 @@ /// -interface Locals { - session: import("svelte-kit-cookie-session").Session<{ - theme: "dark" | "light"; - }>; +interface SessionData { + theme: string; } +// See https://kit.svelte.dev/docs#typescript +// for information about these interfaces +declare namespace App { + interface Locals { + session: import("svelte-kit-cookie-session").Session; + cookies: Record; + } + + interface Platform {} + + interface Session extends SessionData {} + + interface Stuff {} +} diff --git a/example/src/hooks.ts b/example/src/hooks.ts index d9c04c9..383e677 100644 --- a/example/src/hooks.ts +++ b/example/src/hooks.ts @@ -1,7 +1,7 @@ import type { GetSession } from "@sveltejs/kit"; import { handleSession } from "svelte-kit-cookie-session"; -export const getSession: GetSession = function ({ locals }) { +export const getSession: GetSession = function ({ locals }) { return locals.session.data; }; @@ -10,17 +10,13 @@ export const handle = handleSession( secret: "A_VERY_SECRET_SECRET_32_CHARS_LONG", }, async function ({ event, resolve }) { - const response = await resolve(event); - - if (!response.body || !response.headers) { - return response; - } - - if (response.headers.get('content-type').startsWith('text/html')) { - let theme = event.locals.session.data?.theme ?? "light"; - const body = await response.text(); - return new Response(body.replace("%session.theme%", theme), response); - } + + const response = await resolve(event, { + transformPage: ({ html }) => { + const theme = event.locals.session.data?.theme ?? "light"; + return html.replace("%session.theme%", theme); + }, + }); return response; } diff --git a/example/src/routes/session.ts b/example/src/routes/session.ts index 6779b41..bdbe1d7 100644 --- a/example/src/routes/session.ts +++ b/example/src/routes/session.ts @@ -1,13 +1,13 @@ import type { RequestHandler } from "@sveltejs/kit"; -export const del: RequestHandler = ({ locals }) => { +export const del: RequestHandler = ({ locals }) => { // Destroy the session and cookie locals.session.destroy(); return { body: { ok: true } }; }; -export const post: RequestHandler = ({ locals }) => { +export const post: RequestHandler = ({ locals }) => { // Use the current session theme or default to light let theme = locals.session.data?.theme ?? "light"; @@ -17,5 +17,5 @@ export const post: RequestHandler = ({ locals }) => { // Set the session, updates current session if already exists locals.session.data = { theme }; - return { body: locals.session.data }; + return { body: { ...locals.session.data } }; }; diff --git a/example/svelte.config.js b/example/svelte.config.js index 9f4a120..8707361 100644 --- a/example/svelte.config.js +++ b/example/svelte.config.js @@ -9,8 +9,6 @@ const config = { preprocess: preprocess(), kit: { - // hydrate the
element in src/app.html - target: "#svelte", adapter: adapter({}), vite: { optimizeDeps: {