remix-run · mcansh · Feb 10, 2023 · Nov 14, 2022 · Nov 15, 2022 · Dec 13, 2022
diff --git a/.changeset/heavy-jars-accept.md b/.changeset/heavy-jars-accept.md
@@ -0,0 +1,8 @@
+---
+"remix": minor
+"@remix-run/dev": minor
+---
+
+make `entry.client` and `entry.server` files optional
+
+we'll use a bundled version of each unless you provide your own
diff --git a/.eslintignore b/.eslintignore
@@ -11,3 +11,5 @@
 integration/helpers/deno-template
 packages/remix-deno
 templates/deno
+
+packages/remix-dev/config/defaults
diff --git a/integration/cf-compiler-test.ts b/integration/cf-compiler-test.ts
@@ -18,8 +18,10 @@ test.describe("cloudflare compiler", () => {
           sideEffects: false,
           main: "build/index.js",
           dependencies: {
+            "@remix-run/cloudflare": "0.0.0-local-version",
             "@remix-run/cloudflare-workers": "0.0.0-local-version",
             "@remix-run/react": "0.0.0-local-version",
+            isbot: "0.0.0-local-version",
             react: "0.0.0-local-version",
             "react-dom": "0.0.0-local-version",
             "worker-pkg": "0.0.0-local-version",

diff --git a/integration/custom-entry-server-test.ts b/integration/custom-entry-server-test.ts
@@ -0,0 +1,56 @@
+import { expect, test } from "@playwright/test";
+
+import { PlaywrightFixture } from "./helpers/playwright-fixture";
+import type { Fixture, AppFixture } from "./helpers/create-fixture";
+import { createAppFixture, createFixture, js } from "./helpers/create-fixture";
+
+let fixture: Fixture;
+let appFixture: AppFixture;
+
+test.beforeAll(async () => {
+  fixture = await createFixture({
+    files: {
+      "app/entry.server.jsx": js`
+        import * as React from "react";
+        import { RemixServer } from "@remix-run/react";
+        import { renderToString } from "react-dom/server";
+
+        export default function handleRequest(
+          request,
+          responseStatusCode,
+          responseHeaders,
+          remixContext
+        ) {
+          let markup = renderToString(
+            <RemixServer context={remixContext} url={request.url} />
+          );
+          responseHeaders.set("Content-Type", "text/html");
+          responseHeaders.set("x-custom-header", "custom-value");
+          return new Response('<!doctype html>' + markup, {
+            headers: responseHeaders,
+            status: responseStatusCode,
+          });
+        }
+      `,
+      "app/routes/index.jsx": js`
+        export default function Index() {
+          return <h1>Hello World</h1>
+        }
+      `,
+    },
+  });
+
+  appFixture = await createAppFixture(fixture);
+});
+
+test.afterAll(() => {
+  appFixture.close();
+});
+
+test("allows user specified entry.server", async ({ page }) => {
+  let app = new PlaywrightFixture(appFixture, page);
+  let responses = app.collectResponses((url) => url.pathname === "/");
+  await app.goto("/");
+  let header = await responses[0].headerValues("x-custom-header");
+  expect(header).toEqual(["custom-value"]);
+});
diff --git a/integration/deno-compiler-test.ts b/integration/deno-compiler-test.ts
@@ -42,6 +42,7 @@ test.beforeAll(async () => {
         dependencies: {
           "@remix-run/deno": "0.0.0-local-version",
           "@remix-run/react": "0.0.0-local-version",
+          isbot: "0.0.0-local-version",
           react: "0.0.0-local-version",
           "react-dom": "0.0.0-local-version",
           component: "0.0.0-local-version",

diff --git a/integration/esm-only-warning-test.ts b/integration/esm-only-warning-test.ts
@@ -24,6 +24,7 @@ test.beforeAll(async () => {
           "@remix-run/node": "0.0.0-local-version",
           "@remix-run/react": "0.0.0-local-version",
           "@remix-run/serve": "0.0.0-local-version",
+          isbot: "0.0.0-local-version",
           react: "0.0.0-local-version",
           "react-dom": "0.0.0-local-version",
           "esm-only-no-exports": "0.0.0-local-version",

diff --git a/integration/helpers/cf-template/app/entry.client.tsx b/integration/helpers/cf-template/app/entry.client.tsx
diff --git a/integration/helpers/cf-template/app/entry.server.tsx b/integration/helpers/cf-template/app/entry.server.tsx
diff --git a/integration/helpers/cf-template/package.json b/integration/helpers/cf-template/package.json
@@ -8,6 +8,7 @@
     "@remix-run/cloudflare": "0.0.0-local-version",
     "@remix-run/cloudflare-workers": "0.0.0-local-version",
     "@remix-run/react": "0.0.0-local-version",
+    "isbot": "0.0.0-local-version",
     "react": "0.0.0-local-version",
     "react-dom": "0.0.0-local-version"
   },

diff --git a/integration/helpers/cf-template/wrangler.toml b/integration/helpers/cf-template/wrangler.toml
@@ -1,5 +1,7 @@
 name = "remix-cloudflare-workers"
 type = "javascript"
+compatibility_date = "2022-04-05"
+compatibility_flags = ["streams_enable_constructors"]
 
 zone_id = ""
 account_id = ""

diff --git a/integration/helpers/deno-template/app/entry.client.tsx b/integration/helpers/deno-template/app/entry.client.tsx
diff --git a/integration/helpers/deno-template/app/entry.server.tsx b/integration/helpers/deno-template/app/entry.server.tsx
diff --git a/integration/helpers/deno-template/package.json b/integration/helpers/deno-template/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@remix-run/deno": "0.0.0-local-version",
     "@remix-run/react": "0.0.0-local-version",
+    "isbot": "0.0.0-local-version",
     "react": "0.0.0-local-version",
     "react-dom": "0.0.0-local-version"
   },

diff --git a/packages/remix-dev/__tests__/cli-test.ts b/packages/remix-dev/__tests__/cli-test.ts
@@ -182,7 +182,14 @@ describe("remix CLI", () => {
 
             $ remix routes
             $ remix routes my-app
-            $ remix routes --json"
+            $ remix routes --json
+
+          Reveal the used entry point:
+
+            $ remix reveal entry.client
+            $ remix reveal entry.server
+            $ remix reveal entry.client --no-typescript
+            $ remix reveal entry.server --no-typescript"
       `);
     });
   });

diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/.eslintrc.js b/packages/remix-dev/__tests__/fixtures/cloudflare/.eslintrc.js
@@ -0,0 +1,4 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  extends: ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
+};
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/.gitignore b/packages/remix-dev/__tests__/fixtures/cloudflare/.gitignore
@@ -0,0 +1,7 @@
+node_modules
+
+/.cache
+/functions/\[\[path\]\].js
+/functions/\[\[path\]\].js.map
+/public/build
+.env
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/.node-version b/packages/remix-dev/__tests__/fixtures/cloudflare/.node-version
@@ -0,0 +1 @@
+16.13.0
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/README.md b/packages/remix-dev/__tests__/fixtures/cloudflare/README.md
@@ -0,0 +1,22 @@
+# Welcome to Remix!
+
+- [Remix Docs](https://remix.run/docs)
+
+## Development
+
+You will be utilizing Wrangler for local development to emulate the Cloudflare runtime. This is already wired up in your package.json as the `dev` script:
+
+```sh
+# start the remix dev server and wrangler
+npm run dev
+```
+
+Open up [http://127.0.0.1:8788](http://127.0.0.1:8788) and you should be ready to go!
+
+## Deployment
+
+Cloudflare Pages are currently only deployable through their Git provider integrations.
+
+If you don't already have an account, then [create a Cloudflare account here](https://dash.cloudflare.com/sign-up/pages) and after verifying your email address with Cloudflare, go to your dashboard and follow the [Cloudflare Pages deployment guide](https://developers.cloudflare.com/pages/framework-guides/deploy-anything).
+
+Configure the "Build command" should be set to `npm run build`, and the "Build output directory" should be set to `public`.
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/app/root.tsx b/packages/remix-dev/__tests__/fixtures/cloudflare/app/root.tsx
@@ -0,0 +1,32 @@
+import type { MetaFunction } from "@remix-run/cloudflare";
+import {
+  Links,
+  LiveReload,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "@remix-run/react";
+
+export const meta: MetaFunction = () => ({
+  charset: "utf-8",
+  title: "New Remix App",
+  viewport: "width=device-width,initial-scale=1",
+});
+
+export default function App() {
+  return (
+    <html lang="en">
+      <head>
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <Outlet />
+        <ScrollRestoration />
+        <Scripts />
+        <LiveReload />
+      </body>
+    </html>
+  );
+}
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/app/routes/index.tsx b/packages/remix-dev/__tests__/fixtures/cloudflare/app/routes/index.tsx
@@ -0,0 +1,32 @@
+export default function Index() {
+  return (
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.4" }}>
+      <h1>Welcome to Remix</h1>
+      <ul>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/blog"
+            rel="noreferrer"
+          >
+            15m Quickstart Blog Tutorial
+          </a>
+        </li>
+        <li>
+          <a
+            target="_blank"
+            href="https://remix.run/tutorials/jokes"
+            rel="noreferrer"
+          >
+            Deep Dive Jokes App Tutorial
+          </a>
+        </li>
+        <li>
+          <a target="_blank" href="https://remix.run/docs" rel="noreferrer">
+            Remix Docs
+          </a>
+        </li>
+      </ul>
+    </div>
+  );
+}
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/package.json b/packages/remix-dev/__tests__/fixtures/cloudflare/package.json
@@ -0,0 +1,36 @@
+{
+  "private": true,
+  "sideEffects": false,
+  "scripts": {
+    "build": "remix build",
+    "dev:remix": "remix watch",
+    "dev:wrangler": "cross-env NODE_ENV=development npm run wrangler",
+    "dev": "remix build && run-p \"dev:*\"",
+    "start": "cross-env NODE_ENV=production npm run wrangler",
+    "typecheck": "tsc",
+    "wrangler": "wrangler pages dev ./public"
+  },
+  "dependencies": {
+    "@remix-run/cloudflare": "^1.12.0",
+    "@remix-run/cloudflare-pages": "^1.12.0",
+    "@remix-run/react": "^1.12.0",
+    "cross-env": "^7.0.3",
+    "isbot": "^3.6.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@cloudflare/workers-types": "^3.18.0",
+    "@remix-run/dev": "^1.12.0",
+    "@remix-run/eslint-config": "^1.12.0",
+    "@types/react": "^18.0.25",
+    "@types/react-dom": "^18.0.8",
+    "eslint": "^8.27.0",
+    "npm-run-all": "^4.1.5",
+    "typescript": "^4.8.4",
+    "wrangler": "^2.2.1"
+  },
+  "engines": {
+    "node": ">=16.13"
+  }
+}
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/public/_headers b/packages/remix-dev/__tests__/fixtures/cloudflare/public/_headers
@@ -0,0 +1,2 @@
+/build/*
+  Cache-Control: public, max-age=31536000, s-maxage=31536000
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/public/_routes.json b/packages/remix-dev/__tests__/fixtures/cloudflare/public/_routes.json
@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "include": ["/*"],
+  "exclude": ["/build/*"]
+}
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/public/favicon.ico b/packages/remix-dev/__tests__/fixtures/cloudflare/public/favicon.ico
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/remix.config.js b/packages/remix-dev/__tests__/fixtures/cloudflare/remix.config.js
@@ -0,0 +1,11 @@
+/** @type {import('@remix-run/dev').AppConfig} */
+module.exports = {
+  serverBuildTarget: "cloudflare-pages",
+  server: "./server.js",
+  devServerBroadcastDelay: 1000,
+  ignoredRouteFiles: ["**/.*"],
+  // appDirectory: "app",
+  // assetsBuildDirectory: "public/build",
+  // serverBuildPath: "functions/[[path]].js",
+  // publicPath: "/build/",
+};
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/remix.env.d.ts b/packages/remix-dev/__tests__/fixtures/cloudflare/remix.env.d.ts
@@ -0,0 +1,3 @@
+/// <reference types="@remix-run/dev" />
+/// <reference types="@remix-run/cloudflare" />
+/// <reference types="@cloudflare/workers-types" />
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/server.js b/packages/remix-dev/__tests__/fixtures/cloudflare/server.js
@@ -0,0 +1,12 @@
+import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
+import * as build from "@remix-run/dev/server-build";
+
+const handleRequest = createPagesFunctionHandler({
+  build,
+  mode: process.env.NODE_ENV,
+  getLoadContext: (context) => context.env,
+});
+
+export function onRequest(context) {
+  return handleRequest(context);
+}
diff --git a/packages/remix-dev/__tests__/fixtures/cloudflare/tsconfig.json b/packages/remix-dev/__tests__/fixtures/cloudflare/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "target": "ES2019",
+    "strict": true,
+    "allowJs": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./app/*"]
+    },
+
+    // Remix takes care of building everything in `remix build`.
+    "noEmit": true
+  }
+}