Merge branch 'release-next'

remix-run · Apr 24, 2024 · 7b2fa03 · 7b2fa03
2 parents 75c3eb3 + f72d268
commit 7b2fa03
Show file tree

Hide file tree

Showing 36 changed files with 166 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -167,6 +167,22 @@ Date: YYYY-MM-DD
 
 -->
 
+## v2.9.1
+
+Date: 2024-04-24
+
+### Patch Changes
+
+- `@remix-run/dev` - Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option ([#9301](https://github.com/remix-run/remix/pull/9301))
+- `@remix-run/react` - Ignore `future/*.d.ts` files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
+
+### Changes by Package
+
+- [`@remix-run/dev`](https://github.com/remix-run/remix/blob/remix%402.9.1/packages/remix-dev/CHANGELOG.md#291)
+- [`@remix-run/react`](https://github.com/remix-run/remix/blob/remix%402.9.1/packages/remix-react/CHANGELOG.md#291)
+
+**Full Changelog**: [`v2.9.0...v2.9.1`](https://github.com/remix-run/remix/compare/[email protected]@2.9.1)
+
 ## v2.9.0
 
 Date: 2024-04-23

diff --git a/integration/helpers/vite-cloudflare-template/package.json b/integration/helpers/vite-cloudflare-template/package.json
@@ -11,9 +11,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.9.0",
-    "@remix-run/cloudflare-pages": "2.9.0",
-    "@remix-run/react": "2.9.0",
+    "@remix-run/cloudflare": "2.9.1",
+    "@remix-run/cloudflare-pages": "2.9.1",
+    "@remix-run/react": "2.9.1",
     "isbot": "^4.1.0",
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",

diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `create-remix`
 
+## 2.9.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/architect`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-architect/package.json b/packages/remix-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/architect",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-pages/package.json b/packages/remix-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-pages",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare-workers/package.json b/packages/remix-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare-workers",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-cloudflare/package.json b/packages/remix-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/cloudflare",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @remix-run/css-bundle
 
+## 2.9.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
+
 ## 2.9.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.

diff --git a/packages/remix-css-bundle/package.json b/packages/remix-css-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/css-bundle",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "CSS bundle href when using CSS bundling features in Remix",
   "homepage": "https://remix.run",
   "bugs": {

diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-deno/package.json b/packages/remix-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/deno",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",

diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `@remix-run/dev`
 
+## 2.9.1
+
+### Patch Changes
+
+- Fix issue where consumers who had added Remix packages to Vite's `ssr.noExternal` option were being overridden by the Remix Vite plugin adding Remix packages to Vite's `ssr.external` option ([#9301](https://github.com/remix-run/remix/pull/9301))
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Minor Changes

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/dev",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -106,8 +106,8 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/react": "^2.9.0",
-    "@remix-run/serve": "^2.9.0",
+    "@remix-run/react": "^2.9.1",
+    "@remix-run/serve": "^2.9.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"

diff --git a/packages/remix-dev/vite/plugin.ts b/packages/remix-dev/vite/plugin.ts
@@ -1054,24 +1054,26 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
               : "custom",
 
           ssr: {
-            external: [
-              // This is only necessary for development within the Remix repo
-              // because these packages are symlinked and Vite treats them as
-              // internal source code. For consumers this is a no-op.
-              "@remix-run/architect",
-              "@remix-run/cloudflare-pages",
-              "@remix-run/cloudflare-workers",
-              "@remix-run/cloudflare",
-              "@remix-run/css-bundle",
-              "@remix-run/deno",
-              "@remix-run/dev",
-              "@remix-run/express",
-              "@remix-run/netlify",
-              "@remix-run/node",
-              "@remix-run/react",
-              "@remix-run/serve",
-              "@remix-run/server-runtime",
-            ],
+            external: isInRemixMonorepo()
+              ? [
+                  // This is only needed within the Remix repo because these
+                  // packages are linked to a directory outside of node_modules
+                  // so Vite treats them as internal code by default.
+                  "@remix-run/architect",
+                  "@remix-run/cloudflare-pages",
+                  "@remix-run/cloudflare-workers",
+                  "@remix-run/cloudflare",
+                  "@remix-run/css-bundle",
+                  "@remix-run/deno",
+                  "@remix-run/dev",
+                  "@remix-run/express",
+                  "@remix-run/netlify",
+                  "@remix-run/node",
+                  "@remix-run/react",
+                  "@remix-run/serve",
+                  "@remix-run/server-runtime",
+                ]
+              : undefined,
           },
           optimizeDeps: {
             include: [
@@ -1771,6 +1773,12 @@ export const remixVitePlugin: RemixVitePlugin = (remixUserConfig = {}) => {
   ];
 };
 
+function isInRemixMonorepo() {
+  let devPath = path.dirname(require.resolve("@remix-run/dev/package.json"));
+  let devParentDir = path.basename(path.resolve(devPath, ".."));
+  return devParentDir === "packages";
+}
+
 function isEqualJson(v1: unknown, v2: unknown) {
   return JSON.stringify(v1) === JSON.stringify(v2);
 }

diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `@remix-run/eslint-config`
 
+## 2.9.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
+
 ## 2.9.0
 
 No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.0.

diff --git a/packages/remix-eslint-config/package.json b/packages/remix-eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/eslint-config",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "ESLint configuration for Remix projects",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-express/CHANGELOG.md b/packages/remix-express/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/express`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Patch Changes

diff --git a/packages/remix-express/package.json b/packages/remix-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/express",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Minor Changes

diff --git a/packages/remix-node/package.json b/packages/remix-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-react/CHANGELOG.md b/packages/remix-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/react`
 
+## 2.9.1
+
+### Patch Changes
+
+- Ignore `future/*.d.ts` files from TS build ([#9299](https://github.com/remix-run/remix/pull/9299))
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Minor Changes

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/react",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "React DOM bindings for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-react/tsconfig.json b/packages/remix-react/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["dist", "__tests__", "node_modules"],
+  "exclude": ["future/*.d.ts", "dist", "__tests__", "node_modules"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "target": "ES2022",

diff --git a/packages/remix-serve/CHANGELOG.md b/packages/remix-serve/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/serve`
 
+## 2.9.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 2.9.0
 
 ### Minor Changes

diff --git a/packages/remix-serve/package.json b/packages/remix-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/serve",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Production application server for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"

diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `@remix-run/server-runtime`
 
+## 2.9.1
+
+No significant changes to this package were made in this release. [See the repo `CHANGELOG.md`](https://github.com/remix-run/remix/blob/main/CHANGELOG.md) for an overview of all changes in v2.9.1.
+
 ## 2.9.0
 
 ### Minor Changes

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/server-runtime",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Server runtime for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"