Merge branch 'dev' into mdxjs-2

.changeset/config.json

@@ -6,20 +6,19 @@
     [
       "create-remix",
       "remix",
-      "@remix-run/dev",
-      "@remix-run/eslint-config",
-      "@remix-run/react",
-      "@remix-run/serve",
-
-      "@remix-run/server-runtime",
+      "@remix-run/architect",
       "@remix-run/cloudflare",
-      "@remix-run/node",
-
-      "@remix-run/deno",
       "@remix-run/cloudflare-pages",
       "@remix-run/cloudflare-workers",
+      "@remix-run/deno",
+      "@remix-run/dev",
+      "@remix-run/eslint-config",
       "@remix-run/express",
       "@remix-run/netlify",
+      "@remix-run/node",
+      "@remix-run/react",
+      "@remix-run/serve",
+      "@remix-run/server-runtime",
       "@remix-run/vercel"
     ]
   ],

.changeset/late-jars-wonder.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+fix: GET form submissions should replace current search params (#4046)

.changeset/smooth-buses-approve.md

@@ -0,0 +1,8 @@
+---
+"@remix-run/architect": patch
+"@remix-run/express": patch
+"@remix-run/netlify": patch
+"@remix-run/vercel": patch
+---
+
+fix: abort requests on response close instead of request close (#3626)

.github/workflows/nightly.yml

@@ -102,6 +102,7 @@ jobs:
     uses: remix-run/remix/.github/workflows/release-comments.yml@main
     with:
       ref: "refs/tags/v${{ needs.nightly.outputs.NEXT_VERSION }}"
+      packageVersionToFollow: "remix"
 
   deployments:
     needs: [nightly]

.github/workflows/postrelease.yml

@@ -14,8 +14,8 @@ jobs:
     uses: remix-run/remix/.github/workflows/release-comments.yml@main
     with:
       ref: ${{ github.ref }}
-      # this should match the above tag to watch including the trailing "@"
-      packageVersionToFollow: "remix@"
+      # this should match the above tag to watch not including the trailing "@"
+      packageVersionToFollow: "remix"
 
   deployments:
     needs: [release]

.github/workflows/release-comments.yml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
       packageVersionToFollow:
-        required: false
+        required: true
         type: string
 
 jobs:
@@ -41,4 +41,4 @@ jobs:
           VERSION: ${{ inputs.ref }}
           DEFAULT_BRANCH: "main"
           NIGHTLY_BRANCH: "dev"
-          PACKAGE_VERSION_TO_FOLLOW: ${{ inputs.packageToWatch }}
+          PACKAGE_VERSION_TO_FOLLOW: ${{ inputs.packageVersionToFollow }}

.github/workflows/release-test.yml

@@ -14,6 +14,6 @@ on:
 jobs:
   test:
     if: github.repository == 'remix-run/remix'
-    uses: remix-run/remix/.github/workflows/reusable-test.yml@main
+    uses: ./.github/workflows/reusable-test.yml
     with:
       node_version: "[14, 16, 18]"

.github/workflows/reusable-test.yml

@@ -12,6 +12,7 @@ on:
 
 env:
   CI: true
+  CYPRESS_INSTALL_BINARY: 0
 
 jobs:
   build:
@@ -97,7 +98,7 @@ jobs:
         run: "yarn test:primary"
 
   integration:
-    name: "👀 Integration Test: (OS: ${{ matrix.os }} Node: ${{ matrix.node }})"
+    name: "👀 Integration Test: (OS: ${{ matrix.os }} Node: ${{ matrix.node }} Browser: ${{ matrix.browser }})"
     strategy:
       fail-fast: false
       matrix:
@@ -106,13 +107,10 @@ jobs:
           - ubuntu-latest
           # - macos-latest
           - windows-latest
-        include:
-          - os: ubuntu-latest
-            playwright_binary_path: ~/.cache/ms-playwright
-          # - os: macos-latest
-          #   playwright_binary_path: ~/Library/Caches/ms-playwright
-          - os: windows-latest
-            playwright_binary_path: '~\\AppData\\Local\\ms-playwright'
+        browser:
+          - chromium
+          # - firefox
+          - webkit
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -131,34 +129,8 @@ jobs:
       - name: 📥 Install deps
         run: yarn --frozen-lockfile
 
-      # playwright recommends if you cache the binaries to keep it tied to the version of playwright you are using.
-      # https://playwright.dev/docs/ci#caching-browsers
-      - name: 🕵️‍♂️ Get current Playwright version
-        id: playwright-version
-        shell: bash
-        run: |
-          playwright_version=$(node -e "console.log(require('@playwright/test/package.json').version)")
-          echo "::set-output name=version::${playwright_version}"
-
-      - name: 🤖 Cache Playwright binaries
-        uses: actions/cache@v3
-        id: playwright-cache
-        with:
-          path: ${{ matrix.playwright_binary_path }}
-          key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}
-
-      - name: 🖨️ Playwright info
-        shell: bash
-        run: |
-          echo "OS: ${{ matrix.os }}"
-          echo "Playwright version: ${{ steps.playwright-version.outputs.version }}"
-          echo "Playwright install dir: ${{ matrix.playwright_binary_path }}"
-          echo "Cache key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}"
-          echo "Cache hit: ${{ steps.playwright-cache.outputs.cache-hit == 'true' }}"
-
       - name: 📥 Install Playwright
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps
 
-      - name: 👀 Run Integration Tests
-        run: "yarn test:integration"
+      - name: 👀 Run Integration Tests ${{ matrix.browser }}
+        run: "yarn test:integration --project=${{ matrix.browser }}"

.github/workflows/test.yml

@@ -17,6 +17,6 @@ on:
 jobs:
   test:
     if: github.repository == 'remix-run/remix'
-    uses: remix-run/remix/.github/workflows/reusable-test.yml@main
+    uses: ./.github/workflows/reusable-test.yml
     with:
       node_version: '["latest"]'

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 
+/.env
 /build/
 /packages/*/dist/
 /packages/*/LICENSE.md