Merge branch 'dev' into logan/rem-1118-include-publicpath-in-server-m…

…anifest

.eslintignore

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

.github/workflows/deployments.yml

@@ -75,10 +75,10 @@ jobs:
         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"
@@ -113,8 +113,51 @@ jobs:
         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 }}
+
+  # "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.9.1
+
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+
+      # 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
+        uses: bahmutov/npm-install@v1
+        with:
+          working-directory: ./scripts/deployment-test
+          useLockFile: false
+
+      - 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"

.github/workflows/format.yml

@@ -31,8 +31,19 @@ jobs:
         # because we have a yarn.lock and caches efficiently.
         uses: bahmutov/npm-install@v1
 
+      - name: 🔗 Convert Docs links to references
+        run: node scripts/markdown-references.mjs
+
       - name: 👔 Format
-        run: npm run format --if-present
+        run: yarn format
+
+      - name: 🦕 Install Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+
+      - name: 👔 Format Deno files
+        run: yarn format:deno
 
       - name: 💪 Commit
         run: |

.github/workflows/no-response.yml

@@ -7,20 +7,31 @@ on:
     # Schedule for five minutes after the hour, every hour
     - cron: "5 * * * *"
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   noResponse:
     if: github.repository == 'remix-run/remix'
     runs-on: ubuntu-latest
 
     steps:
       - name: 🥺 Handle Ghosting
-        uses: lee-dohm/no-response@v0.5.0
+        uses: actions/stale@v5
         with:
-          closeComment: >
+          close-issue-message: >
             This issue has been automatically closed because we haven't received a
             response from the original author 🙈. This automation helps keep the issue
             tracker clean from issues that are unactionable. Please reach out if you
             have more information for us! 🙂
-          daysUntilClose: 10
-          responseRequiredLabel: needs-response
-          token: ${{ github.token }}
+          close-pr-message: >
+            This PR has been automatically closed because we haven't received a
+            response from the original author 🙈. This automation helps keep the issue
+            tracker clean from PRs that are unactionable. Please reach out if you
+            have more information for us! 🙂
+          days-before-close: 10
+          # don't automatically mark issues/PRs as stale
+          days-before-stale: -1
+          any-of-labels: needs-response
+          labels-to-remove-when-unstale: needs-response

.github/workflows/stacks.yml

@@ -239,7 +239,7 @@ jobs:
           npm run build
 
       - name: 🌳 Cypress run
-        uses: cypress-io/github-action@v3
+        uses: cypress-io/github-action@v4
         with:
           start: ${{ matrix.stack.cypress }}
           wait-on: "http://localhost:8811"

.github/workflows/test.yml

@@ -66,6 +66,14 @@ jobs:
       - name: 🔬 Lint
         run: yarn lint
 
+      - name: 🦕 Install Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: vx.x.x
+
+      - name: 🔬 Lint deno files
+        run: yarn lint:deno
+
   test:
     name: "🧪 Test: (OS: ${{ matrix.os }} Node: ${{ matrix.node }})"
     strategy:

.github/workflows/website.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: 🔄 Refresh the docs
-        uses: fjogeleit/http-request-action@v1.9.0
+        uses: fjogeleit/http-request-action@v1
         with:
           url: "${{ secrets.DOCS_REFRESH_URL }}?ref=${{ github.ref }}"
           method: "POST"

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 
 /build/
+/packages/*/dist/
+/packages/*/LICENSE.md
 node_modules/
 yarn-error.log
 

.vscode/deno_resolve_npm_imports.json

@@ -1,13 +1,11 @@
 {
   "// Resolve NPM imports for `packages/remix-deno`.": "",
-
   "// This import map is used solely for the denoland.vscode-deno extension.": "",
   "// Remix does not support import maps.": "",
   "// Dependency management is done through `npm` and `node_modules/` instead.": "",
   "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
-
   "imports": {
-    "mime": "https://esm.sh/mime@3.0.0",
-    "@remix-run/server-runtime": "https://esm.sh/@remix-run/server-runtime@1.4.3"
+    "@remix-run/server-runtime": "https://esm.sh/@remix-run/server-runtime@1.6.0",
+    "mime": "https://esm.sh/mime@3.0.0"
   }
 }

contributors.yml

@@ -24,6 +24,7 @@
 - anmonteiro
 - AntoninBeaufort
 - anubra266
+- apeltop
 - Aprillion
 - arange
 - archwebio
@@ -61,7 +62,9 @@
 - clarkmitchell
 - cliffordfajardo
 - cloudy9101
+- cmd-johnson
 - codymjarrett
+- colinhacks
 - confix
 - coryhouse
 - craigglennie
@@ -76,6 +79,7 @@
 - denissb
 - derekr
 - developit
+- dgurns
 - dhargitai
 - dhmacs
 - dima-takoy
@@ -155,16 +159,20 @@
 - jesse-deboer
 - jesseflorig
 - jgarrow
+- jiahao-c
 - jkup
 - jmasson
+- JNaftali
 - jo-ninja
 - joaosamouco
 - jodygeraldo
 - johannesbraeunig
+- johnpolacek
 - johnson444
 - johnson444
 - joms
 - joshball
+- jrubins
 - jssisodiya
 - jstafman
 - juhanakristian
@@ -275,6 +283,7 @@
 - pacexy
 - pcattori
 - penspinner
+- penx
 - phishy
 - plastic041
 - princerajroy
@@ -284,6 +293,7 @@
 - RATIU5
 - raulrpearson
 - real34
+- realjokele
 - reggie3
 - rlfarman
 - roachjc
@@ -306,6 +316,7 @@
 - schpet
 - sdavids
 - sean-roberts
+- sebz
 - selfish
 - sergiocarneiro
 - sergiodxa
@@ -332,9 +343,11 @@
 - tjefferson08
 - tombyrer
 - toyozaki
+- turkerdev
 - tvanantwerp
 - twhitbeck
 - tylerbrostrom
+- udasitharani
 - uhoh-itsmaciek
 - unhackit
 - UsamaHameed

decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md

@@ -50,7 +50,7 @@ That means that specifying peer dependencies becomes tedious and error-prone as
 
 - determine which dependencies themselves depend on `react` (or other similar peer dependency), even if indirectly.
 - manually figure out which `react` version works across _all_ of these dependencies
-- set that version for `react` as a query parameter in _all_ or the URLs for the identified dependencies
+- set that version for `react` as a query parameter in _all_ of the URLs for the identified dependencies
 
 If any dependencies change (added, removed, version change),
 the user must repeat all of these steps again.