diff --git a/.eslintignore b/.eslintignore index d11c2a620fb..efb6260f60e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,5 +7,6 @@ **/__tests__/fixtures # deno +integration/helpers/deno-template packages/remix-deno templates/deno diff --git a/integration/helpers/deno-template/.gitignore b/integration/helpers/deno-template/.gitignore index 2b5c2c32959..3f7bf98da3e 100644 --- a/integration/helpers/deno-template/.gitignore +++ b/integration/helpers/deno-template/.gitignore @@ -1,5 +1,6 @@ -/node_modules/ +node_modules /.cache /build -/public/build \ No newline at end of file +/public/build +.env diff --git a/integration/helpers/deno-template/app/entry.client.tsx b/integration/helpers/deno-template/app/entry.client.tsx index 62a6a81634d..fa091046ff3 100644 --- a/integration/helpers/deno-template/app/entry.client.tsx +++ b/integration/helpers/deno-template/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(, document); +hydrate(, document); diff --git a/integration/helpers/deno-template/app/entry.server.tsx b/integration/helpers/deno-template/app/entry.server.tsx index 8ab0f9f7a18..24bf2d741d5 100644 --- a/integration/helpers/deno-template/app/entry.server.tsx +++ b/integration/helpers/deno-template/app/entry.server.tsx @@ -1,16 +1,16 @@ -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, responseStatusCode: number, responseHeaders: Headers, - remixContext: EntryContext + remixContext: EntryContext, ) { - let markup = renderToString( - + const markup = renderToString( + , ); responseHeaders.set("Content-Type", "text/html"); diff --git a/integration/helpers/deno-template/app/root.tsx b/integration/helpers/deno-template/app/root.tsx index a74cc0195c0..9171cb50f31 100644 --- a/integration/helpers/deno-template/app/root.tsx +++ b/integration/helpers/deno-template/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/integration/helpers/deno-template/package.json b/integration/helpers/deno-template/package.json index 1fec877f2bf..7bfeb3ed6ae 100644 --- a/integration/helpers/deno-template/package.json +++ b/integration/helpers/deno-template/package.json @@ -3,13 +3,13 @@ "private": true, "sideEffects": false, "dependencies": { - "@remix-run/deno": "*", - "@remix-run/react": "*", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "@remix-run/deno": "0.0.0-local-version", + "@remix-run/react": "0.0.0-local-version", + "react": "0.0.0-local-version", + "react-dom": "0.0.0-local-version" }, "devDependencies": { - "@remix-run/dev": "*" + "@remix-run/dev": "0.0.0-local-version" }, "engines": { "node": ">=14" diff --git a/integration/helpers/deno-template/remix.config.js b/integration/helpers/deno-template/remix.config.js index 625a152107a..4dde611cb5c 100644 --- a/integration/helpers/deno-template/remix.config.js +++ b/integration/helpers/deno-template/remix.config.js @@ -1,7 +1,6 @@ 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. @@ -9,4 +8,9 @@ module.exports = { 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/", };