diff options
| author |  Fred K. Schott <fkschott@gmail.com>
| 2022-03-31 10:01:05 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-03-31 13:01:05 -0400 |
| commit | 3a4dc9e0a7a21493f36426814a6fbef4c95ed535 (patch) | |
| tree | ead86daa36c9dc5fafa35c889c28246873de614a /packages/integrations/react | |
| parent | bdb9ba1c34adbfd1d0dfdd6abc3db808f77683bd (diff) | |
| download | astro-3a4dc9e0a7a21493f36426814a6fbef4c95ed535.tar.gz astro-3a4dc9e0a7a21493f36426814a6fbef4c95ed535.tar.zst astro-3a4dc9e0a7a21493f36426814a6fbef4c95ed535.zip | |
React 18 monorepo upgrade (#2948)
* First pass at supporting React 18 in @astrojs/react
* Try marking React 18’s `react-dom/client` as external
* Try a different approach to importing different React versions
* Allow resolving JSON modules
* Revert "Allow resolving JSON modules"
This reverts commit 5279b7249c52b20fd74fe48f9f1047c9b3a117dc.
* Try the separate client entrypoint approach from #2946
* Clean up diff
* Trying to see something
* Just keep swimming… 🐠
* update to support react 18
* update React to React 18 across the board
Co-authored-by: delucis <swithinbank@gmail.com>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Diffstat (limited to 'packages/integrations/react')
| -rw-r--r-- | packages/integrations/react/package.json | 4 | ||||
| -rw-r--r-- | packages/integrations/react/src/index.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index b1a2be46d..1184ce8d3 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -40,8 +40,8 @@ "@types/react-dom": "^17.0.14", "astro": "workspace:*", "astro-scripts": "workspace:*", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "react": "^18.0.0", + "react-dom": "^18.0.0" }, "peerDependencies": { "react": "^17.0.2 || ^18.0.0", diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts index 25899a025..2ea2dd5fb 100644 --- a/packages/integrations/react/src/index.ts +++ b/packages/integrations/react/src/index.ts @@ -35,7 +35,7 @@ function getViteConfiguration() { return { optimizeDeps: { include: [ReactVersion.startsWith('18.') ? '@astrojs/react/client.js' : '@astrojs/react/client-v17.js', 'react', 'react/jsx-runtime', 'react/jsx-dev-runtime', 'react-dom'], - exclude: [ReactVersion.startsWith('18.') ? '@astrojs/react/server.js' : '@astrojs/react/server-v17.js'], + exclude: [ReactVersion.startsWith('18.') ? '@astrojs/react/server.js' : '@astrojs/react/server-v17.js'], }, resolve: { dedupe: ['react', 'react-dom'], |