Merge branch 'main' into release-v1.6.5

danielevilela · Jul 13, 2022 · f76d833 · f76d833
2 parents 465b7fa + 1f92d74
commit f76d833
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,24 +71,24 @@ jobs:
     with:
       ref: ${{ github.ref }}
 
-  # deployments:
-  #   needs: [release]
-  #   name: 🚀 Deployment Tests
-  #   if: github.repository == 'remix-run/remix'
-  #   uses: remix-run/remix/.github/workflows/deployments.yml@main
-  #   secrets:
-  #     TEST_AWS_ACCESS_KEY_ID: ${{ secrets.TEST_AWS_ACCESS_KEY_ID }}
-  #     TEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY }}
-  #     TEST_CF_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
-  #     TEST_CF_GLOBAL_API_KEY: ${{ secrets.TEST_CF_GLOBAL_API_KEY }}
-  #     TEST_CF_EMAIL: ${{ secrets.TEST_CF_EMAIL }}
-  #     TEST_CF_PAGES_API_TOKEN: ${{ secrets.TEST_CF_PAGES_API_TOKEN }}
-  #     TEST_CF_API_TOKEN: ${{ secrets.TEST_CF_API_TOKEN }}
-  #     TEST_DENO_DEPLOY_TOKEN: ${{ secrets.TEST_DENO_DEPLOY_TOKEN }}
-  #     TEST_FLY_TOKEN: ${{ secrets.TEST_FLY_TOKEN }}
-  #     TEST_NETLIFY_TOKEN: ${{ secrets.TEST_NETLIFY_TOKEN }}
-  #     TEST_VERCEL_TOKEN: ${{ secrets.TEST_VERCEL_TOKEN }}
-  #     TEST_VERCEL_USER_ID: ${{ secrets.TEST_VERCEL_USER_ID }}
+  deployments:
+    needs: [release]
+    name: 🚀 Deployment Tests
+    if: github.repository == 'remix-run/remix'
+    uses: remix-run/remix/.github/workflows/deployments.yml@main
+    secrets:
+      TEST_AWS_ACCESS_KEY_ID: ${{ secrets.TEST_AWS_ACCESS_KEY_ID }}
+      TEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY }}
+      TEST_CF_ACCOUNT_ID: ${{ secrets.TEST_CF_ACCOUNT_ID }}
+      TEST_CF_GLOBAL_API_KEY: ${{ secrets.TEST_CF_GLOBAL_API_KEY }}
+      TEST_CF_EMAIL: ${{ secrets.TEST_CF_EMAIL }}
+      TEST_CF_PAGES_API_TOKEN: ${{ secrets.TEST_CF_PAGES_API_TOKEN }}
+      TEST_CF_API_TOKEN: ${{ secrets.TEST_CF_API_TOKEN }}
+      TEST_DENO_DEPLOY_TOKEN: ${{ secrets.TEST_DENO_DEPLOY_TOKEN }}
+      TEST_FLY_TOKEN: ${{ secrets.TEST_FLY_TOKEN }}
+      TEST_NETLIFY_TOKEN: ${{ secrets.TEST_NETLIFY_TOKEN }}
+      TEST_VERCEL_TOKEN: ${{ secrets.TEST_VERCEL_TOKEN }}
+      TEST_VERCEL_USER_ID: ${{ secrets.TEST_VERCEL_USER_ID }}
 
   stacks:
     needs: [release]

diff --git a/contributors.yml b/contributors.yml
@@ -317,6 +317,7 @@
 - robindrost
 - roddds
 - RomanSavarin
+- ronnylt
 - rossipedia
 - RossJHagan
 - RossMcMillan92
@@ -377,6 +378,7 @@
 - visormatt
 - vkrol
 - vlindhol
+- vmosyaykin
 - weavdale
 - wKovacs64
 - wladiston

diff --git a/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md b/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md
@@ -1,7 +1,3 @@
----
-title: 0001 - Use npm to manage NPM dependencies for Deno projects
----
-
 # Use `npm` to manage NPM dependencies for Deno projects
 
 Date: 2022-05-10

diff --git a/decisions/0002-do-not-clone-request.md b/decisions/0002-do-not-clone-request.md
@@ -1,7 +1,3 @@
----
-title: 0002 - Do not clone request
----
-
 # Do not clone request
 
 Date: 2022-05-13

diff --git a/decisions/index.md b/decisions/index.md
diff --git a/decisions/template.md b/decisions/template.md
@@ -1,7 +1,3 @@
----
-title: Title
----
-
 # Title
 
 Date: YYYY-MM-DD

