From d8efaa2faa9c7a93c9b7e7cf234bc485de330d28 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Wed, 15 Sep 2021 19:17:53 +0200 Subject: [PATCH] [fix] update to TS 4.4.3 (#2432) --- package.json | 2 +- packages/create-svelte/package.json | 2 +- .../shared/+typescript/package.json | 4 +- .../templates/default/package.json | 4 +- packages/kit/package.json | 2 +- packages/kit/src/cli.js | 19 +- packages/kit/src/core/config/test/index.js | 2 +- packages/kit/src/core/dev/index.js | 8 +- packages/kit/src/core/preview/index.js | 2 +- packages/kit/src/runtime/client/renderer.js | 6 +- packages/kit/src/runtime/server/index.js | 2 +- .../kit/src/runtime/server/page/render.js | 3 +- .../kit/src/runtime/server/page/respond.js | 10 +- .../runtime/server/page/respond_with_error.js | 4 +- packages/kit/src/runtime/utils.js | 7 - packages/kit/src/utils/error.js | 19 ++ packages/kit/src/utils/filesystem.js | 2 +- .../apps/basics/src/routes/errors/_tests.js | 2 +- .../apps/basics/src/routes/routing/_tests.js | 2 +- packages/kit/test/test.js | 2 +- pnpm-lock.yaml | 189 +++++++++++++----- 21 files changed, 206 insertions(+), 87 deletions(-) delete mode 100644 packages/kit/src/runtime/utils.js create mode 100644 packages/kit/src/utils/error.js diff --git a/package.json b/package.json index c4e1651bebee..91d7166a05e8 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "playwright-chromium": "^1.10.0", "prettier": "2.2.1", "rollup": "^2.55.0", - "typescript": "^4.3.5" + "typescript": "^4.4.3" }, "type": "module" } diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json index 1055e046bd92..9cdc6c37385a 100644 --- a/packages/create-svelte/package.json +++ b/packages/create-svelte/package.json @@ -22,7 +22,7 @@ "prettier-plugin-svelte": "^2.2.0", "sucrase": "^3.18.1", "svelte": "^3.42.4", - "svelte-preprocess": "^4.7.3", + "svelte-preprocess": "^4.9.0", "tiny-glob": "^0.2.8" }, "scripts": { diff --git a/packages/create-svelte/shared/+typescript/package.json b/packages/create-svelte/shared/+typescript/package.json index 334b96b584bf..28cfb42803fe 100644 --- a/packages/create-svelte/shared/+typescript/package.json +++ b/packages/create-svelte/shared/+typescript/package.json @@ -4,9 +4,9 @@ "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch" }, "devDependencies": { - "typescript": "^4.0.0", + "typescript": "^4.4.0", "tslib": "^2.0.0", "svelte-check": "^2.0.0", - "svelte-preprocess": "^4.0.0" + "svelte-preprocess": "^4.9.0" } } diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json index a800428ff32b..94a68208b0c3 100644 --- a/packages/create-svelte/templates/default/package.json +++ b/packages/create-svelte/templates/default/package.json @@ -12,8 +12,8 @@ "@sveltejs/adapter-vercel": "next", "@sveltejs/kit": "next", "svelte": "^3.42.4", - "svelte-preprocess": "^4.7.3", - "typescript": "^4.3.5" + "svelte-preprocess": "^4.9.0", + "typescript": "^4.4.0" }, "type": "module", "dependencies": { diff --git a/packages/kit/package.json b/packages/kit/package.json index 73e7541be5ea..d853d1c13126 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -40,7 +40,7 @@ "selfsigned": "^1.10.11", "sirv": "^1.0.12", "svelte": "^3.42.4", - "svelte-check": "^2.2.4", + "svelte-check": "^2.2.6", "svelte2tsx": "~0.4.1", "tiny-glob": "^0.2.8", "uvu": "^0.5.1" diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js index 4bade26f5ffc..34a081932172 100644 --- a/packages/kit/src/cli.js +++ b/packages/kit/src/cli.js @@ -4,6 +4,7 @@ import colors from 'kleur'; import * as ports from 'port-authority'; import { load_config } from './core/config/index.js'; import { networkInterfaces, release } from 'os'; +import { coalesce_to_error, has_error_code } from './utils/error.js'; async function get_config() { // TODO this is temporary, for the benefit of early adopters @@ -23,11 +24,12 @@ async function get_config() { try { return await load_config(); - } catch (error) { + } catch (err) { + const error = coalesce_to_error(err); let message = error.message; if ( - error.code === 'MODULE_NOT_FOUND' && + has_error_code(error, 'MODULE_NOT_FOUND') && /Cannot find module svelte\.config\./.test(error.message) ) { message = 'Missing svelte.config.js'; @@ -36,16 +38,19 @@ async function get_config() { } console.error(colors.bold().red(message)); - console.error(colors.grey(error.stack)); + if (error.stack) { + console.error(colors.grey(error.stack)); + } process.exit(1); } } -/** @param {Error} error */ +/** @param {unknown} error */ function handle_error(error) { - console.log(colors.bold().red(`> ${error.message}`)); - if (error.stack) { - console.log(colors.gray(error.stack)); + const err = coalesce_to_error(error); + console.log(colors.bold().red(`> ${err.message}`)); + if (err.stack) { + console.log(colors.gray(err.stack)); } process.exit(1); } diff --git a/packages/kit/src/core/config/test/index.js b/packages/kit/src/core/config/test/index.js index 3d7f7dfc9714..f0fa6835ad91 100644 --- a/packages/kit/src/core/config/test/index.js +++ b/packages/kit/src/core/config/test/index.js @@ -81,7 +81,7 @@ test('errors on loading config with incorrect default export', async () => { try { const cwd = join(__dirname, 'fixtures', 'export-string'); await load_config({ cwd }); - } catch (e) { + } catch (/** @type {any} */ e) { errorMessage = e.message; } diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js index 06253e6919e4..8c12fd13019b 100644 --- a/packages/kit/src/core/dev/index.js +++ b/packages/kit/src/core/dev/index.js @@ -21,6 +21,7 @@ import { getRawBody } from '../node/index.js'; import { get_server } from '../server/index.js'; import { SVELTE_KIT, SVELTE_KIT_ASSETS } from '../constants.js'; import { copy_assets, resolve_entry } from '../utils.js'; +import { coalesce_to_error } from '../../utils/error.js'; /** @typedef {{ cwd?: string, port: number, host?: string, https: boolean, config: import('types/config').ValidatedConfig }} Options */ /** @typedef {import('types/internal').SSRComponent} SSRComponent */ @@ -334,7 +335,7 @@ async function create_handler(vite, config, dir, cwd, get_manifest) { try { body = await getRawBody(req); - } catch (err) { + } catch (/** @type {any} */ err) { res.statusCode = err.status || 400; return res.end(err.reason || 'Invalid request body'); } @@ -486,9 +487,10 @@ async function create_handler(vite, config, dir, cwd, get_manifest) { not_found(res); } } catch (e) { - vite.ssrFixStacktrace(e); + const error = coalesce_to_error(e); + vite.ssrFixStacktrace(error); res.statusCode = 500; - res.end(e.stack); + res.end(error.stack); } }); }; diff --git a/packages/kit/src/core/preview/index.js b/packages/kit/src/core/preview/index.js index a859ba209700..a68c8275923a 100644 --- a/packages/kit/src/core/preview/index.js +++ b/packages/kit/src/core/preview/index.js @@ -78,7 +78,7 @@ export async function preview({ try { body = await getRawBody(req); - } catch (err) { + } catch (/** @type {any} */ err) { res.statusCode = err.status || 400; return res.end(err.reason || 'Invalid request body'); } diff --git a/packages/kit/src/runtime/client/renderer.js b/packages/kit/src/runtime/client/renderer.js index d0c5861f886f..dd5e8e50ee68 100644 --- a/packages/kit/src/runtime/client/renderer.js +++ b/packages/kit/src/runtime/client/renderer.js @@ -1,7 +1,7 @@ import { writable } from 'svelte/store'; +import { coalesce_to_error } from '../../utils/error.js'; import { hash } from '../hash.js'; import { normalize } from '../load.js'; -import { coalesce_to_error } from '../utils.js'; /** * @typedef {import('types/internal').CSRComponent} CSRComponent @@ -181,7 +181,7 @@ export class Renderer { result = error_args ? await this._load_error(error_args) : await this._get_navigation_result_from_branch({ page, branch }); - } catch (/** @type {unknown} */ e) { + } catch (e) { if (error) throw e; result = await this._load_error({ @@ -637,7 +637,7 @@ export class Renderer { } } catch (e) { status = 500; - error = e; + error = coalesce_to_error(e); } if (error) { diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js index d915cec6fa27..1f56067ffc84 100644 --- a/packages/kit/src/runtime/server/index.js +++ b/packages/kit/src/runtime/server/index.js @@ -4,9 +4,9 @@ import { render_response } from './page/render.js'; import { respond_with_error } from './page/respond_with_error.js'; import { parse_body } from './parse_body/index.js'; import { lowercase_keys } from './utils.js'; -import { coalesce_to_error } from '../utils.js'; import { hash } from '../hash.js'; import { get_single_valued_header } from '../../utils/http.js'; +import { coalesce_to_error } from '../../utils/error.js'; /** @type {import('@sveltejs/kit/ssr').Respond} */ export async function respond(incoming, options, state = {}) { diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js index dc3f9d247834..ea126a86d741 100644 --- a/packages/kit/src/runtime/server/page/render.js +++ b/packages/kit/src/runtime/server/page/render.js @@ -1,5 +1,6 @@ import devalue from 'devalue'; import { writable } from 'svelte/store'; +import { coalesce_to_error } from '../../../utils/error.js'; import { hash } from '../../hash.js'; const s = JSON.stringify; @@ -203,7 +204,7 @@ function try_serialize(data, fail) { try { return devalue(data); } catch (err) { - if (fail) fail(err); + if (fail) fail(coalesce_to_error(err)); return null; } } diff --git a/packages/kit/src/runtime/server/page/respond.js b/packages/kit/src/runtime/server/page/respond.js index f662e1973ef2..6251e3d97299 100644 --- a/packages/kit/src/runtime/server/page/respond.js +++ b/packages/kit/src/runtime/server/page/respond.js @@ -1,7 +1,7 @@ import { render_response } from './render.js'; import { load_node } from './load_node.js'; import { is_prerender_enabled, respond_with_error } from './respond_with_error.js'; -import { coalesce_to_error } from '../../utils.js'; +import { coalesce_to_error } from '../../../utils/error.js'; /** * @typedef {import('./types.js').Loaded} Loaded @@ -30,7 +30,7 @@ export async function respond(opts) { try { nodes = await Promise.all(route.a.map((id) => (id ? options.load_component(id) : undefined))); - } catch (/** @type {unknown} */ err) { + } catch (err) { const error = coalesce_to_error(err); options.handle_error(error, request); @@ -111,7 +111,7 @@ export async function respond(opts) { if (loaded.loaded.error) { ({ status, error } = loaded.loaded); } - } catch (/** @type {unknown} */ err) { + } catch (err) { const e = coalesce_to_error(err); options.handle_error(e, request); @@ -156,7 +156,7 @@ export async function respond(opts) { page_config = get_page_config(error_node.module, options); branch = branch.slice(0, j + 1).concat(error_loaded); break ssr; - } catch (/** @type {unknown} */ err) { + } catch (err) { const e = coalesce_to_error(err); options.handle_error(e, request); @@ -204,7 +204,7 @@ export async function respond(opts) { }), set_cookie_headers ); - } catch (/** @type {unknown} */ err) { + } catch (err) { const error = coalesce_to_error(err); options.handle_error(error, request); diff --git a/packages/kit/src/runtime/server/page/respond_with_error.js b/packages/kit/src/runtime/server/page/respond_with_error.js index 4f1d0f17d966..b85dc0c0d900 100644 --- a/packages/kit/src/runtime/server/page/respond_with_error.js +++ b/packages/kit/src/runtime/server/page/respond_with_error.js @@ -1,6 +1,6 @@ import { render_response } from './render.js'; import { load_node } from './load_node.js'; -import { coalesce_to_error } from '../../utils.js'; +import { coalesce_to_error } from '../../../utils/error.js'; /** * @typedef {import('./types.js').Loaded} Loaded @@ -78,7 +78,7 @@ export async function respond_with_error({ request, options, state, $session, st branch, page }); - } catch (/** @type {unknown} */ err) { + } catch (err) { const error = coalesce_to_error(err); options.handle_error(error, request); diff --git a/packages/kit/src/runtime/utils.js b/packages/kit/src/runtime/utils.js deleted file mode 100644 index 6424f36810aa..000000000000 --- a/packages/kit/src/runtime/utils.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @param {unknown} err - * @return {Error} - */ -export function coalesce_to_error(err) { - return err instanceof Error ? err : new Error(JSON.stringify(err)); -} diff --git a/packages/kit/src/utils/error.js b/packages/kit/src/utils/error.js new file mode 100644 index 000000000000..9c00c946b43d --- /dev/null +++ b/packages/kit/src/utils/error.js @@ -0,0 +1,19 @@ +/** + * @param {unknown} err + * @return {Error} + */ +export function coalesce_to_error(err) { + return err instanceof Error || + (err && /** @type {any} */ (err).name && /** @type {any} */ (err).message) + ? /** @type {Error} */ (err) + : new Error(JSON.stringify(err)); +} + +/** + * @param {Error} err + * @param {any} errorCode + * @return {err is Error & {code: any}} + */ +export function has_error_code(err, errorCode = undefined) { + return 'code' in err && (errorCode === undefined || /** @type {any} */ (err).code === errorCode); +} diff --git a/packages/kit/src/utils/filesystem.js b/packages/kit/src/utils/filesystem.js index b3b3af80b53a..9886bc607654 100644 --- a/packages/kit/src/utils/filesystem.js +++ b/packages/kit/src/utils/filesystem.js @@ -5,7 +5,7 @@ import path from 'path'; export function mkdirp(dir) { try { fs.mkdirSync(dir, { recursive: true }); - } catch (e) { + } catch (/** @type {any} */ e) { if (e.code === 'EEXIST') return; throw e; } diff --git a/packages/kit/test/apps/basics/src/routes/errors/_tests.js b/packages/kit/test/apps/basics/src/routes/errors/_tests.js index 2407dc2776c8..08567b1a3101 100644 --- a/packages/kit/test/apps/basics/src/routes/errors/_tests.js +++ b/packages/kit/test/apps/basics/src/routes/errors/_tests.js @@ -9,7 +9,7 @@ export default function (test, is_dev) { try { // ??? // await visit('/errors/clientside'); - } catch (error) { + } catch (/** @type {any} */ error) { assert.ok(/Crashing now/.test(error.message)); } finally { // this is the Snowpack error overlay diff --git a/packages/kit/test/apps/basics/src/routes/routing/_tests.js b/packages/kit/test/apps/basics/src/routes/routing/_tests.js index 4e89fde10f2a..d5579093db70 100644 --- a/packages/kit/test/apps/basics/src/routes/routing/_tests.js +++ b/packages/kit/test/apps/basics/src/routes/routing/_tests.js @@ -128,7 +128,7 @@ export default function (test, is_dev) { try { await app.prefetch('https://example.com'); throw new Error('Error was not thrown'); - } catch (e) { + } catch (/** @type {any} */ e) { assert.ok( e.message.includes('Attempted to prefetch a URL that does not belong to this app') ); diff --git a/packages/kit/test/test.js b/packages/kit/test/test.js index bc226f5bf17b..1ea73843279b 100644 --- a/packages/kit/test/test.js +++ b/packages/kit/test/test.js @@ -275,7 +275,7 @@ async function main() { try { context.watcher = await dev({ cwd, port, config, host: undefined, https: false }); Object.assign(context, await setup({ port })); - } catch (e) { + } catch (/** @type {any} */ e) { console.log(e.stack); throw e; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4ec6d164d5d..f2c591ee2d7f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,16 +20,16 @@ importers: playwright-chromium: ^1.10.0 prettier: 2.2.1 rollup: ^2.55.0 - typescript: ^4.3.5 + typescript: ^4.4.3 devDependencies: '@changesets/cli': 2.16.0 '@changesets/get-github-info': 0.5.0 '@rollup/plugin-commonjs': 17.1.0_rollup@2.55.0 '@rollup/plugin-json': 4.1.0_rollup@2.55.0 '@rollup/plugin-node-resolve': 11.2.1_rollup@2.55.0 - '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/885b062904591606c030b4e8eb9160c63f16b322_9d3ce2148653bb6cbbfcd9b88d4d1961 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/885b062904591606c030b4e8eb9160c63f16b322_0aead88bb7bc400ad99459b1a1062885 + '@typescript-eslint/eslint-plugin': 4.28.4_1023fecc1597d32dc62a5f3c369f1df3 + '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.4.3 action-deploy-docs: github.com/sveltejs/action-deploy-docs/321fe3aec0f4484eaa42e32283025106161cc296 dotenv: 10.0.0 eslint: 7.31.0 @@ -38,7 +38,7 @@ importers: playwright-chromium: 1.10.0 prettier: 2.2.1 rollup: 2.55.0 - typescript: 4.3.5 + typescript: 4.4.3 .github/actions/env: specifiers: @@ -155,7 +155,7 @@ importers: prompts: ^2.4.1 sucrase: ^3.18.1 svelte: ^3.42.4 - svelte-preprocess: ^4.7.3 + svelte-preprocess: ^4.9.0 tiny-glob: ^0.2.8 dependencies: kleur: 4.1.4 @@ -170,7 +170,7 @@ importers: prettier-plugin-svelte: 2.2.0_prettier@2.2.1+svelte@3.42.4 sucrase: 3.18.1 svelte: 3.42.4 - svelte-preprocess: 4.7.3_svelte@3.42.4+typescript@4.3.5 + svelte-preprocess: 4.9.4_svelte@3.42.4 tiny-glob: 0.2.8 packages/create-svelte/templates/default: @@ -183,8 +183,8 @@ importers: '@sveltejs/kit': next cookie: ^0.4.1 svelte: ^3.42.4 - svelte-preprocess: ^4.7.3 - typescript: ^4.3.5 + svelte-preprocess: ^4.9.0 + typescript: ^4.4.0 dependencies: '@fontsource/fira-mono': 4.2.2 '@lukeed/uuid': 2.0.0 @@ -195,8 +195,8 @@ importers: '@sveltejs/adapter-vercel': link:../../../adapter-vercel '@sveltejs/kit': link:../../../kit svelte: 3.42.4 - svelte-preprocess: 4.7.3_svelte@3.42.4+typescript@4.3.5 - typescript: 4.3.5 + svelte-preprocess: 4.9.4_svelte@3.42.4+typescript@4.4.3 + typescript: 4.4.3 packages/kit: specifiers: @@ -228,7 +228,7 @@ importers: selfsigned: ^1.10.11 sirv: ^1.0.12 svelte: ^3.42.4 - svelte-check: ^2.2.4 + svelte-check: ^2.2.6 svelte2tsx: ~0.4.1 tiny-glob: ^0.2.8 uvu: ^0.5.1 @@ -264,8 +264,8 @@ importers: selfsigned: 1.10.11 sirv: 1.0.12 svelte: 3.42.4 - svelte-check: 2.2.4_svelte@3.42.4 - svelte2tsx: 0.4.1_svelte@3.42.4+typescript@4.3.5 + svelte-check: 2.2.6_svelte@3.42.4 + svelte2tsx: 0.4.1_svelte@3.42.4 tiny-glob: 0.2.8 uvu: 0.5.1 @@ -996,7 +996,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/4.28.4_b1648df9f9ba40bdeef3710a5a5af353: + /@typescript-eslint/eslint-plugin/4.28.4_1023fecc1597d32dc62a5f3c369f1df3: resolution: {integrity: sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -1007,21 +1007,21 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 4.28.4_eslint@7.31.0+typescript@4.3.5 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/experimental-utils': 4.28.4_eslint@7.31.0+typescript@4.4.3 + '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.4.3 '@typescript-eslint/scope-manager': 4.28.4 debug: 4.3.2 eslint: 7.31.0 functional-red-black-tree: 1.0.1 regexpp: 3.1.0 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.3.5 - typescript: 4.3.5 + tsutils: 3.21.0_typescript@4.4.3 + typescript: 4.4.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils/4.28.4_eslint@7.31.0+typescript@4.3.5: + /@typescript-eslint/experimental-utils/4.28.4_eslint@7.31.0+typescript@4.4.3: resolution: {integrity: sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -1030,7 +1030,7 @@ packages: '@types/json-schema': 7.0.7 '@typescript-eslint/scope-manager': 4.28.4 '@typescript-eslint/types': 4.28.4 - '@typescript-eslint/typescript-estree': 4.28.4_typescript@4.3.5 + '@typescript-eslint/typescript-estree': 4.28.4_typescript@4.4.3 eslint: 7.31.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@7.31.0 @@ -1039,7 +1039,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser/4.28.4_eslint@7.31.0+typescript@4.3.5: + /@typescript-eslint/parser/4.28.4_eslint@7.31.0+typescript@4.4.3: resolution: {integrity: sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -1051,10 +1051,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 4.28.4 '@typescript-eslint/types': 4.28.4 - '@typescript-eslint/typescript-estree': 4.28.4_typescript@4.3.5 + '@typescript-eslint/typescript-estree': 4.28.4_typescript@4.4.3 debug: 4.3.2 eslint: 7.31.0 - typescript: 4.3.5 + typescript: 4.4.3 transitivePeerDependencies: - supports-color dev: true @@ -1072,7 +1072,7 @@ packages: engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} dev: true - /@typescript-eslint/typescript-estree/4.28.4_typescript@4.3.5: + /@typescript-eslint/typescript-estree/4.28.4_typescript@4.4.3: resolution: {integrity: sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -1087,8 +1087,8 @@ packages: globby: 11.0.3 is-glob: 4.0.1 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.3.5 - typescript: 4.3.5 + tsutils: 3.21.0_typescript@4.4.3 + typescript: 4.4.3 transitivePeerDependencies: - supports-color dev: true @@ -1754,6 +1754,10 @@ packages: is-symbol: 1.0.3 dev: true + /es6-promise/3.3.1: + resolution: {integrity: sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=} + dev: true + /esbuild/0.12.20: resolution: {integrity: sha512-u7+0qTo9Z64MD9PhooEngCmzyEYJ6ovFhPp8PLNh3UasR5Ihjv6HWVXqm8uHmasdQlpsAf0IsY4U0YVUfCpt4Q==} hasBin: true @@ -2072,6 +2076,17 @@ packages: picomatch: 2.2.3 dev: true + /fast-glob/3.2.7: + resolution: {integrity: sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==} + engines: {node: '>=8'} + dependencies: + '@nodelib/fs.stat': 2.0.4 + '@nodelib/fs.walk': 1.2.6 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.4 + dev: true + /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} dev: true @@ -2834,6 +2849,13 @@ packages: engines: {node: '>= 8.0.0'} dev: true + /mkdirp/0.5.5: + resolution: {integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==} + hasBin: true + dependencies: + minimist: 1.2.5 + dev: true + /mri/1.1.6: resolution: {integrity: sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==} engines: {node: '>=4'} @@ -3437,6 +3459,13 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true + /rimraf/2.7.1: + resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} + hasBin: true + dependencies: + glob: 7.1.6 + dev: true + /rimraf/3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true @@ -3471,6 +3500,15 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true + /sander/0.5.1: + resolution: {integrity: sha1-dB4kXiMfB8r7b98PEzrfohalAq0=} + dependencies: + es6-promise: 3.3.1 + graceful-fs: 4.2.6 + mkdirp: 0.5.5 + rimraf: 2.7.1 + dev: true + /selfsigned/1.10.11: resolution: {integrity: sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==} dependencies: @@ -3575,6 +3613,16 @@ packages: yargs: 15.4.1 dev: true + /sorcery/0.10.0: + resolution: {integrity: sha1-iukK19fLBfxZ8asMY3hF1cFaUrc=} + hasBin: true + dependencies: + buffer-crc32: 0.2.13 + minimist: 1.2.5 + sander: 0.5.1 + sourcemap-codec: 1.4.8 + dev: true + /source-map-js/0.6.2: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} engines: {node: '>=0.10.0'} @@ -3728,22 +3776,22 @@ packages: has-flag: 4.0.0 dev: true - /svelte-check/2.2.4_svelte@3.42.4: - resolution: {integrity: sha512-eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ==} + /svelte-check/2.2.6_svelte@3.42.4: + resolution: {integrity: sha512-oJux/afbmcZO+N+ADXB88h6XANLie8Y2rh2qBlhgfkpr2c3t/q/T0w2JWrHqagaDL8zeNwO8a8RVFBkrRox8gg==} hasBin: true peerDependencies: svelte: ^3.24.0 dependencies: chalk: 4.1.1 chokidar: 3.5.1 - glob: 7.1.6 + fast-glob: 3.2.7 import-fresh: 3.3.0 minimist: 1.2.5 sade: 1.7.4 source-map: 0.7.3 svelte: 3.42.4 - svelte-preprocess: 4.7.3_svelte@3.42.4+typescript@4.3.5 - typescript: 4.3.5 + svelte-preprocess: 4.9.4_svelte@3.42.4+typescript@4.4.3 + typescript: 4.4.3 transitivePeerDependencies: - '@babel/core' - coffeescript @@ -3765,8 +3813,8 @@ packages: svelte: 3.42.4 dev: false - /svelte-preprocess/4.7.3_svelte@3.42.4+typescript@4.3.5: - resolution: {integrity: sha512-Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA==} + /svelte-preprocess/4.9.4_svelte@3.42.4: + resolution: {integrity: sha512-Z0mUQBGtE+ZZSv/HerRSHe7ukJokxjiPeHe7iPOIXseEoRw51H3K/Vh6OMIMstetzZ11vWO9rCsXSD/uUUArmA==} engines: {node: '>= 9.11.2'} requiresBuild: true peerDependencies: @@ -3809,9 +3857,61 @@ packages: '@types/pug': 2.0.4 '@types/sass': 1.16.0 detect-indent: 6.0.0 + magic-string: 0.25.7 + sorcery: 0.10.0 + strip-indent: 3.0.0 + svelte: 3.42.4 + dev: true + + /svelte-preprocess/4.9.4_svelte@3.42.4+typescript@4.4.3: + resolution: {integrity: sha512-Z0mUQBGtE+ZZSv/HerRSHe7ukJokxjiPeHe7iPOIXseEoRw51H3K/Vh6OMIMstetzZ11vWO9rCsXSD/uUUArmA==} + engines: {node: '>= 9.11.2'} + requiresBuild: true + peerDependencies: + '@babel/core': ^7.10.2 + coffeescript: ^2.5.1 + less: ^3.11.3 + node-sass: '*' + postcss: ^7 || ^8 + postcss-load-config: ^2.1.0 || ^3.0.0 + pug: ^3.0.0 + sass: ^1.26.8 + stylus: ^0.54.7 + sugarss: ^2.0.0 + svelte: ^3.23.0 + typescript: ^3.9.5 || ^4.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true + coffeescript: + optional: true + less: + optional: true + node-sass: + optional: true + postcss: + optional: true + postcss-load-config: + optional: true + pug: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + typescript: + optional: true + dependencies: + '@types/pug': 2.0.4 + '@types/sass': 1.16.0 + detect-indent: 6.0.0 + magic-string: 0.25.7 + sorcery: 0.10.0 strip-indent: 3.0.0 svelte: 3.42.4 - typescript: 4.3.5 + typescript: 4.4.3 dev: true /svelte/3.42.4: @@ -3819,7 +3919,7 @@ packages: engines: {node: '>= 8'} dev: true - /svelte2tsx/0.4.1_svelte@3.42.4+typescript@4.3.5: + /svelte2tsx/0.4.1_svelte@3.42.4: resolution: {integrity: sha512-qqXWg+wlsYXhtolKI2NGL52rK7ACejNzEKn98qcz2T6Fd1e73+YPZMw/FNeGRSZLCdNxzGf7QJDhzIiK3MXihA==} peerDependencies: svelte: ^3.24 @@ -3828,7 +3928,6 @@ packages: dedent-js: 1.0.1 pascal-case: 3.1.2 svelte: 3.42.4 - typescript: 4.3.5 dev: true /table/6.6.0: @@ -3953,14 +4052,14 @@ packages: resolution: {integrity: sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==} dev: true - /tsutils/3.21.0_typescript@4.3.5: + /tsutils/3.21.0_typescript@4.4.3: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.3.5 + typescript: 4.4.3 dev: true /tty-table/2.8.13: @@ -4008,8 +4107,8 @@ packages: engines: {node: '>=8'} dev: true - /typescript/4.3.5: - resolution: {integrity: sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==} + /typescript/4.4.3: + resolution: {integrity: sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==} engines: {node: '>=4.2.0'} hasBin: true dev: true @@ -4261,7 +4360,7 @@ packages: httpie: 1.1.2 dev: true - github.com/sveltejs/eslint-config/885b062904591606c030b4e8eb9160c63f16b322_9d3ce2148653bb6cbbfcd9b88d4d1961: + github.com/sveltejs/eslint-config/885b062904591606c030b4e8eb9160c63f16b322_0aead88bb7bc400ad99459b1a1062885: resolution: {tarball: https://codeload.github.com/sveltejs/eslint-config/tar.gz/885b062904591606c030b4e8eb9160c63f16b322} id: github.com/sveltejs/eslint-config/885b062904591606c030b4e8eb9160c63f16b322 name: '@sveltejs/eslint-config' @@ -4275,10 +4374,10 @@ packages: eslint-plugin-svelte3: '>= 2' typescript: '>= 3' dependencies: - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.4_1023fecc1597d32dc62a5f3c369f1df3 + '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.4.3 eslint: 7.31.0 eslint-plugin-import: 2.23.4_eslint@7.31.0 eslint-plugin-svelte3: 3.2.0_eslint@7.31.0 - typescript: 4.3.5 + typescript: 4.4.3 dev: true