From 7116c021a39eac15a6e1264dfbd11bef0f5d618a Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Thu, 6 Apr 2023 00:03:58 +0800 Subject: [PATCH] Upgrade to Vite 4.2 (#6759) --- .changeset/unlucky-wolves-share.md | 5 + packages/astro/package.json | 2 +- .../astro/src/core/build/add-rollup-input.ts | 7 +- packages/astro/src/core/build/internal.ts | 6 +- .../src/core/build/plugins/plugin-css.ts | 30 -- .../core/build/plugins/plugin-internals.ts | 9 - packages/astro/src/core/build/static-build.ts | 4 + packages/astro/test/ssr-manifest.test.js | 2 +- packages/integrations/image/package.json | 2 +- packages/integrations/mdx/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/src/index.ts | 7 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 335 ++++++++++++++++-- 15 files changed, 331 insertions(+), 86 deletions(-) create mode 100644 .changeset/unlucky-wolves-share.md diff --git a/.changeset/unlucky-wolves-share.md b/.changeset/unlucky-wolves-share.md new file mode 100644 index 000000000000..8af5c5fa65e7 --- /dev/null +++ b/.changeset/unlucky-wolves-share.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Upgrade to Vite 4.2 diff --git a/packages/astro/package.json b/packages/astro/package.json index e80e25090236..cc7801924db4 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -155,7 +155,7 @@ "typescript": "*", "unist-util-visit": "^4.1.0", "vfile": "^5.3.2", - "vite": "^4.1.2", + "vite": "^4.2.1", "vitefu": "^0.2.4", "yargs-parser": "^21.0.1", "zod": "^3.17.3" diff --git a/packages/astro/src/core/build/add-rollup-input.ts b/packages/astro/src/core/build/add-rollup-input.ts index 4043d3ecd319..f45aef731ce9 100644 --- a/packages/astro/src/core/build/add-rollup-input.ts +++ b/packages/astro/src/core/build/add-rollup-input.ts @@ -1,4 +1,4 @@ -import type { InputOptions } from 'rollup'; +import type { Rollup } from 'vite'; function fromEntries(entries: [string, V][]) { const obj: Record = {}; @@ -8,7 +8,10 @@ function fromEntries(entries: [string, V][]) { return obj; } -export function addRollupInput(inputOptions: InputOptions, newInputs: string[]): InputOptions { +export function addRollupInput( + inputOptions: Rollup.InputOptions, + newInputs: string[] +): Rollup.InputOptions { // Add input module ids to existing input option, whether it's a string, array or object // this way you can use multiple html plugins all adding their own inputs if (!inputOptions.input) { diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index d4372c0a2081..e54405724af6 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -1,4 +1,4 @@ -import type { OutputChunk, RenderedChunk } from 'rollup'; +import type { Rollup } from 'vite'; import type { PageBuildData, ViteID } from './types'; import type { SSRResult } from '../../@types/astro'; @@ -76,7 +76,7 @@ export interface BuildInternals { // A list of all static files created during the build. Used for SSR. staticFiles: Set; // The SSR entry chunk. Kept in internals to share between ssr/client build steps - ssrEntryChunk?: OutputChunk; + ssrEntryChunk?: Rollup.OutputChunk; componentMetadata: SSRResult['componentMetadata']; } @@ -146,7 +146,7 @@ export function trackClientOnlyPageDatas( export function* getPageDatasByChunk( internals: BuildInternals, - chunk: RenderedChunk + chunk: Rollup.RenderedChunk ): Generator { const pagesByViteID = internals.pagesByViteID; for (const [modulePath] of Object.entries(chunk.modules)) { diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts index 826058b4e4b2..431a920cca48 100644 --- a/packages/astro/src/core/build/plugins/plugin-css.ts +++ b/packages/astro/src/core/build/plugins/plugin-css.ts @@ -232,36 +232,6 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] } }, }, - { - name: 'astro:rollup-plugin-build-css-minify', - enforce: 'post', - async generateBundle(_outputOptions, bundle) { - // Minify CSS in each bundle ourselves, since server builds are not minified - // so that the JS is debuggable. Since you cannot configure vite:css-post to minify - // we need to do it ourselves. - if (options.target === 'server') { - for (const [, output] of Object.entries(bundle)) { - if (output.type === 'asset') { - if (output.name?.endsWith('.css') && typeof output.source === 'string') { - const cssTarget = settings.config.vite.build?.cssTarget; - const minify = settings.config.vite.build?.minify !== false; - const { code: minifiedCSS } = await transformWithEsbuild( - output.source, - output.name, - { - loader: 'css', - minify, - target: cssTarget || undefined, - sourcemap: false, - } - ); - output.source = minifiedCSS; - } - } - } - } - }, - }, ]; } diff --git a/packages/astro/src/core/build/plugins/plugin-internals.ts b/packages/astro/src/core/build/plugins/plugin-internals.ts index d1ce021bc4f4..3dce58f081c6 100644 --- a/packages/astro/src/core/build/plugins/plugin-internals.ts +++ b/packages/astro/src/core/build/plugins/plugin-internals.ts @@ -23,15 +23,6 @@ export function vitePluginInternals(input: Set, internals: BuildInternal return extra; }, - configResolved(resolvedConfig) { - // Delete this hook because it causes assets not to be built - const plugins = resolvedConfig.plugins as VitePlugin[]; - const viteAsset = plugins.find((p) => p.name === 'vite:asset'); - if (viteAsset) { - delete viteAsset.generateBundle; - } - }, - async generateBundle(_options, bundle) { const promises = []; const mapping = new Map>(); diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index e3cd4f0e9860..cb11a5fa06f2 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -148,6 +148,9 @@ async function ssrBuild( logLevel: opts.viteConfig.logLevel ?? 'error', build: { target: 'esnext', + // Vite defaults cssMinify to false in SSR by default, but we want to minify it + // as the CSS generated are used and served to the client. + cssMinify: viteConfig.build?.minify == null ? true : !!viteConfig.build?.minify, ...viteConfig.build, emptyOutDir: false, manifest: false, @@ -173,6 +176,7 @@ async function ssrBuild( }, }, ssr: true, + ssrEmitAssets: true, // improve build performance minify: false, modulePreload: { polyfill: false }, diff --git a/packages/astro/test/ssr-manifest.test.js b/packages/astro/test/ssr-manifest.test.js index 519f86a664ef..cb876bde9889 100644 --- a/packages/astro/test/ssr-manifest.test.js +++ b/packages/astro/test/ssr-manifest.test.js @@ -23,6 +23,6 @@ describe('astro:ssr-manifest', () => { const html = await response.text(); const $ = cheerio.load(html); - expect($('#assets').text()).to.equal('["/_astro/index.1bad7273.css"]'); + expect($('#assets').text()).to.equal('["/_astro/index.a8a337e4.css"]'); }); }); diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 6d465ff8091e..dee932a0b22c 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -60,7 +60,7 @@ "mocha": "^9.2.2", "rollup-plugin-copy": "^3.4.0", "sharp": "^0.31.0", - "vite": "^4.1.2" + "vite": "^4.2.1" }, "peerDependencies": { "astro": "workspace:^2.1.9", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 093f72bf3c38..4264b35a09a8 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -70,7 +70,7 @@ "remark-rehype": "^10.1.0", "remark-shiki-twoslash": "^3.1.0", "remark-toc": "^8.0.1", - "vite": "^4.1.2" + "vite": "^4.2.1" }, "engines": { "node": ">=16.12.0" diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 30126d96104b..5a44e58824e6 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -49,7 +49,7 @@ "chai": "^4.3.6", "cheerio": "^1.0.0-rc.11", "mocha": "^9.2.2", - "vite": "^4.1.2" + "vite": "^4.2.1" }, "astro": { "external": true diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 59006a4c0cc8..784b4f9b6646 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -40,7 +40,7 @@ "astro": "workspace:*", "astro-scripts": "workspace:*", "svelte": "^3.54.0", - "vite": "^4.1.2" + "vite": "^4.2.1" }, "peerDependencies": { "astro": "workspace:^2.1.9", diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index 9c6fdc1006ed..04be569b9470 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -1,5 +1,5 @@ import load, { resolve } from '@proload/core'; -import type { AstroIntegration } from 'astro'; +import type { AstroConfig, AstroIntegration } from 'astro'; import autoprefixerPlugin from 'autoprefixer'; import fs from 'fs/promises'; import path from 'path'; @@ -85,7 +85,10 @@ async function getPostCssConfig( return postcssConfigResult; } -async function getViteConfiguration(tailwindConfig: TailwindConfig, viteConfig: UserConfig) { +async function getViteConfiguration( + tailwindConfig: TailwindConfig, + viteConfig: AstroConfig['vite'] +) { // We need to manually load postcss config files because when inlining the tailwind and autoprefixer plugins, // that causes vite to ignore postcss config files const postcssConfigResult = await getPostCssConfig(viteConfig.root, viteConfig.css?.postcss); diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index bae442a5eef0..66c8b8edcfb3 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -46,7 +46,7 @@ "chai": "^4.3.6", "linkedom": "^0.14.17", "mocha": "^9.2.2", - "vite": "^4.1.2", + "vite": "^4.2.1", "vue": "^3.2.37" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4e1a1b764c1..2424f7d30b57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -514,7 +514,7 @@ importers: unified: ^10.1.2 unist-util-visit: ^4.1.0 vfile: ^5.3.2 - vite: ^4.1.2 + vite: ^4.2.1 vitefu: ^0.2.4 yargs-parser: ^21.0.1 zod: ^3.17.3 @@ -568,8 +568,8 @@ importers: typescript: 5.0.2 unist-util-visit: 4.1.2 vfile: 5.3.7 - vite: 4.1.2_sass@1.58.0 - vitefu: 0.2.4_vite@4.1.2 + vite: 4.2.1_sass@1.58.0 + vitefu: 0.2.4_vite@4.2.1 yargs-parser: 21.1.1 zod: 3.20.6 devDependencies: @@ -2948,7 +2948,7 @@ importers: mocha: ^9.2.2 rollup-plugin-copy: ^3.4.0 sharp: ^0.31.0 - vite: ^4.1.2 + vite: ^4.2.1 dependencies: '@altano/tiny-async-pool': 1.0.2 http-cache-semantics: 4.1.1 @@ -2968,7 +2968,7 @@ importers: mocha: 9.2.2 rollup-plugin-copy: 3.4.0 sharp: 0.31.3 - vite: 4.1.2 + vite: 4.2.1 packages/integrations/image/test/fixtures/assets-prefix: specifiers: @@ -3245,7 +3245,7 @@ importers: shiki: ^0.11.1 unist-util-visit: ^4.1.0 vfile: ^5.3.2 - vite: ^4.1.2 + vite: ^4.2.1 dependencies: '@astrojs/markdown-remark': link:../../markdown/remark '@astrojs/prism': link:../../astro-prism @@ -3286,7 +3286,7 @@ importers: remark-rehype: 10.1.0 remark-shiki-twoslash: 3.1.0 remark-toc: 8.0.1 - vite: 4.1.2 + vite: 4.2.1 packages/integrations/mdx/test/fixtures/css-head-mdx: specifiers: @@ -3384,7 +3384,7 @@ importers: cheerio: ^1.0.0-rc.11 esbuild: ^0.15.18 mocha: ^9.2.2 - vite: ^4.1.2 + vite: ^4.2.1 dependencies: '@astrojs/webapi': link:../../webapi '@netlify/functions': 1.4.0 @@ -3397,7 +3397,7 @@ importers: chai: 4.3.7 cheerio: 1.0.0-rc.12 mocha: 9.2.2 - vite: 4.1.2_@types+node@14.18.36 + vite: 4.2.1_@types+node@14.18.36 packages/integrations/netlify/test/edge-functions/fixtures/dynimport: specifiers: @@ -3663,15 +3663,15 @@ importers: astro-scripts: workspace:* svelte: ^3.54.0 svelte2tsx: ^0.5.11 - vite: ^4.1.2 + vite: ^4.2.1 dependencies: - '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.55.1+vite@4.1.2 + '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.55.1+vite@4.2.1 svelte2tsx: 0.5.23_svelte@3.55.1 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts svelte: 3.55.1 - vite: 4.1.2 + vite: 4.2.1 packages/integrations/tailwind: specifiers: @@ -3760,11 +3760,11 @@ importers: chai: ^4.3.6 linkedom: ^0.14.17 mocha: ^9.2.2 - vite: ^4.1.2 + vite: ^4.2.1 vue: ^3.2.37 dependencies: - '@vitejs/plugin-vue': 4.0.0_vite@4.1.2+vue@3.2.47 - '@vitejs/plugin-vue-jsx': 3.0.0_vite@4.1.2+vue@3.2.47 + '@vitejs/plugin-vue': 4.0.0_vite@4.2.1+vue@3.2.47 + '@vitejs/plugin-vue-jsx': 3.0.0_vite@4.2.1+vue@3.2.47 '@vue/babel-plugin-jsx': 1.1.1 '@vue/compiler-sfc': 3.2.47 devDependencies: @@ -3774,7 +3774,7 @@ importers: chai: 4.3.7 linkedom: 0.14.21 mocha: 9.2.2 - vite: 4.1.2 + vite: 4.2.1 vue: 3.2.47 packages/integrations/vue/test/fixtures/app-entrypoint: @@ -6180,6 +6180,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/android-arm/0.16.3: @@ -6199,12 +6200,21 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm/0.17.15: + resolution: {integrity: sha512-sRSOVlLawAktpMvDyJIkdLI/c/kdRTOqo8t6ImVxg8yT7LQDUYV5Rp2FKeEosLr6ZCja9UjYAzyRSxGteSJPYg==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + optional: true + /@esbuild/android-arm64/0.16.17: resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==} engines: {node: '>=12'} cpu: [arm64] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/android-arm64/0.16.3: @@ -6224,12 +6234,21 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm64/0.17.15: + resolution: {integrity: sha512-0kOB6Y7Br3KDVgHeg8PRcvfLkq+AccreK///B4Z6fNZGr/tNHX0z2VywCc7PTeWp+bPvjA5WMvNXltHw5QjAIA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + optional: true + /@esbuild/android-x64/0.16.17: resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==} engines: {node: '>=12'} cpu: [x64] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/android-x64/0.16.3: @@ -6249,12 +6268,21 @@ packages: requiresBuild: true optional: true + /@esbuild/android-x64/0.17.15: + resolution: {integrity: sha512-MzDqnNajQZ63YkaUWVl9uuhcWyEyh69HGpMIrf+acR4otMkfLJ4sUCxqwbCyPGicE9dVlrysI3lMcDBjGiBBcQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + optional: true + /@esbuild/darwin-arm64/0.16.17: resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] requiresBuild: true + dev: true optional: true /@esbuild/darwin-arm64/0.16.3: @@ -6274,12 +6302,21 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-arm64/0.17.15: + resolution: {integrity: sha512-7siLjBc88Z4+6qkMDxPT2juf2e8SJxmsbNVKFY2ifWCDT72v5YJz9arlvBw5oB4W/e61H1+HDB/jnu8nNg0rLA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + /@esbuild/darwin-x64/0.16.17: resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==} engines: {node: '>=12'} cpu: [x64] os: [darwin] requiresBuild: true + dev: true optional: true /@esbuild/darwin-x64/0.16.3: @@ -6299,12 +6336,21 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-x64/0.17.15: + resolution: {integrity: sha512-NbImBas2rXwYI52BOKTW342Tm3LTeVlaOQ4QPZ7XuWNKiO226DisFk/RyPk3T0CKZkKMuU69yOvlapJEmax7cg==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + /@esbuild/freebsd-arm64/0.16.17: resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] requiresBuild: true + dev: true optional: true /@esbuild/freebsd-arm64/0.16.3: @@ -6324,12 +6370,21 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-arm64/0.17.15: + resolution: {integrity: sha512-Xk9xMDjBVG6CfgoqlVczHAdJnCs0/oeFOspFap5NkYAmRCT2qTn1vJWA2f419iMtsHSLm+O8B6SLV/HlY5cYKg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + optional: true + /@esbuild/freebsd-x64/0.16.17: resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] requiresBuild: true + dev: true optional: true /@esbuild/freebsd-x64/0.16.3: @@ -6349,12 +6404,21 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-x64/0.17.15: + resolution: {integrity: sha512-3TWAnnEOdclvb2pnfsTWtdwthPfOz7qAfcwDLcfZyGJwm1SRZIMOeB5FODVhnM93mFSPsHB9b/PmxNNbSnd0RQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + optional: true + /@esbuild/linux-arm/0.16.17: resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==} engines: {node: '>=12'} cpu: [arm] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-arm/0.16.3: @@ -6374,12 +6438,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm/0.17.15: + resolution: {integrity: sha512-MLTgiXWEMAMr8nmS9Gigx43zPRmEfeBfGCwxFQEMgJ5MC53QKajaclW6XDPjwJvhbebv+RzK05TQjvH3/aM4Xw==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-arm64/0.16.17: resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==} engines: {node: '>=12'} cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-arm64/0.16.3: @@ -6399,12 +6472,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm64/0.17.15: + resolution: {integrity: sha512-T0MVnYw9KT6b83/SqyznTs/3Jg2ODWrZfNccg11XjDehIved2oQfrX/wVuev9N936BpMRaTR9I1J0tdGgUgpJA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-ia32/0.16.17: resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-ia32/0.16.3: @@ -6424,6 +6506,14 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ia32/0.17.15: + resolution: {integrity: sha512-wp02sHs015T23zsQtU4Cj57WiteiuASHlD7rXjKUyAGYzlOKDAjqK6bk5dMi2QEl/KVOcsjwL36kD+WW7vJt8Q==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-loong64/0.15.18: resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} engines: {node: '>=12'} @@ -6439,6 +6529,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-loong64/0.16.3: @@ -6458,12 +6549,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64/0.17.15: + resolution: {integrity: sha512-k7FsUJjGGSxwnBmMh8d7IbObWu+sF/qbwc+xKZkBe/lTAF16RqxRCnNHA7QTd3oS2AfGBAnHlXL67shV5bBThQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-mips64el/0.16.17: resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-mips64el/0.16.3: @@ -6483,12 +6583,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-mips64el/0.17.15: + resolution: {integrity: sha512-ZLWk6czDdog+Q9kE/Jfbilu24vEe/iW/Sj2d8EVsmiixQ1rM2RKH2n36qfxK4e8tVcaXkvuV3mU5zTZviE+NVQ==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-ppc64/0.16.17: resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-ppc64/0.16.3: @@ -6508,12 +6617,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ppc64/0.17.15: + resolution: {integrity: sha512-mY6dPkIRAiFHRsGfOYZC8Q9rmr8vOBZBme0/j15zFUKM99d4ILY4WpOC7i/LqoY+RE7KaMaSfvY8CqjJtuO4xg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-riscv64/0.16.17: resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-riscv64/0.16.3: @@ -6533,12 +6651,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-riscv64/0.17.15: + resolution: {integrity: sha512-EcyUtxffdDtWjjwIH8sKzpDRLcVtqANooMNASO59y+xmqqRYBBM7xVLQhqF7nksIbm2yHABptoioS9RAbVMWVA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-s390x/0.16.17: resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==} engines: {node: '>=12'} cpu: [s390x] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-s390x/0.16.3: @@ -6558,12 +6685,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-s390x/0.17.15: + resolution: {integrity: sha512-BuS6Jx/ezxFuHxgsfvz7T4g4YlVrmCmg7UAwboeyNNg0OzNzKsIZXpr3Sb/ZREDXWgt48RO4UQRDBxJN3B9Rbg==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/linux-x64/0.16.17: resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==} engines: {node: '>=12'} cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-x64/0.16.3: @@ -6583,12 +6719,21 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-x64/0.17.15: + resolution: {integrity: sha512-JsdS0EgEViwuKsw5tiJQo9UdQdUJYuB+Mf6HxtJSPN35vez1hlrNb1KajvKWF5Sa35j17+rW1ECEO9iNrIXbNg==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + /@esbuild/netbsd-x64/0.16.17: resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] requiresBuild: true + dev: true optional: true /@esbuild/netbsd-x64/0.16.3: @@ -6608,12 +6753,21 @@ packages: requiresBuild: true optional: true + /@esbuild/netbsd-x64/0.17.15: + resolution: {integrity: sha512-R6fKjtUysYGym6uXf6qyNephVUQAGtf3n2RCsOST/neIwPqRWcnc3ogcielOd6pT+J0RDR1RGcy0ZY7d3uHVLA==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + optional: true + /@esbuild/openbsd-x64/0.16.17: resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] requiresBuild: true + dev: true optional: true /@esbuild/openbsd-x64/0.16.3: @@ -6633,12 +6787,21 @@ packages: requiresBuild: true optional: true + /@esbuild/openbsd-x64/0.17.15: + resolution: {integrity: sha512-mVD4PGc26b8PI60QaPUltYKeSX0wxuy0AltC+WCTFwvKCq2+OgLP4+fFd+hZXzO2xW1HPKcytZBdjqL6FQFa7w==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + optional: true + /@esbuild/sunos-x64/0.16.17: resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] requiresBuild: true + dev: true optional: true /@esbuild/sunos-x64/0.16.3: @@ -6658,12 +6821,21 @@ packages: requiresBuild: true optional: true + /@esbuild/sunos-x64/0.17.15: + resolution: {integrity: sha512-U6tYPovOkw3459t2CBwGcFYfFRjivcJJc1WC8Q3funIwX8x4fP+R6xL/QuTPNGOblbq/EUDxj9GU+dWKX0oWlQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + optional: true + /@esbuild/win32-arm64/0.16.17: resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==} engines: {node: '>=12'} cpu: [arm64] os: [win32] requiresBuild: true + dev: true optional: true /@esbuild/win32-arm64/0.16.3: @@ -6683,12 +6855,21 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-arm64/0.17.15: + resolution: {integrity: sha512-W+Z5F++wgKAleDABemiyXVnzXgvRFs+GVKThSI+mGgleLWluv0D7Diz4oQpgdpNzh4i2nNDzQtWbjJiqutRp6Q==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + /@esbuild/win32-ia32/0.16.17: resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==} engines: {node: '>=12'} cpu: [ia32] os: [win32] requiresBuild: true + dev: true optional: true /@esbuild/win32-ia32/0.16.3: @@ -6708,12 +6889,21 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-ia32/0.17.15: + resolution: {integrity: sha512-Muz/+uGgheShKGqSVS1KsHtCyEzcdOn/W/Xbh6H91Etm+wiIfwZaBn1W58MeGtfI8WA961YMHFYTthBdQs4t+w==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + /@esbuild/win32-x64/0.16.17: resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==} engines: {node: '>=12'} cpu: [x64] os: [win32] requiresBuild: true + dev: true optional: true /@esbuild/win32-x64/0.16.3: @@ -6733,6 +6923,14 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-x64/0.17.15: + resolution: {integrity: sha512-DjDa9ywLUUmjhV2Y9wUTIF+1XsmuFGvZoCmOWkli1XcNAh5t25cc7fgsCx4Zi/Uurep3TTLyDiKATgGEg61pkA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /@eslint-community/eslint-utils/4.3.0_eslint@8.33.0: resolution: {integrity: sha512-v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -7560,7 +7758,7 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte/2.0.2_svelte@3.55.1+vite@4.1.2: + /@sveltejs/vite-plugin-svelte/2.0.2_svelte@3.55.1+vite@4.2.1: resolution: {integrity: sha512-xCEan0/NNpQuL0l5aS42FjwQ6wwskdxC3pW1OeFtEKNZwRg7Evro9lac9HesGP6TdFsTv2xMes5ASQVKbCacxg==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -7576,8 +7774,8 @@ packages: magic-string: 0.27.0 svelte: 3.55.1 svelte-hmr: 0.15.1_svelte@3.55.1 - vite: 4.1.2 - vitefu: 0.2.4_vite@4.1.2 + vite: 4.2.1 + vitefu: 0.2.4_vite@4.2.1 transitivePeerDependencies: - supports-color dev: false @@ -8277,7 +8475,7 @@ packages: - supports-color dev: false - /@vitejs/plugin-vue-jsx/3.0.0_vite@4.1.2+vue@3.2.47: + /@vitejs/plugin-vue-jsx/3.0.0_vite@4.2.1+vue@3.2.47: resolution: {integrity: sha512-vurkuzgac5SYuxd2HUZqAFAWGTF10diKBwJNbCvnWijNZfXd+7jMtqjPFbGt7idOJUn584fP1Ar9j/GN2jQ3Ew==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -8290,13 +8488,13 @@ packages: '@babel/core': 7.20.12 '@babel/plugin-transform-typescript': 7.20.13_@babel+core@7.20.12 '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.20.12 - vite: 4.1.2 + vite: 4.2.1 vue: 3.2.47 transitivePeerDependencies: - supports-color dev: false - /@vitejs/plugin-vue/4.0.0_vite@4.1.2+vue@3.2.47: + /@vitejs/plugin-vue/4.0.0_vite@4.2.1+vue@3.2.47: resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -8306,7 +8504,7 @@ packages: vite: optional: true dependencies: - vite: 4.1.2 + vite: 4.2.1 vue: 3.2.47 dev: false @@ -10251,6 +10449,7 @@ packages: '@esbuild/win32-arm64': 0.16.17 '@esbuild/win32-ia32': 0.16.17 '@esbuild/win32-x64': 0.16.17 + dev: true /esbuild/0.16.3: resolution: {integrity: sha512-71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg==} @@ -10311,6 +10510,35 @@ packages: '@esbuild/win32-ia32': 0.17.12 '@esbuild/win32-x64': 0.17.12 + /esbuild/0.17.15: + resolution: {integrity: sha512-LBUV2VsUIc/iD9ME75qhT4aJj0r75abCVS0jakhFzOtR7TQsqQA5w0tZ+KTKnwl3kXE0MhskNdHDh/I5aCR1Zw==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.17.15 + '@esbuild/android-arm64': 0.17.15 + '@esbuild/android-x64': 0.17.15 + '@esbuild/darwin-arm64': 0.17.15 + '@esbuild/darwin-x64': 0.17.15 + '@esbuild/freebsd-arm64': 0.17.15 + '@esbuild/freebsd-x64': 0.17.15 + '@esbuild/linux-arm': 0.17.15 + '@esbuild/linux-arm64': 0.17.15 + '@esbuild/linux-ia32': 0.17.15 + '@esbuild/linux-loong64': 0.17.15 + '@esbuild/linux-mips64el': 0.17.15 + '@esbuild/linux-ppc64': 0.17.15 + '@esbuild/linux-riscv64': 0.17.15 + '@esbuild/linux-s390x': 0.17.15 + '@esbuild/linux-x64': 0.17.15 + '@esbuild/netbsd-x64': 0.17.15 + '@esbuild/openbsd-x64': 0.17.15 + '@esbuild/sunos-x64': 0.17.15 + '@esbuild/win32-arm64': 0.17.15 + '@esbuild/win32-ia32': 0.17.15 + '@esbuild/win32-x64': 0.17.15 + /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -14822,6 +15050,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: true /rollup/3.20.1: resolution: {integrity: sha512-sz2w8cBJlWQ2E17RcpvHuf4sk2BQx4tfKDnjNPikEpLEevrbIAR7CH3PGa2hpPwWbNgPaA9yh9Jzljds5bc9zg==} @@ -14831,6 +15060,13 @@ packages: fsevents: 2.3.2 dev: true + /rollup/3.20.2: + resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: @@ -16350,9 +16586,42 @@ packages: rollup: 3.14.0 optionalDependencies: fsevents: 2.3.2 + dev: true - /vite/4.1.2_@types+node@14.18.36: - resolution: {integrity: sha512-MWDb9Rfy3DI8omDQySbMK93nQqStwbsQWejXRY2EBzEWKmLAXWb1mkI9Yw2IJrc+oCvPCI1Os5xSSIBYY6DEAw==} + /vite/4.2.1: + resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.17.15 + postcss: 8.4.21 + resolve: 1.22.1 + rollup: 3.20.2 + optionalDependencies: + fsevents: 2.3.2 + + /vite/4.2.1_@types+node@14.18.36: + resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -16377,16 +16646,16 @@ packages: optional: true dependencies: '@types/node': 14.18.36 - esbuild: 0.16.17 + esbuild: 0.17.15 postcss: 8.4.21 resolve: 1.22.1 - rollup: 3.14.0 + rollup: 3.20.2 optionalDependencies: fsevents: 2.3.2 dev: true - /vite/4.1.2_sass@1.58.0: - resolution: {integrity: sha512-MWDb9Rfy3DI8omDQySbMK93nQqStwbsQWejXRY2EBzEWKmLAXWb1mkI9Yw2IJrc+oCvPCI1Os5xSSIBYY6DEAw==} + /vite/4.2.1_sass@1.58.0: + resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -16410,10 +16679,10 @@ packages: terser: optional: true dependencies: - esbuild: 0.16.17 + esbuild: 0.17.15 postcss: 8.4.21 resolve: 1.22.1 - rollup: 3.14.0 + rollup: 3.20.2 sass: 1.58.0 optionalDependencies: fsevents: 2.3.2 @@ -16428,7 +16697,7 @@ packages: optional: true dev: false - /vitefu/0.2.4_vite@4.1.2: + /vitefu/0.2.4_vite@4.2.1: resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: vite: ^3.0.0 || ^4.0.0 @@ -16436,7 +16705,7 @@ packages: vite: optional: true dependencies: - vite: 4.1.2_sass@1.58.0 + vite: 4.2.1_sass@1.58.0 dev: false /vitest/0.20.3: