From 55d05310fa4c7a4893dfd95025e119c233886b63 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 17 Aug 2022 16:35:12 -0700 Subject: [PATCH] [fix] support linked @sveltejs/kit package in Vite 3.0.3+ (#5861) * [chore] upgrade to Vite 3.0.8 * Update .changeset/pink-gorillas-watch.md * bump pnpm * make function name clearer * huh apparently this works * set SvelteKit as external only in development mode * Revert "set SvelteKit as external only in development mode" This reverts commit 592f964199ac6475b764c27b57ef100628632341. * add comment * revert unneeded upgrade to esbuild in adapters * unpin vite peerdep in kit * update changeset * remove old version of esbuild Co-authored-by: Rich Harris Co-authored-by: Conduitry --- .changeset/pink-gorillas-watch.md | 5 + package.json | 2 +- packages/adapter-static/package.json | 2 +- .../test/apps/prerendered/package.json | 2 +- .../adapter-static/test/apps/spa/package.json | 2 +- .../templates/default/package.template.json | 2 +- packages/kit/package.json | 4 +- packages/kit/src/vite/build/build_server.js | 4 +- packages/kit/src/vite/build/utils.js | 4 +- packages/kit/src/vite/index.js | 9 +- packages/kit/test/apps/amp/package.json | 2 +- packages/kit/test/apps/basics/package.json | 2 +- packages/kit/test/apps/options-2/package.json | 2 +- packages/kit/test/apps/options/package.json | 2 +- packages/kit/test/apps/writes/package.json | 2 +- .../kit/test/prerendering/basics/package.json | 2 +- .../test/prerendering/fallback/package.json | 2 +- .../test/prerendering/options/package.json | 2 +- .../test/prerendering/paths-base/package.json | 2 +- .../prerendering/trailing-slash/package.json | 2 +- pnpm-lock.yaml | 234 ++++++++---------- sites/kit.svelte.dev/package.json | 2 +- 22 files changed, 143 insertions(+), 149 deletions(-) create mode 100644 .changeset/pink-gorillas-watch.md diff --git a/.changeset/pink-gorillas-watch.md b/.changeset/pink-gorillas-watch.md new file mode 100644 index 000000000000..199a76170735 --- /dev/null +++ b/.changeset/pink-gorillas-watch.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +[fix] support linked `@sveltejs/kit` project in Vite 3.0.3+ diff --git a/package.json b/package.json index 3aa8f7a1274b..3f3b9d671aec 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "turbo": "^1.3.4", "typescript": "^4.7.4" }, - "packageManager": "pnpm@7.9.0", + "packageManager": "pnpm@7.9.3", "engines": { "pnpm": "^7.0.0" }, diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json index d3a0c7a2576e..9c0a100dac1d 100644 --- a/packages/adapter-static/package.json +++ b/packages/adapter-static/package.json @@ -32,6 +32,6 @@ "svelte": "^3.48.0", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" } } diff --git a/packages/adapter-static/test/apps/prerendered/package.json b/packages/adapter-static/test/apps/prerendered/package.json index 3d8844d99cb6..b38399527f6b 100644 --- a/packages/adapter-static/test/apps/prerendered/package.json +++ b/packages/adapter-static/test/apps/prerendered/package.json @@ -10,7 +10,7 @@ "devDependencies": { "@sveltejs/kit": "workspace:*", "svelte": "^3.48.0", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json index 585a543a2e72..a3144238b04d 100644 --- a/packages/adapter-static/test/apps/spa/package.json +++ b/packages/adapter-static/test/apps/spa/package.json @@ -12,7 +12,7 @@ "@sveltejs/kit": "workspace:*", "sirv-cli": "^2.0.2", "svelte": "^3.48.0", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/create-svelte/templates/default/package.template.json b/packages/create-svelte/templates/default/package.template.json index d4cc74df2dfb..98557d778296 100644 --- a/packages/create-svelte/templates/default/package.template.json +++ b/packages/create-svelte/templates/default/package.template.json @@ -11,7 +11,7 @@ "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", "svelte": "^3.46.0", - "vite": "^3.0.4" + "vite": "^3.0.8" }, "type": "module", "dependencies": { diff --git a/packages/kit/package.json b/packages/kit/package.json index 9cb4739f7159..861643b5631e 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -39,11 +39,11 @@ "tiny-glob": "^0.2.9", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" }, "peerDependencies": { "svelte": "^3.44.0", - "vite": "3.0.2" + "vite": "^3.0.0" }, "bin": { "svelte-kit": "svelte-kit.js" diff --git a/packages/kit/src/vite/build/build_server.js b/packages/kit/src/vite/build/build_server.js index 7414463b8ec9..cb126b83c40d 100644 --- a/packages/kit/src/vite/build/build_server.js +++ b/packages/kit/src/vite/build/build_server.js @@ -4,7 +4,7 @@ import { mkdirp, posixify } from '../../utils/filesystem.js'; import { get_vite_config, merge_vite_configs, resolve_entry } from '../utils.js'; import { load_template } from '../../core/config/index.js'; import { runtime_directory } from '../../core/utils.js'; -import { create_build, find_deps, get_default_config, is_http_method } from './utils.js'; +import { create_build, find_deps, get_default_build_config, is_http_method } from './utils.js'; import { s } from '../../utils/misc.js'; /** @@ -205,7 +205,7 @@ export async function build_server(options, client) { ); const merged_config = merge_vite_configs( - get_default_config({ config, input, ssr: true, outDir: `${output_dir}/server` }), + get_default_build_config({ config, input, ssr: true, outDir: `${output_dir}/server` }), await get_vite_config(vite_config, vite_config_env) ); diff --git a/packages/kit/src/vite/build/utils.js b/packages/kit/src/vite/build/utils.js index a1b3da9f8768..14cd04a368f1 100644 --- a/packages/kit/src/vite/build/utils.js +++ b/packages/kit/src/vite/build/utils.js @@ -87,7 +87,7 @@ export function find_deps(manifest, entry, add_dynamic_css) { * }} options * @return {import('vite').UserConfig} */ -export const get_default_config = function ({ config, input, ssr, outDir }) { +export function get_default_build_config({ config, input, ssr, outDir }) { const prefix = `${config.kit.appDir}/immutable`; return { @@ -135,7 +135,7 @@ export const get_default_config = function ({ config, input, ssr, outDir }) { } } }; -}; +} /** * @param {import('types').ValidatedKitConfig} config diff --git a/packages/kit/src/vite/index.js b/packages/kit/src/vite/index.js index a5ef0f32ee80..33a8f324b065 100644 --- a/packages/kit/src/vite/index.js +++ b/packages/kit/src/vite/index.js @@ -12,7 +12,7 @@ import { load_config } from '../core/config/index.js'; import { dev } from './dev/index.js'; import { generate_manifest } from '../core/generate_manifest/index.js'; import { runtime_directory, logger } from '../core/utils.js'; -import { find_deps, get_default_config as get_default_build_config } from './build/utils.js'; +import { find_deps, get_default_build_config } from './build/utils.js'; import { preview } from './preview/index.js'; import { get_aliases, resolve_entry, prevent_illegal_rollup_imports, get_env } from './utils.js'; import { fileURLToPath } from 'node:url'; @@ -266,6 +266,13 @@ function kit() { `${posixify(svelte_config.kit.outDir)}/!(generated)` ] } + }, + ssr: { + // Without this, Vite will treat `@sveltejs/kit` as noExternal if it's + // a linked dependency, and that causes modules to be imported twice + // under different IDs, which breaks a bunch of stuff + // https://github.com/vitejs/vite/pull/9296 + external: ['@sveltejs/kit'] } }; diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json index fdc85fc837c0..1576cdbfc974 100644 --- a/packages/kit/test/apps/amp/package.json +++ b/packages/kit/test/apps/amp/package.json @@ -19,7 +19,7 @@ "svelte": "^3.48.0", "svelte-check": "^2.7.1", "typescript": "^4.7.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json index 567a8a1be931..a58156c56d74 100644 --- a/packages/kit/test/apps/basics/package.json +++ b/packages/kit/test/apps/basics/package.json @@ -18,7 +18,7 @@ "svelte": "^3.48.0", "svelte-check": "^2.7.1", "typescript": "^4.7.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json index 63cd01ba2783..747b2bef6b81 100644 --- a/packages/kit/test/apps/options-2/package.json +++ b/packages/kit/test/apps/options-2/package.json @@ -18,7 +18,7 @@ "svelte": "^3.48.0", "svelte-check": "^2.7.1", "typescript": "^4.7.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json index 6850d6f4c2b9..51e96620d8fa 100644 --- a/packages/kit/test/apps/options/package.json +++ b/packages/kit/test/apps/options/package.json @@ -17,7 +17,7 @@ "svelte": "^3.48.0", "svelte-check": "^2.7.1", "typescript": "^4.7.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json index 6ea72a979ed9..3aeed6b2be9c 100644 --- a/packages/kit/test/apps/writes/package.json +++ b/packages/kit/test/apps/writes/package.json @@ -18,7 +18,7 @@ "svelte": "^3.48.0", "svelte-check": "^2.7.1", "typescript": "^4.7.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json index 95f04e742134..92c4a6bfa24b 100644 --- a/packages/kit/test/prerendering/basics/package.json +++ b/packages/kit/test/prerendering/basics/package.json @@ -15,7 +15,7 @@ "svelte-check": "^2.7.1", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/prerendering/fallback/package.json b/packages/kit/test/prerendering/fallback/package.json index 3c3e7aa3869e..8b6a092827bd 100644 --- a/packages/kit/test/prerendering/fallback/package.json +++ b/packages/kit/test/prerendering/fallback/package.json @@ -15,7 +15,7 @@ "svelte-check": "^2.7.1", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json index b3a9e2feaf91..1fba5f3024d0 100644 --- a/packages/kit/test/prerendering/options/package.json +++ b/packages/kit/test/prerendering/options/package.json @@ -15,7 +15,7 @@ "svelte-check": "^2.7.1", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json index 6c94d7c1f40b..1f743ca22906 100644 --- a/packages/kit/test/prerendering/paths-base/package.json +++ b/packages/kit/test/prerendering/paths-base/package.json @@ -15,7 +15,7 @@ "svelte-check": "^2.7.1", "typescript": "^4.7.4", "uvu": "^0.5.3", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/packages/kit/test/prerendering/trailing-slash/package.json b/packages/kit/test/prerendering/trailing-slash/package.json index 77123a00a81e..a2c58958642a 100644 --- a/packages/kit/test/prerendering/trailing-slash/package.json +++ b/packages/kit/test/prerendering/trailing-slash/package.json @@ -15,7 +15,7 @@ "svelte-check": "^2.7.1", "typescript": "^4.7.4", "uvu": "^0.5.4", - "vite": "3.0.2" + "vite": "^3.0.8" }, "type": "module" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3b958fc87c6b..141b10e1d121 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,7 +55,7 @@ importers: worktop: 0.8.0-next.14 dependencies: '@cloudflare/workers-types': 3.14.0 - esbuild: 0.14.48 + esbuild: 0.14.54 worktop: 0.8.0-next.14 devDependencies: '@types/node': 16.11.42 @@ -73,7 +73,7 @@ importers: dependencies: '@cloudflare/workers-types': 3.14.0 '@iarna/toml': 2.2.5 - esbuild: 0.14.48 + esbuild: 0.14.54 devDependencies: '@cloudflare/kv-asset-handler': 0.2.0 '@types/node': 16.11.42 @@ -98,7 +98,7 @@ importers: uvu: ^0.5.3 dependencies: '@iarna/toml': 2.2.5 - esbuild: 0.14.48 + esbuild: 0.14.54 set-cookie-parser: 2.5.0 tiny-glob: 0.2.9 devDependencies: @@ -149,7 +149,7 @@ importers: svelte: ^3.48.0 typescript: ^4.7.4 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../kit '@types/node': 16.11.42 @@ -158,17 +158,17 @@ importers: svelte: 3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/adapter-static/test/apps/prerendered: specifiers: '@sveltejs/kit': workspace:* svelte: ^3.48.0 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../../../kit svelte: 3.48.0 - vite: 3.0.2 + vite: 3.0.8 packages/adapter-static/test/apps/spa: specifiers: @@ -176,13 +176,13 @@ importers: '@sveltejs/kit': workspace:* sirv-cli: ^2.0.2 svelte: ^3.48.0 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/adapter-node': link:../../../../adapter-node '@sveltejs/kit': link:../../../../kit sirv-cli: 2.0.2 svelte: 3.48.0 - vite: 3.0.2 + vite: 3.0.8 packages/adapter-vercel: specifiers: @@ -193,7 +193,7 @@ importers: typescript: ^4.7.4 dependencies: '@vercel/nft': 0.21.0 - esbuild: 0.14.48 + esbuild: 0.14.54 devDependencies: '@sveltejs/kit': link:../kit '@types/node': 16.11.42 @@ -294,9 +294,9 @@ importers: typescript: ^4.7.4 undici: ^5.8.1 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.1_svelte@3.48.0+vite@3.0.2 + '@sveltejs/vite-plugin-svelte': 1.0.1_svelte@3.48.0+vite@3.0.8 cookie: 0.5.0 devalue: 2.0.1 kleur: 4.1.5 @@ -323,7 +323,7 @@ importers: svelte-preprocess: 4.10.7_lvfi2wesz6u4l5rfbnetbucfmm typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/apps/amp: specifiers: @@ -334,7 +334,7 @@ importers: svelte: ^3.48.0 svelte-check: ^2.7.1 typescript: ^4.7.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/amp': link:../../../../amp '@sveltejs/kit': link:../../.. @@ -343,7 +343,7 @@ importers: svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/apps/basics: specifiers: @@ -353,7 +353,7 @@ importers: svelte: ^3.48.0 svelte-check: ^2.7.1 typescript: ^4.7.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 @@ -361,7 +361,7 @@ importers: svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/apps/options: specifiers: @@ -370,14 +370,14 @@ importers: svelte: ^3.48.0 svelte-check: ^2.7.1 typescript: ^4.7.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/apps/options-2: specifiers: @@ -387,7 +387,7 @@ importers: svelte: ^3.48.0 svelte-check: ^2.7.1 typescript: ^4.7.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/adapter-node': link:../../../../adapter-node '@sveltejs/kit': link:../../.. @@ -395,7 +395,7 @@ importers: svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/apps/writes: specifiers: @@ -405,7 +405,7 @@ importers: svelte: ^3.48.0 svelte-check: ^2.7.1 typescript: ^4.7.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 @@ -413,7 +413,7 @@ importers: svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/prerendering/basics: specifiers: @@ -422,14 +422,14 @@ importers: svelte-check: ^2.7.1 typescript: ^4.7.4 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/prerendering/fallback: specifiers: @@ -438,14 +438,14 @@ importers: svelte-check: ^2.7.1 typescript: ^4.7.4 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/prerendering/options: specifiers: @@ -454,14 +454,14 @@ importers: svelte-check: ^2.7.1 typescript: ^4.7.4 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/prerendering/paths-base: specifiers: @@ -470,14 +470,14 @@ importers: svelte-check: ^2.7.1 typescript: ^4.7.4 uvu: ^0.5.3 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/kit/test/prerendering/trailing-slash: specifiers: @@ -486,14 +486,14 @@ importers: svelte-check: ^2.7.1 typescript: ^4.7.4 uvu: ^0.5.4 - vite: 3.0.2 + vite: ^3.0.8 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.48.0 svelte-check: 2.8.0_svelte@3.48.0 typescript: 4.7.4 uvu: 0.5.4 - vite: 3.0.2 + vite: 3.0.8 packages/migrate: specifiers: @@ -554,7 +554,7 @@ importers: shiki-twoslash: ^3.0.2 svelte: ^3.48.0 typescript: ^4.7.4 - vite: ^3.0.4 + vite: ^3.0.8 vite-imagetools: ^4.0.3 devDependencies: '@sveltejs/adapter-auto': link:../../packages/adapter-auto @@ -809,6 +809,14 @@ packages: resolution: {integrity: sha512-F6lZuzu/vNl9AxOq1U3x2UCi68bcE1O59cKGQ5ntRh3lGQfd3vers6NUag02T7P+qFCHaAp78QN6fRmq12Y3iA==} dev: false + /@esbuild/linux-loong64/0.14.54: + resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + optional: true + /@fontsource/fira-mono/4.5.8: resolution: {integrity: sha512-sFuSPB/Km8B1fy3CH0NqO5Nb4GmVMzp3XFaw6MwK293xhm3OnB68QJawwTTjLewcrS78wOTAhTUB058qxurJoQ==} dev: false @@ -993,7 +1001,7 @@ packages: golden-fleece: 1.0.9 dev: true - /@sveltejs/vite-plugin-svelte/1.0.1_svelte@3.48.0+vite@3.0.2: + /@sveltejs/vite-plugin-svelte/1.0.1_svelte@3.48.0+vite@3.0.8: resolution: {integrity: sha512-PorCgUounn0VXcpeJu+hOweZODKmGuLHsLomwqSj+p26IwjjGffmYQfVHtiTWq+NqaUuuHWWG7vPge6UFw4Aeg==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -1011,7 +1019,7 @@ packages: magic-string: 0.26.2 svelte: 3.48.0 svelte-hmr: 0.14.12_svelte@3.48.0 - vite: 3.0.2 + vite: 3.0.8 transitivePeerDependencies: - supports-color dev: false @@ -1813,192 +1821,193 @@ packages: resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==} dev: true - /esbuild-android-64/0.14.48: - resolution: {integrity: sha512-3aMjboap/kqwCUpGWIjsk20TtxVoKck8/4Tu19rubh7t5Ra0Yrpg30Mt1QXXlipOazrEceGeWurXKeFJgkPOUg==} + /esbuild-android-64/0.14.54: + resolution: {integrity: sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==} engines: {node: '>=12'} cpu: [x64] os: [android] requiresBuild: true optional: true - /esbuild-android-arm64/0.14.48: - resolution: {integrity: sha512-vptI3K0wGALiDq+EvRuZotZrJqkYkN5282iAfcffjI5lmGG9G1ta/CIVauhY42MBXwEgDJkweiDcDMRLzBZC4g==} + /esbuild-android-arm64/0.14.54: + resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} cpu: [arm64] os: [android] requiresBuild: true optional: true - /esbuild-darwin-64/0.14.48: - resolution: {integrity: sha512-gGQZa4+hab2Va/Zww94YbshLuWteyKGD3+EsVon8EWTWhnHFRm5N9NbALNbwi/7hQ/hM1Zm4FuHg+k6BLsl5UA==} + /esbuild-darwin-64/0.14.54: + resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /esbuild-darwin-arm64/0.14.48: - resolution: {integrity: sha512-bFjnNEXjhZT+IZ8RvRGNJthLWNHV5JkCtuOFOnjvo5pC0sk2/QVk0Qc06g2PV3J0TcU6kaPC3RN9yy9w2PSLEA==} + /esbuild-darwin-arm64/0.14.54: + resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /esbuild-freebsd-64/0.14.48: - resolution: {integrity: sha512-1NOlwRxmOsnPcWOGTB10JKAkYSb2nue0oM1AfHWunW/mv3wERfJmnYlGzL3UAOIUXZqW8GeA2mv+QGwq7DToqA==} + /esbuild-freebsd-64/0.14.54: + resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] requiresBuild: true optional: true - /esbuild-freebsd-arm64/0.14.48: - resolution: {integrity: sha512-gXqKdO8wabVcYtluAbikDH2jhXp+Klq5oCD5qbVyUG6tFiGhrC9oczKq3vIrrtwcxDQqK6+HDYK8Zrd4bCA9Gw==} + /esbuild-freebsd-arm64/0.14.54: + resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] requiresBuild: true optional: true - /esbuild-linux-32/0.14.48: - resolution: {integrity: sha512-ghGyDfS289z/LReZQUuuKq9KlTiTspxL8SITBFQFAFRA/IkIvDpnZnCAKTCjGXAmUqroMQfKJXMxyjJA69c/nQ==} + /esbuild-linux-32/0.14.54: + resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} cpu: [ia32] os: [linux] requiresBuild: true optional: true - /esbuild-linux-64/0.14.48: - resolution: {integrity: sha512-vni3p/gppLMVZLghI7oMqbOZdGmLbbKR23XFARKnszCIBpEMEDxOMNIKPmMItQrmH/iJrL1z8Jt2nynY0bE1ug==} + /esbuild-linux-64/0.14.54: + resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm/0.14.48: - resolution: {integrity: sha512-+VfSV7Akh1XUiDNXgqgY1cUP1i2vjI+BmlyXRfVz5AfV3jbpde8JTs5Q9sYgaoq5cWfuKfoZB/QkGOI+QcL1Tw==} + /esbuild-linux-arm/0.14.54: + resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm64/0.14.48: - resolution: {integrity: sha512-3CFsOlpoxlKPRevEHq8aAntgYGYkE1N9yRYAcPyng/p4Wyx0tPR5SBYsxLKcgPB9mR8chHEhtWYz6EZ+H199Zw==} + /esbuild-linux-arm64/0.14.54: + resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-mips64le/0.14.48: - resolution: {integrity: sha512-cs0uOiRlPp6ymknDnjajCgvDMSsLw5mST2UXh+ZIrXTj2Ifyf2aAP3Iw4DiqgnyYLV2O/v/yWBJx+WfmKEpNLA==} + /esbuild-linux-mips64le/0.14.54: + resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] requiresBuild: true optional: true - /esbuild-linux-ppc64le/0.14.48: - resolution: {integrity: sha512-+2F0vJMkuI0Wie/wcSPDCqXvSFEELH7Jubxb7mpWrA/4NpT+/byjxDz0gG6R1WJoeDefcrMfpBx4GFNN1JQorQ==} + /esbuild-linux-ppc64le/0.14.54: + resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-riscv64/0.14.48: - resolution: {integrity: sha512-BmaK/GfEE+5F2/QDrIXteFGKnVHGxlnK9MjdVKMTfvtmudjY3k2t8NtlY4qemKSizc+QwyombGWTBDc76rxePA==} + /esbuild-linux-riscv64/0.14.54: + resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-s390x/0.14.48: - resolution: {integrity: sha512-tndw/0B9jiCL+KWKo0TSMaUm5UWBLsfCKVdbfMlb3d5LeV9WbijZ8Ordia8SAYv38VSJWOEt6eDCdOx8LqkC4g==} + /esbuild-linux-s390x/0.14.54: + resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] requiresBuild: true optional: true - /esbuild-netbsd-64/0.14.48: - resolution: {integrity: sha512-V9hgXfwf/T901Lr1wkOfoevtyNkrxmMcRHyticybBUHookznipMOHoF41Al68QBsqBxnITCEpjjd4yAos7z9Tw==} + /esbuild-netbsd-64/0.14.54: + resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] requiresBuild: true optional: true - /esbuild-openbsd-64/0.14.48: - resolution: {integrity: sha512-+IHf4JcbnnBl4T52egorXMatil/za0awqzg2Vy6FBgPcBpisDWT2sVz/tNdrK9kAqj+GZG/jZdrOkj7wsrNTKA==} + /esbuild-openbsd-64/0.14.54: + resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] requiresBuild: true optional: true - /esbuild-sunos-64/0.14.48: - resolution: {integrity: sha512-77m8bsr5wOpOWbGi9KSqDphcq6dFeJyun8TA+12JW/GAjyfTwVtOnN8DOt6DSPUfEV+ltVMNqtXUeTeMAxl5KA==} + /esbuild-sunos-64/0.14.54: + resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] requiresBuild: true optional: true - /esbuild-windows-32/0.14.48: - resolution: {integrity: sha512-EPgRuTPP8vK9maxpTGDe5lSoIBHGKO/AuxDncg5O3NkrPeLNdvvK8oywB0zGaAZXxYWfNNSHskvvDgmfVTguhg==} + /esbuild-windows-32/0.14.54: + resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /esbuild-windows-64/0.14.48: - resolution: {integrity: sha512-YmpXjdT1q0b8ictSdGwH3M8VCoqPpK1/UArze3X199w6u8hUx3V8BhAi1WjbsfDYRBanVVtduAhh2sirImtAvA==} + /esbuild-windows-64/0.14.54: + resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /esbuild-windows-arm64/0.14.48: - resolution: {integrity: sha512-HHaOMCsCXp0rz5BT2crTka6MPWVno121NKApsGs/OIW5QC0ggC69YMGs1aJct9/9FSUF4A1xNE/cLvgB5svR4g==} + /esbuild-windows-arm64/0.14.54: + resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /esbuild/0.14.48: - resolution: {integrity: sha512-w6N1Yn5MtqK2U1/WZTX9ZqUVb8IOLZkZ5AdHkT6x3cHDMVsYWC7WPdiLmx19w3i4Rwzy5LqsEMtVihG3e4rFzA==} + /esbuild/0.14.54: + resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.48 - esbuild-android-arm64: 0.14.48 - esbuild-darwin-64: 0.14.48 - esbuild-darwin-arm64: 0.14.48 - esbuild-freebsd-64: 0.14.48 - esbuild-freebsd-arm64: 0.14.48 - esbuild-linux-32: 0.14.48 - esbuild-linux-64: 0.14.48 - esbuild-linux-arm: 0.14.48 - esbuild-linux-arm64: 0.14.48 - esbuild-linux-mips64le: 0.14.48 - esbuild-linux-ppc64le: 0.14.48 - esbuild-linux-riscv64: 0.14.48 - esbuild-linux-s390x: 0.14.48 - esbuild-netbsd-64: 0.14.48 - esbuild-openbsd-64: 0.14.48 - esbuild-sunos-64: 0.14.48 - esbuild-windows-32: 0.14.48 - esbuild-windows-64: 0.14.48 - esbuild-windows-arm64: 0.14.48 + '@esbuild/linux-loong64': 0.14.54 + esbuild-android-64: 0.14.54 + esbuild-android-arm64: 0.14.54 + esbuild-darwin-64: 0.14.54 + esbuild-darwin-arm64: 0.14.54 + esbuild-freebsd-64: 0.14.54 + esbuild-freebsd-arm64: 0.14.54 + esbuild-linux-32: 0.14.54 + esbuild-linux-64: 0.14.54 + esbuild-linux-arm: 0.14.54 + esbuild-linux-arm64: 0.14.54 + esbuild-linux-mips64le: 0.14.54 + esbuild-linux-ppc64le: 0.14.54 + esbuild-linux-riscv64: 0.14.54 + esbuild-linux-s390x: 0.14.54 + esbuild-netbsd-64: 0.14.54 + esbuild-openbsd-64: 0.14.54 + esbuild-sunos-64: 0.14.54 + esbuild-windows-32: 0.14.54 + esbuild-windows-64: 0.14.54 + esbuild-windows-arm64: 0.14.54 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -4468,32 +4477,6 @@ packages: magic-string: 0.26.2 dev: true - /vite/3.0.2: - resolution: {integrity: sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - less: '*' - sass: '*' - stylus: '*' - terser: ^5.4.0 - peerDependenciesMeta: - less: - optional: true - sass: - optional: true - stylus: - optional: true - terser: - optional: true - dependencies: - esbuild: 0.14.48 - postcss: 8.4.16 - resolve: 1.22.1 - rollup: 2.75.7 - optionalDependencies: - fsevents: 2.3.2 - /vite/3.0.8: resolution: {integrity: sha512-AOZ4eN7mrkJiOLuw8IA7piS4IdOQyQCA81GxGsAQvAZzMRi9ZwGB3TOaYsj4uLAWK46T5L4AfQ6InNGlxX30IQ==} engines: {node: ^14.18.0 || >=16.0.0} @@ -4513,13 +4496,12 @@ packages: terser: optional: true dependencies: - esbuild: 0.14.48 + esbuild: 0.14.54 postcss: 8.4.16 resolve: 1.22.1 rollup: 2.75.7 optionalDependencies: fsevents: 2.3.2 - dev: true /vscode-oniguruma/1.6.2: resolution: {integrity: sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==} diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json index 5be7b5e4436b..eeeb76b29d88 100644 --- a/sites/kit.svelte.dev/package.json +++ b/sites/kit.svelte.dev/package.json @@ -21,7 +21,7 @@ "shiki-twoslash": "^3.0.2", "svelte": "^3.48.0", "typescript": "^4.7.4", - "vite": "^3.0.4", + "vite": "^3.0.8", "vite-imagetools": "^4.0.3" }, "type": "module"