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

chore(examples): update with-tailwind #9764

Merged
merged 9 commits into from
Jan 23, 2025
+971 −2,139
Merged

chore(examples): update with-tailwind #9764

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9dbcc95
upgrading with-tailwind
anthonyshew Jan 22, 2025
e7e3d10
moar
anthonyshew Jan 23, 2025
f6c9a02
WIP
anthonyshew Jan 23, 2025
9acee8f
WIP
anthonyshew Jan 23, 2025
126c814
WIP
anthonyshew Jan 23, 2025
f44d00c
resest lockfile
anthonyshew Jan 23, 2025
d51b3e2
WIP
anthonyshew Jan 23, 2025
9f32624
WIP
anthonyshew Jan 23, 2025
70aab14
WIP
anthonyshew Jan 23, 2025
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
3 changes: 0 additions & 3 deletions examples/with-tailwind/apps/docs/.eslintrc.js
View file
Open in desktop

This file was deleted.

0 ...th-tailwind/apps/docs/src/app/favicon.ico → ...s/with-tailwind/apps/docs/app/favicon.ico
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions ...ith-tailwind/apps/web/src/app/globals.css → ...s/with-tailwind/apps/docs/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

:root {
--foreground-rgb: 0, 0, 0;
Expand Down
2 changes: 1 addition & 1 deletion ...ith-tailwind/apps/docs/src/app/layout.tsx → ...es/with-tailwind/apps/docs/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function RootLayout({
children,
}: {
children: React.ReactNode;
}): JSX.Element {
}) {
return (
<html lang="en">
<body className={inter.className}>{children}</body>
Expand Down
6 changes: 3 additions & 3 deletions .../with-tailwind/apps/docs/src/app/page.tsx → ...ples/with-tailwind/apps/docs/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ function Gradient({
small?: boolean;
conic?: boolean;
className?: string;
}): JSX.Element {
}) {
return (
<span
className={`absolute mix-blend-normal will-change-[filter] rounded-[100%] ${
small ? "blur-[32px]" : "blur-[75px]"
} ${conic ? "bg-glow-conic" : ""} ${className}`}
} ${conic ? "bg-glow-conic" : ""} ${className ?? ""}`}
/>
);
}
Expand Down Expand Up @@ -43,7 +43,7 @@ const LINKS = [
},
];

export default function Page(): JSX.Element {
export default function Page() {
return (
<main className="flex flex-col items-center justify-between min-h-screen p-24">
<div className="z-10 items-center justify-between w-full max-w-5xl font-mono text-sm lg:flex">
Expand Down
4 changes: 4 additions & 0 deletions examples/with-tailwind/apps/docs/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { nextJsConfig } from "@repo/eslint-config/next-js";

/** @type {import("eslint").Linter.Config} */
export default nextJsConfig;
2 changes: 1 addition & 1 deletion examples/with-tailwind/apps/docs/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
6 changes: 6 additions & 0 deletions ...les/with-tailwind/apps/web/next.config.js → ...es/with-tailwind/apps/docs/next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
module.exports = {
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
reactStrictMode: true,
transpilePackages: ["@repo/ui"],
typescript: {
ignoreBuildErrors: true,
},
eslint: {
ignoreDuringBuilds: true,
},
};
8 changes: 5 additions & 3 deletions examples/with-tailwind/apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"name": "docs",
"version": "1.0.0",
"type": "module",
"private": true,
"scripts": {
"dev": "next dev --port 3001",
"build": "next build",
"start": "next start",
"lint": "next lint",
"type-check": "tsc --noEmit"
"lint": "next lint --max-warnings 0",
"check-types": "tsc --noEmit"
},
"dependencies": {
"@repo/ui": "workspace:*",
"@tailwindcss/postcss": "^4.0.0",
"next": "^15.1.6",
"react": "^19.0.0",
"react-dom": "^19.0.0"
Expand All @@ -25,7 +27,7 @@
"@types/react-dom": "^19.0.3",
"autoprefixer": "^10.4.20",
"postcss": "^8.5.1",
"tailwindcss": "^3.4.17",
"tailwindcss": "^4.0.0",
"typescript": "5.7.3"
}
}
9 changes: 0 additions & 9 deletions examples/with-tailwind/apps/docs/postcss.config.js
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions examples/with-tailwind/apps/docs/postcss.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export default {
plugins: {
"@tailwindcss/postcss": {},
},
};
2 changes: 1 addition & 1 deletion examples/with-tailwind/apps/docs/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Config } from "tailwindcss";
import sharedConfig from "@repo/tailwind-config";

const config: Pick<Config, "content" | "presets"> = {
content: ["./src/app/**/*.tsx"],
content: ["./app/**/*.tsx"],
presets: [sharedConfig],
};

Expand Down
14 changes: 12 additions & 2 deletions examples/with-tailwind/apps/docs/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
{
"extends": "@repo/typescript-config/nextjs.json",
"compilerOptions": {
"plugins": [{ "name": "next" }]
"plugins": [
{
"name": "next"
}
]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"include": [
"**/*.ts",
"**/*.tsx",
"next-env.d.ts",
"next.config.js",
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
".next/types/**/*.ts"
],
"exclude": ["node_modules"]
}
3 changes: 0 additions & 3 deletions examples/with-tailwind/apps/web/.eslintrc.js
View file
Open in desktop

This file was deleted.

0 ...ith-tailwind/apps/web/src/app/favicon.ico → ...es/with-tailwind/apps/web/app/favicon.ico
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions ...th-tailwind/apps/docs/src/app/globals.css → ...es/with-tailwind/apps/web/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

:root {
--foreground-rgb: 0, 0, 0;
Expand Down
2 changes: 1 addition & 1 deletion ...with-tailwind/apps/web/src/app/layout.tsx → ...les/with-tailwind/apps/web/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function RootLayout({
children,
}: {
children: React.ReactNode;
}): JSX.Element {
}) {
return (
<html lang="en">
<body className={inter.className}>{children}</body>
Expand Down
6 changes: 3 additions & 3 deletions ...s/with-tailwind/apps/web/src/app/page.tsx → examples/with-tailwind/apps/web/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ function Gradient({
small?: boolean;
conic?: boolean;
className?: string;
}): JSX.Element {
}) {
return (
<span
className={`absolute mix-blend-normal will-change-[filter] rounded-[100%] ${
small ? "blur-[32px]" : "blur-[75px]"
} ${conic ? "bg-glow-conic" : ""} ${className}`}
} ${conic ? "bg-glow-conic" : ""} ${className ?? ""}`}
/>
);
}
Expand Down Expand Up @@ -43,7 +43,7 @@ const LINKS = [
},
];

