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

Update with-docker with App Router. #4844

Merged
merged 5 commits into from May 16, 2023
Merged

Update with-docker with App Router. #4844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
737c637
Update with-docker with App Router.
anthonyshew May 5, 2023
d1c1526
Cleanup pass.
anthonyshew May 5, 2023
2db95f8
Merge branch 'main' into shew/app-router-with-docker
anthonyshew May 5, 2023
4a4d5a6
More cleanup.
anthonyshew May 5, 2023
aba634f
Merge branch 'main' into shew/app-router-with-docker
anthonyshew May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/with-docker/apps/web/package.json
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
"start": "next start"
},
"dependencies": {
"next": "latest",
"next": "^13.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ui": "*"
Expand Down
11 changes: 11 additions & 0 deletions examples/with-docker/apps/web/src/app/layout.tsx
View file
Open in desktop
@@ -0,0 +1,11 @@
export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="en">
<body>{children}</body>
</html>
);
}
2 changes: 2 additions & 0 deletions .../with-docker/apps/web/src/pages/index.tsx → ...les/with-docker/apps/web/src/app/page.tsx
View file
Open in desktop
@@ -1,3 +1,5 @@
"use client";

import { useEffect, useState } from "react";
import { Button } from "ui";

Expand Down
5 changes: 4 additions & 1 deletion examples/with-docker/apps/web/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,8 @@
{
"extends": "tsconfig/nextjs.json",
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"compilerOptions": {
"plugins": [{ "name": "next" }]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
}
4 changes: 2 additions & 2 deletions examples/with-docker/package.json
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@
"dependencies": {},
"devDependencies": {
"eslint-config-custom": "*",
"prettier": "latest",
"turbo": "latest"
"prettier": "^2.8.8",
"turbo": "^1.9.3"
},
"packageManager": "yarn@1.22.19",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions examples/with-docker/packages/eslint-config-custom/package.json
View file
Open in desktop
Expand Up @@ -4,10 +4,10 @@
"license": "MIT",
"main": "index.js",
"dependencies": {
"eslint-config-next": "latest",
"eslint-config-next": "^13.4.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-react": "7.28.0",
"eslint-config-turbo": "latest"
"eslint-config-turbo": "^1.9.3"
},
"publishConfig": {
"access": "public"
Expand Down
1 change: 1 addition & 0 deletions examples/with-docker/packages/tsconfig/nextjs.json
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
"display": "Next.js",
"extends": "./base.json",
"compilerOptions": {
"plugins": [{ "name": "next" }],
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/with-docker/packages/ui/package.json
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
"@types/react-dom": "^17.0.11",
"eslint": "^7.32.0",
"eslint-config-custom": "*",
"react": "^17.0.2",
"react": "^18.2.0",
"tsconfig": "*",
"typescript": "^4.5.2"
}
Expand Down
1,765 changes: 1,070 additions & 695 deletions examples/with-docker/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.