From 278a2a5db73d90567d818e930125c9604b5d3d9d Mon Sep 17 00:00:00 2001 From: Chia1104 Date: Wed, 29 Mar 2023 17:46:19 +0800 Subject: [PATCH 1/2] chore(with-tailwind): use presets instead of spread operator to include sharedConfig in tailwind configuration files --- examples/with-tailwind/apps/docs/tailwind.config.js | 6 +++++- examples/with-tailwind/apps/web/tailwind.config.js | 6 +++++- examples/with-tailwind/packages/ui/tailwind.config.js | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/examples/with-tailwind/apps/docs/tailwind.config.js b/examples/with-tailwind/apps/docs/tailwind.config.js index c4cf07dfa7c4f..cc78ae35e3f26 100644 --- a/examples/with-tailwind/apps/docs/tailwind.config.js +++ b/examples/with-tailwind/apps/docs/tailwind.config.js @@ -1,3 +1,7 @@ // tailwind config is required for editor support -module.exports = require("tailwind-config/tailwind.config.js"); +const sharedConfig = require("tailwind-config/tailwind.config.js"); + +module.exports = { + presets: [sharedConfig], +}; diff --git a/examples/with-tailwind/apps/web/tailwind.config.js b/examples/with-tailwind/apps/web/tailwind.config.js index c4cf07dfa7c4f..cc78ae35e3f26 100644 --- a/examples/with-tailwind/apps/web/tailwind.config.js +++ b/examples/with-tailwind/apps/web/tailwind.config.js @@ -1,3 +1,7 @@ // tailwind config is required for editor support -module.exports = require("tailwind-config/tailwind.config.js"); +const sharedConfig = require("tailwind-config/tailwind.config.js"); + +module.exports = { + presets: [sharedConfig], +}; diff --git a/examples/with-tailwind/packages/ui/tailwind.config.js b/examples/with-tailwind/packages/ui/tailwind.config.js index 7f59682b197bc..24faae43ad03b 100644 --- a/examples/with-tailwind/packages/ui/tailwind.config.js +++ b/examples/with-tailwind/packages/ui/tailwind.config.js @@ -3,5 +3,5 @@ const sharedConfig = require("tailwind-config/tailwind.config.js"); module.exports = { // prefix ui lib classes to avoid conflicting with the app prefix: "ui-", - ...sharedConfig, + presets: [sharedConfig] }; From 740c8428c667866c846478e83f1b1bf2255a71ac Mon Sep 17 00:00:00 2001 From: Chia1104 Date: Wed, 29 Mar 2023 22:47:48 +0800 Subject: [PATCH 2/2] prettier --- examples/with-tailwind/packages/ui/tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/with-tailwind/packages/ui/tailwind.config.js b/examples/with-tailwind/packages/ui/tailwind.config.js index 24faae43ad03b..23887e6b59cf3 100644 --- a/examples/with-tailwind/packages/ui/tailwind.config.js +++ b/examples/with-tailwind/packages/ui/tailwind.config.js @@ -3,5 +3,5 @@ const sharedConfig = require("tailwind-config/tailwind.config.js"); module.exports = { // prefix ui lib classes to avoid conflicting with the app prefix: "ui-", - presets: [sharedConfig] + presets: [sharedConfig], };