export default function Page(): JSX.Element {
export default function Page() {
return (
<main className="flex flex-col items-center justify-between min-h-screen p-24">
<div className="z-10 items-center justify-between w-full max-w-5xl font-mono text-sm lg:flex">
Expand Down
4 changes: 4 additions & 0 deletions examples/with-tailwind/apps/web/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { nextJsConfig } from "@repo/eslint-config/next-js";

/** @type {import("eslint").Linter.Config} */
export default nextJsConfig;
2 changes: 1 addition & 1 deletion examples/with-tailwind/apps/web/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
6 changes: 6 additions & 0 deletions ...es/with-tailwind/apps/docs/next.config.js → ...les/with-tailwind/apps/web/next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
module.exports = {
reactStrictMode: true,
transpilePackages: ["@repo/ui"],
typescript: {
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
ignoreBuildErrors: true,
},
eslint: {
ignoreDuringBuilds: true,
},
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
};
8 changes: 5 additions & 3 deletions examples/with-tailwind/apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"name": "web",
"version": "1.0.0",
"type": "module",
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"type-check": "tsc --noEmit"
"lint": "next lint --max-warnings 0",
"check-types": "tsc --noEmit"
},
"dependencies": {
"@repo/ui": "workspace:*",
"@tailwindcss/postcss": "^4.0.0",
"next": "^15.1.6",
"react": "^19.0.0",
"react-dom": "^19.0.0"
Expand All @@ -25,7 +27,7 @@
"@types/react-dom": "^19.0.3",
"autoprefixer": "^10.4.20",
"postcss": "^8.5.1",
"tailwindcss": "^3.4.17",
"tailwindcss": "^4.0.0",
"typescript": "5.7.3"
}
}
9 changes: 0 additions & 9 deletions examples/with-tailwind/apps/web/postcss.config.js
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions examples/with-tailwind/apps/web/postcss.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export default {
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
plugins: {
"@tailwindcss/postcss": {},
},
};
2 changes: 1 addition & 1 deletion examples/with-tailwind/apps/web/tailwind.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Config } from "tailwindcss";
import sharedConfig from "@repo/tailwind-config";

const config: Pick<Config, "content" | "presets"> = {
content: ["./src/app/**/*.tsx"],
content: ["./app/**/*.tsx"],
presets: [sharedConfig],
};

Expand Down
14 changes: 12 additions & 2 deletions examples/with-tailwind/apps/web/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
{
"extends": "@repo/typescript-config/nextjs.json",
"compilerOptions": {
"plugins": [{ "name": "next" }]
"plugins": [
{
"name": "next"
}
]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"include": [
"**/*.ts",
"**/*.tsx",
"next-env.d.ts",
"next.config.js",
".next/types/**/*.ts"
],
"exclude": ["node_modules"]
}
11 changes: 5 additions & 6 deletions examples/with-tailwind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "with-tailwind",
"private": true,
"scripts": {
"build": "turbo build",
"dev": "turbo dev",
"lint": "turbo lint",
"type-check": "turbo type-check",
"clean": "turbo clean",
"dev": "turbo run dev",
"lint": "turbo run lint",
"check-types": "turbo check-types",
"format": "prettier --write \"**/*.{ts,tsx,md}\""
},
"devDependencies": {
Expand All @@ -16,6 +16,5 @@
"packageManager": "[email protected]",
"engines": {
"node": ">=18"
},
"name": "with-tailwind"
}
}
37 changes: 0 additions & 37 deletions examples/with-tailwind/packages/config-eslint/library.js
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions examples/with-tailwind/packages/config-eslint/next.js
View file
Open in desktop

This file was deleted.

Loading
Loading