Merge branch 'remix-run:main' into main

vercel · Feb 21, 2024 · 2362a53 · 2362a53
2 parents 3debef0 + 91af129
commit 2362a53
Show file tree

Hide file tree

Showing 36 changed files with 173 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -146,6 +146,15 @@ Date: YYYY-MM-DD
 
 -->
 
+## 2.7.1
+
+Date: 2024-02-20
+
+### Patch Changes
+
+- Fix breaking change for `@remix-run/cloudflare-pages` ([#8819](https://github.com/remix-run/remix/pull/8819))
+  - Restore Cloudflare event context fields in `getLoadContext` argument for backwards compatibility.
+
 ## v2.7.0
 
 Date: 2024-02-20

diff --git a/contributors.yml b/contributors.yml
@@ -74,6 +74,7 @@
 - bmac
 - bmarvinb
 - bmontalvo
+- bobziroll
 - bogas04
 - BogdanDevBst
 - bolchowka

diff --git a/docs/guides/client-data.md b/docs/guides/client-data.md
@@ -14,7 +14,7 @@ These new exports are a bit of a sharp knife and are not recommended as your _pr
 - **Client Cache:** Cache server loader data in the client and avoid some server calls
 - **Migration:** Ease your migration from React Router -> Remix SPA -> Remix SSR (once Remix supports [SPA Mode][rfc-spa])
 
-Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing it's normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.
+Please use these new exports with caution! If you're not careful - it's easy to get your UI out of sync. Remix out of the box tries _very_ hard to ensure that this doesn't happen - but once you take control over your own client-side cache, and potentially prevent Remix from performing its normal server `fetch` calls - then Remix can no longer guarantee your UI remains in sync.
 
 ## Skip the Hop
 

diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-remix`
 
+## 2.7.1
+
 ## 2.7.0
 
 ## 2.6.0

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "2.7.0",
+  "version": "2.7.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.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.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.7.0",
+  "version": "2.7.1",
   "description": "Architect server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@architect/functions": "^5.2.0",
-    "@remix-run/node": "2.7.0",
+    "@remix-run/node": "2.7.1",
     "@types/aws-lambda": "^8.10.82"
   },
   "devDependencies": {

diff --git a/packages/remix-cloudflare-pages/CHANGELOG.md b/packages/remix-cloudflare-pages/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `@remix-run/cloudflare-pages`
 
+## 2.7.1
+
+### Patch Changes
+
+- Fix breaking change for `@remix-run/cloudflare-pages` ([#8819](https://github.com/remix-run/remix/pull/8819))
+
+  Restore Cloudflare event context fields in `getLoadContext` argument for backwards compatibility.
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.0
 
 ### Minor 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.7.0",
+  "version": "2.7.1",
   "description": "Cloudflare Pages request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "module": "dist/esm/index.js",
   "dependencies": {
-    "@remix-run/cloudflare": "2.7.0"
+    "@remix-run/cloudflare": "2.7.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

diff --git a/packages/remix-cloudflare-pages/worker.ts b/packages/remix-cloudflare-pages/worker.ts
@@ -14,6 +14,25 @@ export type GetLoadContextFunction<
   Params extends string = any,
   Data extends Record<string, unknown> = Record<string, unknown>
 > = (args: {
+  /** @deprecated use `context.cloudflare.env` instead */
+  env: EventContext<Env, Params, Data>["env"];
+  /** @deprecated use `context.cloudflare.functionPath` instead */
+  functionPath: EventContext<Env, Params, Data>["functionPath"];
+  /** @deprecated use `context.cloudflare.waitUntil` instead */
+  waitUntil: EventContext<Env, Params, Data>["waitUntil"];
+  /** @deprecated use `context.cloudflare.passThroughOnException` instead */
+  passThroughOnException: EventContext<
+    Env,
+    Params,
+    Data
+  >["passThroughOnException"];
+  /** @deprecated use `context.cloudflare.next` instead */
+  next: EventContext<Env, Params, Data>["next"];
+  /** @deprecated use `context.cloudflare.params` instead */
+  params: EventContext<Env, Params, Data>["params"];
+  /** @deprecated use `context.cloudflare.data` instead */
+  data: EventContext<Env, Params, Data>["data"];
+
   request: Request;
   context: {
     cloudflare: EventContext<Env, Params, Data> & {
@@ -54,6 +73,7 @@ export function createRequestHandler<Env = any>({
 
   return async (cloudflare) => {
     let loadContext = await getLoadContext({
+      ...cloudflare, // Backcompat, remove in v3
       request: cloudflare.request,
       context: {
         cloudflare: {

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.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.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.7.0",
+  "version": "2.7.1",
   "description": "Cloudflare worker request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -16,7 +16,7 @@
   "module": "dist/esm/index.js",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/cloudflare": "2.7.0"
+    "@remix-run/cloudflare": "2.7.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare`
 
+## 2.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.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.7.0",
+  "version": "2.7.1",
   "description": "Cloudflare platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -15,7 +15,7 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.1.3",
-    "@remix-run/server-runtime": "2.7.0"
+    "@remix-run/server-runtime": "2.7.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

diff --git a/packages/remix-css-bundle/CHANGELOG.md b/packages/remix-css-bundle/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @remix-run/css-bundle
 
+## 2.7.1
+
 ## 2.7.0
 
 ## 2.6.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.7.0",
+  "version": "2.7.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.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.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.7.0",
+  "version": "2.7.1",
   "description": "Deno platform abstractions for Remix",
   "homepage": "https://remix.run",
   "main": "./index.ts",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@remix-run/server-runtime": "2.7.0",
+    "@remix-run/server-runtime": "2.7.1",
     "mime": "^3.0.0"
   },
   "peerDependencies": {

diff --git a/packages/remix-dev/CHANGELOG.md b/packages/remix-dev/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@remix-run/dev`
 
+## 2.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `@remix-run/[email protected]`
+
 ## 2.7.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.7.0",
+  "version": "2.7.1",
   "description": "Dev tools and CLI for Remix",
   "homepage": "https://remix.run",
   "bugs": {
@@ -28,9 +28,9 @@
     "@babel/types": "^7.22.5",
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
-    "@remix-run/node": "2.7.0",
+    "@remix-run/node": "2.7.1",
     "@remix-run/router": "1.15.1",
-    "@remix-run/server-runtime": "2.7.0",
+    "@remix-run/server-runtime": "2.7.1",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",
     "arg": "^5.0.1",
@@ -73,7 +73,7 @@
     "ws": "^7.4.5"
   },
   "devDependencies": {
-    "@remix-run/serve": "2.7.0",
+    "@remix-run/serve": "2.7.1",
     "@types/cacache": "^17.0.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/gunzip-maybe": "^1.4.0",
@@ -95,7 +95,7 @@
     "wrangler": "^3.28.2"
   },
   "peerDependencies": {
-    "@remix-run/serve": "^2.7.0",
+    "@remix-run/serve": "^2.7.1",
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2"

diff --git a/packages/remix-eslint-config/CHANGELOG.md b/packages/remix-eslint-config/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `@remix-run/eslint-config`
 
+## 2.7.1
+
 ## 2.7.0
 
 ## 2.6.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.7.0",
+  "version": "2.7.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.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.0
 
 ### Minor 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.7.0",
+  "version": "2.7.1",
   "description": "Express server request handler for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -14,7 +14,7 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@remix-run/node": "2.7.0"
+    "@remix-run/node": "2.7.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.9",

diff --git a/packages/remix-node/CHANGELOG.md b/packages/remix-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/node`
 
+## 2.7.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+
 ## 2.7.0
 
 ### Patch 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.7.0",
+  "version": "2.7.1",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -17,7 +17,7 @@
     "./install.js"
   ],
   "dependencies": {
-    "@remix-run/server-runtime": "2.7.0",
+    "@remix-run/server-runtime": "2.7.1",
     "@remix-run/web-fetch": "^4.4.2",
     "@remix-run/web-file": "^3.1.0",
     "@remix-run/web-stream": "^1.1.0",

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