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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Normalize css (#1333)
Ivan Starkov11e73390c2b9
diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.test.tsindex 9b27fa28bd..4392ae2e39 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts@@ -66,7 +66,7 @@ const instances: Instances = new Map([{type: "instance",id: "1",- component: "Box",+ component: "Body",children: [{ type: "id", value: "2" }],},],@@ -161,11 +161,31 @@ test("compute inherited styles", () => {instances,inheritingStylesByInstanceId,selectedInstanceSelector,+ new Map([+ ["1", "body"],+ ["2", "div"],+ ["3", "div"],+ ]),+cascadedBreakpointIds,selectedBreakpointId)).toMatchInlineSnapshot(`{+ "color": {+ "instanceId": "1",+ "value": {+ "type": "keyword",+ "value": "#232323",+ },+ },+ "fontFamily": {+ "instanceId": "1",+ "value": {+ "type": "keyword",+ "value": "Arial",+ },+ },"fontSize": {"instanceId": "1","value": {@@ -181,6 +201,14 @@ test("compute inherited styles", () => {"value": "600",},},+ "lineHeight": {+ "instanceId": "1",+ "value": {+ "type": "unit",+ "unit": "number",+ "value": 1.5,+ },+ },}`);});diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.tsindex 45cd52721f..309c364ad1 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.ts@@ -14,6 +14,7 @@ import {instancesStore,selectedInstanceBrowserStyleStore,selectedInstanceSelectorStore,+ selectedInstanceIntanceToTagStore,selectedStyleSourceStore,stylesIndexStore,useBreakpoints,@@ -21,6 +22,7 @@ import {import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";import type { InstanceSelector } from "~/shared/tree-utils";import { getComponentMeta } from "@webstudio-is/react-sdk";+import type { htmlTags as HtmlTags } from "html-tags";type CascadedValueInfo = {breakpointId: string;@@ -150,7 +152,8 @@ export const getCascadedInfo = (export const getPresetStyle = (instances: Instances,- instanceId: undefined | Instance["id"]+ instanceId: undefined | Instance["id"],+ tagName: HtmlTags) => {if (instanceId === undefined) {return;@@ -159,7 +162,10 @@ export const getPresetStyle = (if (instance === undefined) {return;}- return getComponentMeta(instance.component)?.presetStyle;+ if (tagName === undefined) {+ return;+ }+ return getComponentMeta(instance.component)?.presetStyle?.[tagName];};/**@@ -170,6 +176,7 @@ export const getInheritedInfo = (instances: Instances,stylesByInstanceId: Map<Instance["id"], StyleDecl[]>,instanceSelector: InstanceSelector,+ selectedInstanceIntanceToTag: Map<Instance["id"], HtmlTags>,cascadedBreakpointIds: string[],selectedBreakpointId: string) => {@@ -190,7 +197,12 @@ export const getInheritedInfo = (continue;}- const presetStyle = getPresetStyle(instances, ancestorInstance.id);+ const tagName = selectedInstanceIntanceToTag.get(instanceId);++ const presetStyle =+ tagName !== undefined+ ? getPresetStyle(instances, ancestorInstance.id, tagName)+ : undefined;if (presetStyle) {for (const [styleProperty, styleValue] of Object.entries(presetStyle)) {if (inheritableProperties.has(styleProperty)) {@@ -231,6 +243,10 @@ export const useStyleInfo = () => {const selectedStyleSource = useStore(selectedStyleSourceStore);const selectedStyleSourceId = selectedStyleSource?.id;const browserStyle = useStore(selectedInstanceBrowserStyleStore);+ const selectedInstanceIntanceToTag = useStore(+ selectedInstanceIntanceToTagStore+ );+const instances = useStore(instancesStore);const { stylesByInstanceId, stylesByStyleSourceId } =useStore(stylesIndexStore);@@ -257,7 +273,8 @@ export const useStyleInfo = () => {const inheritedInfo = useMemo(() => {if (selectedBreakpointId === undefined ||- selectedInstanceSelector === undefined+ selectedInstanceSelector === undefined ||+ selectedInstanceIntanceToTag === undefined) {return {};}@@ -265,6 +282,7 @@ export const useStyleInfo = () => {instances,stylesByInstanceId,selectedInstanceSelector,+ selectedInstanceIntanceToTag,cascadedBreakpointIds,selectedBreakpointId);@@ -274,6 +292,7 @@ export const useStyleInfo = () => {cascadedBreakpointIds,selectedBreakpointId,selectedInstanceSelector,+ selectedInstanceIntanceToTag,]);const cascadedInfo = useMemo(() => {@@ -288,8 +307,16 @@ export const useStyleInfo = () => {}, [stylesByInstanceId, selectedInstanceSelector, cascadedBreakpointIds]);const presetStyle = useMemo(() => {- return getPresetStyle(instances, selectedInstanceSelector?.[0]);- }, [instances, selectedInstanceSelector]);+ const selectedInstanceId = selectedInstanceSelector?.[0];+ if (selectedInstanceId === undefined) {+ return;+ }+ const tagName = selectedInstanceIntanceToTag?.get(selectedInstanceId);++ return tagName !== undefined+ ? getPresetStyle(instances, selectedInstanceSelector?.[0], tagName)+ : undefined;+ }, [instances, selectedInstanceSelector, selectedInstanceIntanceToTag]);const styleInfoData = useMemo(() => {const styleInfoData: StyleInfo = {};@@ -325,11 +352,26 @@ export const useInstanceStyleData = (const { stylesByInstanceId } = useStore(stylesIndexStore);const [breakpoints] = useBreakpoints();const selectedBreakpoint = useStore(selectedBreakpointStore);++ // We assume that instance ancestor contains tags we need to get preset styles+ // Its not always true, but to extract parent styles it works well+ const selectedInstanceIntanceToTag = useStore(+ selectedInstanceIntanceToTagStore+ );+const selectedBreakpointId = selectedBreakpoint?.id;const presetStyle = useMemo(() => {- return getPresetStyle(instances, instanceSelector?.[0]);- }, [instances, instanceSelector]);+ const selectedInstanceId = instanceSelector?.[0];+ if (selectedInstanceId === undefined) {+ return;+ }+ const tagName = selectedInstanceIntanceToTag?.get(selectedInstanceId);++ return tagName !== undefined+ ? getPresetStyle(instances, instanceSelector?.[0], tagName)+ : undefined;+ }, [instances, instanceSelector, selectedInstanceIntanceToTag]);const cascadedBreakpointIds = useMemo(() => getCascadedBreakpointIds(breakpoints, selectedBreakpointId),@@ -352,13 +394,18 @@ export const useInstanceStyleData = (]);const inheritedInfo = useMemo(() => {- if (selectedBreakpointId === undefined || instanceSelector === undefined) {+ if (+ selectedBreakpointId === undefined ||+ instanceSelector === undefined ||+ selectedInstanceIntanceToTag === undefined+ ) {return {};}return getInheritedInfo(instances,stylesByInstanceId,instanceSelector,+ selectedInstanceIntanceToTag,cascadedBreakpointIds,selectedBreakpointId);@@ -368,6 +415,7 @@ export const useInstanceStyleData = (cascadedBreakpointIds,selectedBreakpointId,instanceSelector,+ selectedInstanceIntanceToTag,]);const styleData = useMemo(() => {diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 3383d70c06..e72fd37cdf 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -57,6 +57,7 @@ const useElementsTree = (getComponent: GetComponent) => {// @todo remove after https://github.com/webstudio-is/webstudio-builder/issues/1313 now its needed to be sure that no leaks exists// eslint-disable-next-line no-consoleconsole.log({+ rootInstance,assetsStore: assetsStore.get().size,pagesStore: pagesStore.get()?.pages.length ?? 0,instancesStore: instancesStore.get().size,diff --git a/apps/builder/app/canvas/collapsed.ts b/apps/builder/app/canvas/collapsed.tsindex 2a95e18f0d..91aaa5266e 100644--- a/apps/builder/app/canvas/collapsed.ts+++ b/apps/builder/app/canvas/collapsed.ts@@ -11,6 +11,10 @@ import {} from "~/shared/nano-states";import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";import { subscribe } from "~/shared/pubsub";+import htmlTags, { type htmlTags as HtmlTags } from "html-tags";++const isHtmlTag = (tag: string): tag is HtmlTags =>+ htmlTags.includes(tag as HtmlTags);const instanceIdSet = new Set<string>();@@ -40,7 +44,7 @@ const replacedHtmlElements = ["IFRAME", "VIDEO", "EMBED", "IMG"];const skipElementsSet = new Set([...voidHtmlElements, ...replacedHtmlElements]);-const getInstanceSize = (instanceId: string) => {+const getInstanceSize = (instanceId: string, tagName: HtmlTags | undefined) => {const breakpoints = breakpointsContainer.get();const selectedBreakpoint = selectedBreakpointStore.get();const { stylesByInstanceId } = stylesIndexStore.get();@@ -59,7 +63,10 @@ const getInstanceSize = (instanceId: string) => {selectedBreakpointId);- const presetStyle = getPresetStyle(instances, instanceId);+ const presetStyle =+ tagName !== undefined+ ? getPresetStyle(instances, instanceId, tagName)+ : undefined;const cascadedStyle = getCascadedInfo(stylesByInstanceId, instanceId, [...cascadedBreakpointIds,@@ -170,7 +177,12 @@ const recalculate = () => {throw new Error(`Element ${idAttribute} has no instance id`);}- const elementSize = getInstanceSize(elementInstanceId);+ const tagName = element.tagName.toLowerCase();++ const elementSize = getInstanceSize(+ elementInstanceId,+ isHtmlTag(tagName) ? tagName : undefined+ );const collapsedWidth =element.offsetWidth === 0 && elementSize.width === undefined ? "w" : "";diff --git a/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts b/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.tsindex 66a447002f..18726a8dd6 100644--- a/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts+++ b/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts@@ -1,17 +1,22 @@import { useEffect } from "react";import { useStore } from "@nanostores/react";import type { Instance, Prop, StyleDecl } from "@webstudio-is/project-build";-import { getBrowserStyle } from "@webstudio-is/react-sdk";+import { getBrowserStyle, idAttribute } from "@webstudio-is/react-sdk";import { subscribe } from "~/shared/pubsub";import { subscribeWindowResize } from "~/shared/dom-hooks";import {rootInstanceContainer,selectedInstanceBrowserStyleStore,+ selectedInstanceIntanceToTagStore,} from "~/shared/nano-states";+import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import { getAllElementsBoundingBox } from "~/shared/dom-utils";import { subscribeScrollState } from "~/canvas/shared/scroll-state";import { selectedInstanceOutlineStore } from "~/shared/nano-states/canvas";+const isHtmlTag = (tag: string): tag is HtmlTags =>+ htmlTags.includes(tag as HtmlTags);+const setOutline = (instanceId: Instance["id"], element: HTMLElement) => {selectedInstanceOutlineStore.set({instanceId,@@ -90,6 +95,23 @@ export const SelectedInstanceConnector = ({// trigger style recomputing every time instance styles are changedselectedInstanceBrowserStyleStore.set(getBrowserStyle(element));+ // Map self and ancestor instance ids to tag names+ const instanceToTag = new Map<Instance["id"], HtmlTags>();+ for (+ let ancestorOrSelf: HTMLElement | null = element;+ ancestorOrSelf !== null;+ ancestorOrSelf = ancestorOrSelf.parentElement+ ) {+ const tagName = ancestorOrSelf.tagName.toLowerCase();+ const instanceId = ancestorOrSelf.getAttribute(idAttribute);++ if (isHtmlTag(tagName) && instanceId !== null) {+ instanceToTag.set(instanceId, tagName);+ }+ }++ selectedInstanceIntanceToTagStore.set(instanceToTag);+return () => {resizeObserver.disconnect();mutationObserver.disconnect();diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 019f47ccc4..fd4bf7ac6e 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -132,12 +132,14 @@ export const GlobalStyles = () => {const meta = getComponentMeta(component);const presetStyle = meta?.presetStyle;if (presetStyle !== undefined) {- presetStylesEngine.addStyleRule(- `[${componentAttribute}=${component}]`,- {- style: presetStyle,- }- );+ for (const [tag, style] of Object.entries(presetStyle)) {+ presetStylesEngine.addStyleRule(+ `${tag}:where([${componentAttribute}=${component}])`,+ {+ style,+ }+ );+ }}}presetStylesEngine.render();diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 48a7829c77..40b36b8764 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -32,6 +32,7 @@ import type {import { useSyncInitializeOnce } from "../hook-utils";import { shallowComputed } from "../store-utils";import { createInstancesIndex, type InstanceSelector } from "../tree-utils";+import type { htmlTags as HtmlTags } from "html-tags";const useValue = <T>(atom: WritableAtom<T>) => {const value = useStore(atom);@@ -329,6 +330,13 @@ export const selectedInstanceStore = computed(export const selectedInstanceBrowserStyleStore = atom<undefined | Style>();+/**+ * instanceId => tagName store for selected instance and its ancestors+ */+export const selectedInstanceIntanceToTagStore = atom<+ undefined | Map<Instance["id"], HtmlTags>+>();+export const selectedInstanceStyleSourcesStore = computed([styleSourceSelectionsStore,diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 0d237f13bd..d39c96568b 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -15,6 +15,7 @@ import {assetContainersStore,selectedInstanceSelectorStore,selectedInstanceBrowserStyleStore,+ selectedInstanceIntanceToTagStore,hoveredInstanceSelectorStore,isPreviewModeStore,} from "~/shared/nano-states";@@ -66,6 +67,11 @@ export const registerContainers = () => {"selectedInstanceBrowserStyle",selectedInstanceBrowserStyleStore);+ clientStores.set(+ "selectedInstanceIntanceToTagStore",+ selectedInstanceIntanceToTagStore+ );+clientStores.set("hoveredInstanceSelector", hoveredInstanceSelectorStore);clientStores.set("isPreviewMode", isPreviewModeStore);for (const [name, store] of synchronizedBreakpointsStores) {diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 9bd89d8f2b..ab8e4dd881 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -119,6 +119,7 @@"@webstudio-is/tsconfig": "workspace:^","css-tree": "^2.3.0","dotenv": "^16.0.0",+ "html-tags": "^3.2.0","jest": "^29.3.1","prettier": "^2.8.4","react-test-renderer": "^17.0.2",diff --git a/packages/project/src/shared/styles/css.ts b/packages/project/src/shared/styles/css.tsindex fdf6e1a6e4..ca43fc54a3 100644--- a/packages/project/src/shared/styles/css.ts+++ b/packages/project/src/shared/styles/css.ts@@ -37,9 +37,14 @@ export const generateCssText = (data: Data) => {const meta = getComponentMeta(component);const presetStyle = meta?.presetStyle;if (presetStyle !== undefined) {- engine.addStyleRule(`[${componentAttribute}=${component}]`, {- style: presetStyle,- });+ for (const [tag, style] of Object.entries(presetStyle)) {+ engine.addStyleRule(+ `${tag}:where([${componentAttribute}=${component}])`,+ {+ style,+ }+ );+ }}}diff --git a/packages/react-sdk/LICENSE-3RD-PARTY b/packages/react-sdk/LICENSE-3RD-PARTYindex e3dba448bf..35405573c9 100644--- a/packages/react-sdk/LICENSE-3RD-PARTY+++ b/packages/react-sdk/LICENSE-3RD-PARTY@@ -13,3 +13,21 @@ Permission is hereby granted, free of charge, to any person obtaining a copy ofThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.++---++MIT License++applies to:++- https://github.com/sindresorhus/modern-normalize++Copyright (c) Nicolas Gallagher+Copyright (c) Jonathan Neal+Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)++Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAREdiff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.jsonindex 85829ed8e4..c6d3093c00 100644--- a/packages/react-sdk/package.json+++ b/packages/react-sdk/package.json@@ -56,6 +56,7 @@"@webstudio-is/prisma-client": "workspace:^","@webstudio-is/project-build": "workspace:^","detect-font": "^0.1.5",+ "html-tags": "^3.2.0","mitt": "^3.0.0","nanostores": "^0.7.1","warn-once": "^0.1.1"diff --git a/packages/react-sdk/src/components/blockquote.tsx b/packages/react-sdk/src/components/blockquote.tsxindex b5223cc7e5..c5c87a6983 100644--- a/packages/react-sdk/src/components/blockquote.tsx+++ b/packages/react-sdk/src/components/blockquote.tsx@@ -5,7 +5,7 @@ import {type ComponentProps,} from "react";-const defaultTag = "blockquote";+export const defaultTag = "blockquote";type Props = ComponentProps<typeof defaultTag>;diff --git a/packages/react-sdk/src/components/blockquote.ws.tsx b/packages/react-sdk/src/components/blockquote.ws.tsxindex 36dd908b33..dc90f32311 100644--- a/packages/react-sdk/src/components/blockquote.ws.tsx+++ b/packages/react-sdk/src/components/blockquote.ws.tsx@@ -1,45 +1,72 @@+import type { Style } from "@webstudio-is/css-data";import { BlockquoteIcon } from "@webstudio-is/icons";+import type { defaultTag } from "./blockquote";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/blockquote.props";const presetStyle = {- margin: {- type: "keyword",- value: "0",- },- marginBottom: {- type: "keyword",- value: "10px",- },- paddingTop: {- type: "keyword",- value: "10px",- },- paddingBottom: {- type: "keyword",- value: "10px",- },- paddingLeft: {- type: "keyword",- value: "20px",- },- paddingRight: {- type: "keyword",- value: "20px",- },- borderLeftWidth: {- type: "keyword",- value: "5px",- },- borderLeftStyle: {- type: "keyword",- value: "solid",- },- borderLeftColor: {- type: "keyword",- value: "#e2e2e2",+ blockquote: {+ marginTop: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginRight: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginBottom: {+ type: "unit",+ value: 10,+ unit: "px",+ },+ marginLeft: {+ type: "unit",+ value: 0,+ unit: "number",+ },++ paddingTop: {+ type: "unit",+ value: 10,+ unit: "px",+ },+ paddingBottom: {+ type: "unit",+ value: 10,+ unit: "px",+ },+ paddingLeft: {+ type: "unit",+ value: 20,+ unit: "px",+ },+ paddingRight: {+ type: "unit",+ value: 20,+ unit: "px",+ },++ borderLeftWidth: {+ type: "unit",+ value: 5,+ unit: "px",+ },+ borderLeftStyle: {+ type: "keyword",+ value: "solid",+ },++ borderLeftColor: {+ type: "rgb",+ r: 226,+ g: 226,+ b: 226,+ alpha: 1,+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "typography",diff --git a/packages/react-sdk/src/components/body.tsx b/packages/react-sdk/src/components/body.tsxindex bbd6c314da..0a9ff7f45f 100644--- a/packages/react-sdk/src/components/body.tsx+++ b/packages/react-sdk/src/components/body.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "body";+export const defaultTag = "body";export const Body = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/body.ws.tsx b/packages/react-sdk/src/components/body.ws.tsxindex 5cbceda098..63d3fa12bd 100644--- a/packages/react-sdk/src/components/body.ws.tsx+++ b/packages/react-sdk/src/components/body.ws.tsx@@ -1,56 +1,48 @@import { BodyIcon } from "@webstudio-is/icons";+import { body } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/body.props";+import type { defaultTag } from "./body";+import type { Style } from "@webstudio-is/css-data";const presetStyle = {- marginTop: {- type: "unit",- unit: "px",- value: 0,- },- marginRight: {- type: "unit",- unit: "px",- value: 0,- },- marginBottom: {- type: "unit",- unit: "px",- value: 0,- },- marginLeft: {- type: "unit",- unit: "px",- value: 0,- },- minHeight: {- type: "unit",- unit: "%",- value: 100,- },- backgroundColor: {- type: "keyword",- value: "white",- },- fontFamily: {- type: "keyword",- value: "Arial",- },- fontSize: {- type: "unit",- unit: "px",- value: 14,- },- lineHeight: {- type: "unit",- unit: "number",- value: 1.5,- },- color: {- type: "keyword",- value: "#232323",+ body: {+ ...body,++ minHeight: {+ type: "unit",+ unit: "%",+ value: 100,+ },++ backgroundColor: {+ type: "keyword",+ value: "white",+ },++ fontFamily: {+ type: "keyword",+ value: "Arial",+ },++ fontSize: {+ type: "unit",+ unit: "px",+ value: 14,+ },++ lineHeight: {+ type: "unit",+ unit: "number",+ value: 1.5,+ },++ color: {+ type: "keyword",+ value: "#232323",+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {type: "container",diff --git a/packages/react-sdk/src/components/bold.tsx b/packages/react-sdk/src/components/bold.tsxindex ce9ec8fe6a..fdebcb8018 100644--- a/packages/react-sdk/src/components/bold.tsx+++ b/packages/react-sdk/src/components/bold.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "b";+export const defaultTag = "b";export const Bold = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/bold.ws.tsx b/packages/react-sdk/src/components/bold.ws.tsxindex d9444e22f7..a8c2db9429 100644--- a/packages/react-sdk/src/components/bold.ws.tsx+++ b/packages/react-sdk/src/components/bold.ws.tsx@@ -1,11 +1,19 @@import { FontBoldIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/bold.props";+import { b } from "../css/normalize";+import type { Style } from "@webstudio-is/css-data";+import type { defaultTag } from "./bold";++const presetStyle = {+ b,+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {type: "rich-text-child",label: "Bold Text",Icon: FontBoldIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/box.ws.ts b/packages/react-sdk/src/components/box.ws.tsindex c94b191ebb..d8bb87e9c7 100644--- a/packages/react-sdk/src/components/box.ws.ts+++ b/packages/react-sdk/src/components/box.ws.ts@@ -1,13 +1,36 @@import { BoxIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/box.props";+import type { Box } from "./box";+import type { ComponentProps } from "react";+import type { Style } from "@webstudio-is/css-data";+import {+ div,+ address,+ article,+ aside,+ figure,+ footer,+ header,+ main,+ nav,+ section,+} from "../css/normalize";++type BoxTags = NonNullable<ComponentProps<typeof Box>["tag"]>;const presetStyle = {- boxSizing: {- type: "keyword",- value: "border-box",- },-} as const;+ div,+ address,+ article,+ aside,+ figure,+ footer,+ header,+ main,+ nav,+ section,+} as const satisfies Record<BoxTags, Style>;export const meta: WsComponentMeta = {category: "general",diff --git a/packages/react-sdk/src/components/button.tsx b/packages/react-sdk/src/components/button.tsxindex ff748274fd..5c1f4b7e53 100644--- a/packages/react-sdk/src/components/button.tsx+++ b/packages/react-sdk/src/components/button.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "button";+export const defaultTag = "button";type ButtonProps = ComponentProps<typeof defaultTag> & { innerText?: string };diff --git a/packages/react-sdk/src/components/button.ws.tsx b/packages/react-sdk/src/components/button.ws.tsxindex bca40f380f..61b8802dcc 100644--- a/packages/react-sdk/src/components/button.ws.tsx+++ b/packages/react-sdk/src/components/button.ws.tsx@@ -1,12 +1,20 @@import { ButtonIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/button.props";+import { button } from "../css/normalize";+import type { defaultTag } from "./button";+import type { Style } from "@webstudio-is/css-data";++const presetStyle = {+ button,+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "forms",type: "container",label: "Button",Icon: ButtonIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/code.tsx b/packages/react-sdk/src/components/code.tsxindex 5b5474d7e1..1a81b70f7b 100644--- a/packages/react-sdk/src/components/code.tsx+++ b/packages/react-sdk/src/components/code.tsx@@ -6,7 +6,7 @@ import {} from "react";import { cssVars } from "@webstudio-is/css-vars";-const defaultTag = "code";+export const defaultTag = "code";export const displayVarNamespace = cssVars.unique("code-display");diff --git a/packages/react-sdk/src/components/code.ws.tsx b/packages/react-sdk/src/components/code.ws.tsxindex aabc672388..3d80c9d1ac 100644--- a/packages/react-sdk/src/components/code.ws.tsx+++ b/packages/react-sdk/src/components/code.ws.tsx@@ -1,37 +1,45 @@import { CodeIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";-import { displayVarNamespace } from "./code";+import { type defaultTag, displayVarNamespace } from "./code";import { props } from "./__generated__/code.props";+import type { Style, StyleValue } from "@webstudio-is/css-data";+import { code } from "../css/normalize";-const presetStyle: WsComponentMeta["presetStyle"] = {- display: {- type: "var",- value: displayVarNamespace,- fallbacks: [- {- type: "keyword",- value: "inline-block",- },- ],- },- paddingLeft: {- type: "keyword",- value: "0.2em",- },- paddingRight: {- type: "keyword",- value: "0.2em",- },- backgroundColor: {- type: "keyword",- value: "#eee",- },- fontFamily: {- type: "keyword",- value: "monospace",- },+const display: StyleValue = {+ type: "var",+ value: displayVarNamespace,+ fallbacks: [+ {+ type: "keyword",+ value: "inline-block",+ },+ ],};+const presetStyle = {+ code: {+ ...code,+ display,+ paddingLeft: {+ type: "unit",+ value: 0.2,+ unit: "em",+ },+ paddingRight: {+ type: "unit",+ value: 0.2,+ unit: "em",+ },+ backgroundColor: {+ type: "rgb",+ r: 238,+ g: 238,+ b: 238,+ alpha: 1,+ },+ },+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {category: "general",type: "rich-text",diff --git a/packages/react-sdk/src/components/component-meta.ts b/packages/react-sdk/src/components/component-meta.tsindex 089788c27f..e7734ef8d2 100644--- a/packages/react-sdk/src/components/component-meta.ts+++ b/packages/react-sdk/src/components/component-meta.ts@@ -3,6 +3,9 @@ import type { FunctionComponent } from "react";import type { IconProps } from "@webstudio-is/icons";import type { Style } from "@webstudio-is/css-data";import { PropMeta } from "@webstudio-is/generate-arg-types";+import type { htmlTags as HtmlTags } from "html-tags";++type PresetStyle = Partial<Record<HtmlTags, Style>>;// props are separated from the rest of the meta// so they can be exported separately and potentially tree-shaken@@ -44,6 +47,6 @@ export type WsComponentMeta = Omit<z.infer<typeof WsComponentMeta>,"presetStyle" | "Icon"> & {- presetStyle?: Style;+ presetStyle?: PresetStyle;Icon: FunctionComponent<IconProps>;};diff --git a/packages/react-sdk/src/components/form.tsx b/packages/react-sdk/src/components/form.tsxindex 87d7ed51a8..4e30f337f4 100644--- a/packages/react-sdk/src/components/form.tsx+++ b/packages/react-sdk/src/components/form.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "form";+export const defaultTag = "form";export const Form = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/form.ws.tsx b/packages/react-sdk/src/components/form.ws.tsxindex 3e3858bb96..71211811fd 100644--- a/packages/react-sdk/src/components/form.ws.tsx+++ b/packages/react-sdk/src/components/form.ws.tsx@@ -1,18 +1,20 @@+import type { Style } from "@webstudio-is/css-data";import { FormIcon } from "@webstudio-is/icons";+import { form } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./form";import { props } from "./__generated__/form.props";const presetStyle = {- minHeight: {- type: "unit",- unit: "px",- value: 20,+ form: {+ ...form,+ minHeight: {+ type: "unit",+ unit: "px",+ value: 20,+ },},- boxSizing: {- type: "keyword",- value: "border-box",- },-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "forms",diff --git a/packages/react-sdk/src/components/heading.ws.tsx b/packages/react-sdk/src/components/heading.ws.tsxindex c5cdf36288..ccaf676cc2 100644--- a/packages/react-sdk/src/components/heading.ws.tsx+++ b/packages/react-sdk/src/components/heading.ws.tsx@@ -1,13 +1,29 @@+import type { Style } from "@webstudio-is/css-data";import { HeadingIcon } from "@webstudio-is/icons";+import type { ComponentProps } from "react";+import { h1, h2, h3, h4, h5, h6 } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { Heading } from "./heading";import { props } from "./__generated__/heading.props";+type HeadingTags = NonNullable<ComponentProps<typeof Heading>["tag"]>;++const presetStyle = {+ h1,+ h2,+ h3,+ h4,+ h5,+ h6,+} as const satisfies Record<HeadingTags, Style>;+export const meta: WsComponentMeta = {category: "typography",type: "rich-text",label: "Heading",Icon: HeadingIcon,children: ["Heading you can edit"],+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/image.tsx b/packages/react-sdk/src/components/image.tsxindex 6b8bdab370..ffdc2e98a3 100644--- a/packages/react-sdk/src/components/image.tsx+++ b/packages/react-sdk/src/components/image.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "img";+export const defaultTag = "img";// quality and optimize can be overwritten and used by asset transform// Or we need and additional way to pass them upper leveldiff --git a/packages/react-sdk/src/components/image.ws.tsx b/packages/react-sdk/src/components/image.ws.tsxindex 99056959c1..3889eb6446 100644--- a/packages/react-sdk/src/components/image.ws.tsx+++ b/packages/react-sdk/src/components/image.ws.tsx@@ -1,21 +1,28 @@+import type { Style } from "@webstudio-is/css-data";import { ImageIcon } from "@webstudio-is/icons";+import { img } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./image";import { props } from "./__generated__/image.props";const presetStyle = {- // Otherwise on new image insert onto canvas it can overfit screen size multiple times- maxWidth: {- type: "unit",- unit: "%",- value: 100,- },- // inline | inline-block is not suitable because without line-height: 0 on the parent you get unsuitable spaces/margins- // see https://stackoverflow.com/questions/24771194/is-the-margin-of-inline-block-4px-is-static-for-all-browsers- display: {- type: "keyword",- value: "block",+ img: {+ ...img,++ // Otherwise on new image insert onto canvas it can overfit screen size multiple times+ maxWidth: {+ type: "unit",+ unit: "%",+ value: 100,+ },+ // inline | inline-block is not suitable because without line-height: 0 on the parent you get unsuitable spaces/margins+ // see https://stackoverflow.com/questions/24771194/is-the-margin-of-inline-block-4px-is-static-for-all-browsers+ display: {+ type: "keyword",+ value: "block",+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "media",diff --git a/packages/react-sdk/src/components/input.tsx b/packages/react-sdk/src/components/input.tsxindex 31b7cc61b2..f6b19da07f 100644--- a/packages/react-sdk/src/components/input.tsx+++ b/packages/react-sdk/src/components/input.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "input";+export const defaultTag = "input";export const Input = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/input.ws.tsx b/packages/react-sdk/src/components/input.ws.tsxindex c2e6fafc90..e1fa7d4284 100644--- a/packages/react-sdk/src/components/input.ws.tsx+++ b/packages/react-sdk/src/components/input.ws.tsx@@ -1,12 +1,20 @@+import type { Style } from "@webstudio-is/css-data";import { InputIcon } from "@webstudio-is/icons";+import { input } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./input";import { props } from "./__generated__/input.props";+const presetStyle = {+ input,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {category: "forms",type: "control",label: "Input",Icon: InputIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/italic.tsx b/packages/react-sdk/src/components/italic.tsxindex ec246ccd74..13d507ac35 100644--- a/packages/react-sdk/src/components/italic.tsx+++ b/packages/react-sdk/src/components/italic.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "i";+export const defaultTag = "i";export const Italic = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/italic.ws.tsx b/packages/react-sdk/src/components/italic.ws.tsxindex c9532bf29c..e469e3e447 100644--- a/packages/react-sdk/src/components/italic.ws.tsx+++ b/packages/react-sdk/src/components/italic.ws.tsx@@ -1,13 +1,19 @@+import type { Style } from "@webstudio-is/css-data";import { FontItalicIcon } from "@webstudio-is/icons";+import type { defaultTag } from "./italic";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/italic.props";+import { i } from "../css/normalize";const presetStyle = {- fontStyle: {- type: "keyword",- value: "italic",+ i: {+ ...i,+ fontStyle: {+ type: "keyword",+ value: "italic",+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {type: "rich-text-child",diff --git a/packages/react-sdk/src/components/link-block.tsx b/packages/react-sdk/src/components/link-block.tsxindex a2d3e0ab8e..3dede5007f 100644--- a/packages/react-sdk/src/components/link-block.tsx+++ b/packages/react-sdk/src/components/link-block.tsx@@ -1,5 +1,6 @@import { forwardRef } from "react";import { Link } from "./link";+export { defaultTag } from "./link";export const LinkBlock: typeof Link = forwardRef((props, ref) => (<Link {...props} ref={ref} />diff --git a/packages/react-sdk/src/components/link-block.ws.tsx b/packages/react-sdk/src/components/link-block.ws.tsxindex c940962a5e..513825b096 100644--- a/packages/react-sdk/src/components/link-block.ws.tsx+++ b/packages/react-sdk/src/components/link-block.ws.tsx@@ -2,17 +2,19 @@ import { BoxLinkIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/link-block.props";import { propsMeta as linkPropsMeta } from "./link.ws";+import type { defaultTag } from "./link-block";+import type { Style } from "@webstudio-is/css-data";+import { a } from "../css/normalize";const presetStyle = {- boxSizing: {- type: "keyword",- value: "border-box",+ a: {+ ...a,+ display: {+ type: "keyword",+ value: "inline-block",+ },},- display: {- type: "keyword",- value: "inline-block",- },-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "general",diff --git a/packages/react-sdk/src/components/link.tsx b/packages/react-sdk/src/components/link.tsxindex 0bafa36506..560ec7fc9d 100644--- a/packages/react-sdk/src/components/link.tsx+++ b/packages/react-sdk/src/components/link.tsx@@ -1,6 +1,8 @@import { forwardRef, type ComponentProps } from "react";import { usePropUrl, getInstanceIdFromComponentProps } from "../props";+export const defaultTag = "a";+// @todo props that come from remix link, shouldn't be here at all// - prefetch should be only on remix component and it already is// - props meta should be generated from Remix linkdiff --git a/packages/react-sdk/src/components/link.ws.tsx b/packages/react-sdk/src/components/link.ws.tsxindex 3277e94971..a58e5ce5fe 100644--- a/packages/react-sdk/src/components/link.ws.tsx+++ b/packages/react-sdk/src/components/link.ws.tsx@@ -1,18 +1,24 @@+import type { Style } from "@webstudio-is/css-data";import { Link2Icon } from "@webstudio-is/icons";+import { a } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./link";import { props } from "./__generated__/link.props";const presetStyle = {- minHeight: {- type: "unit",- unit: "em",- value: 1,- },- display: {- type: "keyword",- value: "inline-block",+ a: {+ ...a,+ minHeight: {+ type: "unit",+ unit: "em",+ value: 1,+ },+ display: {+ type: "keyword",+ value: "inline-block",+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "general",diff --git a/packages/react-sdk/src/components/list-item.tsx b/packages/react-sdk/src/components/list-item.tsxindex 8292517cc4..3e6b329582 100644--- a/packages/react-sdk/src/components/list-item.tsx+++ b/packages/react-sdk/src/components/list-item.tsx@@ -5,7 +5,7 @@ import {type ComponentProps,} from "react";-const defaultTag = "li";+export const defaultTag = "li";type Props = ComponentProps<typeof defaultTag>;diff --git a/packages/react-sdk/src/components/list-item.ws.tsx b/packages/react-sdk/src/components/list-item.ws.tsxindex 96b0ff5842..5fd0138e4f 100644--- a/packages/react-sdk/src/components/list-item.ws.tsx+++ b/packages/react-sdk/src/components/list-item.ws.tsx@@ -1,13 +1,21 @@+import type { Style } from "@webstudio-is/css-data";import { ListItemIcon } from "@webstudio-is/icons";+import { li } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./list-item";import { props } from "./__generated__/list-item.props";+const presetStyle = {+ li,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {category: "typography",type: "rich-text",label: "List Item",Icon: ListItemIcon,children: ["List Item you can edit"],+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/list.tsx b/packages/react-sdk/src/components/list.tsxindex e7d328564f..74c551988b 100644--- a/packages/react-sdk/src/components/list.tsx+++ b/packages/react-sdk/src/components/list.tsx@@ -8,6 +8,8 @@ import {const unorderedTag = "ul";const orderedTag = "ol";+export type ListTag = typeof unorderedTag | typeof orderedTag;+type Props = ComponentProps<typeof unorderedTag> &ComponentProps<typeof orderedTag> & {ordered?: boolean;diff --git a/packages/react-sdk/src/components/list.ws.tsx b/packages/react-sdk/src/components/list.ws.tsxindex 10faad0023..2a6015d369 100644--- a/packages/react-sdk/src/components/list.ws.tsx+++ b/packages/react-sdk/src/components/list.ws.tsx@@ -1,21 +1,42 @@import { ListIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/list.props";+import type { ListTag } from "./list";+import type { Style } from "@webstudio-is/css-data";+import { ol, ul } from "../css/normalize";const presetStyle = {- marginTop: {- type: "keyword",- value: "0",+ ol: {+ ...ol,+ marginTop: {+ type: "keyword",+ value: "0",+ },+ marginBottom: {+ type: "keyword",+ value: "10px",+ },+ paddingLeft: {+ type: "keyword",+ value: "40px",+ },},- marginBottom: {- type: "keyword",- value: "10px",+ ul: {+ ...ul,+ marginTop: {+ type: "keyword",+ value: "0",+ },+ marginBottom: {+ type: "keyword",+ value: "10px",+ },+ paddingLeft: {+ type: "keyword",+ value: "40px",+ },},- paddingLeft: {- type: "keyword",- value: "40px",- },-} as const;+} as const satisfies Record<ListTag, Style>;export const meta: WsComponentMeta = {category: "typography",diff --git a/packages/react-sdk/src/components/paragraph.tsx b/packages/react-sdk/src/components/paragraph.tsxindex 2ebe207c47..0047199d0d 100644--- a/packages/react-sdk/src/components/paragraph.tsx+++ b/packages/react-sdk/src/components/paragraph.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "p";+export const defaultTag = "p";export const Paragraph = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/paragraph.ws.tsx b/packages/react-sdk/src/components/paragraph.ws.tsxindex e08bb7093e..6d4687c2d6 100644--- a/packages/react-sdk/src/components/paragraph.ws.tsx+++ b/packages/react-sdk/src/components/paragraph.ws.tsx@@ -1,13 +1,21 @@+import type { Style } from "@webstudio-is/css-data";import { TextAlignLeftIcon } from "@webstudio-is/icons";+import { p } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./paragraph";import { props } from "./__generated__/paragraph.props";+const presetStyle = {+ p,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {category: "typography",type: "rich-text",label: "Paragraph",Icon: TextAlignLeftIcon,children: ["Pragraph you can edit"],+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/separator.tsx b/packages/react-sdk/src/components/separator.tsxindex 7c2ce7c5bc..5207c19eaf 100644--- a/packages/react-sdk/src/components/separator.tsx+++ b/packages/react-sdk/src/components/separator.tsx@@ -5,7 +5,7 @@ import {type ComponentProps,} from "react";-const defaultTag = "hr";+export const defaultTag = "hr";type Props = ComponentProps<typeof defaultTag>;diff --git a/packages/react-sdk/src/components/separator.ws.tsx b/packages/react-sdk/src/components/separator.ws.tsxindex dfd8277ce3..9bf43a7c79 100644--- a/packages/react-sdk/src/components/separator.ws.tsx+++ b/packages/react-sdk/src/components/separator.ws.tsx@@ -1,21 +1,42 @@import { DashIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/separator.props";+import type { defaultTag } from "./separator";+import type { Style } from "@webstudio-is/css-data";+import { hr } from "../css/normalize";const presetStyle = {- height: {- type: "keyword",- value: "1px",- },- backgroundColor: {- type: "keyword",- value: "gray",- },- border: {- type: "keyword",- value: "none",+ hr: {+ ...hr,++ height: {+ type: "keyword",+ value: "1px",+ },++ backgroundColor: {+ type: "keyword",+ value: "gray",+ },++ borderTopStyle: {+ type: "keyword",+ value: "none",+ },+ borderRightStyle: {+ type: "keyword",+ value: "none",+ },+ borderLeftStyle: {+ type: "keyword",+ value: "none",+ },+ borderBottomStyle: {+ type: "keyword",+ value: "none",+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "general",diff --git a/packages/react-sdk/src/components/span.tsx b/packages/react-sdk/src/components/span.tsxindex b0a510184f..879379da60 100644--- a/packages/react-sdk/src/components/span.tsx+++ b/packages/react-sdk/src/components/span.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "span";+export const defaultTag = "span";export const Span = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/span.ws.tsx b/packages/react-sdk/src/components/span.ws.tsxindex b24fe9a872..8ae238ae2e 100644--- a/packages/react-sdk/src/components/span.ws.tsx+++ b/packages/react-sdk/src/components/span.ws.tsx@@ -1,11 +1,19 @@+import type { Style } from "@webstudio-is/css-data";import { BrushIcon } from "@webstudio-is/icons";+import { span } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./span";import { props } from "./__generated__/span.props";+const presetStyle = {+ span,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {type: "rich-text-child",label: "Styled Text",Icon: BrushIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/subscript.tsx b/packages/react-sdk/src/components/subscript.tsxindex c5931eca89..157e1a4d35 100644--- a/packages/react-sdk/src/components/subscript.tsx+++ b/packages/react-sdk/src/components/subscript.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "sub";+export const defaultTag = "sub";export const Subscript = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/subscript.ws.tsx b/packages/react-sdk/src/components/subscript.ws.tsxindex 1ac80c2bd0..e4dd1610ed 100644--- a/packages/react-sdk/src/components/subscript.ws.tsx+++ b/packages/react-sdk/src/components/subscript.ws.tsx@@ -1,11 +1,19 @@+import type { Style } from "@webstudio-is/css-data";import { SubscriptIcon } from "@webstudio-is/icons";+import { sub } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./subscript";import { props } from "./__generated__/subscript.props";+const presetStyle = {+ sub,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {type: "rich-text-child",label: "Subscript Text",Icon: SubscriptIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/superscript.tsx b/packages/react-sdk/src/components/superscript.tsxindex beb816069c..86a082c083 100644--- a/packages/react-sdk/src/components/superscript.tsx+++ b/packages/react-sdk/src/components/superscript.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "sup";+export const defaultTag = "sup";export const Superscript = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/superscript.ws.tsx b/packages/react-sdk/src/components/superscript.ws.tsxindex 11d1fb5573..426a8a7d66 100644--- a/packages/react-sdk/src/components/superscript.ws.tsx+++ b/packages/react-sdk/src/components/superscript.ws.tsx@@ -1,11 +1,19 @@+import type { Style } from "@webstudio-is/css-data";import { SuperscriptIcon } from "@webstudio-is/icons";+import { sup } from "../css/normalize";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";+import type { defaultTag } from "./superscript";import { props } from "./__generated__/superscript.props";+const presetStyle = {+ sup,+} as const satisfies Record<typeof defaultTag, Style>;+export const meta: WsComponentMeta = {type: "rich-text-child",label: "Superscript Text",Icon: SuperscriptIcon,+ presetStyle,};export const propsMeta: WsComponentPropsMeta = {diff --git a/packages/react-sdk/src/components/text-block.tsx b/packages/react-sdk/src/components/text-block.tsxindex 8dad187a57..03c20a5ddd 100644--- a/packages/react-sdk/src/components/text-block.tsx+++ b/packages/react-sdk/src/components/text-block.tsx@@ -1,6 +1,6 @@import { forwardRef, type ElementRef, type ComponentProps } from "react";-const defaultTag = "div";+export const defaultTag = "div";export const TextBlock = forwardRef<ElementRef<typeof defaultTag>,diff --git a/packages/react-sdk/src/components/text-block.ws.tsx b/packages/react-sdk/src/components/text-block.ws.tsxindex 3db2b16cbf..894196b2ab 100644--- a/packages/react-sdk/src/components/text-block.ws.tsx+++ b/packages/react-sdk/src/components/text-block.ws.tsx@@ -1,14 +1,21 @@import { TextIcon } from "@webstudio-is/icons";import type { WsComponentMeta, WsComponentPropsMeta } from "./component-meta";import { props } from "./__generated__/text-block.props";+import type { defaultTag } from "./text-block";+import type { Style } from "@webstudio-is/css-data";+import { div } from "../css/normalize";const presetStyle = {- minHeight: {- type: "unit",- unit: "em",- value: 1,+ div: {+ ...div,++ minHeight: {+ type: "unit",+ unit: "em",+ value: 1,+ },},-} as const;+} as const satisfies Record<typeof defaultTag, Style>;export const meta: WsComponentMeta = {category: "typography",diff --git a/packages/react-sdk/src/css/normalize-type-check.ts b/packages/react-sdk/src/css/normalize-type-check.tsnew file mode 100644index 0000000000..1c2d29f548--- /dev/null+++ b/packages/react-sdk/src/css/normalize-type-check.ts@@ -0,0 +1,13 @@+import * as normalize from "./normalize";+import type { htmlTags as HtmlTags } from "html-tags";+import type { Style } from "@webstudio-is/css-data";++// no way I found to check exports https://github.com/microsoft/TypeScript/issues/38511+// we can check here that all exports represents a valid html tag+const normalizeWithKeyof = { ...normalize };++type ExportedTags = keyof typeof normalizeWithKeyof;++type ValidTags = ExportedTags extends HtmlTags ? ExportedTags : false;++normalizeWithKeyof satisfies Record<ValidTags, Style>;diff --git a/packages/react-sdk/src/css/normalize.ts b/packages/react-sdk/src/css/normalize.tsnew file mode 100644index 0000000000..2671a8d102--- /dev/null+++ b/packages/react-sdk/src/css/normalize.ts@@ -0,0 +1,519 @@+/**+ * Based on https://github.com/sindresorhus/modern-normalize+ *+ * Attributions+ *+ * The MIT License (MIT)+ * Copyright (c) Nicolas Gallagher+ * Copyright (c) Jonathan Neal+ * Copyright (c) Sindre Sorhus <[email protected]> (sindresorhus.com)+ *+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:+ *+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.+ *+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE+ */++import type { Style } from "@webstudio-is/css-data";++// webstudio custom opinionated presets+import { borders } from "./presets";++/**+Use a better box model (opinionated).+*/+const boxSizing = {+ type: "keyword",+ value: "border-box",+} as const;++/**+ * We dont support rules like this now, implement boxSizing for each used element+ * *,+ * ::before,+ * ::after {+ * box-sizing: border-box;+ }+*/+const baseStyle = {+ boxSizing,+ ...borders,+} as const satisfies Style;++export const div = baseStyle;+export const address = baseStyle;+export const article = baseStyle;+export const aside = baseStyle;+export const figure = baseStyle;+export const footer = baseStyle;+export const header = baseStyle;+export const main = baseStyle;+export const nav = baseStyle;+export const section = baseStyle;+export const form = baseStyle;++export const h1 = baseStyle;+export const h2 = baseStyle;+export const h3 = baseStyle;+export const h4 = baseStyle;+export const h5 = baseStyle;+export const h6 = baseStyle;++export const i = baseStyle;++export const img = baseStyle;++export const a = baseStyle;+export const li = baseStyle;+export const ul = baseStyle;+export const ol = baseStyle;++export const p = baseStyle;+export const span = baseStyle;++// @todo for now not applied to html, as we don't have html element+/**+1. Correct the line height in all browsers.+2. Prevent adjustments of font size after orientation changes in iOS.+3. Use a more readable tab size (opinionated).+*/+export const html = {+ /* 1 */+ lineHeight: {+ type: "unit",+ value: 1.15,+ unit: "number",+ },++ /* 2 */+ textSizeAdjust: {+ type: "unit",+ value: 100,+ unit: "%",+ },++ /* 3 */+ tabSize: {+ type: "unit",+ value: 4,+ unit: "number",+ },++ boxSizing,+ ...borders,+} as const satisfies Style;++/**+1. Remove the margin in all browsers.+2. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)+*/+export const body = {+ /* 1 */+ marginTop: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginRight: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginBottom: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginLeft: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ /* 2 */+ fontFamily: {+ type: "keyword",+ value: `system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji'`,+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++/**+1. Add the correct height in Firefox.+2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)+*/+export const hr = {+ /* 1 */+ height: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ /* 2 */+ color: { type: "keyword", value: "inherit" },+ boxSizing,+ ...borders,+} as const satisfies Style;++/**+Add the correct text decoration in Chrome, Edge, and Safari.++!!!Skipped as we don't support this logic!!!++abbr[title] {+ text-decoration: underline dotted;+}+*/++/**+Add the correct font weight in Edge and Safari.+*/+export const b = {+ fontWeight: {+ type: "keyword",+ value: "bolder",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;+export const strong = b;++/**+1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)+2. Correct the odd 'em' font sizing in all browsers.+*/+export const code = {+ /* 1 */+ fontFamily: {+ type: "keyword",+ value: `ui-monospace, SFMono-Regular, Consolas, 'Liberation Mono', Menlo, monospace`,+ },+ /* 2 */+ fontSize: {+ type: "unit",+ value: 1,+ unit: "em",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++export const kbd = code;+export const samp = code;+export const pre = code;++/**+Add the correct font size in all browsers.+*/++export const small = {+ fontSize: {+ type: "unit",+ value: 80,+ unit: "%",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++/**+Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.+*/++const subSupBase = {+ fontSize: {+ type: "unit",+ value: 75,+ unit: "%",+ },+ lineHeight: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ position: {+ type: "keyword",+ value: "relative",+ },+ verticalAlign: {+ type: "keyword",+ value: "baseline",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++export const sub = {+ ...subSupBase,+ bottom: {+ type: "unit",+ value: -0.25,+ unit: "em",+ },+} as const satisfies Style;++export const sup = {+ ...subSupBase,+ top: {+ type: "unit",+ value: -0.5,+ unit: "em",+ },+} as const satisfies Style;++/*+Tabular data+============+*/++/**+1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)+2. Correct table border color inheritance in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)+*/++export const table = {+ /* 1 */+ textIndent: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ ...borders,+ /* 2 */+ borderTopColor: {+ type: "keyword",+ value: "inherit",+ },+ borderRightColor: {+ type: "keyword",+ value: "inherit",+ },+ borderBottomColor: {+ type: "keyword",+ value: "inherit",+ },+ borderLeftColor: {+ type: "keyword",+ value: "inherit",+ },+ boxSizing,+} as const satisfies Style;++/*+Forms+=====+*/++/**+1. Change the font styles in all browsers.+2. Remove the margin in Firefox and Safari.+*/++const buttonBase = {+ /* 1 */+ fontFamily: {+ type: "keyword",+ value: "inherit",+ },+ fontSize: {+ type: "unit",+ value: 100,+ unit: "%",+ },+ lineHeight: {+ type: "unit",+ value: 1.15,+ unit: "number",+ },+ /* 2 */+ marginTop: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginRight: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginBottom: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ marginLeft: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++export const input = buttonBase;+export const optgroup = buttonBase;+export const textarea = buttonBase;++/**+Remove the inheritance of text transform in Edge and Firefox.+*/+export const button = {+ ...buttonBase,+ textTransform: {+ type: "keyword",+ value: "none",+ },+} as const satisfies Style;++export const select = button;++/**+Correct the inability to style clickable types in iOS and Safari.++!!!Skipped as we don't support this logic!!!++buttonBase,+[type='button'],+[type='reset'],+[type='submit'] {+ -webkit-appearance: buttonBase;+}+*/++/**+Remove the inner border and padding in Firefox.++!!!Skipped as we don't support this logic!!!++::-moz-focus-inner {+ border-style: none;+ padding: 0;+}+*/++/**+Restore the focus styles unset by the previous rule.++!!!Skipped as we don't support this logic!!!++:-moz-focusring {+ outline: 1px dotted ButtonText;+}+*/++/**+Remove the additional ':invalid' styles in Firefox.+See: https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737++!!!Skipped as we don't support this logic!!!++:-moz-ui-invalid {+ box-shadow: none;+}+*/++/**+Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.+*/++export const legend = {+ paddingTop: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ paddingRight: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ paddingBottom: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ paddingLeft: {+ type: "unit",+ value: 0,+ unit: "number",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++/**+Add the correct vertical alignment in Chrome and Firefox.+*/++export const progress = {+ verticalAlign: {+ type: "keyword",+ value: "baseline",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;++/**+Correct the cursor style of increment and decrement buttons in Safari.++!!!Skipped as we don't support this logic!!!++::-webkit-inner-spin-buttonBase,+::-webkit-outer-spin-buttonBase {+ height: auto;+}+*/++/**+1. Correct the odd appearance in Chrome and Safari.+2. Correct the outline style in Safari.++!!!Skipped as we don't support this logic!!!++[type='search'] {+ -webkit-appearance: textfield;+ outline-offset: -2px;+}+*/++/**+Remove the inner padding in Chrome and Safari on macOS.++!!!Skipped as we don't support this logic!!!++::-webkit-search-decoration {+ -webkit-appearance: none;+}+*/++/**+1. Correct the inability to style clickable types in iOS and Safari.+2. Change font properties to 'inherit' in Safari.++!!!Skipped as we don't support this logic!!!++::-webkit-file-upload-buttonBase {+ -webkit-appearance: buttonBase;+ font: inherit;+}+*/++/*+Interactive+===========+*/++/*+Add the correct display in Chrome and Safari.+*/++export const summary = {+ display: {+ type: "keyword",+ value: "list-item",+ },+ boxSizing,+ ...borders,+} as const satisfies Style;diff --git a/packages/react-sdk/src/css/presets.ts b/packages/react-sdk/src/css/presets.tsnew file mode 100644index 0000000000..d5f0131486--- /dev/null+++ b/packages/react-sdk/src/css/presets.ts@@ -0,0 +1,42 @@+import type { Style } from "@webstudio-is/css-data";++export const borders = {+ borderTopColor: {+ type: "keyword",+ value: "currentColor",+ },+ borderRightColor: {+ type: "keyword",+ value: "currentColor",+ },+ borderBottomColor: {+ type: "keyword",+ value: "currentColor",+ },+ borderLeftColor: {+ type: "keyword",+ value: "currentColor",+ },++ borderTopWidth: {+ type: "unit",+ value: 1,+ unit: "px",+ },++ borderRightWidth: {+ type: "unit",+ value: 1,+ unit: "px",+ },+ borderBottomWidth: {+ type: "unit",+ value: 1,+ unit: "px",+ },+ borderLeftWidth: {+ type: "unit",+ value: 1,+ unit: "px",+ },+} as const satisfies Style;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 74094adb47..ebb587e29c 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -17,7 +17,7 @@ importers:version: 1.1.3'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@types/css-tree':specifier: ^2.0.0version: 2.0.0@@ -343,9 +343,12 @@ importers:dotenv:specifier: ^16.0.0version: 16.0.1+ html-tags:+ specifier: ^3.2.0+ version: 3.2.0jest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])prettier:specifier: ^2.8.4version: 2.8.4@@ -449,7 +452,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -507,7 +510,7 @@ importers:version: 29.3.1'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@types/hyphenate-style-name':specifier: ^1.0.0version: 1.0.0@@ -534,7 +537,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -580,7 +583,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -719,7 +722,7 @@ importers:version: 29.3.1'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@testing-library/react-hooks':specifier: ^8.0.1@@ -746,7 +749,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])react:specifier: ^17.0.2version: 17.0.2@@ -825,7 +828,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -893,7 +896,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -915,7 +918,7 @@ importers:devDependencies:'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@svgo/jsx':specifier: ^0.4.2version: 0.4.2@@ -958,7 +961,7 @@ importers:version: 29.3.1'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@types/react':specifier: 17.0.47version: 17.0.47@@ -976,7 +979,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -991,7 +994,7 @@ importers:version: 0.5.0([email protected])jest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])packages/prisma-client:dependencies:@@ -1116,7 +1119,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -1165,7 +1168,7 @@ importers:version: link:../tsconfigjest:specifier: ^29.3.1- version: 29.3.1+ version: 29.3.1(@types/[email protected])typescript:specifier: 4.9.5version: 4.9.5@@ -1202,6 +1205,9 @@ importers:detect-font:specifier: ^0.1.5version: 0.1.5+ html-tags:+ specifier: ^3.2.0+ version: 3.2.0mitt:specifier: ^3.0.0version: 3.0.0@@ -1229,7 +1235,7 @@ importers:version: 1.14.3'@storybook/react':specifier: ^6.5.16- version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])+ version: 6.5.16(@babel/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])'@types/node':specifier: ^18.11.18version: 18.11.18@@ -1318,7 +1324,7 @@ importers:devDependencies:'@remix-run/dev':specifier: 1.14.3- version: 1.14.3+ version: 1.14.3(@remix-run/[email protected])'@size-limit/file':specifier: ^8.2.4version: 8.2.4([email protected])@@ -4342,7 +4348,6 @@ packages:strip-json-comments: 3.1.1transitivePeerDependencies:- supports-color- dev: false/@floating-ui/[email protected]:resolution: {integrity: sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==}@@ -4414,7 +4419,6 @@ packages:minimatch: 3.1.2transitivePeerDependencies:- supports-color- dev: false/@humanwhocodes/[email protected]:resolution: {integrity: sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==}@@ -4427,7 +4431,6 @@ packages:/@humanwhocodes/[email protected]:resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}- dev: false/@icons/[email protected]([email protected]):resolution: {integrity: sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==}@@ -5180,45 +5183,6 @@ packages:webpack: 4.46.0dev: true- resolution: {integrity: sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q==}- engines: {node: '>= 10.13'}- peerDependencies:- '@types/webpack': 4.x || 5.x- react-refresh: '>=0.10.0 <1.0.0'- sockjs-client: ^1.4.0- type-fest: '>=0.17.0 <3.0.0'- webpack: '>=4.43.0 <6.0.0'- webpack-dev-server: 3.x || 4.x- webpack-hot-middleware: 2.x- webpack-plugin-serve: 0.x || 1.x- peerDependenciesMeta:- '@types/webpack':- optional: true- sockjs-client:- optional: true- type-fest:- optional: true- webpack-dev-server:- optional: true- webpack-hot-middleware:- optional: true- webpack-plugin-serve:- optional: true- dependencies:- ansi-html-community: 0.0.8- common-path-prefix: 3.0.0- core-js-pure: 3.23.3- error-stack-parser: 2.1.4- find-up: 5.0.0- html-entities: 2.3.3- loader-utils: 2.0.4- react-refresh: 0.11.0- schema-utils: 3.1.1- source-map: 0.7.4- webpack: 4.46.0- dev: true-/@prisma/[email protected]([email protected]):resolution: {integrity: sha512-bz6QARw54sWcbyR1lLnF2QHvRW5R/Jxnbbmwh3u+969vUKXtBkXgSgjDA85nji31ZBlf7+FrHDy5x+5ydGyQDg==}engines: {node: '>=14.17'}@@ -6260,77 +6224,6 @@ packages:'@remix-run/server-runtime': 1.14.3dev: false- /@remix-run/[email protected]:- resolution: {integrity: sha512-46mmwiA/k9YDkg0UrP90UB3azVVWRXw16NLHRSbZiaaYe8XgUkddEtBnH/nBp/IrVCtzUL3LObplUe5sFk5Z9Q==}- engines: {node: '>=14'}- hasBin: true- peerDependencies:- '@remix-run/serve': ^1.14.3- peerDependenciesMeta:- '@remix-run/serve':- optional: true- dependencies:- '@babel/core': 7.21.0- '@babel/generator': 7.21.1- '@babel/parser': 7.21.2- '@babel/plugin-syntax-jsx': 7.18.6(@babel/[email protected])- '@babel/plugin-syntax-typescript': 7.20.0(@babel/[email protected])- '@babel/preset-env': 7.20.2(@babel/[email protected])- '@babel/preset-typescript': 7.21.0(@babel/[email protected])- '@babel/traverse': 7.21.2- '@babel/types': 7.21.2- '@esbuild-plugins/node-modules-polyfill': 0.1.4([email protected])- '@npmcli/package-json': 2.0.0- '@remix-run/server-runtime': 1.14.3- '@vanilla-extract/integration': 6.0.2- arg: 5.0.2- cacache: 15.3.0- chalk: 4.1.2- chokidar: 3.5.3- dotenv: 16.0.1- esbuild: 0.16.3- execa: 5.1.1- exit-hook: 2.2.1- express: 4.18.2- fast-glob: 3.2.11- fs-extra: 10.1.0- get-port: 5.1.1- gunzip-maybe: 1.4.2- inquirer: 8.2.5- jsesc: 3.0.2- json5: 2.2.3- lodash: 4.17.21- lodash.debounce: 4.0.8- lru-cache: 7.14.1- minimatch: 3.1.2- node-fetch: 2.6.9- ora: 5.4.1- postcss: 8.4.21- postcss-discard-duplicates: 5.1.0([email protected])- postcss-load-config: 4.0.1([email protected])- postcss-modules: 6.0.0([email protected])- prettier: 2.7.1- pretty-ms: 7.0.1- proxy-agent: 5.0.0- react-refresh: 0.14.0- recast: 0.21.5- remark-frontmatter: 4.0.1- remark-mdx-frontmatter: 1.1.1- semver: 7.3.8- sort-package-json: 1.57.0- tar-fs: 2.1.1- tsconfig-paths: 4.1.2- ws: 7.5.9- xdm: 2.1.0- transitivePeerDependencies:- - bluebird- - bufferutil- - encoding- - supports-color- - ts-node- - utf-8-validate- dev: true-/@remix-run/[email protected](@remix-run/[email protected]):resolution: {integrity: sha512-46mmwiA/k9YDkg0UrP90UB3azVVWRXw16NLHRSbZiaaYe8XgUkddEtBnH/nBp/IrVCtzUL3LObplUe5sFk5Z9Q==}engines: {node: '>=14'}@@ -7253,7 +7146,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])([email protected])'@storybook/core-events': 6.5.16'@storybook/node-logger': 6.5.16'@storybook/preview-web': 6.5.16([email protected])([email protected])@@ -7506,78 +7399,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: 17.0.2- react-dom: 17.0.2([email protected])- resolve-from: 5.0.0- slash: 3.0.0- telejson: 6.0.8- ts-dedent: 2.2.0- typescript: 4.9.5- 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-PLu0M8Mqt9ruN5RupgcFKHEybiSm3CdWQyylWO5FRGg+WZV3BCm0aI8ujvO1GAm+YEi57Lull+M9d6NUycTpRg==}@@ -7609,7 +7430,7 @@ packages:'@discoveryjs/json-ext': 0.5.7'@storybook/core-client': 6.5.16([email protected])([email protected])([email protected])([email protected])+ '@storybook/core-common': 6.5.16([email protected])([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@@ -7770,7 +7591,7 @@ packages:'@babel/preset-react': 7.18.6(@babel/[email protected])'@storybook/addons': 6.5.16([email protected])([email protected])'@storybook/core-client': 6.5.16([email protected])([email protected])([email protected])([email protected])+ '@storybook/core-common': 6.5.16([email protected])([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])@@ -7935,94 +7756,7 @@ packages:'@storybook/addons': 6.5.16([email protected])([email protected])'@storybook/client-logger': 6.5.16'@storybook/core': 6.5.16([email protected])([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- '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0([email protected])([email protected])- '@storybook/semver': 7.3.2- '@storybook/store': 6.5.16([email protected])([email protected])- '@types/estree': 0.0.51- '@types/node': 16.18.11- '@types/webpack-env': 1.18.0- acorn: 7.4.1- acorn-jsx: 5.3.2([email protected])- acorn-walk: 7.2.0- babel-plugin-add-react-displayname: 0.0.5- babel-plugin-react-docgen: 4.2.1- core-js: 3.23.3- escodegen: 2.0.0- fs-extra: 9.1.0- global: 4.4.0- html-tags: 3.2.0- lodash: 4.17.21- prop-types: 15.8.1- react: 17.0.2- react-dom: 17.0.2([email protected])- react-element-to-jsx-string: 14.3.4([email protected])([email protected])- react-refresh: 0.11.0- read-pkg-up: 7.0.1- regenerator-runtime: 0.13.11- require-from-string: 2.0.2- ts-dedent: 2.2.0- typescript: 4.9.5- util-deprecate: 1.0.2- webpack: 4.46.0- transitivePeerDependencies:- - '@storybook/mdx2-csf'- - '@types/webpack'- - bluebird- - bufferutil- - encoding- - eslint- - sockjs-client- - supports-color- - type-fest- - utf-8-validate- - vue-template-compiler- - webpack-cli- - webpack-command- - webpack-dev-server- - webpack-hot-middleware- - webpack-plugin-serve- dev: true-- /@storybook/[email protected](@babel/[email protected])([email protected])([email protected])([email protected])([email protected]):- resolution: {integrity: sha512-cBtNlOzf/MySpNLBK22lJ8wFU22HnfTB2xJyBk7W7Zi71Lm7Uxkhv1Pz8HdiQndJ0SlsAAQOWjQYsSZsGkZIaA==}- engines: {node: '>=10.13.0'}- hasBin: true- peerDependencies:- '@babel/core': ^7.11.5- '@storybook/builder-webpack4': '*'- '@storybook/builder-webpack5': '*'- '@storybook/manager-webpack4': '*'- '@storybook/manager-webpack5': '*'- react: ^16.8.0 || ^17.0.0 || ^18.0.0- react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0- require-from-string: ^2.0.2- typescript: '*'- peerDependenciesMeta:- '@babel/core':- optional: true- '@storybook/builder-webpack4':- optional: true- '@storybook/builder-webpack5':- optional: true- '@storybook/manager-webpack4':- optional: true- '@storybook/manager-webpack5':- optional: true- typescript:- optional: true- dependencies:- '@babel/core': 7.21.0- '@babel/preset-flow': 7.18.6(@babel/[email protected])- '@babel/preset-react': 7.18.6(@babel/[email protected])- '@pmmmwh/react-refresh-webpack-plugin': 0.5.7([email protected])([email protected])- '@storybook/addons': 6.5.16([email protected])([email protected])- '@storybook/client-logger': 6.5.16- '@storybook/core': 6.5.16([email protected])([email protected])([email protected])([email protected])+ '@storybook/core-common': 6.5.16([email protected])([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@@ -8179,7 +7913,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])([email protected])chalk: 4.1.2core-js: 3.23.3detect-package-manager: 2.0.1@@ -9261,7 +8995,6 @@ packages:resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}engines: {node: '>=6'}- dev: falseresolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}@@ -10116,7 +9849,7 @@ packages:minipass-pipeline: 1.2.4mkdirp: 1.0.4p-map: 4.0.0- promise-inflight: 1.0.1+ promise-inflight: 1.0.1([email protected])rimraf: 3.0.2ssri: 8.0.1tar: 6.1.13@@ -11385,7 +11118,6 @@ packages:engines: {node: '>=8.6'}dependencies:ansi-colors: 4.1.3- dev: falseresolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}@@ -11998,7 +11730,6 @@ packages:dependencies:esrecurse: 4.3.0estraverse: 5.3.0- dev: falseresolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}@@ -12018,17 +11749,14 @@ packages:dependencies:eslint: 8.4.1eslint-visitor-keys: 2.1.0- dev: falseresolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}engines: {node: '>=10'}- dev: falseresolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- dev: falseresolution: {integrity: sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==}@@ -12123,7 +11851,6 @@ packages:v8-compile-cache: 2.3.0transitivePeerDependencies:- supports-color- dev: falseresolution: {integrity: sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==}@@ -12141,7 +11868,6 @@ packages:acorn: 8.8.2acorn-jsx: 5.3.2([email protected])eslint-visitor-keys: 3.3.0- dev: falseresolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}@@ -12153,7 +11879,6 @@ packages:engines: {node: '>=0.10'}dependencies:estraverse: 5.3.0- dev: falseresolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}@@ -12525,7 +12250,6 @@ packages:engines: {node: ^10.12.0 || >=12.0.0}dependencies:flat-cache: 3.0.4- dev: falseresolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==}@@ -12730,38 +12454,6 @@ packages:tapable: 1.1.3typescript: 4.9.5webpack: 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: 4.9.5- webpack: 4.46.0- dev: trueresolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}@@ -12903,7 +12595,6 @@ packages:resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}- dev: falseresolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}@@ -13066,7 +12757,6 @@ packages:engines: {node: '>=10.13.0'}dependencies:is-glob: 4.0.3- dev: falseresolution: {integrity: sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==}@@ -13132,7 +12822,6 @@ packages:engines: {node: '>=8'}dependencies:type-fest: 0.20.2- dev: falseresolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}@@ -13452,7 +13141,6 @@ packages:resolution: {integrity: sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==}engines: {node: '>=8'}- dev: trueresolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==}@@ -13591,7 +13279,6 @@ packages:resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}engines: {node: '>= 4'}- dev: falseresolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}@@ -14277,33 +13964,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.3.1- chalk: 4.1.2- exit: 0.1.2- graceful-fs: 4.2.10- import-local: 3.1.0- jest-config: 29.3.1- jest-util: 29.3.1- jest-validate: 29.3.1- prompts: 2.4.2- yargs: 17.6.2- transitivePeerDependencies:- - '@types/node'- - supports-color- - ts-node-/[email protected](@types/[email protected]):resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -14330,44 +13990,6 @@ packages:- '@types/node'- supports-color- ts-node- dev: true-- resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}- peerDependencies:- '@types/node': '*'- ts-node: '>=9.0.0'- peerDependenciesMeta:- '@types/node':- optional: true- ts-node:- optional: true- dependencies:- '@babel/core': 7.21.0- '@jest/test-sequencer': 29.3.1- '@jest/types': 29.4.2- babel-jest: 29.3.1(@babel/[email protected])- chalk: 4.1.2- ci-info: 3.8.0- deepmerge: 4.3.0- glob: 7.2.3- graceful-fs: 4.2.10- jest-circus: 29.3.1- jest-environment-node: 29.3.1- jest-get-type: 29.4.2- jest-regex-util: 29.2.0- jest-resolve: 29.3.1- jest-runner: 29.3.1- jest-util: 29.4.2- jest-validate: 29.3.1- micromatch: 4.0.5- parse-json: 5.2.0- pretty-format: 29.4.2- slash: 3.0.0- strip-json-comments: 3.1.1- transitivePeerDependencies:- - supports-color/[email protected](@types/[email protected]):resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}@@ -14754,25 +14376,6 @@ packages:merge-stream: 2.0.0supports-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.3.1- import-local: 3.1.0- jest-cli: 29.3.1- transitivePeerDependencies:- - '@types/node'- - supports-color- - ts-node-/[email protected](@types/[email protected]):resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}@@ -14791,7 +14394,6 @@ packages:- '@types/node'- supports-color- ts-node- dev: trueresolution: {integrity: sha512-njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A==}@@ -14862,7 +14464,6 @@ packages:resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}- dev: falseresolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}@@ -14968,7 +14569,6 @@ packages:dependencies:prelude-ls: 1.2.1type-check: 0.4.0- dev: falseresolution: {integrity: sha512-0nhl2wsPR34fYphPPDdA9LGPx90klIsLokdx43Rl4UzvmGNK66todNkwkm0qsSSLgEVu8lBpGwo1Hwf58MfbuA==}@@ -15071,7 +14671,6 @@ packages:resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}- dev: falseresolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}@@ -16438,7 +16037,6 @@ packages:prelude-ls: 1.2.1type-check: 0.4.0word-wrap: 1.2.3- dev: falseresolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}@@ -17066,7 +16664,6 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}- dev: falseresolution: {integrity: sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==}@@ -17151,16 +16748,6 @@ packages:resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}engines: {node: '>=0.4.0'}- dev: false-- resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}- peerDependencies:- bluebird: '*'- peerDependenciesMeta:- bluebird:- optional: true- dev: trueresolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}@@ -17810,7 +17397,6 @@ packages:resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}engines: {node: '>=8'}- dev: falseresolution: {integrity: sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==}@@ -19196,7 +18782,6 @@ packages:resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}- dev: falseresolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}@@ -19509,7 +19094,6 @@ packages:engines: {node: '>= 0.8.0'}dependencies:prelude-ls: 1.2.1- dev: falseresolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}@@ -19988,7 +19572,6 @@ packages:resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}- dev: falseresolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}