Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Fix unexpected error issue on project loading (#1612)

Ivan Starkov86dc7e74aa58
diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsx
index 92f3d8cfc6..56107cb852 100644
--- a/apps/builder/app/routes/builder.$projectId.tsx
+++ b/apps/builder/app/routes/builder.$projectId.tsx
@@ -1,14 +1,21 @@
-import { useLoaderData, useRouteError } from "@remix-run/react";
+import {
+ useLoaderData,
+ useRouteError,
+ isRouteErrorResponse,
+} from "@remix-run/react";
import type { ShouldRevalidateFunction } from "@remix-run/react";
-import type { LoaderArgs } from "@remix-run/node";
+import { redirect, type LoaderArgs, json } from "@remix-run/node";
import { loadBuildByProjectId } from "@webstudio-is/project-build/index.server";
import { db } from "@webstudio-is/project/index.server";
-import { authorizeProject } from "@webstudio-is/trpc-interface/index.server";
+import {
+ AuthorizationError,
+ authorizeProject,
+} from "@webstudio-is/trpc-interface/index.server";
import { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";
import { createContext } from "~/shared/context.server";
import { ErrorMessage } from "~/shared/error";
import { sentryException } from "~/shared/sentry";
-import { getBuildOrigin } from "~/shared/router-utils";
+import { getBuildOrigin, loginPath } from "~/shared/router-utils";
import { type BuilderProps, Builder, links } from "~/builder";
export { links };
@@ -17,59 +24,85 @@ export const loader = async ({
params,
request,
}: LoaderArgs): Promise<BuilderProps> => {
- if (params.projectId === undefined) {
- throw new Error("Project id undefined");
- }
-
const context = await createContext(request);
- const url = new URL(request.url);
-
- const start = Date.now();
- const project = await db.project.loadById(params.projectId, context);
-
- const authPermit =
- (await authorizeProject.getProjectPermit(
- {
- projectId: project.id,
- // At this point we already knew that if project loaded we have at least "view" permit
- // having that getProjectPermit is heavy operation we can skip check "view" permit
- permits: ["own", "build"] as const,
- },
- context
- )) ?? "view";
-
- if (project === null) {
- throw new Error(`Project "${params.projectId}" not found`);
+ try {
+ if (params.projectId === undefined) {
+ throw new Error("Project id undefined");
+ }
+
+ const url = new URL(request.url);
+
+ const start = Date.now();
+ const project = await db.project.loadById(params.projectId, context);
+
+ const authPermit =
+ (await authorizeProject.getProjectPermit(
+ {
+ projectId: project.id,
+ // At this point we already knew that if project loaded we have at least "view" permit
+ // having that getProjectPermit is heavy operation we can skip check "view" permit
+ permits: ["own", "build"] as const,
+ },
+ context
+ )) ?? "view";
+
+ if (project === null) {
+ throw new Error(`Project "${params.projectId}" not found`);
+ }
+
+ const devBuild = await loadBuildByProjectId(project.id, "dev");
+ const assets = await loadAssetsByProject(project.id, context);
+
+ const end = Date.now();
+
+ const diff = end - start;
+
+ // we need to log timings to figure out how to speed up loading
+ // eslint-disable-next-line no-console
+ console.log(`Project ${project.id} is loaded in ${diff}ms`);
+
+ const authToken = url.searchParams.get("authToken") ?? undefined;
+
+ return {
+ project,
+ build: devBuild,
+ assets: assets.map((asset) => [asset.id, asset]),
+ buildOrigin: getBuildOrigin(request),
+ authToken,
+ authPermit,
+ };
+ } catch (error) {
+ if (error instanceof AuthorizationError) {
+ // try to login user if he is not logged in
+ if (context.authorization.userId === undefined) {
+ const url = new URL(request.url);
+
+ throw redirect(
+ loginPath({
+ returnTo: url.pathname,
+ })
+ );
+ }
+
+ const FORBIDDEN = 403;
+
+ throw json({ message: error.message }, { status: FORBIDDEN });
+ }
+
+ throw error;
}
-
- const devBuild = await loadBuildByProjectId(project.id, "dev");
- const assets = await loadAssetsByProject(project.id, context);
-
- const end = Date.now();
-
- const diff = end - start;
-
- // we need to log timings to figure out how to speed up loading
- // eslint-disable-next-line no-console
- console.log(`Project ${project.id} is loaded in ${diff}ms`);
-
- const authToken = url.searchParams.get("authToken") ?? undefined;
-
- return {
- project,
- build: devBuild,
- assets: assets.map((asset) => [asset.id, asset]),
- buildOrigin: getBuildOrigin(request),
- authToken,
- authPermit,
- };
};
export const ErrorBoundary = () => {
const error = useRouteError();
sentryException({ error });
- const message = error instanceof Error ? error.message : String(error);
+ const message = isRouteErrorResponse(error)
+ ? error.data.message ?? error.data
+ : error instanceof Error
+ ? error.message
+ : String(error);
+
return <ErrorMessage message={message} />;
};
diff --git a/packages/asset-uploader/src/db/clone.ts b/packages/asset-uploader/src/db/clone.ts
index 4e0321ec49..2499716d5c 100644
--- a/packages/asset-uploader/src/db/clone.ts
+++ b/packages/asset-uploader/src/db/clone.ts
@@ -2,6 +2,7 @@ import { prisma, type Prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
export const cloneAssets = async (
@@ -28,7 +29,9 @@ export const cloneAssets = async (
);
if (canView === false) {
- throw new Error("You don't have access to this project assets");
+ throw new AuthorizationError(
+ "You don't have access to this project assets"
+ );
}
if (dontCheckEditPermission === false) {
@@ -38,7 +41,9 @@ export const cloneAssets = async (
);
if (canEdit === false) {
- throw new Error("You don't have access to create this project assets");
+ throw new AuthorizationError(
+ "You don't have access to create this project assets"
+ );
}
}
diff --git a/packages/asset-uploader/src/db/delete.ts b/packages/asset-uploader/src/db/delete.ts
index fbe92ae1d2..99aa823369 100644
--- a/packages/asset-uploader/src/db/delete.ts
+++ b/packages/asset-uploader/src/db/delete.ts
@@ -2,6 +2,7 @@ import { prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
import type { Asset } from "../schema";
@@ -22,7 +23,9 @@ export const deleteFromDb = async (
);
if (canDelete === false) {
- throw new Error("You don't have access to create this project assets");
+ throw new AuthorizationError(
+ "You don't have access to create this project assets"
+ );
}
return await prisma.asset.deleteMany({
diff --git a/packages/asset-uploader/src/db/load.ts b/packages/asset-uploader/src/db/load.ts
index ea94159a3e..ad8b004601 100644
--- a/packages/asset-uploader/src/db/load.ts
+++ b/packages/asset-uploader/src/db/load.ts
@@ -2,6 +2,7 @@ import { prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
import type { Asset } from "../schema";
import { formatAsset } from "../utils/format-asset";
@@ -16,7 +17,9 @@ export const loadAssetsByProject = async (
);
if (canRead === false) {
- throw new Error("You don't have access to this project assets");
+ throw new AuthorizationError(
+ "You don't have access to this project assets"
+ );
}
const assets = await prisma.asset.findMany({
diff --git a/packages/asset-uploader/src/delete.ts b/packages/asset-uploader/src/delete.ts
index 65efb8a423..3de70daf5b 100644
--- a/packages/asset-uploader/src/delete.ts
+++ b/packages/asset-uploader/src/delete.ts
@@ -2,6 +2,7 @@ import { prisma, type Project } from "@webstudio-is/prisma-client";
import {
authorizeProject,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
import type { AssetClient } from "./client";
import { deleteFromDb } from "./db";
@@ -22,7 +23,9 @@ export const deleteAssets = async (
);
if (canDelete === false) {
- throw new Error("You don't have access to delete this project assets");
+ throw new AuthorizationError(
+ "You don't have access to delete this project assets"
+ );
}
const assets = await prisma.asset.findMany({
diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.ts
index 72619743f5..01e75bce81 100644
--- a/packages/asset-uploader/src/upload.ts
+++ b/packages/asset-uploader/src/upload.ts
@@ -2,6 +2,7 @@ import { prisma } from "@webstudio-is/prisma-client";
import {
type AppContext,
authorizeProject,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
import type { AssetClient } from "./client";
import { getUniqueFilename } from "./utils/get-unique-filename";
@@ -27,7 +28,9 @@ export const createUploadName = async (
context
);
if (canEdit === false) {
- throw new Error("You don't have access to create this project assets");
+ throw new AuthorizationError(
+ "You don't have access to create this project assets"
+ );
}
/**
diff --git a/packages/authorization-token/src/db/authorization-token.ts b/packages/authorization-token/src/db/authorization-token.ts
index fa2759e1c6..a43678d1f5 100644
--- a/packages/authorization-token/src/db/authorization-token.ts
+++ b/packages/authorization-token/src/db/authorization-token.ts
@@ -8,6 +8,7 @@ import {
authorizeProject,
authorizeAuthorizationToken,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
export const findMany = async (
@@ -21,7 +22,7 @@ export const findMany = async (
);
if (canList === false) {
- throw new Error(
+ throw new AuthorizationError(
"You don't have access to list this project authorization tokens"
);
}
@@ -72,7 +73,7 @@ export const create = async (
);
if (canCreateToken === false) {
- throw new Error(
+ throw new AuthorizationError(
"You don't have access to create this project authorization tokens"
);
}
@@ -114,7 +115,7 @@ export const update = async (
);
if (canCreateToken === false) {
- throw new Error(
+ throw new AuthorizationError(
"You don't have access to edit this project authorization tokens"
);
}
@@ -130,7 +131,7 @@ export const update = async (
});
if (previousToken === null) {
- throw new Error("Authorization token not found");
+ throw new AuthorizationError("Authorization token not found");
}
if (previousToken.relation !== props.relation) {
diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.ts
index 0c51e47088..9682cfc24c 100644
--- a/packages/project/src/db/project.ts
+++ b/packages/project/src/db/project.ts
@@ -6,6 +6,7 @@ import { cloneAssets } from "@webstudio-is/asset-uploader/index.server";
import {
authorizeProject,
type AppContext,
+ AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
import {
createBuild,
@@ -34,7 +35,7 @@ export const loadById = async (
);
if (canRead === false) {
- throw new Error("You don't have access to this project");
+ throw new AuthorizationError("You don't have access to this project");
}
const data = await prisma.project.findUnique({
diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.json
index 94b0910a07..50a27f7844 100644
--- a/packages/trpc-interface/package.json
+++ b/packages/trpc-interface/package.json
@@ -19,6 +19,7 @@
"@trpc/server": "^10.9.0",
"@webstudio-is/prisma-client": "workspace:^",
"node-fetch": "2",
+ "ts-custom-error": "^3.3.1",
"uuid": "^9.0.0",
"zod": "^3.19.1"
},
diff --git a/packages/trpc-interface/src/context/errors.server.ts b/packages/trpc-interface/src/context/errors.server.ts
new file mode 100644
index 0000000000..8715cd44f2
--- /dev/null
+++ b/packages/trpc-interface/src/context/errors.server.ts
@@ -0,0 +1,7 @@
+import { customErrorFactory } from "ts-custom-error";
+
+export const AuthorizationError = customErrorFactory(
+ function AuthorizationError(message: string) {
+ this.message = message;
+ }
+);
diff --git a/packages/trpc-interface/src/index.server.ts b/packages/trpc-interface/src/index.server.ts
index ac8eb627c7..12170aa04e 100644
--- a/packages/trpc-interface/src/index.server.ts
+++ b/packages/trpc-interface/src/index.server.ts
@@ -2,6 +2,7 @@ export type { SharedRouter } from "./shared/shared-router";
export { createTrpcProxyServiceClient } from "./shared/client";
export type { AppContext } from "./context/context.server";
+export { AuthorizationError } from "./context/errors.server";
export * as authorizeProject from "./authorize/project.server";
export * as authorizeAuthorizationToken from "./authorize/authorization-token.server";
export type { AuthPermit } from "./shared/authorization-router";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2d6534aae4..e29a0b0b50 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -344,7 +344,7 @@ importers:
version: 3.2.0
jest:
specifier: ^29.3.1
- version: 29.3.1
+ version: 29.3.1(@types/[email protected])
react-test-renderer:
specifier: ^18.2.0
version: 18.2.0([email protected])
@@ -1379,6 +1379,9 @@ importers:
node-fetch:
specifier: '2'
version: 2.6.9
+ ts-custom-error:
+ specifier: ^3.3.1
+ version: 3.3.1
uuid:
specifier: ^9.0.0
version: 9.0.0
@@ -4525,7 +4528,6 @@ packages:
strip-json-comments: 3.1.1
transitivePeerDependencies:
- supports-color
- dev: false
/@floating-ui/[email protected]:
resolution: {integrity: sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==}
@@ -4597,7 +4599,6 @@ packages:
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
- dev: false
/@humanwhocodes/[email protected]:
resolution: {integrity: sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==}
@@ -4610,7 +4611,6 @@ packages:
/@humanwhocodes/[email protected]:
resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
- dev: false
resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
@@ -7453,7 +7453,7 @@ packages:
'@storybook/client-api': 6.5.16([email protected])([email protected])
'@storybook/client-logger': 6.5.16
'@storybook/components': 6.5.16([email protected])([email protected])
- '@storybook/core-common': 6.5.16([email protected])([email protected])([email protected])
'@storybook/core-events': 6.5.16
'@storybook/node-logger': 6.5.16
'@storybook/preview-web': 6.5.16([email protected])([email protected])
@@ -7710,78 +7710,6 @@ packages:
- vue-template-compiler
- webpack-cli
- webpack-command
- dev: false
-
- resolution: {integrity: sha512-2qtnKP3TTOzt2cp6LXKRTh7XrI9z5VanMnMTgeoFcA5ebnndD4V6BExQUdYPClE/QooLx6blUWNgS9dFEpjSqQ==}
- peerDependencies:
- react: ^16.8.0 || ^17.0.0 || ^18.0.0
- react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@babel/core': 7.21.0
- '@babel/plugin-proposal-class-properties': 7.18.6(@babel/[email protected])
- '@babel/plugin-proposal-decorators': 7.19.0(@babel/[email protected])
- '@babel/plugin-proposal-export-default-from': 7.18.10(@babel/[email protected])
- '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/[email protected])
- '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/[email protected])
- '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/[email protected])
- '@babel/plugin-proposal-private-methods': 7.18.6(@babel/[email protected])
- '@babel/plugin-proposal-private-property-in-object': 7.20.5(@babel/[email protected])
- '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])
- '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/[email protected])
- '@babel/plugin-transform-block-scoping': 7.20.14(@babel/[email protected])
- '@babel/plugin-transform-classes': 7.20.7(@babel/[email protected])
- '@babel/plugin-transform-destructuring': 7.20.7(@babel/[email protected])
- '@babel/plugin-transform-for-of': 7.18.8(@babel/[email protected])
- '@babel/plugin-transform-parameters': 7.20.7(@babel/[email protected])
- '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/[email protected])
- '@babel/plugin-transform-spread': 7.20.7(@babel/[email protected])
- '@babel/preset-env': 7.20.2(@babel/[email protected])
- '@babel/preset-react': 7.18.6(@babel/[email protected])
- '@babel/preset-typescript': 7.21.0(@babel/[email protected])
- '@babel/register': 7.18.9(@babel/[email protected])
- '@storybook/node-logger': 6.5.16
- '@storybook/semver': 7.3.2
- '@types/node': 16.18.11
- '@types/pretty-hrtime': 1.0.1
- babel-loader: 8.3.0(@babel/[email protected])([email protected])
- babel-plugin-macros: 3.1.0
- babel-plugin-polyfill-corejs3: 0.1.7(@babel/[email protected])
- chalk: 4.1.2
- core-js: 3.23.3
- express: 4.18.2
- file-system-cache: 1.1.0
- find-up: 5.0.0
- fork-ts-checker-webpack-plugin: 6.5.2([email protected])([email protected])
- fs-extra: 9.1.0
- glob: 7.2.3
- handlebars: 4.7.7
- interpret: 2.2.0
- json5: 2.2.3
- lazy-universal-dotenv: 3.0.1
- picomatch: 2.3.1
- pkg-dir: 5.0.0
- pretty-hrtime: 1.0.3
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- resolve-from: 5.0.0
- slash: 3.0.0
- telejson: 6.0.8
- ts-dedent: 2.2.0
- typescript: 5.0.3
- util-deprecate: 1.0.2
- webpack: 4.46.0
- transitivePeerDependencies:
- - eslint
- - supports-color
- - vue-template-compiler
- - webpack-cli
- - webpack-command
- dev: true
/@storybook/[email protected]:
resolution: {integrity: sha512-qMZQwmvzpH5F2uwNUllTPg6eZXr2OaYZQRRN8VZJiuorZzDNdAFmiVWMWdkThwmyLEJuQKXxqCL8lMj/7PPM+g==}
@@ -7807,7 +7735,7 @@ packages:
'@discoveryjs/json-ext': 0.5.7
'@storybook/builder-webpack4': 6.5.16([email protected])([email protected])([email protected])
- '@storybook/core-common': 6.5.16([email protected])([email protected])([email protected])
'@storybook/core-events': 6.5.16
'@storybook/csf': 0.0.2--canary.4566f4d.1
'@storybook/csf-tools': 6.5.16
@@ -7985,7 +7913,7 @@ packages:
'@babel/preset-react': 7.18.6(@babel/[email protected])
'@storybook/addons': 6.5.16([email protected])([email protected])
- '@storybook/core-common': 6.5.16([email protected])([email protected])([email protected])
'@storybook/node-logger': 6.5.16
'@storybook/theming': 6.5.16([email protected])([email protected])
'@storybook/ui': 6.5.16([email protected])([email protected])
@@ -8177,7 +8105,7 @@ packages:
'@storybook/addons': 6.5.16([email protected])([email protected])
'@storybook/client-logger': 6.5.16
- '@storybook/core-common': 6.5.16([email protected])([email protected])([email protected])
'@storybook/csf': 0.0.2--canary.4566f4d.1
'@storybook/docs-tools': 6.5.16([email protected])([email protected])
'@storybook/node-logger': 6.5.16
@@ -8341,7 +8269,7 @@ packages:
resolution: {integrity: sha512-CWr5Uko1l9jJW88yTXsZTj/3GTabPvw0o7pDPOXPp8JRZiJTxv1JFaFCafhK9UzYbgcRuGfCC8kEWPZims7iKA==}
dependencies:
'@storybook/client-logger': 6.5.16
- '@storybook/core-common': 6.5.16([email protected])([email protected])([email protected])
chalk: 4.1.2
core-js: 3.23.3
detect-package-manager: 2.0.1
@@ -9383,7 +9311,6 @@ packages:
resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
engines: {node: '>=6'}
- dev: false
resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
@@ -11492,7 +11419,6 @@ packages:
engines: {node: '>=8.6'}
dependencies:
ansi-colors: 4.1.3
- dev: false
resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
@@ -11927,7 +11853,6 @@ packages:
dependencies:
esrecurse: 4.3.0
estraverse: 5.3.0
- dev: false
resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
@@ -11947,17 +11872,14 @@ packages:
dependencies:
eslint: 8.4.1
eslint-visitor-keys: 2.1.0
- dev: false
resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
engines: {node: '>=10'}
- dev: false
resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dev: false
resolution: {integrity: sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==}
@@ -12052,7 +11974,6 @@ packages:
v8-compile-cache: 2.3.0
transitivePeerDependencies:
- supports-color
- dev: false
resolution: {integrity: sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==}
@@ -12070,7 +11991,6 @@ packages:
acorn: 8.8.2
acorn-jsx: 5.3.2([email protected])
eslint-visitor-keys: 3.3.0
- dev: false
resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
@@ -12082,7 +12002,6 @@ packages:
engines: {node: '>=0.10'}
dependencies:
estraverse: 5.3.0
- dev: false
resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -12444,7 +12363,6 @@ packages:
engines: {node: ^10.12.0 || >=12.0.0}
dependencies:
flat-cache: 3.0.4
- dev: false
resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==}
@@ -12649,38 +12567,6 @@ packages:
tapable: 1.1.3
typescript: 5.0.3
webpack: 4.46.0
- dev: false
-
- resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}
- engines: {node: '>=10', yarn: '>=1.0.0'}
- peerDependencies:
- eslint: '>= 6'
- typescript: '>= 2.7'
- vue-template-compiler: '*'
- webpack: '>= 4'
- peerDependenciesMeta:
- eslint:
- optional: true
- vue-template-compiler:
- optional: true
- dependencies:
- '@babel/code-frame': 7.18.6
- '@types/json-schema': 7.0.11
- chalk: 4.1.2
- chokidar: 3.5.3
- cosmiconfig: 6.0.0
- deepmerge: 4.3.0
- fs-extra: 9.1.0
- glob: 7.2.3
- memfs: 3.4.12
- minimatch: 3.1.2
- schema-utils: 2.7.0
- semver: 7.3.8
- tapable: 1.1.3
- typescript: 5.0.3
- webpack: 4.46.0
- dev: true
resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
@@ -12822,7 +12708,6 @@ packages:
resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
- dev: false
resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
@@ -12972,7 +12857,6 @@ packages:
engines: {node: '>=10.13.0'}
dependencies:
is-glob: 4.0.3
- dev: false
resolution: {integrity: sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==}
@@ -13038,7 +12922,6 @@ packages:
engines: {node: '>=8'}
dependencies:
type-fest: 0.20.2
- dev: false
resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
@@ -14156,34 +14039,6 @@ packages:
transitivePeerDependencies:
- supports-color
- resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}
- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
- hasBin: true
- peerDependencies:
- node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
- peerDependenciesMeta:
- node-notifier:
- optional: true
- dependencies:
- '@jest/core': 29.3.1
- '@jest/test-result': 29.3.1
- '@jest/types': 29.4.2
- chalk: 4.1.2
- exit: 0.1.2
- graceful-fs: 4.2.10
- import-local: 3.1.0
- jest-config: 29.3.1(@types/[email protected])
- jest-util: 29.4.2
- jest-validate: 29.3.1
- prompts: 2.4.2
- yargs: 17.7.1
- transitivePeerDependencies:
- - '@types/node'
- - supports-color
- - ts-node
- dev: true
-
resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14609,26 +14464,6 @@ packages:
merge-stream: 2.0.0
supports-color: 8.1.1
- resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}
- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
- hasBin: true
- peerDependencies:
- node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
- peerDependenciesMeta:
- node-notifier:
- optional: true
- dependencies:
- '@jest/core': 29.3.1
- '@jest/types': 29.4.2
- import-local: 3.1.0
- jest-cli: 29.3.1
- transitivePeerDependencies:
- - '@types/node'
- - supports-color
- - ts-node
- dev: true
-
resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14706,7 +14541,6 @@ packages:
resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
- dev: false
resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
@@ -14816,7 +14650,6 @@ packages:
dependencies:
prelude-ls: 1.2.1
type-check: 0.4.0
- dev: false
resolution: {integrity: sha512-0nhl2wsPR34fYphPPDdA9LGPx90klIsLokdx43Rl4UzvmGNK66todNkwkm0qsSSLgEVu8lBpGwo1Hwf58MfbuA==}
@@ -14907,7 +14740,6 @@ packages:
resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
- dev: false
resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
@@ -16313,7 +16145,6 @@ packages:
prelude-ls: 1.2.1
type-check: 0.4.0
word-wrap: 1.2.3
- dev: false
resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
@@ -16957,7 +16788,6 @@ packages:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
- dev: false
resolution: {integrity: sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==}
@@ -17031,7 +16861,6 @@ packages:
resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
engines: {node: '>=0.4.0'}
- dev: false
resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
@@ -17300,7 +17129,6 @@ packages:
loose-envify: 1.4.0
react: 17.0.2
scheduler: 0.23.0
- dev: false
resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
@@ -17520,7 +17348,6 @@ packages:
dependencies:
loose-envify: 1.4.0
object-assign: 4.1.1
- dev: false
resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
@@ -17696,7 +17523,6 @@ packages:
resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
engines: {node: '>=8'}
- dev: false
resolution: {integrity: sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==}
@@ -19063,7 +18889,6 @@ packages:
resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
- dev: false
resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}
@@ -19191,6 +19016,11 @@ packages:
resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==}
dev: true
+ resolution: {integrity: sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==}
+ engines: {node: '>=14.0.0'}
+ dev: false
+
resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
engines: {node: '>=6.10'}
@@ -19339,7 +19169,6 @@ packages:
engines: {node: '>= 0.8.0'}
dependencies:
prelude-ls: 1.2.1
- dev: false
resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
@@ -19829,7 +19658,6 @@ packages:
resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
- dev: false
resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}