diff --git a/front/apps/web/package.json b/front/apps/web/package.json index 7a55142a..6e988ac5 100644 --- a/front/apps/web/package.json +++ b/front/apps/web/package.json @@ -56,6 +56,7 @@ "@types/react-dom": "18.2.18", "react-native": "0.73.2", "typescript": "^5.3.3", + "vite-plugin-cjs-interop": "^2.1.0", "vite-plugin-react-native-web": "^1.0.2" } } diff --git a/front/apps/web/vite.config.ts b/front/apps/web/vite.config.ts index 5505458d..a9d0d530 100644 --- a/front/apps/web/vite.config.ts +++ b/front/apps/web/vite.config.ts @@ -1,5 +1,6 @@ import react from "@vitejs/plugin-react"; import reactNativeWeb from "vite-plugin-react-native-web"; +import { cjsInterop } from "vite-plugin-cjs-interop"; import vike from "vike/plugin"; import type { UserConfig } from "vite"; import path from "node:path"; @@ -13,15 +14,15 @@ export default { "~": path.resolve(__dirname, "./src"), }, }, - build: { - commonjsOptions: { - transformMixedEsModules: true, - }, - }, - optimizeDeps: { - esbuildOptions: { - mainFields: ["module", "main"], - }, - }, - plugins: [react(), vike(), reactNativeWeb()], + // build: { + // commonjsOptions: { + // transformMixedEsModules: true, + // }, + // }, + // optimizeDeps: { + // esbuildOptions: { + // mainFields: ["module", "main"], + // }, + // }, + plugins: [react(), vike(), reactNativeWeb()] } satisfies UserConfig; diff --git a/front/yarn.lock b/front/yarn.lock index 6695fea2..31e60581 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -3077,7 +3077,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 @@ -5030,7 +5030,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:1.0.5": +"@types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a @@ -5263,7 +5263,16 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.8.2": +"acorn-import-assertions@npm:^1.9.0": + version: 1.9.0 + resolution: "acorn-import-assertions@npm:1.9.0" + peerDependencies: + acorn: ^8 + checksum: 944fb2659d0845c467066bdcda2e20c05abe3aaf11972116df457ce2627628a81764d800dd55031ba19de513ee0d43bb771bc679cc0eda66dc8b4fade143bc0c + languageName: node + linkType: hard + +"acorn@npm:^8.0.0, acorn@npm:^8.11.3, acorn@npm:^8.8.2": version: 8.11.3 resolution: "acorn@npm:8.11.3" bin: @@ -7132,6 +7141,15 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^3.0.3": + version: 3.0.3 + resolution: "estree-walker@npm:3.0.3" + dependencies: + "@types/estree": ^1.0.0 + checksum: a65728d5727b71de172c5df323385755a16c0fdab8234dc756c3854cfee343261ddfbb72a809a5660fac8c75d960bb3e21aa898c2d7e9b19bb298482ca58a3af + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -9371,6 +9389,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.8": + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" + dependencies: + "@jridgewell/sourcemap-codec": ^1.4.15 + checksum: 456fd47c39b296c47dff967e1965121ace35417eab7f45a99e681e725b8661b48e1573c366ee67a27715025b3740773c46b088f115421c7365ea4ea6fa10d399 + languageName: node + linkType: hard + "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -9806,6 +9833,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^9.0.3": + version: 9.0.4 + resolution: "minimatch@npm:9.0.4" + dependencies: + brace-expansion: ^2.0.1 + checksum: cf717f597ec3eed7dabc33153482a2e8d49f4fd3c26e58fd9c71a94c5029a0838728841b93f46bf1263b65a8010e2ee800d0dc9b004ab8ba8b6d1ec07cc115b5 + languageName: node + linkType: hard + "minimist@npm:^1.2.0, minimist@npm:^1.2.6": version: 1.2.8 resolution: "minimist@npm:1.2.8" @@ -13075,6 +13111,19 @@ __metadata: languageName: node linkType: hard +"vite-plugin-cjs-interop@npm:^2.1.0": + version: 2.1.0 + resolution: "vite-plugin-cjs-interop@npm:2.1.0" + dependencies: + acorn: ^8.11.3 + acorn-import-assertions: ^1.9.0 + estree-walker: ^3.0.3 + magic-string: ^0.30.8 + minimatch: ^9.0.3 + checksum: 1bf6d10ee6f81652831d7be7ffb9c0113634f7c290c8d386f21ebcac801bb5d67f082d885d892faba57186ca2ca36ff2ce4f226eee62d0844e21be9b4214c912 + languageName: node + linkType: hard + "vite-plugin-react-native-web@npm:^1.0.2": version: 1.0.2 resolution: "vite-plugin-react-native-web@npm:1.0.2" @@ -13234,6 +13283,7 @@ __metadata: vike-react: ^0.4.8 vike-react-query: ^0.0.5 vite: ^5.2.11 + vite-plugin-cjs-interop: ^2.1.0 vite-plugin-react-native-web: ^1.0.2 yoshiki: 1.2.14 zod: ^3.22.4 diff --git a/shell.nix b/shell.nix index e9778d1e..86d5f94d 100644 --- a/shell.nix +++ b/shell.nix @@ -37,6 +37,7 @@ in postgresql_15 pgformatter biome + bun ]; DOTNET_ROOT = "${dotnet}";