From 3f708e451c570c085934253378986f54f581aa5e Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Tue, 14 Jan 2025 17:09:40 +0530 Subject: [PATCH] fix: update tailwind config package --- admin/.eslintrc.js | 3 --- admin/package.json | 2 +- admin/tailwind.config.js | 3 ++- packages/editor/package.json | 2 +- packages/editor/tailwind.config.js | 2 +- packages/propel/.eslintrc.js | 3 --- packages/propel/package.json | 2 +- packages/propel/tailwind.config.ts | 4 ++-- .../{tailwind-config-custom => tailwind-config}/package.json | 4 ++-- .../postcss.config.js | 0 .../tailwind.config.js | 0 packages/ui/package.json | 2 +- packages/ui/postcss.config.js | 3 ++- packages/ui/tailwind.config.js | 3 ++- space/.eslintrc.js | 4 ---- space/package.json | 2 +- space/postcss.config.js | 3 ++- space/tailwind.config.js | 3 ++- turbo.json | 1 + web/.eslintrc.js | 3 --- web/package.json | 2 +- web/tailwind.config.js | 3 ++- 22 files changed, 24 insertions(+), 30 deletions(-) rename packages/{tailwind-config-custom => tailwind-config}/package.json (84%) rename packages/{tailwind-config-custom => tailwind-config}/postcss.config.js (100%) rename packages/{tailwind-config-custom => tailwind-config}/tailwind.config.js (100%) diff --git a/admin/.eslintrc.js b/admin/.eslintrc.js index d8355bae80..666f5ab50c 100644 --- a/admin/.eslintrc.js +++ b/admin/.eslintrc.js @@ -2,7 +2,4 @@ module.exports = { root: true, extends: ["@plane/eslint-config/next.js"], parser: "@typescript-eslint/parser", - parserOptions: { - project: true, - }, }; diff --git a/admin/package.json b/admin/package.json index 0f91f8d011..cf1f11420e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -41,13 +41,13 @@ }, "devDependencies": { "@plane/eslint-config": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@types/node": "18.16.1", "@types/react": "^18.3.11", "@types/react-dom": "^18.2.18", "@types/uuid": "^9.0.8", "@types/zxcvbn": "^4.4.4", - "tailwind-config-custom": "*", "typescript": "5.3.3" } } diff --git a/admin/tailwind.config.js b/admin/tailwind.config.js index 05bc93bdcd..a05d9dcd8d 100644 --- a/admin/tailwind.config.js +++ b/admin/tailwind.config.js @@ -1,4 +1,5 @@ -const sharedConfig = require("tailwind-config-custom/tailwind.config.js"); +/* eslint-disable @typescript-eslint/no-require-imports */ +const sharedConfig = require("@plane/tailwind-config/tailwind.config.js"); module.exports = { presets: [sharedConfig], diff --git a/packages/editor/package.json b/packages/editor/package.json index aef0b79bcf..8efca0e6b8 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -76,12 +76,12 @@ }, "devDependencies": { "@plane/eslint-config": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@types/node": "18.15.3", "@types/react": "^18.3.11", "@types/react-dom": "^18.2.18", "postcss": "^8.4.38", - "tailwind-config-custom": "*", "tsup": "^7.2.0", "typescript": "5.3.3" }, diff --git a/packages/editor/tailwind.config.js b/packages/editor/tailwind.config.js index f320631588..de93a571f8 100644 --- a/packages/editor/tailwind.config.js +++ b/packages/editor/tailwind.config.js @@ -1,4 +1,4 @@ -const sharedConfig = require("tailwind-config-custom/tailwind.config.js"); +const sharedConfig = require("@plane/tailwind-config/tailwind.config.js"); module.exports = { // prefix ui lib classes to avoid conflicting with the app diff --git a/packages/propel/.eslintrc.js b/packages/propel/.eslintrc.js index 558b8f76ed..b11b7bb6d6 100644 --- a/packages/propel/.eslintrc.js +++ b/packages/propel/.eslintrc.js @@ -3,7 +3,4 @@ module.exports = { root: true, extends: ["@plane/eslint-config/library.js"], parser: "@typescript-eslint/parser", - parserOptions: { - project: true, - }, }; diff --git a/packages/propel/package.json b/packages/propel/package.json index cc9282b613..14661c7b19 100644 --- a/packages/propel/package.json +++ b/packages/propel/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@plane/eslint-config": "*", - "tailwind-config-custom": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@types/react": "18.3.1", "@types/react-dom": "18.3.0", diff --git a/packages/propel/tailwind.config.ts b/packages/propel/tailwind.config.ts index cc313b82ed..859971bab5 100644 --- a/packages/propel/tailwind.config.ts +++ b/packages/propel/tailwind.config.ts @@ -1,7 +1,7 @@ import type { Config } from "tailwindcss"; -// import sharedConfig from "@plane/tailwind-config-custom/tailwind.config"; +import sharedConfig from "@plane/tailwind-config/tailwind.config"; export default { - // ...sharedConfig, + ...sharedConfig, content: ["./src/**/*.{ts,tsx}"], } satisfies Config; diff --git a/packages/tailwind-config-custom/package.json b/packages/tailwind-config/package.json similarity index 84% rename from packages/tailwind-config-custom/package.json rename to packages/tailwind-config/package.json index a7fac6401b..8d6f62612d 100644 --- a/packages/tailwind-config-custom/package.json +++ b/packages/tailwind-config/package.json @@ -1,8 +1,8 @@ { - "name": "tailwind-config-custom", + "name": "@plane/tailwind-config", "version": "0.24.1", "description": "common tailwind configuration across monorepo", - "main": "index.js", + "main": "tailwind.config.js", "private": true, "devDependencies": { "@tailwindcss/typography": "^0.5.9", diff --git a/packages/tailwind-config-custom/postcss.config.js b/packages/tailwind-config/postcss.config.js similarity index 100% rename from packages/tailwind-config-custom/postcss.config.js rename to packages/tailwind-config/postcss.config.js diff --git a/packages/tailwind-config-custom/tailwind.config.js b/packages/tailwind-config/tailwind.config.js similarity index 100% rename from packages/tailwind-config-custom/tailwind.config.js rename to packages/tailwind-config/tailwind.config.js diff --git a/packages/ui/package.json b/packages/ui/package.json index 2cfcc3643c..ac65247393 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -47,6 +47,7 @@ "devDependencies": { "@chromatic-com/storybook": "^1.4.0", "@plane/eslint-config": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@storybook/addon-essentials": "^8.1.1", "@storybook/addon-interactions": "^8.1.1", @@ -68,7 +69,6 @@ "postcss-cli": "^11.0.0", "postcss-nested": "^6.0.1", "storybook": "^8.1.1", - "tailwind-config-custom": "*", "tailwindcss": "^3.4.3", "tsup": "^7.2.0", "typescript": "5.3.3" diff --git a/packages/ui/postcss.config.js b/packages/ui/postcss.config.js index 129aa7f59e..9b1e55fc44 100644 --- a/packages/ui/postcss.config.js +++ b/packages/ui/postcss.config.js @@ -1 +1,2 @@ -module.exports = require("tailwind-config-custom/postcss.config"); +// eslint-disable-next-line @typescript-eslint/no-require-imports +module.exports = require("@plane/tailwind-config/postcss.config.js"); diff --git a/packages/ui/tailwind.config.js b/packages/ui/tailwind.config.js index 79a219c22c..5970ea08ed 100644 --- a/packages/ui/tailwind.config.js +++ b/packages/ui/tailwind.config.js @@ -1,4 +1,5 @@ -const config = require("tailwind-config-custom/tailwind.config"); +// eslint-disable-next-line @typescript-eslint/no-require-imports +const config = require("@plane/tailwind-config/tailwind.config.js"); config.content.files = ["./src/**/*.{js,ts,jsx,tsx}"]; diff --git a/space/.eslintrc.js b/space/.eslintrc.js index 58822f90ba..5a6f060678 100644 --- a/space/.eslintrc.js +++ b/space/.eslintrc.js @@ -3,8 +3,4 @@ module.exports = { root: true, extends: ["@plane/eslint-config/next.js"], parser: "@typescript-eslint/parser", - parserOptions: { - project: true, - }, - rules: {}, }; diff --git a/space/package.json b/space/package.json index 8de70c7541..ff174a1d33 100644 --- a/space/package.json +++ b/space/package.json @@ -50,6 +50,7 @@ }, "devDependencies": { "@plane/eslint-config": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@types/dompurify": "^3.0.5", "@types/lodash": "^4.17.1", @@ -60,7 +61,6 @@ "@types/uuid": "^9.0.1", "@types/zxcvbn": "^4.4.4", "@typescript-eslint/eslint-plugin": "^5.48.2", - "tailwind-config-custom": "*", "typescript": "5.3.3" } } diff --git a/space/postcss.config.js b/space/postcss.config.js index 129aa7f59e..9b1e55fc44 100644 --- a/space/postcss.config.js +++ b/space/postcss.config.js @@ -1 +1,2 @@ -module.exports = require("tailwind-config-custom/postcss.config"); +// eslint-disable-next-line @typescript-eslint/no-require-imports +module.exports = require("@plane/tailwind-config/postcss.config.js"); diff --git a/space/tailwind.config.js b/space/tailwind.config.js index 1e1e598260..2232bb29ae 100644 --- a/space/tailwind.config.js +++ b/space/tailwind.config.js @@ -1 +1,2 @@ -module.exports = require("tailwind-config-custom/tailwind.config"); +/* eslint-disable @typescript-eslint/no-require-imports */ +module.exports = require("@plane/tailwind-config/tailwind.config.js"); diff --git a/turbo.json b/turbo.json index edfcd6771c..1113926cee 100644 --- a/turbo.json +++ b/turbo.json @@ -1,5 +1,6 @@ { "$schema": "https://turbo.build/schema.json", + "ui": "tui", "globalEnv": [ "NODE_ENV", "NEXT_PUBLIC_API_BASE_URL", diff --git a/web/.eslintrc.js b/web/.eslintrc.js index afa7562fd7..5a6f060678 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -3,7 +3,4 @@ module.exports = { root: true, extends: ["@plane/eslint-config/next.js"], parser: "@typescript-eslint/parser", - parserOptions: { - project: true, - }, }; diff --git a/web/package.json b/web/package.json index 5d2ff54e98..5141f67760 100644 --- a/web/package.json +++ b/web/package.json @@ -75,6 +75,7 @@ }, "devDependencies": { "@plane/eslint-config": "*", + "@plane/tailwind-config": "*", "@plane/typescript-config": "*", "@types/dompurify": "^3.0.5", "@types/lodash": "^4.14.202", @@ -86,7 +87,6 @@ "@types/uuid": "^8.3.4", "@types/zxcvbn": "^4.4.4", "prettier": "^3.2.5", - "tailwind-config-custom": "*", "typescript": "5.3.3" } } diff --git a/web/tailwind.config.js b/web/tailwind.config.js index 9b3463d0b1..b6377a0451 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -const sharedConfig = require("tailwind-config-custom/tailwind.config.js"); +// eslint-disable-next-line @typescript-eslint/no-require-imports +const sharedConfig = require("@plane/tailwind-config/tailwind.config.js"); module.exports = { presets: [sharedConfig],