Skip to content

Commit 4168e6a

Browse files
authored
Merge pull request #123 from Lodestone-Team/0.4.1
2 parents 7f58e1e + 7e93e41 commit 4168e6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+25153
-17109
lines changed

.eslintrc.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": [
3-
"plugin:@typescript-eslint/recommended",
43
"next/core-web-vitals",
4+
"plugin:tailwindcss/recommended",
5+
"plugin:@typescript-eslint/recommended",
56
"plugin:storybook/recommended",
67
"prettier"
78
],
@@ -21,6 +22,10 @@
2122
{
2223
"name": "next/router",
2324
"message": "Please use react-router-dom instead"
25+
},
26+
{
27+
"name": "tailwind-merge",
28+
"message": "Please use \"myTwMerge\" from \"utils.ts\" instead"
2429
}
2530
],
2631
"@next/next/no-img-element": "off",
@@ -32,6 +37,13 @@
3237
"varsIgnorePattern": "^_",
3338
"caughtErrorsIgnorePattern": "^_"
3439
}
35-
]
40+
],
41+
"tailwindcss/migration-from-tailwind-2": ["off"]
42+
},
43+
"plugins": ["tailwindcss"],
44+
"settings": {
45+
"tailwindcss": {
46+
"callees": ["cn", "clsx", "variants"]
47+
}
3648
}
3749
}

.vscode/settings.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
"cSpell.words": [
3-
"clsx",
4-
"Formik",
5-
"reduxjs"
6-
],
2+
"cSpell.words": ["clsx", "Formik", "reduxjs"],
73

84
"editor.codeActionsOnSave": {
95
"source.fixAll.eslint": true
@@ -16,5 +12,9 @@
1612
"typescript",
1713
"typescriptreact"
1814
],
19-
"liveServer.settings.port": 5521
15+
"liveServer.settings.port": 5521,
16+
"tailwindCSS.experimental.classRegex": [
17+
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
18+
"ClassName\\s*=\\s*[`\"']([^`\"']*)"
19+
]
2020
}

0 commit comments

Comments
 (0)