Merge branch 'main' into release-next

remix-run · Jun 8, 2023 · 4aacf00 · 4aacf00
2 parents b662d41 + 72d7377
commit 4aacf00
Show file tree

Hide file tree

Showing 20 changed files with 159 additions and 158 deletions.
diff --git a/docs/guides/typescript.md b/docs/guides/typescript.md
@@ -36,7 +36,7 @@ The Remix compiler will not do any type checking (it simply removes the types).
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
 ```

diff --git a/integration/compiler-mjs-output-test.ts b/integration/compiler-mjs-output-test.ts
@@ -43,7 +43,7 @@ test.beforeAll(async () => {
             "typescript": "0.0.0-local-version"
           },
           "engines": {
-            "node": ">=14"
+            "node": ">=14.0.0"
           }
         }      
       `,

diff --git a/integration/helpers/cf-template/package.json b/integration/helpers/cf-template/package.json
@@ -20,6 +20,6 @@
     "typescript": "0.0.0-local-version"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/integration/helpers/deno-template/package.json b/integration/helpers/deno-template/package.json
@@ -13,6 +13,6 @@
     "@remix-run/dev": "0.0.0-local-version"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/integration/helpers/node-template/package.json b/integration/helpers/node-template/package.json
@@ -23,6 +23,6 @@
     "typescript": "0.0.0-local-version"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/integration/hmr-log-test.ts b/integration/hmr-log-test.ts
@@ -50,7 +50,7 @@ let fixture = (options: { appPort: number; devPort: number }): FixtureInit => ({
         typescript: "0.0.0-local-version",
       },
       engines: {
-        node: ">=14",
+        node: ">=14.0.0",
       },
     }),
 

diff --git a/integration/hmr-test.ts b/integration/hmr-test.ts
@@ -51,7 +51,7 @@ let fixture = (options: { appPort: number; devPort: number }): FixtureInit => ({
         typescript: "0.0.0-local-version",
       },
       engines: {
-        node: ">=14",
+        node: ">=14.0.0",
       },
     }),
 

diff --git a/integration/server-entry-test.ts b/integration/server-entry-test.ts
@@ -103,7 +103,7 @@ test.describe("Default Server Entry (React 17)", () => {
             typescript: "0.0.0-local-version",
           },
           engines: {
-            node: ">=14",
+            node: ">=14.0.0",
           },
         }),
       },

diff --git a/packages/remix-server-runtime/CHANGELOG.md b/packages/remix-server-runtime/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 - Add `errorHeaders` parameter to the leaf `headers()` function to expose headers from thrown responses that bubble up to ancestor route boundaries. If the throwing route contains the boundary, then `errorHeaders` will be the same object as `loaderHeaders`/`actionHeaders` for that route. ([#6425](https://github.com/remix-run/remix/pull/6425), [#6475](https://github.com/remix-run/remix/pull/6475))
 
-- Add optional `handleError` export for custom server-side error processing. This is a new optional export from your `entry.server.tsx` that will be called with any encountered error on the Remix server (loader, action, or render error) ([#6495](https://github.com/remix-run/remix/pull/6495]), [#6524](https://github.com/remix-run/remix/pull/6524)):
+- Add optional `handleError` export for custom server-side error processing. This is a new optional export from your `entry.server.tsx` that will be called with any encountered error on the Remix server (loader, action, or render error) ([#6495](https://github.com/remix-run/remix/pull/6495), [#6524](https://github.com/remix-run/remix/pull/6524)):
 
   ```ts
   // entry.server.tsx

diff --git a/scripts/playground/template/package.json b/scripts/playground/template/package.json
@@ -50,7 +50,7 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   },
   "prisma": {
     "seed": "ts-node --require tsconfig-paths/register prisma/seed.ts"

diff --git a/templates/arc/package.json b/templates/arc/package.json
@@ -30,6 +30,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/cloudflare-pages/package.json b/templates/cloudflare-pages/package.json
@@ -32,6 +32,6 @@
     "wrangler": "^2.15.1"
   },
   "engines": {
-    "node": ">=16.13"
+    "node": ">=16.13.0"
   }
 }
diff --git a/templates/cloudflare-workers/package.json b/templates/cloudflare-workers/package.json
@@ -33,6 +33,6 @@
     "wrangler": "^2.15.1"
   },
   "engines": {
-    "node": ">=16.13"
+    "node": ">=16.13.0"
   }
 }
diff --git a/templates/deno/package.json b/templates/deno/package.json
@@ -26,6 +26,6 @@
     "npm-run-all": "^4.1.5"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/express/package.json b/templates/express/package.json
@@ -37,6 +37,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/fly/package.json b/templates/fly/package.json
@@ -26,6 +26,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/netlify/package.json b/templates/netlify/package.json
@@ -28,6 +28,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/remix/package.json b/templates/remix/package.json
@@ -25,6 +25,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }
diff --git a/templates/vercel/package.json b/templates/vercel/package.json
@@ -26,6 +26,6 @@
     "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=14.0.0"
   }
 }