Skip to content

Commit

Permalink
feat(examples): update tailwind lint
Browse files Browse the repository at this point in the history
  • Loading branch information
tknickman committed Aug 22, 2023
1 parent cb6105a commit 4bf20f7
Show file tree
Hide file tree
Showing 26 changed files with 2,396 additions and 1,224 deletions.
10 changes: 0 additions & 10 deletions examples/with-tailwind/.eslintrc.js

This file was deleted.

3 changes: 1 addition & 2 deletions examples/with-tailwind/apps/docs/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
root: true,
extends: ["custom"],
extends: ["eslint-config-custom/next"],
};
5 changes: 3 additions & 2 deletions examples/with-tailwind/apps/docs/package.json
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
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
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
module.exports = {
root: true,
extends: ["custom"],
extends: ["eslint-config-custom/next"],
};
5 changes: 3 additions & 2 deletions examples/with-tailwind/apps/web/package.json
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
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
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
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"
}
11 changes: 0 additions & 11 deletions examples/with-tailwind/packages/eslint-config-custom/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions examples/with-tailwind/packages/eslint-config-custom/package.json

This file was deleted.

3 changes: 3 additions & 0 deletions examples/with-tailwind/packages/eslint-config/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# `@turbo/eslint-config`

Collection of internal eslint configurations.
34 changes: 34 additions & 0 deletions examples/with-tailwind/packages/eslint-config/library.js
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/next.js
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",
},
};
10 changes: 10 additions & 0 deletions examples/with-tailwind/packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "eslint-config-custom",
"license": "MIT",
"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/react.js
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
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
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ["eslint-config-custom/react"],
};
4 changes: 2 additions & 2 deletions examples/with-tailwind/packages/ui/package.json
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"
}
}
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

0 comments on commit 4bf20f7

Please sign in to comment.