Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

chore: update tw intellisense #2186

Merged
merged 1 commit into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ module.exports = {
],
importOrderSeparation: true,
plugins: [require("./plugins/merged-prettier-plugin.js")],
tailwindAttributes: ["tw"],
};
8 changes: 1 addition & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
// already have a Prettier plugin, so don't need this.
Copy link
Contributor

@hirbod hirbod May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments are not allowed in .json. This could / should actually fail

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, now it's the age of JSON5 and we are using it. This is not a problem.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not work in every env though. But yeah, works in VSCode.

"source.organizeImports": false
},
"tailwindCSS.experimental.classRegex": [
"tw=\"([^\"]*)", // <View tw="..." />
"tw={\"([^\"}]*)", // <View tw={"..."} />
"tw={`([^`}]*)", // <View tw={`...`} />
"tw:\"([^\"]*)", // tw:"..."
"tw: \"([^\"]*)" // tw: "..."
],
"tailwindCSS.classAttributes": ["class", "className", "ngClass", ".*Tw"],
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.patterns": {
"*.svg": "${capture}.tsx, ${capture}.svg",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"nativewind": "^2.0.11",
"patch-package": "^7.0.0",
"prettier": "^2.8.7",
"prettier-plugin-tailwindcss": "0.2.5",
"prettier-plugin-tailwindcss": "insiders",
"react-native-os": "^1.2.6",
"turbo": "^1.9.3"
},
Expand Down
13 changes: 0 additions & 13 deletions patches/prettier-plugin-tailwindcss+0.2.5.patch

This file was deleted.

16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27836,12 +27836,11 @@ __metadata:
languageName: node
linkType: hard

"prettier-plugin-tailwindcss@npm:0.2.5":
version: 0.2.5
resolution: "prettier-plugin-tailwindcss@npm:0.2.5"
"prettier-plugin-tailwindcss@npm:insiders":
version: 0.0.0-insiders.d3f787d
resolution: "prettier-plugin-tailwindcss@npm:0.0.0-insiders.d3f787d"
peerDependencies:
"@ianvs/prettier-plugin-sort-imports": "*"
"@prettier/plugin-php": "*"
"@prettier/plugin-pug": "*"
"@shopify/prettier-plugin-liquid": "*"
"@shufo/prettier-plugin-blade": "*"
Expand All @@ -27851,6 +27850,7 @@ __metadata:
prettier-plugin-css-order: "*"
prettier-plugin-import-sort: "*"
prettier-plugin-jsdoc: "*"
prettier-plugin-marko: "*"
prettier-plugin-organize-attributes: "*"
prettier-plugin-organize-imports: "*"
prettier-plugin-style-order: "*"
Expand All @@ -27859,8 +27859,6 @@ __metadata:
peerDependenciesMeta:
"@ianvs/prettier-plugin-sort-imports":
optional: true
"@prettier/plugin-php":
optional: true
"@prettier/plugin-pug":
optional: true
"@shopify/prettier-plugin-liquid":
Expand All @@ -27877,6 +27875,8 @@ __metadata:
optional: true
prettier-plugin-jsdoc:
optional: true
prettier-plugin-marko:
optional: true
prettier-plugin-organize-attributes:
optional: true
prettier-plugin-organize-imports:
Expand All @@ -27887,7 +27887,7 @@ __metadata:
optional: true
prettier-plugin-twig-melody:
optional: true
checksum: 44ae325d40ad747dd8fb36e1d7986de1919b9bd912993628c18f4743c9287b1add6dd2d951ed336b1031a2ad49c7ba5eb50e4be6d3b9b37e0da7fd137d13ec53
checksum: ec929e3ee143ade60a24503f71c38b798105f730218dfe6c9bf1ac3532bf5146084e2c2227b0f9fd951644184175bd48ff2de2ebef813a1cc43f3289a05eb239
languageName: node
linkType: hard

Expand Down Expand Up @@ -30874,7 +30874,7 @@ __metadata:
nativewind: ^2.0.11
patch-package: ^7.0.0
prettier: ^2.8.7
prettier-plugin-tailwindcss: 0.2.5
prettier-plugin-tailwindcss: insiders
react-native-os: ^1.2.6
turbo: ^1.9.3
languageName: unknown
Expand Down