Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to Remix v2 #11

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Migrate to Remix v2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64d88ce
Migrate to Remix v2
rtivital Sep 24, 2023
35826c7
Update @mantine/* dependencies to version 7.0.1
rtivital Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .babelrc.json
View file
Open in desktop

This file was deleted.

0 .eslintrc.js → .eslintrc.cjs
View file
Open in desktop
File renamed without changes.
23 changes: 0 additions & 23 deletions .storybook/main.ts
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .storybook/preview.tsx
View file
Open in desktop

This file was deleted.

31 changes: 24 additions & 7 deletions app/entry.server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import { PassThrough } from "node:stream";

import type { EntryContext } from "@remix-run/node";
import { Response } from "@remix-run/node";
import type { AppLoadContext, EntryContext } from "@remix-run/node";
import { createReadableStreamFromReadable } from "@remix-run/node";
import { RemixServer } from "@remix-run/react";
import isbot from "isbot";
import { renderToPipeableStream } from "react-dom/server";
Expand All @@ -18,7 +18,8 @@ export default function handleRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext
remixContext: EntryContext,
loadContext: AppLoadContext
) {
return isbot(request.headers.get("user-agent"))
? handleBotRequest(
Expand All @@ -42,6 +43,7 @@ function handleBotRequest(
remixContext: EntryContext
) {
return new Promise((resolve, reject) => {
let shellRendered = false;
const { pipe, abort } = renderToPipeableStream(
<RemixServer
context={remixContext}
Expand All @@ -50,12 +52,14 @@ function handleBotRequest(
/>,
{
onAllReady() {
shellRendered = true;
const body = new PassThrough();
const stream = createReadableStreamFromReadable(body);

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(body, {
new Response(stream, {
headers: responseHeaders,
status: responseStatusCode,
})
Expand All @@ -68,7 +72,12 @@ function handleBotRequest(
},
onError(error: unknown) {
responseStatusCode = 500;
console.error(error);
// Log streaming rendering errors from inside the shell. Don't log
// errors encountered during initial shell rendering since they'll
// reject and get logged in handleDocumentRequest.
if (shellRendered) {
console.error(error);
}
},
}
);
Expand All @@ -84,6 +93,7 @@ function handleBrowserRequest(
remixContext: EntryContext
) {
return new Promise((resolve, reject) => {
let shellRendered = false;
const { pipe, abort } = renderToPipeableStream(
<RemixServer
context={remixContext}
Expand All @@ -92,12 +102,14 @@ function handleBrowserRequest(
/>,
{
onShellReady() {
shellRendered = true;
const body = new PassThrough();
const stream = createReadableStreamFromReadable(body);

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(body, {
new Response(stream, {
headers: responseHeaders,
status: responseStatusCode,
})
Expand All @@ -109,8 +121,13 @@ function handleBrowserRequest(
reject(error);
},
onError(error: unknown) {
console.error(error);
responseStatusCode = 500;
// Log streaming rendering errors from inside the shell. Don't log
// errors encountered during initial shell rendering since they'll
// reject and get logged in handleDocumentRequest.
if (shellRendered) {
console.error(error);
}
},
}
);
Expand Down
9 changes: 3 additions & 6 deletions app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import "@mantine/core/styles.css";

import { cssBundleHref } from "@remix-run/css-bundle";
import type { LinksFunction } from "@remix-run/node";
import {
Expand All @@ -10,7 +11,6 @@ import {
ScrollRestoration,
} from "@remix-run/react";
import { MantineProvider, ColorSchemeScript } from "@mantine/core";
import { theme } from "./theme";

export const links: LinksFunction = () => [
...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
Expand All @@ -21,16 +21,13 @@ export default function App() {
<html lang="en">
<head>
<meta charSet="utf-8" />
<meta
name="viewport"
content="minimum-scale=1, initial-scale=1, width=device-width, user-scalable=no"
/>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<Meta />
<Links />
<ColorSchemeScript />
</head>
<body>
<MantineProvider theme={theme}>
<MantineProvider>
<Outlet />
<ScrollRestoration />
<Scripts />
Expand Down
4 changes: 2 additions & 2 deletions app/routes/_index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { V2_MetaFunction } from "@remix-run/node";
import type { MetaFunction } from "@remix-run/node";
import { Welcome } from "~/components/Welcome/Welcome";
import { ColorSchemeToggle } from "~/components/ColorSchemeToggle/ColorSchemeToggle";

export const meta: V2_MetaFunction = () => {
export const meta: MetaFunction = () => {
return [
{ title: "Mantine Remix App" },
{ name: "description", content: "Welcome to Mantine!" },
Expand Down
5 changes: 0 additions & 5 deletions app/theme.ts
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions jest.config.js
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions jest.setup.js
View file
Open in desktop

This file was deleted.

63 changes: 19 additions & 44 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,37 @@
{
"name": "remix-v2",
"private": true,
"sideEffects": false,
"type": "module",
"scripts": {
"build": "remix build",
"dev": "remix dev",
"start": "remix-serve build",
"typecheck": "tsc",
"jest": "jest",
"jest:watch": "jest --watch",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
"dev": "remix dev --manual",
"start": "remix-serve ./build/index.js",
"typecheck": "tsc"
},
"dependencies": {
"@mantine/core": "7.0.0",
"@mantine/hooks": "7.0.0",
"@remix-run/css-bundle": "^1.16.1",
"@remix-run/node": "^1.16.1",
"@remix-run/react": "^1.16.1",
"@remix-run/serve": "^1.16.1",
"@mantine/core": "7.0.1",
"@mantine/hooks": "7.0.1",
"@remix-run/css-bundle": "^2.0.1",
"@remix-run/node": "^2.0.1",
"@remix-run/react": "^2.0.1",
"@remix-run/serve": "^2.0.1",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/preset-env": "^7.22.2",
"@babel/preset-react": "^7.22.3",
"@babel/preset-typescript": "^7.21.5",
"@remix-run/dev": "^1.16.1",
"@remix-run/eslint-config": "^1.16.1",
"@storybook/addon-essentials": "^7.0.18",
"@storybook/addon-interactions": "^7.0.18",
"@storybook/addon-links": "^7.0.18",
"@storybook/addon-styling": "^1.0.8",
"@storybook/blocks": "^7.0.18",
"@storybook/react": "^7.0.18",
"@storybook/react-webpack5": "^7.0.18",
"@storybook/testing-library": "^0.0.14-next.2",
"@testing-library/dom": "^9.3.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.1",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@remix-run/dev": "^2.0.1",
"@remix-run/eslint-config": "^2.0.1",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"eslint": "^8.38.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"postcss": "^8.4.23",
"postcss-preset-mantine": "1.6.0",
"postcss": "^8.4.30",
"postcss-preset-mantine": "^1.7.0",
"postcss-simple-vars": "^7.0.1",
"prop-types": "^15.8.1",
"storybook": "^7.0.18",
"storybook-dark-mode": "^3.0.0",
"ts-jest": "^29.1.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
},
"engines": {
"node": ">=14"
"node": ">=18.0.0"
}
}
0 postcss.config.js → postcss.config.cjs
View file
Open in desktop
File renamed without changes.
11 changes: 2 additions & 9 deletions remix.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
/** @type {import('@remix-run/dev').AppConfig} */
module.exports = {
export default {
postcss: true,
ignoredRouteFiles: ["**/.*"],
// appDirectory: "app",
// assetsBuildDirectory: "public/build",
// serverBuildPath: "build/index.js",
// publicPath: "/build/",
serverModuleFormat: "cjs",
future: {
v2_errorBoundary: true,
v2_meta: true,
v2_normalizeFormMethod: true,
v2_routeConvention: true,
},
// serverBuildPath: "build/index.js",
};
5 changes: 0 additions & 5 deletions test-utils/index.ts
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions test-utils/render.tsx
View file
Open in desktop

This file was deleted.

Loading