From e16afd9b7499d1114f51a7532346b531627cd493 Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 9 May 2024 17:38:36 -0700 Subject: [PATCH] chore: update optimizeDeps for prod chore: move depDep to prod dep. --- packages/remix-dev/package.json | 4 +- packages/remix-dev/vite/plugin.ts | 11 +++++ pnpm-lock.yaml | 79 ++++++++++++++++--------------- 3 files changed, 54 insertions(+), 40 deletions(-) diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json index 4a701778fa..7060132d83 100644 --- a/packages/remix-dev/package.json +++ b/packages/remix-dev/package.json @@ -47,7 +47,8 @@ "react-refresh": "^0.14.0", "react-router": "workspace:*", "semver": "^7.3.7", - "set-cookie-parser": "^2.6.0" + "set-cookie-parser": "^2.6.0", + "unplugin-rsc": "0.0.9" }, "devDependencies": { "@react-router/serve": "workspace:*", @@ -72,7 +73,6 @@ "react-server-dom-diy": "0.0.0-experimental-15a3a5622-202404158", "strip-ansi": "^6.0.1", "tiny-invariant": "^1.2.0", - "unplugin-rsc": "0.0.9", "vite": "^5.1.0", "wrangler": "^3.28.2" }, diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts index 7141b6b54a..741a760c69 100644 --- a/packages/remix-dev/vite/plugin.ts +++ b/packages/remix-dev/vite/plugin.ts @@ -1671,6 +1671,17 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = (_config) => { const env = process.env.REACT_SERVER_BUILD ? "server" : "client"; switch (env) { + case "client": + return { + optimizeDeps: { + include: [ + "react", + "react/jsx-runtime", + "react/jsx-dev-runtime", + "react-server-dom-diy/client", + ], + }, + }; case "server": return { optimizeDeps: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e55bc0e10d..a14e255b51 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -633,6 +633,9 @@ importers: typescript: specifier: ^5.1.0 version: 5.1.6 + unplugin-rsc: + specifier: 0.0.9 + version: 0.0.9(rollup@2.79.1) devDependencies: '@react-router/serve': specifier: workspace:* @@ -700,9 +703,6 @@ importers: tiny-invariant: specifier: ^1.2.0 version: 1.3.3 - unplugin-rsc: - specifier: 0.0.9 - version: 0.0.9(rollup@2.79.1) vite: specifier: ^5.1.0 version: 5.1.3(@types/node@18.19.26) @@ -3955,7 +3955,7 @@ packages: cpu: [ppc64] os: [aix] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/aix-ppc64@0.19.12: @@ -3988,7 +3988,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/android-arm64@0.19.12: @@ -4021,7 +4021,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/android-arm@0.19.12: @@ -4054,7 +4054,7 @@ packages: cpu: [x64] os: [android] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/android-x64@0.19.12: @@ -4087,7 +4087,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/darwin-arm64@0.19.12: @@ -4120,7 +4120,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/darwin-x64@0.19.12: @@ -4153,7 +4153,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/freebsd-arm64@0.19.12: @@ -4186,7 +4186,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/freebsd-x64@0.19.12: @@ -4219,7 +4219,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-arm64@0.19.12: @@ -4252,7 +4252,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-arm@0.19.12: @@ -4285,7 +4285,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-ia32@0.19.12: @@ -4318,7 +4318,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-loong64@0.19.12: @@ -4351,7 +4351,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-mips64el@0.19.12: @@ -4384,7 +4384,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-ppc64@0.19.12: @@ -4417,7 +4417,7 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-riscv64@0.19.12: @@ -4450,7 +4450,7 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-s390x@0.19.12: @@ -4483,7 +4483,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/linux-x64@0.19.12: @@ -4516,7 +4516,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/netbsd-x64@0.19.12: @@ -4549,7 +4549,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/openbsd-x64@0.19.12: @@ -4582,7 +4582,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/sunos-x64@0.19.12: @@ -4615,7 +4615,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/win32-arm64@0.19.12: @@ -4648,7 +4648,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/win32-ia32@0.19.12: @@ -4681,7 +4681,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /@esbuild/win32-x64@0.19.12: @@ -5419,7 +5419,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi-darwin-x64@0.2.0: @@ -5427,7 +5427,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi-linux-arm64-gnu@0.2.0: @@ -5435,7 +5435,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi-linux-x64-gnu@0.2.0: @@ -5443,7 +5443,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi-win32-arm64-msvc@0.2.0: @@ -5451,7 +5451,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi-win32-x64-msvc@0.2.0: @@ -5459,7 +5459,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true /@oxidation-compiler/napi@0.2.0: @@ -5471,7 +5471,7 @@ packages: '@oxidation-compiler/napi-linux-x64-gnu': 0.2.0 '@oxidation-compiler/napi-win32-arm64-msvc': 0.2.0 '@oxidation-compiler/napi-win32-x64-msvc': 0.2.0 - dev: true + dev: false /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} @@ -5583,6 +5583,7 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.1 rollup: 2.79.1 + dev: false /@rollup/rollup-android-arm-eabi@4.13.1: resolution: {integrity: sha512-4C4UERETjXpC4WpBXDbkgNVgHyWfG3B/NKY46e7w5H134UDOFqUJKpsLm0UYmuupW+aJmRgeScrDNfvZ5WV80A==} @@ -8332,7 +8333,7 @@ packages: '@esbuild/win32-arm64': 0.19.11 '@esbuild/win32-ia32': 0.19.11 '@esbuild/win32-x64': 0.19.11 - dev: true + dev: false /esbuild@0.19.12: resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} @@ -8882,6 +8883,7 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + dev: false /estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} @@ -13093,6 +13095,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.3 + dev: false /rollup@4.13.1: resolution: {integrity: sha512-hFi+fU132IvJ2ZuihN56dwgpltpmLZHZWsx27rMCTZ2sYwrqlgL5sECGy1eeV2lAihD8EzChBVVhsXci0wD4Tg==} @@ -14287,7 +14290,7 @@ packages: unplugin: 1.10.1 transitivePeerDependencies: - rollup - dev: true + dev: false /unplugin@1.10.1: resolution: {integrity: sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==} @@ -14297,7 +14300,7 @@ packages: chokidar: 3.6.0 webpack-sources: 3.2.3 webpack-virtual-modules: 0.6.1 - dev: true + dev: false /update-browserslist-db@1.0.11(browserslist@4.21.10): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} @@ -14564,11 +14567,11 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - dev: true + dev: false /webpack-virtual-modules@0.6.1: resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==} - dev: true + dev: false /whatwg-encoding@2.0.0: resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}