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-tailwind with App Router. #4849

Merged
merged 3 commits into from May 9, 2023
Merged

Update with-tailwind with App Router. #4849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
657be06
Update with-tailwind with App Router.
anthonyshew May 5, 2023
a06db75
Cleanup.
anthonyshew May 5, 2023
b1e17be
Merge branch 'main' into shew/app-router-with-tailwind
anthonyshew May 5, 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
6 changes: 3 additions & 3 deletions examples/with-tailwind/apps/docs/package.json
View file
Open in desktop
Expand Up @@ -9,15 +9,15 @@
"lint": "next lint"
},
"dependencies": {
"next": "latest",
"next": "^13.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ui": "workspace:*"
},
"devDependencies": {
"@types/node": "^18.11.17",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.9",
"@types/react": "^18.2.5",
"@types/react-dom": "^18.2.4",
"autoprefixer": "^10.4.13",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.20",
Expand Down
15 changes: 15 additions & 0 deletions examples/with-tailwind/apps/docs/src/app/layout.tsx
View file
Open in desktop
@@ -0,0 +1,15 @@
import "../styles/globals.css";
// include styles from the ui package
import "ui/styles.css";

export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="en" className="bg-zinc-900">
<body>{children}</body>
</html>
);
}
9 changes: 5 additions & 4 deletions ...th-tailwind/apps/docs/src/pages/index.tsx → .../with-tailwind/apps/docs/src/app/page.tsx
View file
Open in desktop
@@ -1,13 +1,14 @@
import { Metadata } from "next";
import Head from "next/head";
import { Button } from "ui";

export const metadata: Metadata = {
title: "Docs - Turborepo Example",
};

export default function Home() {
return (
<div className="flex min-h-screen flex-col items-center justify-center py-2">
<Head>
<title>Docs - Turborepo Example</title>
</Head>

<main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
<h1 className="mx-auto text-center text-6xl font-extrabold tracking-tight text-white sm:text-7xl lg:text-8xl xl:text-8xl">
Docs
Expand Down
9 changes: 0 additions & 9 deletions examples/with-tailwind/apps/docs/src/pages/_app.tsx
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions examples/with-tailwind/apps/docs/src/pages/_document.tsx
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion examples/with-tailwind/apps/docs/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"]
}
6 changes: 3 additions & 3 deletions examples/with-tailwind/apps/web/package.json
View file
Open in desktop
Expand Up @@ -9,15 +9,15 @@
"lint": "next lint"
},
"dependencies": {
"next": "latest",
"next": "^13.4.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ui": "workspace:*"
},
"devDependencies": {
"@types/node": "^18.11.17",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.9",
"@types/react": "^18.2.5",
"@types/react-dom": "^18.2.4",
"autoprefixer": "^10.4.13",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.20",
Expand Down
15 changes: 15 additions & 0 deletions examples/with-tailwind/apps/web/src/app/layout.tsx
View file
Open in desktop
@@ -0,0 +1,15 @@
import "../styles/globals.css";
// include styles from the ui package
import "ui/styles.css";

export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="en" className="bg-zinc-900">
<body>{children}</body>
</html>
);
}
10 changes: 5 additions & 5 deletions ...ith-tailwind/apps/web/src/pages/index.tsx → ...s/with-tailwind/apps/web/src/app/page.tsx
View file
Open in desktop
@@ -1,4 +1,4 @@
import Head from "next/head";
import { Metadata } from "next";
import { Button, Card } from "ui";

const CARD_CONTENT = [
Expand All @@ -19,13 +19,13 @@ const CARD_CONTENT = [
},
];

export const metadata: Metadata = {
title: "Web - Turborepo Example",
};

export default function Home() {
return (
<div className="flex min-h-screen flex-col items-center justify-center py-2">
<Head>
<title>Web - Turborepo Example</title>
</Head>

<main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
<h1 className="mx-auto text-center text-6xl font-extrabold tracking-tight text-white sm:text-7xl lg:text-8xl xl:text-8xl">
Web
Expand Down
9 changes: 0 additions & 9 deletions examples/with-tailwind/apps/web/src/pages/_app.tsx
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions examples/with-tailwind/apps/web/src/pages/_document.tsx
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion examples/with-tailwind/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"]
}
10 changes: 5 additions & 5 deletions examples/with-tailwind/package.json
View file
Open in desktop
@@ -1,18 +1,18 @@
{
"private": true,
"scripts": {
"build": "turbo run build",
"dev": "turbo run dev",
"lint": "turbo run lint",
"clean": "turbo run clean",
"build": "turbo build",
"dev": "turbo dev",
"lint": "turbo lint",
"clean": "turbo clean",
"format": "prettier --write \"**/*.{ts,tsx,md}\""
},
"devDependencies": {
"eslint": "^7.32.0",
"eslint-config-custom": "workspace:*",
"prettier": "^2.7.1",
"prettier-plugin-tailwindcss": "^0.1.11",
"turbo": "latest"
"turbo": "^1.9.3"
},
"packageManager": "pnpm@7.15.0"
}
4 changes: 2 additions & 2 deletions examples/with-tailwind/packages/eslint-config-custom/package.json
View file
Open in desktop
Expand Up @@ -4,10 +4,10 @@
"main": "index.js",
"license": "MIT",
"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-tailwind/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-tailwind/packages/ui/package.json
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
"react": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.0.26",
"@types/react": "^18.2.5",
"eslint": "^7.32.0",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.20",
Expand Down