Skip to content

Commit 05da9ca

Browse files
authored
feat: replace twMacro with unplugin-ast (RSSNext#1462)
* feat: replace twMacro with unplugin-ast * fix
1 parent c875d69 commit 05da9ca

File tree

7 files changed

+98
-68
lines changed

7 files changed

+98
-68
lines changed

apps/renderer/vitest.config.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url"
55
import tsconfigPath from "vite-tsconfig-paths"
66
import { defineProject } from "vitest/config"
77

8-
import { twMacro } from "../../plugins/vite/tw-macro"
8+
import { astPlugin } from "../../configs/plugins"
99

1010
const pkg = JSON.parse(readFileSync("package.json", "utf8"))
1111
const __dirname = fileURLToPath(new URL(".", import.meta.url))
@@ -31,11 +31,9 @@ export default defineProject({
3131
},
3232

3333
plugins: [
34-
twMacro(),
34+
astPlugin,
3535
tsconfigPath({
3636
projects: ["./tsconfig.json"],
3737
}),
38-
39-
twMacro(),
4038
],
4139
})

apps/server/vite.config.mts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { resolve } from "node:path"
33
import react from "@vitejs/plugin-react"
44
import { defineConfig } from "vite"
55

6+
import { astPlugin } from "../../configs/plugins"
67
import { viteRenderBaseConfig } from "../../configs/vite.render.config"
7-
import { twMacro } from "../../plugins/vite/tw-macro"
88

99
export default () => {
1010
return defineConfig({
@@ -27,7 +27,7 @@ export default () => {
2727
},
2828
},
2929
},
30-
plugins: [react(), twMacro()],
30+
plugins: [react(), astPlugin],
3131

3232
server: {
3333
proxy: {

configs/plugins.ts

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { RemoveWrapperFunction } from "unplugin-ast/transformers"
2+
import AST from "unplugin-ast/vite"
3+
4+
export const astPlugin = AST({
5+
transformer: [RemoveWrapperFunction(["tw", "defineSettingPageData"])],
6+
})

configs/vite.render.config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import type { UserConfig } from "vite"
1010
import { circularImportRefreshPlugin } from "../plugins/vite/hmr"
1111
import { customI18nHmrPlugin } from "../plugins/vite/i18n-hmr"
1212
import { localesPlugin } from "../plugins/vite/locales"
13-
import { twMacro } from "../plugins/vite/tw-macro"
1413
import i18nCompleteness from "../plugins/vite/utils/i18n-completeness"
1514
import { getGitHash } from "../scripts/lib"
15+
import { astPlugin } from "./plugins"
1616

1717
const pkgDir = resolve(dirname(fileURLToPath(import.meta.url)), "..")
1818
const pkg = JSON.parse(readFileSync(resolve(pkgDir, "./package.json"), "utf8"))
@@ -68,7 +68,7 @@ export const viteRenderBaseConfig = {
6868
}),
6969

7070
localesPlugin(),
71-
twMacro(),
71+
astPlugin,
7272
customI18nHmrPlugin(),
7373
],
7474
define: {

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
"tsx": "4.19.2",
103103
"turbo": "2.2.3",
104104
"typescript": "5.6.3",
105+
"unplugin-ast": "^0.11.0",
105106
"vite": "^5.4.10",
106107
"vite-plugin-mkcert": "1.17.6",
107108
"vite-tsconfig-paths": "5.0.1",

plugins/vite/tw-macro.ts

-54
This file was deleted.

pnpm-lock.yaml

+85-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)