Merge branch 'dev' into chance/scroll-restoration-props

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/clean-clocks-float.md

@@ -0,0 +1,5 @@
+---
+"@remix-run/deno": patch
+---
+
+Fix types for request handler context

.changeset/config.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@2.0.0/schema.json",
+  "changelog": ["@remix-run/changelog-github", { "repo": "remix-run/remix" }],
+  "commit": false,
+  "fixed": [
+    [
+      "create-remix",
+      "remix",
+      "@remix-run/architect",
+      "@remix-run/cloudflare",
+      "@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"
+    ]
+  ],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "dev",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.changeset/weak-beds-thank.md

@@ -0,0 +1,6 @@
+---
+"remix": patch
+"@remix-run/dev": patch
+---
+
+fixes a bug in ts -> js conversion on windows by using a relative unix style path as fast-glob uses unix style paths

.eslintignore

@@ -5,8 +5,9 @@
 .tmp
 /playground
 **/__tests__/fixtures
+**/__tests__/**/*/fixtures
 
-# deno
+# Deno
 integration/helpers/deno-template
 packages/remix-deno
 templates/deno

.eslintrc.js

@@ -1,8 +1,27 @@
+const OFF = 0;
+const WARN = 1;
+
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
   root: true,
   extends: [
     require.resolve("./packages/remix-eslint-config/internal.js"),
     "plugin:markdown/recommended",
   ],
   plugins: ["markdown"],
+  overrides: [
+    {
+      files: ["rollup.config.js"],
+      rules: {
+        "import/no-extraneous-dependencies": OFF,
+      },
+    },
+    {
+      files: ["templates/**/*.*"],
+      rules: {
+        "prefer-let/prefer-let": OFF,
+        "prefer-const": WARN,
+      },
+    },
+  ],
 };

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/deployments.yml

@@ -1,8 +1,32 @@
 name: 🚀 Deployment Tests
 
 on:
-  repository_dispatch:
-    types: [release]
+  workflow_call:
+    secrets:
+      TEST_AWS_ACCESS_KEY_ID:
+        required: true
+      TEST_AWS_SECRET_ACCESS_KEY:
+        required: true
+      TEST_CF_ACCOUNT_ID:
+        required: true
+      TEST_CF_GLOBAL_API_KEY:
+        required: true
+      TEST_CF_EMAIL:
+        required: true
+      TEST_CF_PAGES_API_TOKEN:
+        required: true
+      TEST_CF_API_TOKEN:
+        required: true
+      TEST_DENO_DEPLOY_TOKEN:
+        required: true
+      TEST_FLY_TOKEN:
+        required: true
+      TEST_NETLIFY_TOKEN:
+        required: true
+      TEST_VERCEL_TOKEN:
+        required: true
+      TEST_VERCEL_USER_ID:
+        required: true
 
 jobs:
   arc_deploy:
@@ -11,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -20,6 +44,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -29,10 +55,8 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🚀 Deploy to Arc
         run: node ./arc.mjs
@@ -48,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -57,6 +81,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -66,27 +92,25 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🚀 Deploy to Cloudflare Pages
         run: node ./cf-pages.mjs
         working-directory: ./scripts/deployment-test
         env:
-          CF_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
-          CF_GLOBAL_API_KEY: ${{ secrets.TEST_CF_GLOBAL_API_KEY }}
-          CF_EMAIL: ${{ secrets.TEST_CF_EMAIL }}
-          GITHUB_TOKEN: ${{ secrets.TEST_CF_GITHUB_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
+          CLOUDFLARE_GLOBAL_API_KEY: ${{ secrets.TEST_CF_GLOBAL_API_KEY }}
+          CLOUDFLARE_EMAIL: ${{ secrets.TEST_CF_EMAIL }}
+          CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CF_PAGES_API_TOKEN }}
 
   cf_workers_deploy:
     name: "CF Workers Deploy"
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -95,6 +119,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -104,25 +130,68 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🚀 Deploy to Cloudflare Workers
         run: node ./cf-workers.mjs
         working-directory: ./scripts/deployment-test
         env:
-          CF_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
-          CF_API_TOKEN: ${{ secrets.TEST_CF_API_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
+          CLOUDFLARE_API_TOKEN: ${{ secrets.TEST_CF_API_TOKEN }}
+          CLOUDFLARE_EMAIL: ${{ secrets.CLOUDFLARE_EMAIL }}
+          CLOUDFLARE_GLOBAL_API_KEY: ${{ secrets.CLOUDFLARE_GLOBAL_API_KEY }}
+
+  # "deploy deploy" is not a typo, we are deploying to Deno Deploy
+  deno_deploy_deploy:
+    name: "Deno Deploy Deploy"
+    if: github.repository == 'remix-run/remix'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
+
+      # some deployment targets require the latest version of npm
+      # TODO: remove this eventually when the default version we get
+      # is "latest" enough.
+      - name: 📦 Install latest version of npm
+        run: npm install -g npm@latest
+        working-directory: ./scripts/deployment-test
+
+      - name: 📥 Install deployment-test deps
+        run: npm install
+        working-directory: ./scripts/deployment-test
+
+      - name: 🦕 Install Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+      - name: 🦕 Deno Deploy CLI
+        run: deno install --allow-read --allow-write --allow-env --allow-net --allow-run --no-check -r -f https://deno.land/x/deploy/deployctl.ts
+
+      - name: 🚀 Deploy to Deno Deploy
+        run: node ./deno-deploy.mjs
+        working-directory: ./scripts/deployment-test
+        env:
+          DENO_DEPLOY_TOKEN: ${{ secrets.TEST_DENO_DEPLOY_TOKEN }}
 
   fly_deploy:
     name: "Fly Deploy"
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -131,6 +200,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -140,10 +211,8 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🎈 Install the Fly CLI
         run: curl -L https://fly.io/install.sh | FLYCTL_INSTALL=/usr/local sh
@@ -160,7 +229,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -169,6 +238,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -178,10 +249,8 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🚀 Deploy to Netlify
         run: node ./netlify.mjs
@@ -195,7 +264,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+        uses: styfle/cancel-workflow-action@0.11.0
 
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
@@ -204,6 +273,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version-file: ".nvmrc"
+          cache: npm
+          cache-dependency-path: ./scripts/deployment-test/package.json # no lockfile, key caching off package.json
 
       # some deployment targets require the latest version of npm
       # TODO: remove this eventually when the default version we get
@@ -213,10 +284,8 @@ jobs:
         working-directory: ./scripts/deployment-test
 
       - name: 📥 Install deployment-test deps
-        uses: bahmutov/npm-install@v1
-        with:
-          working-directory: ./scripts/deployment-test
-          useLockFile: false
+        run: npm install
+        working-directory: ./scripts/deployment-test
 
       - name: 🚀 Deploy to Vercel
         run: node ./vercel.mjs