chore(templates): bring deno template in line with other templates

remix-run · May 18, 2022 · a0d2423 · a0d2423
1 parent 3eab365
commit a0d2423
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 33 deletions.
diff --git a/.vscode/deno_resolve_npm_imports.json b/.vscode/deno_resolve_npm_imports.json
@@ -7,7 +7,7 @@
   "// 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.5.0",
+    "mime": "https://esm.sh/mime@3.0.0"
   }
 }
diff --git a/templates/deno/.gitignore b/templates/deno/.gitignore
@@ -1,5 +1,6 @@
-/node_modules/
+node_modules
 
 /.cache
 /build
-/public/build
+/public/build
+.env
diff --git a/templates/deno/.vscode/resolve_npm_imports.json b/templates/deno/.vscode/resolve_npm_imports.json
@@ -5,11 +5,11 @@
   "// Deno-only dependencies may be imported via URL imports (without using import maps).": "",
 
   "imports": {
-    "react": "https://esm.sh/react@18.0.0",
-    "react-dom": "https://esm.sh/react-dom@18.0.0",
-    "react-dom/server": "https://esm.sh/react-dom@18.0.0/server",
-    "@remix-run/dev/server-build": "https://esm.sh/@remix-run/dev@1.4.3/server-build",
-    "@remix-run/deno": "https://esm.sh/@remix-run/deno@1.4.3",
-    "@remix-run/react": "https://esm.sh/@remix-run/react@1.4.3"
+    "@remix-run/deno": "https://esm.sh/@remix-run/deno@1.5.0",
+    "@remix-run/dev/server-build": "https://esm.sh/@remix-run/dev@1.5.0/server-build",
+    "@remix-run/react": "https://esm.sh/@remix-run/react@1.5.0",
+    "react": "https://esm.sh/react@17.0.2",
+    "react-dom": "https://esm.sh/react-dom@17.0.2",
+    "react-dom/server": "https://esm.sh/react-dom@17.0.2/server"
   }
 }
diff --git a/templates/deno/.vscode/settings.json b/templates/deno/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
   "deno.enable": true,
-  "deno.lint": true,
-  "deno.importMap": "./.vscode/resolve_npm_imports.json"
+  "deno.importMap": "./.vscode/resolve_npm_imports.json",
+  "deno.lint": true
 }
diff --git a/templates/deno/README.md b/templates/deno/README.md
@@ -12,8 +12,7 @@ npx create-remix@latest --template deno
 
 ## Managing dependencies
 
-Read about [how we recommend to manage dependencies for Remix projects using Deno](https://github.com/remix-run/remix/blob/main/docs/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md
-).
+Read about [how we recommend to manage dependencies for Remix projects using Deno](https://github.com/remix-run/remix/blob/main/docs/decisions/0001-use-npm-to-manage-npm-dependencies-for-deno-projects.md).
 
 - ✅ You should use `npm` to install NPM packages
   ```sh

diff --git a/templates/deno/app/entry.client.tsx b/templates/deno/app/entry.client.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import ReactDOM from "react-dom";
 import { RemixBrowser } from "@remix-run/react";
+import * as React from "react";
+import { hydrate } from "react-dom";
 
-ReactDOM.hydrate(<RemixBrowser />, document);
+hydrate(<RemixBrowser />, document);
diff --git a/templates/deno/app/entry.server.tsx b/templates/deno/app/entry.server.tsx
@@ -1,7 +1,7 @@
-import React from "react";
-import { renderToString } from "react-dom/server";
-import { RemixServer } from "@remix-run/react";
 import type { EntryContext } from "@remix-run/deno";
+import { RemixServer } from "@remix-run/react";
+import * as React from "react";
+import { renderToString } from "react-dom/server";
 
 export default function handleRequest(
   request: Request,

diff --git a/templates/deno/app/root.tsx b/templates/deno/app/root.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import type { MetaFunction } from "@remix-run/deno";
 import {
   Links,
   LiveReload,
@@ -7,7 +7,7 @@ import {
   Scripts,
   ScrollRestoration,
 } from "@remix-run/react";
-import type { MetaFunction } from "@remix-run/deno";
+import * as React from "react";
 
 export const meta: MetaFunction = () => ({
   charset: "utf-8",

diff --git a/templates/deno/app/routes/index.tsx b/templates/deno/app/routes/index.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import * as React from "react";
 
 export default function Index() {
   return (

diff --git a/templates/deno/package.json b/templates/deno/package.json
@@ -5,11 +5,11 @@
   "scripts": {
     "build": "remix build",
     "dev": "remix build && run-p dev:*",
-    "dev:remix": "remix watch",
     "dev:deno": "cross-env NODE_ENV=development deno run --unstable --watch --allow-net --allow-read --allow-env ./build/index.js",
-    "start": "cross-env NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js",
+    "dev:remix": "remix watch",
+    "format": "deno fmt --ignore=node_modules",
     "lint": "deno lint --ignore=node_modules",
-    "format": "deno fmt --ignore=node_modules"
+    "start": "cross-env NODE_ENV=production deno run --unstable --allow-net --allow-read --allow-env ./build/index.js"
   },
   "dependencies": {
     "@remix-run/deno": "*",

diff --git a/templates/deno/remix.config.js b/templates/deno/remix.config.js
@@ -1,12 +1,16 @@
 module.exports = {
   serverBuildTarget: "deno",
   server: "./server.ts",
-
-  /*
-  If live reload causes page to re-render without changes (live reload is too fast),
-  increase the dev server broadcast delay.
-
-  If live reload seems slow, try to decrease the dev server broadcast delay.
-  */
+  /**
+   * If live reload causes page to re-render without changes (live reload is too fast),
+   * increase the dev server broadcast delay.
+   *
+   * If live reload seems slow, try to decrease the dev server broadcast delay.
+   */
   devServerBroadcastDelay: 300,
+  ignoredRouteFiles: ["**/.*"],
+  // appDirectory: "app",
+  // assetsBuildDirectory: "public/build",
+  // serverBuildPath: "build/index.js",
+  // publicPath: "/build/",
 };