From 81b92f7556411ac2e8e502c8c835431b9160279f Mon Sep 17 00:00:00 2001 From: MrWangJustToDo <2711470541@qq.com> Date: Thu, 14 Dec 2023 11:51:22 +0800 Subject: [PATCH] prepare release --- packages/myreact-dom/package.json | 6 +- .../src/client/api/create/hydrateCreate.ts | 4 +- packages/myreact-dom/src/shared/elementMap.ts | 1 + packages/myreact-jsx/package.json | 4 +- packages/myreact-reactivity/package.json | 4 +- packages/myreact-reconciler/package.json | 4 +- packages/myreact-refresh-tools/package.json | 4 +- packages/myreact-refresh-tools/src/runtime.ts | 2 +- packages/myreact-refresh/package.json | 8 +- packages/myreact-shared/src/version.ts | 2 +- packages/myreact-terminal/package.json | 6 +- packages/myreact-vite/package.json | 2 +- packages/myreact/package.json | 4 +- pnpm-lock.yaml | 166 ++++++++++-------- .../src/client/container/Section/Main.tsx | 4 + ui/ssr-example/src/client/styles/global.scss | 5 + ui/ssr-example/src/client/utils/markdown.ts | 2 +- ui/vite-example/package.json | 12 +- ui/vite-example/src/App.tsx | 2 +- ui/vite-example/src/Example.tsx | 2 +- 20 files changed, 138 insertions(+), 106 deletions(-) diff --git a/packages/myreact-dom/package.json b/packages/myreact-dom/package.json index f57a43d5..cb61e3e1 100644 --- a/packages/myreact-dom/package.json +++ b/packages/myreact-dom/package.json @@ -90,10 +90,10 @@ "react-dom client" ], "devDependencies": { - "@my-react/react-shared": "^0.2.5", - "@my-react/react-reconciler": "^0.2.5" + "@my-react/react-shared": "^0.2.8", + "@my-react/react-reconciler": "^0.2.8" }, "peerDependencies": { - "@my-react/react": ">=0.2.5" + "@my-react/react": ">=0.2.8" } } diff --git a/packages/myreact-dom/src/client/api/create/hydrateCreate.ts b/packages/myreact-dom/src/client/api/create/hydrateCreate.ts index d45db839..e6ce485a 100644 --- a/packages/myreact-dom/src/client/api/create/hydrateCreate.ts +++ b/packages/myreact-dom/src/client/api/create/hydrateCreate.ts @@ -13,7 +13,9 @@ export const hydrateCreate = (fiber: MyReactFiberNode, parentFiberWithDom: MyRea if (include(fiber.type, NODE_TYPE.__text__ | NODE_TYPE.__plain__ | NODE_TYPE.__comment__)) { const maybeContainer = parentFiberWithDom as MyReactFiberContainer; - const parentDom = (parentFiberWithDom.nativeNode || maybeContainer.containerNode) as DomElement; + const parentDom = (parentFiberWithDom?.nativeNode || maybeContainer?.containerNode) as DomElement; + + if (!parentDom) throw new Error('[@my-react/react-dom] hydrate error, parent dom not found'); const result = getHydrateDom(fiber, parentDom, previousDom); diff --git a/packages/myreact-dom/src/shared/elementMap.ts b/packages/myreact-dom/src/shared/elementMap.ts index d2e5422c..30286999 100644 --- a/packages/myreact-dom/src/shared/elementMap.ts +++ b/packages/myreact-dom/src/shared/elementMap.ts @@ -6,6 +6,7 @@ import type { ServerDomDispatch, LegacyServerStreamDispatch } from "@my-react-do /** * @internal + * TODO */ export const initialElementMap = (_fiber: MyReactFiberNode, _dispatch: ClientDomDispatch | ServerDomDispatch | LegacyServerStreamDispatch) => { let isSVG = _fiber.elementType === "svg"; diff --git a/packages/myreact-jsx/package.json b/packages/myreact-jsx/package.json index bee7ca2e..3471056c 100644 --- a/packages/myreact-jsx/package.json +++ b/packages/myreact-jsx/package.json @@ -37,9 +37,9 @@ ] }, "devDependencies": { - "@my-react/react-shared": "^0.2.5" + "@my-react/react-shared": "^0.2.8" }, "peerDependencies": { - "@my-react/react": ">=0.2.5" + "@my-react/react": ">=0.2.8" } } diff --git a/packages/myreact-reactivity/package.json b/packages/myreact-reactivity/package.json index 35ef7e73..198950e3 100644 --- a/packages/myreact-reactivity/package.json +++ b/packages/myreact-reactivity/package.json @@ -47,9 +47,9 @@ ] }, "devDependencies": { - "@my-react/react-shared": "^0.2.5" + "@my-react/react-shared": "^0.2.8" }, "peerDependencies": { - "@my-react/react": ">=0.2.5" + "@my-react/react": ">=0.2.8" } } diff --git a/packages/myreact-reconciler/package.json b/packages/myreact-reconciler/package.json index e4ea4106..04599dea 100644 --- a/packages/myreact-reconciler/package.json +++ b/packages/myreact-reconciler/package.json @@ -34,9 +34,9 @@ ] }, "devDependencies": { - "@my-react/react-shared": "^0.2.5" + "@my-react/react-shared": "^0.2.8" }, "peerDependencies": { - "@my-react/react": ">=0.2.5" + "@my-react/react": ">=0.2.8" } } diff --git a/packages/myreact-refresh-tools/package.json b/packages/myreact-refresh-tools/package.json index ec3dc3ba..e1948092 100644 --- a/packages/myreact-refresh-tools/package.json +++ b/packages/myreact-refresh-tools/package.json @@ -56,7 +56,7 @@ } ], "devDependencies": { - "@my-react/react-shared": "^0.2.5" + "@my-react/react-shared": "^0.2.8" }, "peerDependenciesMeta": { "webpack": { @@ -64,7 +64,7 @@ } }, "peerDependencies": { - "@my-react/react-refresh": ">=0.2.5", + "@my-react/react-refresh": ">=0.2.8", "webpack": "^4 || ^5" } } diff --git a/packages/myreact-refresh-tools/src/runtime.ts b/packages/myreact-refresh-tools/src/runtime.ts index 45d793c1..10ac856c 100644 --- a/packages/myreact-refresh-tools/src/runtime.ts +++ b/packages/myreact-refresh-tools/src/runtime.ts @@ -3,7 +3,7 @@ import { compareVersion } from "@my-react/react-shared"; import RefreshHelpers from "./internal/helpers"; -if (!RefreshRuntime.version || !compareVersion(RefreshRuntime.version, "0.2.5")) { +if (!RefreshRuntime.version || !compareVersion(RefreshRuntime.version, "0.2.8")) { console.error( `[@my-react/react-refresh-tools] current RefreshRuntime version not match for the package required, please reinstall "@my-react/react-refresh" to fix this issue` ); diff --git a/packages/myreact-refresh/package.json b/packages/myreact-refresh/package.json index a6cc43eb..bc6d2fa7 100644 --- a/packages/myreact-refresh/package.json +++ b/packages/myreact-refresh/package.json @@ -50,11 +50,11 @@ } ], "devDependencies": { - "@my-react/react-shared": "^0.2.5", - "@my-react/react-reconciler": "^0.2.5" + "@my-react/react-shared": "^0.2.8", + "@my-react/react-reconciler": "^0.2.8" }, "peerDependencies": { - "@my-react/react": ">=0.2.5", - "@my-react/react-dom": ">=0.2.5" + "@my-react/react": ">=0.2.8", + "@my-react/react-dom": ">=0.2.8" } } diff --git a/packages/myreact-shared/src/version.ts b/packages/myreact-shared/src/version.ts index ebcc64b2..4eab0bc7 100644 --- a/packages/myreact-shared/src/version.ts +++ b/packages/myreact-shared/src/version.ts @@ -9,7 +9,7 @@ export const compareVersion = (version1: string, version2: string) => { } if (arr1.length) return true; if (arr2.length) return false; - return null; + return true; }; return compare(version1.split(".").map(Number), version2.split(".").map(Number)); diff --git a/packages/myreact-terminal/package.json b/packages/myreact-terminal/package.json index 058b1323..b1de9c1e 100644 --- a/packages/myreact-terminal/package.json +++ b/packages/myreact-terminal/package.json @@ -59,8 +59,8 @@ "yoga-wasm-web": "^0.3.3" }, "devDependencies": { - "@my-react/react-shared": "^0.2.5", - "@my-react/react-reconciler": "^0.2.5", + "@my-react/react-shared": "^0.2.8", + "@my-react/react-reconciler": "^0.2.8", "@types/lodash": "^4.14.195", "@types/signal-exit": "^3.0.1", "@types/slice-ansi": "^5.0.0", @@ -68,6 +68,6 @@ "@types/wrap-ansi": "^8.0.1" }, "peerDependencies": { - "@my-react/react": ">=0.2.5" + "@my-react/react": ">=0.2.8" } } diff --git a/packages/myreact-vite/package.json b/packages/myreact-vite/package.json index 86631d88..c57f2a7d 100644 --- a/packages/myreact-vite/package.json +++ b/packages/myreact-vite/package.json @@ -54,7 +54,7 @@ } ], "peerDependencies": { - "@my-react/react-refresh": ">=0.2.5", + "@my-react/react-refresh": ">=0.2.8", "vite": "^4.2.0 || ^5.0.0" }, "dependencies": { diff --git a/packages/myreact/package.json b/packages/myreact/package.json index 2565f2b3..b4ff470d 100644 --- a/packages/myreact/package.json +++ b/packages/myreact/package.json @@ -54,9 +54,9 @@ "react like" ], "dependencies": { - "@my-react/react-jsx": "^0.2.5" + "@my-react/react-jsx": "^0.2.8" }, "devDependencies": { - "@my-react/react-shared": "^0.2.5" + "@my-react/react-shared": "^0.2.8" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a17bc5a8..43f31838 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -129,83 +129,83 @@ importers: packages/myreact: dependencies: '@my-react/react-jsx': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-jsx devDependencies: '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-dom: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact devDependencies: '@my-react/react-reconciler': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-reconciler '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-jsx: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact devDependencies: '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-reactivity: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact devDependencies: '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-reconciler: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact devDependencies: '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-refresh: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact '@my-react/react-dom': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact-dom devDependencies: '@my-react/react-reconciler': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-reconciler '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-refresh-tools: dependencies: '@my-react/react-refresh': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact-refresh webpack: specifier: ^4 || ^5 version: 5.88.1(@swc/core@1.3.76) devDependencies: '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared packages/myreact-shared: {} @@ -213,7 +213,7 @@ importers: packages/myreact-terminal: dependencies: '@my-react/react': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact ansi-escapes: specifier: ^6.2.0 @@ -271,10 +271,10 @@ importers: version: 0.3.3 devDependencies: '@my-react/react-reconciler': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-reconciler '@my-react/react-shared': - specifier: ^0.2.5 + specifier: ^0.2.8 version: link:../myreact-shared '@types/lodash': specifier: ^4.14.195 @@ -304,7 +304,7 @@ importers: specifier: ^7.22.5 version: 7.22.5(@babel/core@7.22.5) '@my-react/react-refresh': - specifier: '>=0.2.5' + specifier: '>=0.2.8' version: link:../myreact-refresh vite: specifier: ^4.2.0 || ^5.0.0 @@ -981,14 +981,14 @@ importers: ui/vite-example: dependencies: '@mantine/core': - specifier: 7.1.0 - version: 7.1.0(@mantine/hooks@7.1.0)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) + specifier: 7.3.1 + version: 7.3.1(@mantine/hooks@7.3.1)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) '@mantine/hooks': - specifier: 7.1.0 - version: 7.1.0(react@18.2.0) + specifier: 7.3.1 + version: 7.3.1(react@18.2.0) '@mantine/vanilla-extract': - specifier: 7.1.0 - version: 7.1.0(@mantine/core@7.1.0) + specifier: 7.3.1 + version: 7.3.1(@mantine/core@7.3.1) '@my-react/react': specifier: workspace:* version: link:../../packages/myreact @@ -996,8 +996,8 @@ importers: specifier: workspace:* version: link:../../packages/myreact-dom '@vanilla-extract/css': - specifier: ^1.13.0 - version: 1.13.0 + specifier: ^1.14.0 + version: 1.14.0 react: specifier: ^18.2.0 version: 18.2.0 @@ -1021,8 +1021,8 @@ importers: specifier: ^18.2.7 version: 18.2.7 '@vanilla-extract/vite-plugin': - specifier: ^3.9.0 - version: 3.9.0(@types/node@20.5.7)(ts-node@10.9.1)(vite@5.0.4) + specifier: ^3.9.3 + version: 3.9.3(@types/node@20.5.7)(ts-node@10.9.1)(vite@5.0.4) eslint: specifier: ^8.48.0 version: 8.48.0 @@ -1030,8 +1030,8 @@ importers: specifier: ^8.4.28 version: 8.4.28 postcss-preset-mantine: - specifier: ^1.7.0 - version: 1.7.0(postcss@8.4.28) + specifier: ^1.11.1 + version: 1.11.1(postcss@8.4.28) postcss-simple-vars: specifier: ^7.0.1 version: 7.0.1(postcss@8.4.28) @@ -5593,40 +5593,40 @@ packages: webpack: 5.88.2(@swc/core@1.3.76) dev: true - /@mantine/core@7.1.0(@mantine/hooks@7.1.0)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-DNexnix5Lz7na8bfXCNVDsCsorxMzF1we3mtU33B0mLyiLkH47BhpgKNxvf5OjEK5SUJ0Bi7r5m91Tm7pmAB7w==} + /@mantine/core@7.3.1(@mantine/hooks@7.3.1)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-WIesapVzK1ERFcALuosaEPuODN/k/FGkryf2d12R7vsDmxmWqX6yNzPUoJDy6j20ueAkyyg4beJZ4PuZfCRW9Q==} peerDependencies: - '@mantine/hooks': 7.1.0 + '@mantine/hooks': 7.3.1 react: ^18.2.0 react-dom: ^18.2.0 dependencies: '@floating-ui/react': 0.24.8(react-dom@18.2.0)(react@18.2.0) - '@mantine/hooks': 7.1.0(react@18.2.0) + '@mantine/hooks': 7.3.1(react@18.2.0) clsx: 2.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-number-format: 5.3.1(react-dom@18.2.0)(react@18.2.0) - react-remove-scroll: 2.5.6(@types/react@18.2.21)(react@18.2.0) - react-textarea-autosize: 8.5.2(@types/react@18.2.21)(react@18.2.0) + react-remove-scroll: 2.5.7(@types/react@18.2.21)(react@18.2.0) + react-textarea-autosize: 8.5.3(@types/react@18.2.21)(react@18.2.0) type-fest: 3.13.1 transitivePeerDependencies: - '@types/react' dev: false - /@mantine/hooks@7.1.0(react@18.2.0): - resolution: {integrity: sha512-XW8qYNoS81bIWmdI7yZV8BmBkTtr0//3fyBJ2dcKRSKWY5HVNPkLDXPQk9/E4bpQIRmufDGQ6pLmUfY+0VjO3g==} + /@mantine/hooks@7.3.1(react@18.2.0): + resolution: {integrity: sha512-pbbqPpVou/13xbt/dYYNphPpbDE2XfPN9mUHBoGZgv9FM8IkziNMIOo4PtNlqqqYsyp1lfQIQVKKT+DLZt1C8Q==} peerDependencies: react: ^18.2.0 dependencies: react: 18.2.0 dev: false - /@mantine/vanilla-extract@7.1.0(@mantine/core@7.1.0): - resolution: {integrity: sha512-43Tc3lpe4c7tj//1swxi/KRxoAnBpiKmENcUVBnAt62JnUlGDwU+j+TA6OSG8iwYr97GP9OUcTzuAyfuj6QvFA==} + /@mantine/vanilla-extract@7.3.1(@mantine/core@7.3.1): + resolution: {integrity: sha512-EeqAWwP4BOgJZzIip0OvnCx52un/z8gEQ6LQeHUEAd1M6ebzY4IPcmzrYZAQ0bZeBoPmRDSHAyw9wn8cWEbDjw==} peerDependencies: - '@mantine/core': 7.1.0 + '@mantine/core': 7.3.1 dependencies: - '@mantine/core': 7.1.0(@mantine/hooks@7.1.0)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) + '@mantine/core': 7.3.1(@mantine/hooks@7.3.1)(@types/react@18.2.21)(react-dom@18.2.0)(react@18.2.0) dev: false /@mapbox/node-pre-gyp@1.0.10: @@ -7660,12 +7660,11 @@ packages: - supports-color dev: true - /@vanilla-extract/css@1.13.0: - resolution: {integrity: sha512-JFFBXhnJrPlGqHBabagXqo5ghXw9mtV270ycIGyLDZG8NAK5eRwAYkMowAxuzK7wZSm67GnETWYB7b0AUmyttg==} + /@vanilla-extract/css@1.14.0: + resolution: {integrity: sha512-rYfm7JciWZ8PFzBM/HDiE2GLnKI3xJ6/vdmVJ5BSgcCZ5CxRlM9Cjqclni9lGzF3eMOijnUhCd/KV8TOzyzbMA==} dependencies: '@emotion/hash': 0.9.1 '@vanilla-extract/private': 1.0.3 - ahocorasick: 1.0.2 chalk: 4.1.2 css-what: 6.1.0 cssesc: 3.0.0 @@ -7673,15 +7672,16 @@ packages: deep-object-diff: 1.1.9 deepmerge: 4.3.0 media-query-parser: 2.0.2 + modern-ahocorasick: 1.0.1 outdent: 0.8.0 - /@vanilla-extract/integration@6.2.2(@types/node@20.5.7): - resolution: {integrity: sha512-gV3qPFjFap1+IrPeuFy+tEZOq7l7ifJf1ik/kluDWhPr1ffsFG9puq1/jjJ4rod1BIC79Q5ZWPNvBInHyxfCew==} + /@vanilla-extract/integration@6.2.4(@types/node@20.5.7): + resolution: {integrity: sha512-+AfymNMVq9sEUe0OJpdCokmPZg4Zi6CqKaW/PnUOfDwEn53ighHOMOBl5hAgxYR8Kiz9NG43Bn00mkjWlFi+ng==} dependencies: '@babel/core': 7.22.5 '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.5) '@vanilla-extract/babel-plugin-debug-ids': 1.0.3 - '@vanilla-extract/css': 1.13.0 + '@vanilla-extract/css': 1.14.0 esbuild: 0.17.6 eval: 0.1.8 find-up: 5.0.0 @@ -7705,15 +7705,15 @@ packages: /@vanilla-extract/private@1.0.3: resolution: {integrity: sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==} - /@vanilla-extract/vite-plugin@3.9.0(@types/node@20.5.7)(ts-node@10.9.1)(vite@5.0.4): - resolution: {integrity: sha512-Q2HYAyEJ93Uy7GHQPPiP8SXwPMHGpd4d0YnrIQqB0YZccYbGJR/WFIln9Dmbzx2pdngQUoOfhwEg6kJF8sQrog==} + /@vanilla-extract/vite-plugin@3.9.3(@types/node@20.5.7)(ts-node@10.9.1)(vite@5.0.4): + resolution: {integrity: sha512-bGyHG98OYTRs5roLRv7LDeyRnD72+vBLonk8cC9VG/xd6hsiHPPj5GyBwoKElT7DyDRfapxWLwLlhgYynrW2Fw==} peerDependencies: - vite: ^2.2.3 || ^3.0.0 || ^4.0.3 + vite: ^2.2.3 || ^3.0.0 || ^4.0.3 || ^5.0.0 dependencies: - '@vanilla-extract/integration': 6.2.2(@types/node@20.5.7) + '@vanilla-extract/integration': 6.2.4(@types/node@20.5.7) outdent: 0.8.0 - postcss: 8.4.28 - postcss-load-config: 3.1.4(postcss@8.4.28)(ts-node@10.9.1) + postcss: 8.4.32 + postcss-load-config: 4.0.1(postcss@8.4.32)(ts-node@10.9.1) vite: 5.0.4(@types/node@20.5.7) transitivePeerDependencies: - '@types/node' @@ -8019,9 +8019,6 @@ packages: clean-stack: 2.2.0 indent-string: 4.0.0 - /ahocorasick@1.0.2: - resolution: {integrity: sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==} - /ajv-formats@2.1.1(ajv@8.12.0): resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} peerDependencies: @@ -12321,6 +12318,9 @@ packages: ufo: 1.3.1 dev: true + /modern-ahocorasick@1.0.1: + resolution: {integrity: sha512-yoe+JbhTClckZ67b2itRtistFKf8yPYelHLc7e5xAwtNAXxM6wJTUx2C7QeVSJFDzKT7bCIFyBVybPMKvmB9AA==} + /module-alias@2.2.3: resolution: {integrity: sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==} dev: false @@ -13114,9 +13114,9 @@ packages: camelcase-css: 2.0.1 postcss: 8.4.28 - /postcss-load-config@3.1.4(postcss@8.4.28)(ts-node@10.9.1): - resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} - engines: {node: '>= 10'} + /postcss-load-config@4.0.1(postcss@8.4.28)(ts-node@10.9.1): + resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} + engines: {node: '>= 14'} peerDependencies: postcss: '>=8.0.9' ts-node: '>=9.0.0' @@ -13129,10 +13129,10 @@ packages: lilconfig: 2.1.0 postcss: 8.4.28 ts-node: 10.9.1(@swc/core@1.3.76)(@types/node@20.5.7)(typescript@4.9.5) - yaml: 1.10.2 - dev: true + yaml: 2.3.1 + dev: false - /postcss-load-config@4.0.1(postcss@8.4.28)(ts-node@10.9.1): + /postcss-load-config@4.0.1(postcss@8.4.32)(ts-node@10.9.1): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -13145,10 +13145,10 @@ packages: optional: true dependencies: lilconfig: 2.1.0 - postcss: 8.4.28 + postcss: 8.4.32 ts-node: 10.9.1(@swc/core@1.3.76)(@types/node@20.5.7)(typescript@4.9.5) yaml: 2.3.1 - dev: false + dev: true /postcss-loader@7.3.3(postcss@8.4.28)(webpack@5.88.2): resolution: {integrity: sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==} @@ -13399,8 +13399,8 @@ packages: postcss-value-parser: 4.2.0 dev: false - /postcss-preset-mantine@1.7.0(postcss@8.4.28): - resolution: {integrity: sha512-mA3Qr57P/M4qCuGAgLlGwcMTDtZlG3nouUgq5lIv50WDpuqHme9d7GA6FngBb37pLKYKngTkR2TXP+v5HxvW/g==} + /postcss-preset-mantine@1.11.1(postcss@8.4.28): + resolution: {integrity: sha512-BMO+VzLP1X6Tm5sfmnFINpYsgVyN4LJheKz+25kT4JcPqccByIo4N0HCHI9B2zzduvdYadg6O/e+yQV7xLOs4g==} peerDependencies: postcss: '>=8.0.0' dependencies: @@ -13959,6 +13959,25 @@ packages: use-sidecar: 1.1.2(@types/react@18.2.21)(react@18.2.0) dev: false + /react-remove-scroll@2.5.7(@types/react@18.2.21)(react@18.2.0): + resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==} + engines: {node: '>=10'} + peerDependencies: + '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + dependencies: + '@types/react': 18.2.21 + react: 18.2.0 + react-remove-scroll-bar: 2.3.4(@types/react@18.2.21)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.21)(react@18.2.0) + tslib: 2.6.0 + use-callback-ref: 1.3.0(@types/react@18.2.21)(react@18.2.0) + use-sidecar: 1.1.2(@types/react@18.2.21)(react@18.2.0) + dev: false + /react-resizable@3.0.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-vKpeHhI5OZvYn82kXOs1bC8aOXktGU5AmKAgaZS4F5JPburCtbmDPqE7Pzp+1kN4+Wb81LlF33VpGwWwtXem+w==} peerDependencies: @@ -14043,8 +14062,8 @@ packages: tslib: 2.6.0 dev: false - /react-textarea-autosize@8.5.2(@types/react@18.2.21)(react@18.2.0): - resolution: {integrity: sha512-uOkyjkEl0ByEK21eCJMHDGBAAd/BoFQBawYK5XItjAmCTeSbjxghd8qnt7nzsLYzidjnoObu6M26xts0YGKsGg==} + /react-textarea-autosize@8.5.3(@types/react@18.2.21)(react@18.2.0): + resolution: {integrity: sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==} engines: {node: '>=10'} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -16030,7 +16049,7 @@ packages: dependencies: '@types/node': 20.5.7 esbuild: 0.18.20 - postcss: 8.4.28 + postcss: 8.4.32 rollup: 3.28.0 optionalDependencies: fsevents: 2.3.3 @@ -16518,6 +16537,7 @@ packages: /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} + dev: false /yaml@2.3.1: resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} diff --git a/ui/ssr-example/src/client/container/Section/Main.tsx b/ui/ssr-example/src/client/container/Section/Main.tsx index e76cfb43..69a8ca4c 100644 --- a/ui/ssr-example/src/client/container/Section/Main.tsx +++ b/ui/ssr-example/src/client/container/Section/Main.tsx @@ -13,6 +13,10 @@ const tsxMd = ` import { useState, useCallback } from '@my-react/react'; import { render } from '@my-react/react-dom'; +/** + * hello world + */ + const useCount = () => { const [state, setState] = useState(0); const add = useCallback(() => setState(i => i + 1), []); diff --git a/ui/ssr-example/src/client/styles/global.scss b/ui/ssr-example/src/client/styles/global.scss index 9649a748..cde1e3d4 100644 --- a/ui/ssr-example/src/client/styles/global.scss +++ b/ui/ssr-example/src/client/styles/global.scss @@ -416,3 +416,8 @@ blockquote { .text-info { color: var(--chakra-colors-green-300); } + +.code-num { + color: initial; + font-style: initial; +} diff --git a/ui/ssr-example/src/client/utils/markdown.ts b/ui/ssr-example/src/client/utils/markdown.ts index ef14a6a6..6b229e41 100644 --- a/ui/ssr-example/src/client/utils/markdown.ts +++ b/ui/ssr-example/src/client/utils/markdown.ts @@ -23,7 +23,7 @@ const mark = new Mark({ const minWidth = String(transformArr.length).length - 0.2; const html = transformArr.reduce( (p: string, c: string, idx: number) => - `${p}${ + `${p}${ idx + 1 }${c}\n`, `
diff --git a/ui/vite-example/package.json b/ui/vite-example/package.json index c6e1cc67..a4c06f3b 100644 --- a/ui/vite-example/package.json +++ b/ui/vite-example/package.json @@ -9,12 +9,12 @@ "preview": "vite preview" }, "dependencies": { - "@mantine/core": "7.1.0", - "@mantine/hooks": "7.1.0", - "@mantine/vanilla-extract": "7.1.0", + "@mantine/core": "7.3.1", + "@mantine/hooks": "7.3.1", + "@mantine/vanilla-extract": "7.3.1", "@my-react/react": "workspace:*", "@my-react/react-dom": "workspace:*", - "@vanilla-extract/css": "^1.13.0", + "@vanilla-extract/css": "^1.14.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, @@ -24,10 +24,10 @@ "@types/node": "^20.5.7", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "@vanilla-extract/vite-plugin": "^3.9.0", + "@vanilla-extract/vite-plugin": "^3.9.3", "eslint": "^8.48.0", "postcss": "^8.4.28", - "postcss-preset-mantine": "^1.7.0", + "postcss-preset-mantine": "^1.11.1", "postcss-simple-vars": "^7.0.1", "typescript": "^5.2.2", "vite": "^5.0.4" diff --git a/ui/vite-example/src/App.tsx b/ui/vite-example/src/App.tsx index 3f1f9158..6c1a11d9 100644 --- a/ui/vite-example/src/App.tsx +++ b/ui/vite-example/src/App.tsx @@ -26,7 +26,7 @@ function App() { Edit src/App.tsx and save to test HMR

- + diff --git a/ui/vite-example/src/Example.tsx b/ui/vite-example/src/Example.tsx index 930fe447..82fd9b0b 100644 --- a/ui/vite-example/src/Example.tsx +++ b/ui/vite-example/src/Example.tsx @@ -44,7 +44,7 @@ export const Example = () => { ]} /> - +