From 7e18889e16a677f3b13b59eed069ff924243d31b Mon Sep 17 00:00:00 2001 From: IzumiSy Date: Thu, 10 Oct 2024 17:55:54 +0900 Subject: [PATCH 1/2] Resolve conflict --- packages/chakra-ui/package.json | 1 + .../chakra-ui/src/components/default/form.tsx | 2 +- packages/fabrix/package.json | 7 +- packages/fabrix/rhf/index.ts | 1 - packages/fabrix/tsup.config.ts | 2 +- pnpm-lock.yaml | 112 +++++++++++++----- 6 files changed, 88 insertions(+), 37 deletions(-) delete mode 100644 packages/fabrix/rhf/index.ts diff --git a/packages/chakra-ui/package.json b/packages/chakra-ui/package.json index c87ac4cf..79a16eb0 100644 --- a/packages/chakra-ui/package.json +++ b/packages/chakra-ui/package.json @@ -32,6 +32,7 @@ "chroma-js": "^3.0.0", "create-color": "^2.0.6", "framer-motion": "^11.3.17", + "react-hook-form": "^7.53.0", "zod": "^3.23.8" }, "peerDependencies": { diff --git a/packages/chakra-ui/src/components/default/form.tsx b/packages/chakra-ui/src/components/default/form.tsx index 72e77bb1..4851f28f 100644 --- a/packages/chakra-ui/src/components/default/form.tsx +++ b/packages/chakra-ui/src/components/default/form.tsx @@ -5,7 +5,7 @@ import { } from "@fabrix-framework/fabrix"; import { Switch, Input, Stack, Button, Box } from "@chakra-ui/react"; import { Select } from "chakra-react-select"; -import { useController } from "@fabrix-framework/fabrix/rhf"; +import { useController } from "react-hook-form"; import { LabelledHeading } from "./shared"; export const ChakraForm = (props: FormComponentProps) => { diff --git a/packages/fabrix/package.json b/packages/fabrix/package.json index 20c8d92a..448856e3 100644 --- a/packages/fabrix/package.json +++ b/packages/fabrix/package.json @@ -7,10 +7,6 @@ ".": { "types": "./dist/fabrix.d.mts", "default": "./dist/fabrix.mjs" - }, - "./rhf": { - "types": "./dist/rhf.d.mts", - "default": "./dist/rhf.mjs" } }, "files": [ @@ -37,7 +33,8 @@ "peerDependencies": { "graphql": "^16", "react": "^18", - "react-dom": "^18" + "react-dom": "^18", + "react-hook-form": "^7" }, "devDependencies": { "@fabrix-framework/eslint-config": "workspace:*", diff --git a/packages/fabrix/rhf/index.ts b/packages/fabrix/rhf/index.ts deleted file mode 100644 index 9a24123e..00000000 --- a/packages/fabrix/rhf/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "react-hook-form"; diff --git a/packages/fabrix/tsup.config.ts b/packages/fabrix/tsup.config.ts index c4b7b426..ee5e3e1e 100644 --- a/packages/fabrix/tsup.config.ts +++ b/packages/fabrix/tsup.config.ts @@ -12,7 +12,7 @@ const devOpts = export default defineConfig({ format: ["esm"], - entry: { fabrix: "src/index.ts", rhf: "rhf/index.ts" }, + entry: { fabrix: "src/index.ts" }, clean: true, minify: true, dts: true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 39314401..73cfa9f6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -135,6 +135,9 @@ importers: react-dom: specifier: ^18 version: 18.3.1(react@18.3.1) + react-hook-form: + specifier: ^7.53.0 + version: 7.53.0(react@18.3.1) zod: specifier: ^3.23.8 version: 3.23.8 @@ -149,8 +152,16 @@ importers: specifier: ^2.4.4 version: 2.4.4 '@types/node': +<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + specifier: ^20.14.10 + version: 22.7.5 +======= + specifier: ^20.14.10 + version: 20.16.11 +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) '@types/react': specifier: ^18.3.3 version: 18.3.11 @@ -222,8 +233,16 @@ importers: specifier: ^14.5.2 version: 14.5.2(@testing-library/dom@10.4.0) '@types/node': +<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + specifier: ^20.14.10 + version: 22.7.5 +======= + specifier: ^20.14.10 + version: 20.16.11 +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) '@types/react': specifier: ^18.3.3 version: 18.3.11 @@ -232,13 +251,21 @@ importers: version: 18.3.0 '@vitejs/plugin-react': specifier: ^4.3.1 - version: 4.3.2(vite@5.4.6(@types/node@22.7.5)) + version: 4.3.2(vite@5.4.6(@types/node@20.16.11)) eslint: specifier: ^9.6.0 version: 9.12.0 happy-dom: +<<<<<<< HEAD specifier: ^15.7.4 version: 15.7.4 +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + specifier: ^14.12.3 + version: 15.7.4 +======= + specifier: ^14.12.3 + version: 14.12.3 +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) msw: specifier: ^2.4.9 version: 2.4.9(typescript@5.6.3) @@ -253,10 +280,16 @@ importers: version: 5.6.3 vite-tsconfig-paths: specifier: ^4.3.2 +<<<<<<< HEAD version: 4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)) +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + version: 5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)) +======= + version: 4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@20.16.11)) +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) vitest: specifier: ^2.0.3 - version: 2.1.2(@types/node@22.7.5)(happy-dom@15.7.4)(msw@2.4.9(typescript@5.6.3)) + version: 2.1.2(@types/node@20.16.11)(happy-dom@14.12.3)(msw@2.4.9(typescript@5.6.3)) packages/graphql-config: dependencies: @@ -271,8 +304,16 @@ importers: specifier: workspace:* version: link:../../shared/prettier '@types/node': +<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + specifier: ^20.14.10 + version: 22.7.5 +======= + specifier: ^20.14.10 + version: 20.16.11 +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) eslint: specifier: ^9.6.0 version: 9.12.0 @@ -1370,6 +1411,9 @@ packages: '@types/node-fetch@2.6.11': resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} + '@types/node@20.16.11': + resolution: {integrity: sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==} + '@types/node@22.7.5': resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} @@ -2276,9 +2320,9 @@ packages: resolution: {integrity: sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - happy-dom@15.7.4: - resolution: {integrity: sha512-r1vadDYGMtsHAAsqhDuk4IpPvr6N8MGKy5ntBo7tSdim+pWDxus2PNqOcOt8LuDZ4t3KJHE+gCuzupcx/GKnyQ==} - engines: {node: '>=18.0.0'} + happy-dom@14.12.3: + resolution: {integrity: sha512-vsYlEs3E9gLwA1Hp+w3qzu+RUDFf4VTT8cyKqVICoZ2k7WM++Qyd2LwzyTi5bqMJFiIC/vNpTDYuxdreENRK/g==} + engines: {node: '>=16.0.0'} has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} @@ -3955,7 +3999,7 @@ snapshots: '@babel/parser': 7.25.6 '@babel/template': 7.25.0 '@babel/types': 7.25.6 - debug: 4.3.6 + debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -4657,13 +4701,13 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/chroma-js@2.4.4': {} '@types/connect@3.4.38': dependencies: - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/cookie@0.6.0': {} @@ -4673,7 +4717,7 @@ snapshots: '@types/express-serve-static-core@4.19.5': dependencies: - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/qs': 6.9.16 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -4703,13 +4747,17 @@ snapshots: '@types/mute-stream@0.0.4': dependencies: - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/node-fetch@2.6.11': dependencies: - '@types/node': 22.7.5 + '@types/node': 20.16.11 form-data: 4.0.0 + '@types/node@20.16.11': + dependencies: + undici-types: 6.19.8 + '@types/node@22.7.5': dependencies: undici-types: 6.19.8 @@ -4738,12 +4786,12 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/serve-static@1.15.7': dependencies: '@types/http-errors': 2.0.4 - '@types/node': 22.7.5 + '@types/node': 20.16.11 '@types/send': 0.17.4 '@types/statuses@2.0.5': {} @@ -4840,14 +4888,14 @@ snapshots: transitivePeerDependencies: - graphql - '@vitejs/plugin-react@4.3.2(vite@5.4.6(@types/node@22.7.5))': + '@vitejs/plugin-react@4.3.2(vite@5.4.6(@types/node@20.16.11))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.25.2) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.6(@types/node@22.7.5) + vite: 5.4.6(@types/node@20.16.11) transitivePeerDependencies: - supports-color @@ -4869,14 +4917,14 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.5))': + '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@20.16.11))': dependencies: '@vitest/spy': 2.1.2 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: msw: 2.4.9(typescript@5.6.3) - vite: 5.4.6(@types/node@22.7.5) + vite: 5.4.6(@types/node@20.16.11) '@vitest/pretty-format@2.1.2': dependencies: @@ -5866,7 +5914,7 @@ snapshots: graphql@16.9.0: {} - happy-dom@15.7.4: + happy-dom@14.12.3: dependencies: entities: 4.5.0 webidl-conversions: 7.0.0 @@ -7056,12 +7104,12 @@ snapshots: vary@1.1.2: {} - vite-node@2.1.2(@types/node@22.7.5): + vite-node@2.1.2(@types/node@20.16.11): dependencies: cac: 6.7.14 debug: 4.3.6 pathe: 1.1.2 - vite: 5.4.6(@types/node@22.7.5) + vite: 5.4.6(@types/node@20.16.11) transitivePeerDependencies: - '@types/node' - less @@ -7073,24 +7121,30 @@ snapshots: - supports-color - terser +<<<<<<< HEAD vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)): +||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) + vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)): +======= + vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@20.16.11)): +>>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.1.3(typescript@5.6.3) optionalDependencies: - vite: 5.4.6(@types/node@22.7.5) + vite: 5.4.6(@types/node@20.16.11) transitivePeerDependencies: - supports-color - typescript - vite@5.4.6(@types/node@22.7.5): + vite@5.4.6(@types/node@20.16.11): dependencies: esbuild: 0.21.5 postcss: 8.4.45 rollup: 4.21.2 optionalDependencies: - '@types/node': 22.7.5 + '@types/node': 20.16.11 fsevents: 2.3.3 vite@5.4.8(@types/node@22.7.5): @@ -7102,10 +7156,10 @@ snapshots: '@types/node': 22.7.5 fsevents: 2.3.3 - vitest@2.1.2(@types/node@22.7.5)(happy-dom@15.7.4)(msw@2.4.9(typescript@5.6.3)): + vitest@2.1.2(@types/node@20.16.11)(happy-dom@14.12.3)(msw@2.4.9(typescript@5.6.3)): dependencies: '@vitest/expect': 2.1.2 - '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.5)) + '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@20.16.11)) '@vitest/pretty-format': 2.1.2 '@vitest/runner': 2.1.2 '@vitest/snapshot': 2.1.2 @@ -7120,12 +7174,12 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.6(@types/node@22.7.5) - vite-node: 2.1.2(@types/node@22.7.5) + vite: 5.4.6(@types/node@20.16.11) + vite-node: 2.1.2(@types/node@20.16.11) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.7.5 - happy-dom: 15.7.4 + '@types/node': 20.16.11 + happy-dom: 14.12.3 transitivePeerDependencies: - less - lightningcss From 738dba1d3cb0f1d8c2820ec760d2197fa7c80dc4 Mon Sep 17 00:00:00 2001 From: IzumiSy Date: Thu, 10 Oct 2024 15:51:40 +0900 Subject: [PATCH 2/2] Remove @fabrix-framework/fabrix/rhf export --- pnpm-lock.yaml | 107 +++++++++++++------------------------------------ 1 file changed, 28 insertions(+), 79 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 73cfa9f6..b3038961 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,16 +152,8 @@ importers: specifier: ^2.4.4 version: 2.4.4 '@types/node': -<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - specifier: ^20.14.10 - version: 22.7.5 -======= - specifier: ^20.14.10 - version: 20.16.11 ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) '@types/react': specifier: ^18.3.3 version: 18.3.11 @@ -233,16 +225,8 @@ importers: specifier: ^14.5.2 version: 14.5.2(@testing-library/dom@10.4.0) '@types/node': -<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - specifier: ^20.14.10 - version: 22.7.5 -======= - specifier: ^20.14.10 - version: 20.16.11 ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) '@types/react': specifier: ^18.3.3 version: 18.3.11 @@ -251,21 +235,13 @@ importers: version: 18.3.0 '@vitejs/plugin-react': specifier: ^4.3.1 - version: 4.3.2(vite@5.4.6(@types/node@20.16.11)) + version: 4.3.2(vite@5.4.6(@types/node@22.7.5)) eslint: specifier: ^9.6.0 version: 9.12.0 happy-dom: -<<<<<<< HEAD specifier: ^15.7.4 version: 15.7.4 -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - specifier: ^14.12.3 - version: 15.7.4 -======= - specifier: ^14.12.3 - version: 14.12.3 ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) msw: specifier: ^2.4.9 version: 2.4.9(typescript@5.6.3) @@ -280,16 +256,10 @@ importers: version: 5.6.3 vite-tsconfig-paths: specifier: ^4.3.2 -<<<<<<< HEAD version: 4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)) -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - version: 5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)) -======= - version: 4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@20.16.11)) ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) vitest: specifier: ^2.0.3 - version: 2.1.2(@types/node@20.16.11)(happy-dom@14.12.3)(msw@2.4.9(typescript@5.6.3)) + version: 2.1.2(@types/node@22.7.5)(happy-dom@15.7.4)(msw@2.4.9(typescript@5.6.3)) packages/graphql-config: dependencies: @@ -304,16 +274,8 @@ importers: specifier: workspace:* version: link:../../shared/prettier '@types/node': -<<<<<<< HEAD specifier: ^22.7.5 version: 22.7.5 -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - specifier: ^20.14.10 - version: 22.7.5 -======= - specifier: ^20.14.10 - version: 20.16.11 ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) eslint: specifier: ^9.6.0 version: 9.12.0 @@ -1411,9 +1373,6 @@ packages: '@types/node-fetch@2.6.11': resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} - '@types/node@20.16.11': - resolution: {integrity: sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==} - '@types/node@22.7.5': resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} @@ -2320,9 +2279,9 @@ packages: resolution: {integrity: sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - happy-dom@14.12.3: - resolution: {integrity: sha512-vsYlEs3E9gLwA1Hp+w3qzu+RUDFf4VTT8cyKqVICoZ2k7WM++Qyd2LwzyTi5bqMJFiIC/vNpTDYuxdreENRK/g==} - engines: {node: '>=16.0.0'} + happy-dom@15.7.4: + resolution: {integrity: sha512-r1vadDYGMtsHAAsqhDuk4IpPvr6N8MGKy5ntBo7tSdim+pWDxus2PNqOcOt8LuDZ4t3KJHE+gCuzupcx/GKnyQ==} + engines: {node: '>=18.0.0'} has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} @@ -4701,13 +4660,13 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/chroma-js@2.4.4': {} '@types/connect@3.4.38': dependencies: - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/cookie@0.6.0': {} @@ -4717,7 +4676,7 @@ snapshots: '@types/express-serve-static-core@4.19.5': dependencies: - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/qs': 6.9.16 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -4747,17 +4706,13 @@ snapshots: '@types/mute-stream@0.0.4': dependencies: - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/node-fetch@2.6.11': dependencies: - '@types/node': 20.16.11 + '@types/node': 22.7.5 form-data: 4.0.0 - '@types/node@20.16.11': - dependencies: - undici-types: 6.19.8 - '@types/node@22.7.5': dependencies: undici-types: 6.19.8 @@ -4786,12 +4741,12 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/serve-static@1.15.7': dependencies: '@types/http-errors': 2.0.4 - '@types/node': 20.16.11 + '@types/node': 22.7.5 '@types/send': 0.17.4 '@types/statuses@2.0.5': {} @@ -4888,14 +4843,14 @@ snapshots: transitivePeerDependencies: - graphql - '@vitejs/plugin-react@4.3.2(vite@5.4.6(@types/node@20.16.11))': + '@vitejs/plugin-react@4.3.2(vite@5.4.6(@types/node@22.7.5))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.25.2) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.6(@types/node@20.16.11) + vite: 5.4.6(@types/node@22.7.5) transitivePeerDependencies: - supports-color @@ -4917,14 +4872,14 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@20.16.11))': + '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.5))': dependencies: '@vitest/spy': 2.1.2 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: msw: 2.4.9(typescript@5.6.3) - vite: 5.4.6(@types/node@20.16.11) + vite: 5.4.6(@types/node@22.7.5) '@vitest/pretty-format@2.1.2': dependencies: @@ -5914,7 +5869,7 @@ snapshots: graphql@16.9.0: {} - happy-dom@14.12.3: + happy-dom@15.7.4: dependencies: entities: 4.5.0 webidl-conversions: 7.0.0 @@ -7104,12 +7059,12 @@ snapshots: vary@1.1.2: {} - vite-node@2.1.2(@types/node@20.16.11): + vite-node@2.1.2(@types/node@22.7.5): dependencies: cac: 6.7.14 debug: 4.3.6 pathe: 1.1.2 - vite: 5.4.6(@types/node@20.16.11) + vite: 5.4.6(@types/node@22.7.5) transitivePeerDependencies: - '@types/node' - less @@ -7121,30 +7076,24 @@ snapshots: - supports-color - terser -<<<<<<< HEAD vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)): -||||||| parent of 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) - vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.5)): -======= - vite-tsconfig-paths@4.3.2(typescript@5.6.3)(vite@5.4.6(@types/node@20.16.11)): ->>>>>>> 2d951b7 (Remove @fabrix-framework/fabrix/rhf export) dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.1.3(typescript@5.6.3) optionalDependencies: - vite: 5.4.6(@types/node@20.16.11) + vite: 5.4.6(@types/node@22.7.5) transitivePeerDependencies: - supports-color - typescript - vite@5.4.6(@types/node@20.16.11): + vite@5.4.6(@types/node@22.7.5): dependencies: esbuild: 0.21.5 postcss: 8.4.45 rollup: 4.21.2 optionalDependencies: - '@types/node': 20.16.11 + '@types/node': 22.7.5 fsevents: 2.3.3 vite@5.4.8(@types/node@22.7.5): @@ -7156,10 +7105,10 @@ snapshots: '@types/node': 22.7.5 fsevents: 2.3.3 - vitest@2.1.2(@types/node@20.16.11)(happy-dom@14.12.3)(msw@2.4.9(typescript@5.6.3)): + vitest@2.1.2(@types/node@22.7.5)(happy-dom@15.7.4)(msw@2.4.9(typescript@5.6.3)): dependencies: '@vitest/expect': 2.1.2 - '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@20.16.11)) + '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(msw@2.4.9(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.5)) '@vitest/pretty-format': 2.1.2 '@vitest/runner': 2.1.2 '@vitest/snapshot': 2.1.2 @@ -7174,12 +7123,12 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.6(@types/node@20.16.11) - vite-node: 2.1.2(@types/node@20.16.11) + vite: 5.4.6(@types/node@22.7.5) + vite-node: 2.1.2(@types/node@22.7.5) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 20.16.11 - happy-dom: 14.12.3 + '@types/node': 22.7.5 + happy-dom: 15.7.4 transitivePeerDependencies: - less - lightningcss