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

feat(examples): update tailwind lint #5777

Merged
merged 1 commit into from
Aug 22, 2023
+2,705 −1,516
Merged

feat(examples): update tailwind lint #5777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions examples/with-tailwind/.eslintrc.js
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions examples/with-tailwind/apps/docs/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
root: true,
extends: ["custom"],
extends: ["custom/next"],
};
5 changes: 3 additions & 2 deletions examples/with-tailwind/apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
"lint": "next lint"
},
"dependencies": {
"next": "^13.4.1",
"next": "^13.4.19",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ui": "workspace:*"
},
"devDependencies": {
"@next/eslint-plugin-next": "^13.4.19",
"@types/node": "^18.11.17",
"@types/react": "^18.2.5",
"@types/react-dom": "^18.2.4",
Expand All @@ -24,6 +25,6 @@
"tailwind-config": "workspace:*",
"tailwindcss": "^3.2.4",
"tsconfig": "workspace:*",
"typescript": "^4.9.4"
"typescript": "^5.1.6"
}
}
4 changes: 2 additions & 2 deletions examples/with-tailwind/apps/docs/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
}): JSX.Element {
return (
<html lang="en" className="bg-zinc-900">
<html className="bg-zinc-900" lang="en">
<body>{children}</body>
</html>
);
Expand Down
5 changes: 2 additions & 3 deletions examples/with-tailwind/apps/docs/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { Metadata } from "next";
import Head from "next/head";
import type { Metadata } from "next";
import { Button } from "ui";

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

export default function Home() {
export default function Home(): JSX.Element {
return (
<div className="flex min-h-screen flex-col items-center justify-center py-2">
<main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
Expand Down
3 changes: 1 addition & 2 deletions examples/with-tailwind/apps/web/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
root: true,
extends: ["custom"],
extends: ["custom/next"],
};
5 changes: 3 additions & 2 deletions examples/with-tailwind/apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
"lint": "next lint"
},
"dependencies": {
"next": "^13.4.1",
"next": "^13.4.19",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ui": "workspace:*"
},
"devDependencies": {
"@next/eslint-plugin-next": "^13.4.19",
"@types/node": "^18.11.17",
"@types/react": "^18.2.5",
"@types/react-dom": "^18.2.4",
Expand All @@ -24,6 +25,6 @@
"tailwind-config": "workspace:*",
"tailwindcss": "^3.2.4",
"tsconfig": "workspace:*",
"typescript": "^4.9.4"
"typescript": "^5.1.6"
}
}
4 changes: 2 additions & 2 deletions examples/with-tailwind/apps/web/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
}): JSX.Element {
return (
<html lang="en" className="bg-zinc-900">
<html className="bg-zinc-900" lang="en">
<body>{children}</body>
</html>
);
Expand Down
4 changes: 2 additions & 2 deletions examples/with-tailwind/apps/web/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Metadata } from "next";
import type { Metadata } from "next";
import { Button, Card } from "ui";

