fix: add svelte to script dependencies

.changeset/yellow-meals-switch.md

@@ -0,0 +1,10 @@
+---
+'@astrojs/renderer-lit': minor
+'@astrojs/renderer-preact': minor
+'@astrojs/renderer-react': minor
+'@astrojs/renderer-solid': minor
+'@astrojs/renderer-svelte': minor
+'@astrojs/renderer-vue': minor
+---
+
+Move framework dependencies from "dependencies" to "peerDependencies" to improve PNPM compatability

packages/astro/package.json

@@ -54,14 +54,12 @@
     "test": "mocha --parallel --timeout 15000 --ignore **/lit-element.test.js && mocha **/lit-element.test.js"
   },
   "dependencies": {
+    "@antfu/ni": "^0.12.0",
+    "execa": "^6.0.0",
     "@astrojs/compiler": "^0.9.2",
     "@astrojs/language-server": "^0.8.6",
     "@astrojs/markdown-remark": "^0.6.0",
     "@astrojs/prism": "0.4.0",
-    "@astrojs/renderer-preact": "^0.4.0",
-    "@astrojs/renderer-react": "0.4.1",
-    "@astrojs/renderer-svelte": "0.3.1",
-    "@astrojs/renderer-vue": "0.3.0",
     "@astropub/webapi": "^0.10.1",
     "@babel/core": "^7.15.8",
     "@babel/traverse": "^7.15.4",

packages/astro/src/@types/astro.ts

@@ -147,7 +147,7 @@ export interface AstroUserConfig {
  * Resolved Astro Config
  * Config with user settings along with all defaults filled in.
  */
-export type AstroConfig = z.output<typeof AstroConfigSchema>;
+export type AstroConfig = z.output<typeof AstroConfigSchema> & { __filePath?: string};
 
 export type AsyncRendererComponentFn<U> = (Component: any, props: any, children: string | undefined, metadata?: AstroComponentMetadata) => Promise<U>;
 

packages/astro/src/cli/add.ts

@@ -0,0 +1,67 @@
+/* eslint-disable no-console */
+import type { AstroConfig, ManifestData, RouteCache, RouteData } from '../@types/astro';
+import type { LogOptions } from '../core/logger';
+
+import { fileURLToPath, pathToFileURL } from 'url'
+import path from 'path'
+import { promises as fs } from 'fs'
+import { execa } from 'execa'
+import { createRequire } from 'module'
+import ni from '@antfu/ni'
+
+export interface AddOptions {
+	astroConfig: AstroConfig;
+	logging: LogOptions;
+}
+
+const renderers = new Set([
+	'lit',
+	'preact',
+	'react',
+	'solid',
+	'svelte',
+	'vue'
+])
+
+export async function add(args: string[], opts: AddOptions) {
+	const packages = [];
+	const config: Partial<AstroConfig> = {};
+	for (const name of args) {
+		if (renderers.has(name)) {
+			packages.push(`@astrojs/renderer-${name}`);
+			config.renderers = [...(config.renderers || []), `@astrojs/renderer-${name}`];
+		}
+	}
+	await install(packages, opts);
+	await updateAstroUserConfig(config, opts);
+}
+
+async function updateAstroUserConfig(overrides: Partial<AstroConfig>, opts: AddOptions) {
+	let userConfigPath = opts.astroConfig.__filePath ?? fileURLToPath(new URL('./astro.config.mjs', opts.astroConfig.projectRoot));
+	console.log(overrides, userConfigPath);
+}
+
+let packageManager: 'npm'|'yarn'|'pnpm'|null = null;
+
+async function install(packages: string[], opts: AddOptions) {
+	const { astroConfig: { projectRoot }}  = opts;
+	const cwd = fileURLToPath(projectRoot);
+	packageManager = packageManager || await ni.detect({ autoInstall: false, cwd });
+
+	if (!packageManager) {
+		throw new Error(`Unable to detect default package manager!`);
+	}
+
+	const i = packageManager === 'yarn' ? 'add' : 'i';
+	const dev = '-D';
+	await execa(packageManager, [i, dev, ...packages], { cwd, stdio: 'inherit' });
+
+	const localRequire = createRequire(pathToFileURL(cwd))
+	let readPkgJSON = [];
+	for (const pkg of packages) {
+		const pkgJSON = path.join(path.dirname(localRequire.resolve(pkg)), 'package.json');
+		readPkgJSON.push(fs.readFile(pkgJSON).then(res => JSON.parse(res.toString())));
+	}
+	const peerDependencies = (await Promise.all(readPkgJSON)).map(pkg => pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : []).flat(Infinity);
+	console.log(peerDependencies);
+}

packages/astro/src/cli/index.ts

@@ -11,11 +11,12 @@ import { defaultLogDestination } from '../core/logger.js';
 import build from '../core/build/index.js';
 import devServer from '../core/dev/index.js';
 import preview from '../core/preview/index.js';
+import { add } from './add.js';
 import { check } from './check.js';
 import { formatConfigError, loadConfig } from '../core/config.js';
 
 type Arguments = yargs.Arguments;
-type cliCommand = 'help' | 'version' | 'dev' | 'build' | 'preview' | 'reload' | 'check';
+type cliCommand = 'help' | 'version' | 'add' | 'dev' | 'build' | 'preview' | 'reload' | 'check';
 interface CLIState {
 	cmd: cliCommand;
 	options: {
@@ -51,6 +52,8 @@ function resolveArgs(flags: Arguments): CLIState {
 
 	const cmd = flags._[2];
 	switch (cmd) {
+		case 'add':
+			return { cmd: 'add', options };
 		case 'dev':
 			return { cmd: 'dev', options };
 		case 'build':
@@ -68,6 +71,7 @@ function resolveArgs(flags: Arguments): CLIState {
 function printHelp() {
 	console.log(`  ${colors.bold('astro')} - Futuristic web development tool.
   ${colors.bold('Commands:')}
+	astro add             Add an integration to Astro.
   astro dev             Run Astro in development mode.
   astro build           Build a pre-compiled production version of your site.
   astro preview         Preview your build locally before deploying.
@@ -110,7 +114,12 @@ export async function cli(args: string[]) {
 	const flags = yargs(args);
 	const state = resolveArgs(flags);
 	const options = { ...state.options };
-	const projectRoot = options.projectRoot || flags._[3];
+	let projectRoot = options.projectRoot;
+	if (!projectRoot) {
+		if (state.cmd !== 'add') {
+			projectRoot = flags._[3];
+		}
+	}
 
 	switch (state.cmd) {
 		case 'help':
@@ -143,6 +152,16 @@ export async function cli(args: string[]) {
 	}
 
 	switch (state.cmd) {
+		case 'add': {
+			try {
+				await add(flags._.slice(3), { astroConfig: config, logging });
+				process.exit(0);
+			} catch (err) {
+				throwAndExit(err);
+			}
+
+			return;
+		}
 		case 'dev': {
 			try {
 				await devServer(config, { logging });

packages/astro/src/core/config.ts

@@ -78,7 +78,7 @@ export const AstroConfigSchema = z.object({
 });
 
 /** Turn raw config values into normalized values */
-export async function validateConfig(userConfig: any, root: string): Promise<AstroConfig> {
+export async function validateConfig(userConfig: any, root: string, userConfigPath?: string): Promise<AstroConfig> {
 	const fileProtocolRoot = pathToFileURL(root + path.sep);
 	// We need to extend the global schema to add transforms that are relative to root.
 	// This is type checked against the global schema to make sure we still match.
@@ -108,7 +108,7 @@ export async function validateConfig(userConfig: any, root: string): Promise<Ast
 			.default('./dist')
 			.transform((val) => new URL(addTrailingSlash(val), fileProtocolRoot)),
 	});
-	return AstroConfigRelativeSchema.parseAsync(userConfig);
+	return AstroConfigRelativeSchema.parseAsync(userConfig).then(value => Object.assign(value, { __filePath: userConfigPath }));
 }
 
 /** Adds '/' to end of string but doesn’t double-up */
@@ -136,9 +136,10 @@ export async function loadConfig(options: LoadConfigOptions): Promise<AstroConfi
 	const config = await load('astro', { mustExist: false, cwd: root, filePath: userConfigPath });
 	if (config) {
 		userConfig = config.value;
+		userConfigPath = config.filePath;
 	}
 	// normalize, validate, and return
-	return validateConfig(userConfig, root);
+	return validateConfig(userConfig, root, userConfigPath);
 }
 
 export function formatConfigError(err: z.ZodError) {

packages/renderers/renderer-lit/package.json

@@ -21,7 +21,9 @@
   },
   "dependencies": {
     "@lit-labs/ssr": "^2.0.1",
-    "@webcomponents/template-shadowroot": "^0.1.0",
+    "@webcomponents/template-shadowroot": "^0.1.0"
+  },
+  "peerDependencies": {
     "lit": "^2.0.2"
   }
 }

packages/renderers/renderer-preact/package.json

@@ -22,9 +22,11 @@
   },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.16.0",
-    "preact": "~10.5.15",
     "preact-render-to-string": "^5.1.19"
   },
+  "peerDependencies": {
+    "preact": "^10.6.4"
+  },
   "engines": {
     "node": "^14.15.0 || >=16.0.0"
   }

packages/renderers/renderer-react/package.json

@@ -21,7 +21,9 @@
     "./jsx-runtime": "./jsx-runtime.js"
   },
   "dependencies": {
-    "@babel/plugin-transform-react-jsx": "^7.16.0",
+    "@babel/plugin-transform-react-jsx": "^7.16.0"
+  },
+  "peerDependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

packages/renderers/renderer-solid/package.json

@@ -21,7 +21,9 @@
   },
   "dependencies": {
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-preset-solid": "^1.2.3",
+    "babel-preset-solid": "^1.2.3"
+  },
+  "peerDependencies": {
     "solid-js": "^1.2.3"
   },
   "engines": {

packages/renderers/renderer-svelte/package.json

@@ -21,9 +21,11 @@
   },
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "1.0.0-next.30",
-    "svelte": "^3.44.3",
     "svelte-preprocess": "^4.9.8"
   },
+  "peerDependencies": {
+    "svelte": "^3.44.3"
+  },
   "engines": {
     "node": "^14.15.0 || >=16.0.0"
   }

packages/renderers/renderer-vue/package.json

@@ -20,7 +20,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^1.9.4",
+    "@vitejs/plugin-vue": "^1.9.4"
+  },
+  "peerDependencies": {
     "vue": "^3.2.22"
   },
   "engines": {

scripts/package.json

@@ -8,6 +8,7 @@
     "astro-scripts": "./index.js"
   },
   "dependencies": {
+    "svelte": "^3.46.2",
     "arg": "^5.0.0",
     "esbuild": "0.13.7",
     "globby": "^12.0.2",

yarn.lock

@@ -114,6 +114,11 @@
     execa "^5.1.1"
     find-up "^5.0.0"
 
+"@antfu/ni@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@antfu/ni/-/ni-0.12.0.tgz#a6de4fb3facd3885d6ce669f61361ac81eb4e57d"
+  integrity sha512-f+uqWBuXoShLpLSaQKHeFUnoUdvMGx8xcXrtyfxK95RGx5guKJVo3kVb2JtLNWkzwYzQvtQ+q0hU9YwSDSTVSw==
+
 "@antfu/utils@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.3.0.tgz#6306c43b52a883bd8e973e3ed8dd64248418bcc4"
@@ -425,7 +430,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7":
+"@babel/parser@^7.1.0", "@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7":
   version "7.16.12"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
@@ -2170,96 +2175,6 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz#d718479e2789d8a94b63e00f23f1898ba239253a"
   integrity sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==
 
-"@vue/compiler-core@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.29.tgz#b06097ab8ff0493177c68c5ea5b63d379a061097"
-  integrity sha512-RePZ/J4Ub3sb7atQw6V6Rez+/5LCRHGFlSetT3N4VMrejqJnNPXKUt5AVm/9F5MJriy2w/VudEIvgscCfCWqxw==
-  dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.29"
-    estree-walker "^2.0.2"
-    source-map "^0.6.1"
-
-"@vue/compiler-dom@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.29.tgz#ad0ead405bd2f2754161335aad9758aa12430715"
-  integrity sha512-y26vK5khdNS9L3ckvkqJk/78qXwWb75Ci8iYLb67AkJuIgyKhIOcR1E8RIt4mswlVCIeI9gQ+fmtdhaiTAtrBQ==
-  dependencies:
-    "@vue/compiler-core" "3.2.29"
-    "@vue/shared" "3.2.29"
-
-"@vue/compiler-sfc@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.29.tgz#f76d556cd5fca6a55a3ea84c88db1a2a53a36ead"
-  integrity sha512-X9+0dwsag2u6hSOP/XsMYqFti/edvYvxamgBgCcbSYuXx1xLZN+dS/GvQKM4AgGS4djqo0jQvWfIXdfZ2ET68g==
-  dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.29"
-    "@vue/compiler-dom" "3.2.29"
-    "@vue/compiler-ssr" "3.2.29"
-    "@vue/reactivity-transform" "3.2.29"
-    "@vue/shared" "3.2.29"
-    estree-walker "^2.0.2"
-    magic-string "^0.25.7"
-    postcss "^8.1.10"
-    source-map "^0.6.1"
-
-"@vue/compiler-ssr@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.29.tgz#37b15b32dcd2f6b410bb61fca3f37b1a92b7eb1e"
-  integrity sha512-LrvQwXlx66uWsB9/VydaaqEpae9xtmlUkeSKF6aPDbzx8M1h7ukxaPjNCAXuFd3fUHblcri8k42lfimHfzMICA==
-  dependencies:
-    "@vue/compiler-dom" "3.2.29"
-    "@vue/shared" "3.2.29"
-
-"@vue/reactivity-transform@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.29.tgz#a08d606e10016b7cf588d1a43dae4db2953f9354"
-  integrity sha512-YF6HdOuhdOw6KyRm59+3rML8USb9o8mYM1q+SH0G41K3/q/G7uhPnHGKvspzceD7h9J3VR1waOQ93CUZj7J7OA==
-  dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.29"
-    "@vue/shared" "3.2.29"
-    estree-walker "^2.0.2"
-    magic-string "^0.25.7"
-
-"@vue/reactivity@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.29.tgz#afdc9c111d4139b14600be17ad80267212af6052"
-  integrity sha512-Ryhb6Gy62YolKXH1gv42pEqwx7zs3n8gacRVZICSgjQz8Qr8QeCcFygBKYfJm3o1SccR7U+bVBQDWZGOyG1k4g==
-  dependencies:
-    "@vue/shared" "3.2.29"
-
-"@vue/runtime-core@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.29.tgz#fb8577b2fcf52e8d967bd91cdf49ab9fb91f9417"
-  integrity sha512-VMvQuLdzoTGmCwIKTKVwKmIL0qcODIqe74JtK1pVr5lnaE0l25hopodmPag3RcnIcIXe+Ye3B2olRCn7fTCgig==
-  dependencies:
-    "@vue/reactivity" "3.2.29"
-    "@vue/shared" "3.2.29"
-
-"@vue/runtime-dom@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.29.tgz#35e9a2bf04ef80b86ac2ca0e7b2ceaccf1e18f01"
-  integrity sha512-YJgLQLwr+SQyORzTsBQLL5TT/5UiV83tEotqjL7F9aFDIQdFBTCwpkCFvX9jqwHoyi9sJqM9XtTrMcc8z/OjPA==
-  dependencies:
-    "@vue/runtime-core" "3.2.29"
-    "@vue/shared" "3.2.29"
-    csstype "^2.6.8"
-
-"@vue/server-renderer@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.29.tgz#ea6afa361b9c781a868c8da18c761f9b7bc89102"
-  integrity sha512-lpiYx7ciV7rWfJ0tPkoSOlLmwqBZ9FTmQm33S+T4g0j1fO/LmhJ9b9Ctl1o5xvIFVDk9QkSUWANZn7H2pXuxVw==
-  dependencies:
-    "@vue/compiler-ssr" "3.2.29"
-    "@vue/shared" "3.2.29"
-
-"@vue/shared@3.2.29":
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.29.tgz#07dac7051117236431d2f737d16932aa38bbb925"
-  integrity sha512-BjNpU8OK6Z0LVzGUppEk0CMYm/hKDnZfYdjSmPOs0N+TR1cLKJAkDwW8ASZUvaaSLEi6d3hVM7jnWnX+6yWnHw==
-
 "@web/parse5-utils@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@web/parse5-utils/-/parse5-utils-1.3.0.tgz#e2e9e98b31a4ca948309f74891bda8d77399f6bd"
@@ -3295,11 +3210,6 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-csstype@^2.6.8:
-  version "2.6.19"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.19.tgz#feeb5aae89020bb389e1f63669a5ed490e391caa"
-  integrity sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==
-
 csv-generate@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-3.4.3.tgz#bc42d943b45aea52afa896874291da4b9108ffff"
@@ -4272,7 +4182,7 @@ estree-walker@^1.0.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
-estree-walker@^2.0.1, estree-walker@^2.0.2:
+estree-walker@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
@@ -5625,7 +5535,7 @@ joi@^17.4.0:
     "@sideway/formula" "^3.0.0"
     "@sideway/pinpoint" "^2.0.0"
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -5812,7 +5722,7 @@ lit-html@^2.0.0, lit-html@^2.1.0:
   dependencies:
     "@types/trusted-types" "^2.0.2"
 
-lit@^2.0.0, lit@^2.0.2, lit@^2.1.0:
+lit@^2.0.0, lit@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/lit/-/lit-2.1.1.tgz#65f43abca945988f696391f762c645ba51966b0b"
   integrity sha512-yqDqf36IhXwOxIQSFqCMgpfvDCRdxLCLZl7m/+tO5C9W/OBHUj17qZpiMBT35v97QMVKcKEi1KZ3hZRyTwBNsQ==
@@ -5916,13 +5826,6 @@ longest-streak@^3.0.0:
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.1.tgz#c97315b7afa0e7d9525db9a5a2953651432bdc5d"
   integrity sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==
 
-loose-envify@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
 lru-cache@4.1.x, lru-cache@^4.0.1:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -7330,7 +7233,7 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.1.10, postcss@^8.3.8:
+postcss@^8.3.8:
   version "8.4.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
   integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
@@ -7577,23 +7480,6 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
-  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
-
-react@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
-  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 read-pkg-up@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -8043,14 +7929,6 @@ sass@^1.43.4:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-scheduler@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
-  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 section-matter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -8273,7 +8151,7 @@ socks@^2.3.3:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
 
-solid-js@^1.2.3, solid-js@^1.2.5:
+solid-js@^1.2.5:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.3.3.tgz#e60a6c5ed29f216e0484673967788f4f174c5f89"
   integrity sha512-0pyHpLZIgQDI1Z+MgxXQRPY10dhXfKJdptb4UCJQ9ArQOLq2gtFA1acEsvSAtPMVdqQ8bqj68FOTXLpz6hm2Mg==
@@ -8319,7 +8197,7 @@ source-map@^0.5.0:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -8698,7 +8576,7 @@ svelte-preprocess@^4.9.8:
     sorcery "^0.10.0"
     strip-indent "^3.0.0"
 
-svelte@^3.44.3:
+svelte@^3.46.2:
   version "3.46.2"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.46.2.tgz#f0ffbffaea3a9a760edcbefc0902b41998a686ad"
   integrity sha512-RXSAtYNefe01Sb1lXtZ2I+gzn3t/h/59hoaRNeRrm8IkMIu6BSiAkbpi41xb+C44x54YKnbk9+dtfs3pM4hECA==
@@ -9564,17 +9442,6 @@ vscode-uri@^3.0.2:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
   integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
 
-vue@^3.2.22:
-  version "3.2.29"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.29.tgz#3571b65dbd796d3a6347e2fd45a8e6e11c13d56a"
-  integrity sha512-cFIwr7LkbtCRanjNvh6r7wp2yUxfxeM2yPpDQpAfaaLIGZSrUmLbNiSze9nhBJt5MrZ68Iqt0O5scwAMEVxF+Q==
-  dependencies:
-    "@vue/compiler-dom" "3.2.29"
-    "@vue/compiler-sfc" "3.2.29"
-    "@vue/runtime-dom" "3.2.29"
-    "@vue/server-renderer" "3.2.29"
-    "@vue/shared" "3.2.29"
-
 wait-on@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7"