Merge branch 'main' into react-scan

Author: AlemTuzlak

.github/workflows/publish.yaml

@@ -4,9 +4,6 @@ on:
     types: [published]
   workflow_dispatch:
 
-env:
-  FLY_ORG: ${{ vars.FLY_ORG }}
-
 jobs:
   npm-publish:
     runs-on: ubuntu-latest
@@ -22,13 +19,22 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  deploy-preview:
+
+  deploy-docs:
     name: "🚀 Deploy Docs"
-    needs: [npm-publish]
-    uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix
-    with:
-      workspace_name: docs
-      set_cwd_to_workspace: true
-      github_environment: "docs-release"
-    secrets:
-      fly_api_token: ${{ secrets.FLY_API_TOKEN }}
+    runs-on: ubuntu-latest
+    environment:
+      name: docs-release
+      url: ${{ steps.deploy.outputs.app_url }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: forge-42/fly-deploy@v1.0.0-rc.1
+        id: deploy
+        env:
+          FLY_ORG: ${{ vars.FLY_ORG }}
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          FLY_REGION: fra
+        with:
+          workspace_name: docs
+          app_name: react-router-devtools-docs-release
+          use_isolated_workspace: true

.github/workflows/validate.yaml

@@ -8,9 +8,6 @@ on:
   pull_request:
     branches: [main]
 
-env:
-  FLY_ORG: ${{ vars.FLY_ORG }}
-
 permissions:
   actions: write
   contents: read
@@ -72,14 +69,23 @@ jobs:
 #        if: always()
 #        uses: davelosert/vitest-coverage-report-action@v2
 
-
-  deploy-preview:
+  deploy-docs-pr-preview:
+    if: ${{ github.event_name == 'pull_request' }}
     name: "🚀 Deploy Docs"
     needs: [lint, typecheck, vitest]
-    uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix
-    with:
-      workspace_name: docs
-      set_cwd_to_workspace: true
-      github_environment: "docs-previev"
-    secrets:
-      fly_api_token: ${{ secrets.FLY_API_TOKEN }}
+    runs-on: ubuntu-latest
+    environment:
+      name: docs-release
+      url: ${{ steps.deploy.outputs.app_url }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: forge-42/fly-deploy@v1.0.0-rc.1
+        id: deploy
+        env:
+          FLY_ORG: ${{ vars.FLY_ORG }}
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          FLY_REGION: fra
+        with:
+          workspace_name: docs
+          app_name: react-router-devtools-docs-pr-${{ github.event.number }}
+          use_isolated_workspace: true

docs/package.json

@@ -26,9 +26,9 @@
     "@epic-web/invariant": "^1.0.0",
     "@headlessui/react": "^1.7.18",
     "@octokit/request": "^8.1.6",
-    "@react-router/fs-routes": "7.0.0",
-    "@react-router/node": "7.0.0",
-    "@react-router/serve": "7.0.0",
+    "@react-router/fs-routes": "7.1.4",
+    "@react-router/node": "7.1.4",
+    "@react-router/serve": "7.1.4",
     "@sindresorhus/slugify": "^2.2.1",
     "@tsparticles/engine": "^3.3.0",
     "@tsparticles/react": "^3.0.0",
@@ -46,7 +46,7 @@
     "prismjs": "^1.29.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "7.0.0",
+    "react-router": "7.1.4",
     "react-spring": "^9.7.3",
     "redent": "^4.0.0",
     "rehype-slug": "^6.0.0",