const CARD_CONTENT = [
Expand All @@ -23,7 +23,7 @@ export const metadata: Metadata = {
title: "Web - Turborepo Example",
};

export default function Home() {
export default function Home(): JSX.Element {
return (
<div className="flex min-h-screen flex-col items-center justify-center py-2">
<main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
Expand Down
10 changes: 5 additions & 5 deletions examples/with-tailwind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"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": "^1.9.3"
"eslint": "^8.47.0",
"prettier": "^3.0.2",
"prettier-plugin-tailwindcss": "^0.5.3",
"turbo": "^1.10.12",
"tsconfig": "workspace:*"
},
"packageManager": "pnpm@8.6.10"
}
3 changes: 3 additions & 0 deletions examples/with-tailwind/packages/eslint-config-custom/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# `@turbo/eslint-config`

Collection of internal eslint configurations.
11 changes: 0 additions & 11 deletions examples/with-tailwind/packages/eslint-config-custom/index.js
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions examples/with-tailwind/packages/eslint-config-custom/library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
const { resolve } = require("node:path");

const project = resolve(process.cwd(), "tsconfig.json");

/*
* This is a custom ESLint configuration for use with
* typescript packages.
*
* This config extends the Vercel Engineering Style Guide.
* For more information, see https://github.com/vercel/style-guide
*
*/

module.exports = {
extends: [
"@vercel/style-guide/eslint/node",
"@vercel/style-guide/eslint/typescript",
].map(require.resolve),
parserOptions: {
project,
},
globals: {
React: true,
JSX: true,
},
settings: {
"import/resolver": {
typescript: {
project,
},
},
},
ignorePatterns: ["node_modules/", "dist/"],
};
41 changes: 41 additions & 0 deletions examples/with-tailwind/packages/eslint-config-custom/next.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const { resolve } = require("node:path");

const project = resolve(process.cwd(), "tsconfig.json");

/*
* This is a custom ESLint configuration for use with
* Next.js apps.
*
* This config extends the Vercel Engineering Style Guide.
* For more information, see https://github.com/vercel/style-guide
*
*/

module.exports = {
extends: [
"@vercel/style-guide/eslint/browser",
"@vercel/style-guide/eslint/typescript",
"@vercel/style-guide/eslint/react",
"@vercel/style-guide/eslint/next",
"eslint-config-turbo",
].map(require.resolve),
parserOptions: {
project,
},
globals: {
React: true,
JSX: true,
},
settings: {
"import/resolver": {
typescript: {
project,
},
},
},
ignorePatterns: ["node_modules/", "dist/"],
// add rules configurations here
rules: {
"import/no-default-export": "off",
},
};
15 changes: 5 additions & 10 deletions examples/with-tailwind/packages/eslint-config-custom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
{
"name": "eslint-config-custom",
"version": "0.0.0",
"main": "index.js",
"license": "MIT",
"dependencies": {
"eslint-config-next": "^13.4.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-react": "7.28.0",
"eslint-config-turbo": "^1.9.3"
},
"publishConfig": {
"access": "public"
"version": "0.0.0",
"private": true,
"devDependencies": {
"@vercel/style-guide": "^4.0.2",
"eslint-config-turbo": "^1.10.12"
}
}
38 changes: 38 additions & 0 deletions examples/with-tailwind/packages/eslint-config-custom/react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const { resolve } = require("node:path");

const project = resolve(process.cwd(), "tsconfig.json");

/*
* This is a custom ESLint configuration for use a library
* that utilizes React.
*
* This config extends the Vercel Engineering Style Guide.
* For more information, see https://github.com/vercel/style-guide
*
*/

module.exports = {
extends: [
"@vercel/style-guide/eslint/browser",
"@vercel/style-guide/eslint/typescript",
"@vercel/style-guide/eslint/react",
].map(require.resolve),
parserOptions: {
project,
},
globals: {
JSX: true,
},
settings: {
"import/resolver": {
typescript: {
project,
},
},
},
ignorePatterns: ["node_modules/", "dist/", ".eslintrc.js", "**/*.css"],
// add rules configurations here
rules: {
"import/no-default-export": "off",
},
};
3 changes: 2 additions & 1 deletion examples/with-tailwind/packages/tsconfig/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"noUnusedParameters": false,
"preserveWatchOutput": true,
"skipLibCheck": true,
"strict": true
"strict": true,
"strictNullChecks": true
},
"exclude": ["node_modules"]
}
16 changes: 7 additions & 9 deletions examples/with-tailwind/packages/tsconfig/nextjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@
"extends": "./base.json",
"compilerOptions": {
"plugins": [{ "name": "next" }],
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"declaration": false,
"declarationMap": false,
"incremental": true,
"esModuleInterop": true,
"jsx": "preserve",
"lib": ["dom", "dom.iterable", "esnext"],
"module": "esnext",
"noEmit": true,
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
"strict": false,
"target": "es5"
},
"include": ["src", "next-env.d.ts"],
"exclude": ["node_modules"]
Expand Down
3 changes: 3 additions & 0 deletions examples/with-tailwind/packages/ui/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ["custom/react"],
};
4 changes: 2 additions & 2 deletions examples/with-tailwind/packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"license": "MIT",
"scripts": {
"build": "tsup",
"lint": "eslint src/**/*",
"dev": "tsup --watch",
"check-types": "tsc --noEmit"
},
Expand All @@ -20,13 +21,12 @@
},
"devDependencies": {
"@types/react": "^18.2.5",
"eslint": "^7.32.0",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.20",
"react": "^18.2.0",
"tailwind-config": "workspace:*",
"tsconfig": "workspace:*",
"tsup": "^6.1.3",
"typescript": "^4.9.4"
"typescript": "^5.1.6"
}
}
4 changes: 2 additions & 2 deletions .../with-tailwind/packages/ui/src/Button.tsx → .../with-tailwind/packages/ui/src/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";

export const Button = () => {
export function Button(): JSX.Element {
return (
<div className="rounded-md ">
<a href="https://turbo.build/repo/docs">
Expand All @@ -13,4 +13,4 @@ export const Button = () => {
</a>
</div>
);
};
}
Loading