Merge branch 'dev' into mk/global-race

remix-run · Dec 2, 2022 · 8db8b1c · 8db8b1c
2 parents 95004d1 + ab29ec3
commit 8db8b1c
Show file tree

Hide file tree

Showing 67 changed files with 540 additions and 5,330 deletions.
diff --git a/.changeset/beige-planes-type.md b/.changeset/beige-planes-type.md
diff --git a/.changeset/big-spoons-grab.md b/.changeset/big-spoons-grab.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": minor
+---
+
+allow defining multiple routes for the same route module file
diff --git a/.changeset/calm-eels-invite.md b/.changeset/calm-eels-invite.md
diff --git a/.changeset/happy-flies-own.md b/.changeset/happy-flies-own.md
diff --git a/.changeset/khaki-meals-prove.md b/.changeset/khaki-meals-prove.md
diff --git a/.changeset/late-files-trade.md b/.changeset/late-files-trade.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Allow pass-through props to be passed to the script rendered by `ScrollRestoration`
diff --git a/.changeset/light-avocados-drop.md b/.changeset/light-avocados-drop.md
diff --git a/.changeset/long-colts-remain.md b/.changeset/long-colts-remain.md
diff --git a/.changeset/moody-cats-relax.md b/.changeset/moody-cats-relax.md
diff --git a/.changeset/neat-months-run.md b/.changeset/neat-months-run.md
diff --git a/.changeset/purple-baboons-beg.md b/.changeset/purple-baboons-beg.md
diff --git a/.changeset/thin-oranges-boil.md b/.changeset/thin-oranges-boil.md
@@ -0,0 +1,15 @@
+---
+"@remix-run/react": patch
+---
+
+Fixed a problem with live reload and firefox infinitely reloading the page
+
+The problem is:
+
+1. Firefox is calling `ws.onclose` immediately upon connecting (?!)
+2. Then we’re trying to reconnect, and upon reconnection, we reload the page.
+3. Firefox then calls `ws.onclose` again after reconnecting and the loop starts over
+
+This fix is to check `event.code === 1006` before actually trying to reconnect and the reload the page. 1006 means the connection was closed abnormally (https://www.rfc-editor.org/rfc/rfc6455#section-7.4.1). In our case, that means the server was shut down in local dev and then the socket can reconnect again when the server is back up.
+
+It’s unclear to me why Firefox is calling `onclose` immediately upon connecting to the web socket, but it does.
diff --git a/.changeset/tricky-bobcats-nail.md b/.changeset/tricky-bobcats-nail.md
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -38,6 +38,11 @@ jobs:
           node-version-file: ".nvmrc"
           cache: "yarn"
 
+      - name: 🦕 Setup deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 

diff --git a/contributors.yml b/contributors.yml
@@ -64,6 +64,7 @@
 - camiaei
 - CanRau
 - ccssmnn
+- cephalization
 - chaance
 - chenc041
 - chenxsan
@@ -256,6 +257,7 @@
 - lpsinger
 - lswest
 - lucasdibz
+- lucasferreira
 - luispagarcia
 - luisrivas
 - luistak

diff --git a/integration/fetcher-test.ts b/integration/fetcher-test.ts
@@ -1,4 +1,4 @@
-import { test, expect } from "@playwright/test";
+import { test } from "@playwright/test";
 
 import { createAppFixture, createFixture, js } from "./helpers/create-fixture";
 import type { Fixture, AppFixture } from "./helpers/create-fixture";

diff --git a/integration/redirects-test.ts b/integration/redirects-test.ts
@@ -144,6 +144,12 @@ test.describe("redirects", () => {
             return <h1>Page 2</h1>
           }
         `,
+        [`app/routes/loader/external.js`]: js`
+          import { redirect } from "@remix-run/node";
+          export const loader = () => {
+            return redirect("https://www.google.com/");
+          }
+        `,
       },
     });
 
@@ -186,4 +192,11 @@ test.describe("redirects", () => {
     // Loader called twice
     await page.waitForSelector(`#count:has-text("3")`);
   });
