diff --git a/.prettierrc.js b/.prettierrc.js
index 6ab632d4b0..bd1e848db7 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -13,4 +13,5 @@ module.exports = {
],
importOrderSeparation: true,
plugins: [require("./plugins/merged-prettier-plugin.js")],
+ tailwindAttributes: ["tw"],
};
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0e250b47e9..0a8cb96b1b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,13 +8,7 @@
// already have a Prettier plugin, so don't need this.
"source.organizeImports": false
},
- "tailwindCSS.experimental.classRegex": [
- "tw=\"([^\"]*)", //
- "tw={\"([^\"}]*)", //
- "tw={`([^`}]*)", //
- "tw:\"([^\"]*)", // tw:"..."
- "tw: \"([^\"]*)" // tw: "..."
- ],
+ "tailwindCSS.classAttributes": ["class", "className", "ngClass", ".*Tw"],
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.patterns": {
"*.svg": "${capture}.tsx, ${capture}.svg",
diff --git a/package.json b/package.json
index f4d231795e..b593edd3c3 100644
--- a/package.json
+++ b/package.json
@@ -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"
},
diff --git a/patches/prettier-plugin-tailwindcss+0.2.5.patch b/patches/prettier-plugin-tailwindcss+0.2.5.patch
deleted file mode 100644
index f8f8b9b464..0000000000
--- a/patches/prettier-plugin-tailwindcss+0.2.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/prettier-plugin-tailwindcss/dist/index.js b/node_modules/prettier-plugin-tailwindcss/dist/index.js
-index 510ba9d..a18241d 100644
---- a/node_modules/prettier-plugin-tailwindcss/dist/index.js
-+++ b/node_modules/prettier-plugin-tailwindcss/dist/index.js
-@@ -131,7 +131,7 @@ while`),i.push(" (",n.call(r,"test"),");"),S.concat(i)}case"DoExpression":{var D
- Use "options.replacer" or "options.ignoreUnknown"
- `)},_domwindow:function(){return e("domwindow")},_bigint:function(i){return e("bigint:"+i.toString())},_process:function(){return e("process")},_timer:function(){return e("timer")},_pipe:function(){return e("pipe")},_tcp:function(){return e("tcp")},_udp:function(){return e("udp")},_tty:function(){return e("tty")},_statwatcher:function(){return e("statwatcher")},_securecontext:function(){return e("securecontext")},_connection:function(){return e("connection")},_zlib:function(){return e("zlib")},_context:function(){return e("context")},_nodescript:function(){return e("nodescript")},_httpparser:function(){return e("httpparser")},_dataview:function(){return e("dataview")},_signal:function(){return e("signal")},_fsevent:function(){return e("fsevent")},_tlswrap:function(){return e("tlswrap")}}}function ob(){return{buf:"",write:function(n){this.buf+=n},end:function(n){this.buf+=n},read:function(){return this.buf}}}});var Kf=D((xN,cb)=>{var d2={}.toString;cb.exports=Array.isArray||function(n){return d2.call(n)=="[object Array]"}});var db=D((SN,fb)=>{"use strict";var p2=Kf();fb.exports=function(t){return t!=null&&typeof t=="object"&&p2(t)===!1}});var hb=D((EN,pb)=>{"use strict";var h2=Kf(),m2=db(),wN=Array.prototype.slice;pb.exports=cn;function cn(n,t){if(!(this instanceof cn))return typeof t=="number"?new cn(n).fromIndex(t):new cn(n,t);this.str=n||"",this.lineToIndex=v2(this.str),t=t||{},this.origin=typeof t.origin>"u"?1:t.origin}cn.prototype.fromIndex=function(n){if(n<0||n>=this.str.length||isNaN(n))return null;var t=g2(n,this.lineToIndex);return{line:t+this.origin,col:n-this.lineToIndex[t]+this.origin}};cn.prototype.toIndex=function(n,t){if(typeof t>"u")return h2(n)&&n.length>=2?this.toIndex(n[0],n[1]):m2(n)&&"line"in n&&("col"in n||"column"in n)?this.toIndex(n.line,"col"in n?n.col:n.column):-1;if(isNaN(n)||isNaN(t))return-1;if(n-=this.origin,t-=this.origin,n>=0&&t>=0&&n=t[t.length-1])return t.length-1;for(var r=0,e=t.length-2,i;r>1),n=t[i+1])r=i+1;else{r=i;break}return r}});var yb=D((DN,gb)=>{"use strict";var mb={},y2=mb.hasOwnProperty,vb=(n,t)=>{for(let r in n)y2.call(n,r)&&t(r,n[r])},b2=(n,t)=>(t&&vb(t,(r,e)=>{n[r]=e}),n),x2=(n,t)=>{let r=n.length,e=-1;for(;++eji.call(n)=="[object Object]",D2=n=>typeof n=="string"||ji.call(n)=="[object String]",C2=n=>typeof n=="number"||ji.call(n)=="[object Number]",A2=n=>typeof n=="function",_2=n=>ji.call(n)=="[object Map]",T2=n=>ji.call(n)=="[object Set]",k2={'"':'\\"',"'":"\\'","\\":"\\\\","\b":"\\b","\f":"\\f","\n":"\\n","\r":"\\r"," ":"\\t"},F2=/["'\\\b\f\n\r\t]/,O2=/[0-9]/,P2=/[ !#-&\(-\[\]-_a-~]/,Zt=(n,t)=>{let r=()=>{p=c,++t.indentLevel,c=t.indent.repeat(t.indentLevel)},e={escapeEverything:!1,minimal:!1,isScriptContext:!1,quotes:"single",wrap:!1,es6:!1,json:!1,compact:!0,lowercaseHex:!1,numbers:"decimal",indent:" ",indentLevel:0,__inline1__:!1,__inline2__:!1},i=t&&t.json;i&&(e.quotes="double",e.wrap=!0),t=b2(e,t),t.quotes!="single"&&t.quotes!="double"&&t.quotes!="backtick"&&(t.quotes="single");let a=t.quotes=="double"?'"':t.quotes=="backtick"?"`":"'",s=t.compact,l=t.lowercaseHex,c=t.indent.repeat(t.indentLevel),p="",f=t.__inline1__,v=t.__inline2__,m=s?"":`
--`,o,u=!0,d=t.numbers=="binary",h=t.numbers=="octal",g=t.numbers=="decimal",y=t.numbers=="hexadecimal";if(i&&n&&A2(n.toJSON)&&(n=n.toJSON()),!D2(n)){if(_2(n))return n.size==0?"new Map()":(s||(t.__inline1__=!0,t.__inline2__=!1),"new Map("+Zt(Array.from(n),t)+")");if(T2(n))return n.size==0?"new Set()":"new Set("+Zt(Array.from(n),t)+")";if(w2(n))return n.length==0?"Buffer.from([])":"Buffer.from("+Zt(Array.from(n),t)+")";if(S2(n))return o=[],t.wrap=!0,f&&(t.__inline1__=!1,t.__inline2__=!0),v||r(),x2(n,E=>{u=!1,v&&(t.__inline2__=!1),o.push((s||v?"":c)+Zt(E,t))}),u?"[]":v?"["+o.join(", ")+"]":"["+m+o.join(","+m)+m+(s?"":p)+"]";if(C2(n)){if(i)return JSON.stringify(n);if(g)return String(n);if(y){let E=n.toString(16);return l||(E=E.toUpperCase()),"0x"+E}if(d)return"0b"+n.toString(2);if(h)return"0o"+n.toString(8)}else return E2(n)?(o=[],t.wrap=!0,r(),vb(n,(E,C)=>{u=!1,o.push((s?"":c)+Zt(E,t)+":"+(s?"":" ")+Zt(C,t))}),u?"{}":"{"+m+o.join(","+m)+m+(s?"":p)+"}"):i?JSON.stringify(n)||"null":String(n)}let b=n,x=-1,w=b.length;for(o="";++x=55296&&W<=56319&&w>x+1){let G=b.charCodeAt(x+1);if(G>=56320&&G<=57343){let de=((W-55296)*1024+G-56320+65536).toString(16);l||(de=de.toUpperCase()),o+="\\u{"+de+"}",++x;continue}}}if(!t.escapeEverything){if(P2.test(E)){o+=E;continue}if(E=='"'){o+=a==E?'\\"':E;continue}if(E=="`"){o+=a==E?"\\`":E;continue}if(E=="'"){o+=a==E?"\\'":E;continue}}if(E=="\0"&&!i&&!O2.test(b.charAt(x+1))){o+="\\0";continue}if(F2.test(E)){o+=k2[E];continue}let C=E.charCodeAt(0);if(t.minimal&&C!=8232&&C!=8233){o+=E;continue}let T=C.toString(16);l||(T=T.toUpperCase());let M=T.length>2||i;o+="\\"+(M?"u":"x")+("0000"+T).slice(M?-4:-2)}return t.wrap&&(o=a+o+a),a=="`"&&(o=o.replace(/\$\{/g,"\\${")),t.isScriptContext?o.replace(/<\/(script|style)/gi,"<\\/$1").replace(/