diff --git a/docs/api/remix.md b/docs/api/remix.md
@@ -10,6 +10,7 @@ React: `@remix-run/react`
 Server runtimes:
 
 - `@remix-run/cloudflare`
+- `@remix-run/deno`
 - `@remix-run/node`
 
 Server adapters:
@@ -27,7 +28,7 @@ These package provides all the components, hooks, and [Web Fetch API][web-fetch-
 
 ### `<Links>`, `<LiveReload>`, `<Meta>`, `<Scripts>`, `<ScrollRestoration>`
 
-These components are to be used once inside of your root route (`root.tsx`). They include everything Remix figured out or built in order for your page to render properly.
+These components are to be used once inside your root route (`root.tsx`). They include everything Remix figured out or built in order for your page to render properly.
 
 ```tsx
 import type {

diff --git a/docs/guides/typescript.md b/docs/guides/typescript.md
@@ -8,7 +8,7 @@ Remix seamlessly supports both JavaScript and TypeScript. If you name a file wit
 
 The Remix compiler will not do any type checking (it simply removes the types). If you want to do type checking, you'll want to use TypeScript's `tsc` CLI yourself. A common solution is to add a `typecheck` script to your package.json:
 
-```json filename=package.json lines=[11]
+```json filename=package.json lines=[9]
 {
   "name": "remix-app",
   "private": true,

diff --git a/docs/tutorials/blog.md b/docs/tutorials/blog.md
@@ -19,7 +19,7 @@ Click this button to create a [Gitpod][gitpod] workspace with the project set up
 
 If you want to follow this tutorial locally on your own computer, it is important for you to have these things installed:
 
-- [Node.js][node-js] 14 or greater
+- [Node.js][node-js] version (^12.22.0, ^14.17.0, or >=16.0.0)
 - [npm][npm] 7 or greater
 - A code editor
 

diff --git a/docs/tutorials/jokes.md b/docs/tutorials/jokes.md
@@ -57,7 +57,7 @@ You'll find links to the sections of the tutorial in the navbar (top of the page
 
 You can follow along with this tutorial on [CodeSandbox][code-sandbox] (a fantastic in-browser editor) or locally on your own computer. If you use the CodeSandbox approach then all you need is a good internet connection and a modern browser. If you run things locally then you're going to need some things installed:
 
-- [Node.js][node-js] 14 or greater
+- [Node.js][node-js] version (^12.22.0, ^14.17.0, or >=16.0.0)
 - [npm][npm] 7 or greater
 - A code editor ([VSCode][vs-code] is a nice one)
 

diff --git a/scripts/release/github.ts b/scripts/release/github.ts
@@ -242,7 +242,7 @@ export async function getIssuesClosedByPullRequests(
    * https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
    */
   let regex =
-    /(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s#([0-9]+)/gi;
+    /(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)(:)?\s#([0-9]+)/gi;
   let matches = prBody.match(regex);
   if (!matches) return linkedIssues.map((issue) => issue.number);
 

diff --git a/templates/cloudflare-workers/package.json b/templates/cloudflare-workers/package.json
@@ -3,7 +3,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "remix build",
-    "deploy": "npm run build && wrangler publish",
+    "deploy": "wrangler publish",
     "dev:remix": "remix watch",
     "dev:miniflare": "cross-env NODE_ENV=development miniflare ./build/index.js --watch",
     "dev": "remix build && run-p \"dev:*\"",

diff --git a/templates/deno/.vscode/resolve_npm_imports.json b/templates/deno/.vscode/resolve_npm_imports.json
@@ -5,7 +5,7 @@
   "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
   "imports": {
     "// `@remix-run/deno` code is already a Deno module, so just get types for it directly from `node_modules/`": "",
-    "@remix-run/deno": "https://esm.sh/@remix-run/deno@1.6.4",
+    "@remix-run/deno": "../node_modules/@remix-run/deno/index.ts",
     "@remix-run/dev/server-build": "https://esm.sh/@remix-run/[email protected]/server-build",
     "@remix-run/react": "https://esm.sh/@remix-run/[email protected]",
     "react": "https://esm.sh/[email protected]",

diff --git a/templates/deno/README.md b/templates/deno/README.md
@@ -76,7 +76,7 @@ Building the Deno app (`npm run build`) results in two outputs:
 You can deploy these bundles to any host that runs Deno, but here we'll focus on
 deploying to [Deno Deploy](https://deno.com/deploy).
 
-## Setting up Deno Deploy
+### Setting up Deno Deploy
 
 1. [Sign up](https://dash.deno.com/signin) for Deno Deploy.