+
+  test("redirects to external URLs", async ({ page }) => {
+    let app = new PlaywrightFixture(appFixture, page);
+
+    await app.waitForNetworkAfter(() => app.goto("/loader/external"));
+    expect(app.page.url()).toBe("https://www.google.com/");
+  });
 });
diff --git a/packages/create-remix/CHANGELOG.md b/packages/create-remix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `create-remix`
 
+## 1.8.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/dev@1.8.0`
+
 ## 1.7.6
 
 ### Patch Changes

diff --git a/packages/create-remix/package.json b/packages/create-remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-remix",
-  "version": "1.7.6",
+  "version": "1.8.0",
   "description": "Create a new Remix app",
   "homepage": "https://remix.run",
   "bugs": {
@@ -17,7 +17,7 @@
     "create-remix": "dist/cli.js"
   },
   "dependencies": {
-    "@remix-run/dev": "1.7.6"
+    "@remix-run/dev": "1.8.0"
   },
   "engines": {
     "node": ">=14"

diff --git a/packages/remix-architect/CHANGELOG.md b/packages/remix-architect/CHANGELOG.md
@@ -1,5 +1,19 @@
 # `@remix-run/architect`
 
+## 1.8.0
+
+### Minor Changes
+
+- Importing functions and types from the `remix` package is deprecated, and all ([#3284](https://github.com/remix-run/remix/pull/3284))
+  exported modules will be removed in the next major release. For more details,
+  [see the release notes for 1.4.0](https://github.com/remix-run/remix/releases/tag/v1.4.0)
+  where these changes were first announced.
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/node@1.8.0`
+
 ## 1.7.6
 
 ### 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": "1.7.6",
+  "version": "1.8.0",
   "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.0.2",
-    "@remix-run/node": "1.7.6",
+    "@remix-run/node": "1.8.0",
     "@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,12 @@
 # `@remix-run/cloudflare-pages`
 
+## 1.8.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@1.8.0`
+
 ## 1.7.6
 
 ### 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": "1.7.6",
+  "version": "1.8.0",
   "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": "1.7.6"
+    "@remix-run/cloudflare": "1.8.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0",

diff --git a/packages/remix-cloudflare-workers/CHANGELOG.md b/packages/remix-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/cloudflare-workers`
 
+## 1.8.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/cloudflare@1.8.0`
+
 ## 1.7.6
 
 ### 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": "1.7.6",
+  "version": "1.8.0",
   "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": "1.7.6"
+    "@remix-run/cloudflare": "1.8.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-cloudflare/CHANGELOG.md b/packages/remix-cloudflare/CHANGELOG.md
@@ -1,5 +1,19 @@
 # `@remix-run/cloudflare`
 
+## 1.8.0
+
+### Minor Changes
+
+- Importing functions and types from the `remix` package is deprecated, and all ([#3284](https://github.com/remix-run/remix/pull/3284))
+  exported modules will be removed in the next major release. For more details,
+  [see the release notes for 1.4.0](https://github.com/remix-run/remix/releases/tag/v1.4.0)
+  where these changes were first announced.
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@1.8.0`
+
 ## 1.7.6
 
 ### 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": "1.7.6",
+  "version": "1.8.0",
   "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": "1.7.6"
+    "@remix-run/server-runtime": "1.8.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^3.4.0"

diff --git a/packages/remix-deno/CHANGELOG.md b/packages/remix-deno/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@remix-run/deno`
 
+## 1.8.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@remix-run/server-runtime@1.8.0`
+
 ## 1.7.6
 
 ### 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": "1.7.6",
+  "version": "1.8.0",
   "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": "1.7.6",
+    "@remix-run/server-runtime": "1.8.0",
     "mime": "^3.0.0"
   },
   "engines": {