@tamagui/vite-plugin-cjs 2.0.0-rc.7 → 2.0.0-rc.7-1770543309730
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/extract.cjs +12 -11
- package/dist/cjs/extract.js +11 -11
- package/dist/cjs/extract.js.map +1 -1
- package/dist/esm/extract.js +11 -11
- package/dist/esm/extract.js.map +1 -1
- package/dist/esm/extract.mjs +12 -11
- package/dist/esm/extract.mjs.map +1 -1
- package/package.json +2 -2
package/dist/cjs/extract.cjs
CHANGED
|
@@ -54,10 +54,10 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
54
54
|
let config, server;
|
|
55
55
|
const virtualExt = ".tamagui.css",
|
|
56
56
|
getAbsoluteVirtualFileId = filePath => filePath.startsWith(config.root) ? filePath : (0, import_vite.normalizePath)(import_node_path.default.join(config.root, filePath));
|
|
57
|
-
function
|
|
57
|
+
function isNotClient(environment) {
|
|
58
58
|
return environment?.name && environment.name !== "client";
|
|
59
59
|
}
|
|
60
|
-
function
|
|
60
|
+
function isNative(environment) {
|
|
61
61
|
return environment?.name && (environment.name === "ios" || environment.name === "android");
|
|
62
62
|
}
|
|
63
63
|
function invalidateModule(absoluteId) {
|
|
@@ -85,7 +85,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
85
85
|
config = resolvedConfig;
|
|
86
86
|
},
|
|
87
87
|
async resolveId(source) {
|
|
88
|
-
if (
|
|
88
|
+
if (isNative(this.environment) || isNotClient(this.environment)) return;
|
|
89
89
|
const [validId, query] = source.split("?");
|
|
90
90
|
if (!validId.endsWith(virtualExt)) return;
|
|
91
91
|
const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(validId);
|
|
@@ -99,14 +99,14 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
99
99
|
*
|
|
100
100
|
*/
|
|
101
101
|
async load(id) {
|
|
102
|
-
if (import_loadTamagui.disableStatic ||
|
|
102
|
+
if (import_loadTamagui.disableStatic || isNative(this.environment) || isNotClient(this.environment)) return;
|
|
103
103
|
const [validId] = id.split("?");
|
|
104
104
|
return cssMap.get(validId);
|
|
105
105
|
},
|
|
106
106
|
transform: {
|
|
107
107
|
order: "pre",
|
|
108
108
|
async handler(code, id) {
|
|
109
|
-
if (import_loadTamagui.disableStatic ||
|
|
109
|
+
if (import_loadTamagui.disableStatic || isNative(this.environment)) return;
|
|
110
110
|
const [validId] = id.split("?");
|
|
111
111
|
if (!validId.endsWith(".tsx")) return;
|
|
112
112
|
const firstCommentIndex = code.indexOf("// "),
|
|
@@ -123,10 +123,8 @@ Original source:
|
|
|
123
123
|
${code}
|
|
124
124
|
|
|
125
125
|
`)), shouldDisable) return;
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
"web" : this.environment.name,
|
|
129
|
-
cacheKey = getHash(`${cacheEnv}${code}${id}`),
|
|
126
|
+
const isSSR = isNotClient(this.environment),
|
|
127
|
+
cacheKey = getHash(`${this.environment.name}${code}${id}`),
|
|
130
128
|
cached = memoryCache[cacheKey];
|
|
131
129
|
if (cached) return cached;
|
|
132
130
|
let extracted;
|
|
@@ -134,7 +132,10 @@ ${code}
|
|
|
134
132
|
extracted = await Static.extractToClassNames({
|
|
135
133
|
source: code,
|
|
136
134
|
sourcePath: validId,
|
|
137
|
-
options:
|
|
135
|
+
options: {
|
|
136
|
+
...import_loadTamagui.tamaguiOptions
|
|
137
|
+
// run full extraction on both SSR and client for hydration parity
|
|
138
|
+
},
|
|
138
139
|
shouldPrintDebug
|
|
139
140
|
});
|
|
140
141
|
} catch (err) {
|
|
@@ -145,7 +146,7 @@ ${code}
|
|
|
145
146
|
const rootRelativeId = `${validId}${virtualExt}`,
|
|
146
147
|
absoluteId = getAbsoluteVirtualFileId(rootRelativeId);
|
|
147
148
|
let source = extracted.js;
|
|
148
|
-
extracted.styles && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
149
|
+
extracted.styles && !isSSR && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
149
150
|
import "${rootRelativeId}";`, cssMap.set(absoluteId, extracted.styles));
|
|
150
151
|
const codeOut = source.toString(),
|
|
151
152
|
out = {
|
package/dist/cjs/extract.js
CHANGED
|
@@ -38,10 +38,10 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
38
38
|
const cssMap = /* @__PURE__ */ new Map();
|
|
39
39
|
let config, server;
|
|
40
40
|
const virtualExt = ".tamagui.css", getAbsoluteVirtualFileId = (filePath) => filePath.startsWith(config.root) ? filePath : (0, import_vite.normalizePath)(import_node_path.default.join(config.root, filePath));
|
|
41
|
-
function
|
|
41
|
+
function isNotClient(environment) {
|
|
42
42
|
return environment?.name && environment.name !== "client";
|
|
43
43
|
}
|
|
44
|
-
function
|
|
44
|
+
function isNative(environment) {
|
|
45
45
|
return environment?.name && (environment.name === "ios" || environment.name === "android");
|
|
46
46
|
}
|
|
47
47
|
function invalidateModule(absoluteId) {
|
|
@@ -69,7 +69,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
69
69
|
config = resolvedConfig;
|
|
70
70
|
},
|
|
71
71
|
async resolveId(source) {
|
|
72
|
-
if (
|
|
72
|
+
if (isNative(this.environment) || isNotClient(this.environment))
|
|
73
73
|
return;
|
|
74
74
|
const [validId, query] = source.split("?");
|
|
75
75
|
if (!validId.endsWith(virtualExt))
|
|
@@ -86,7 +86,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
86
86
|
*
|
|
87
87
|
*/
|
|
88
88
|
async load(id) {
|
|
89
|
-
if (import_loadTamagui.disableStatic ||
|
|
89
|
+
if (import_loadTamagui.disableStatic || isNative(this.environment) || isNotClient(this.environment))
|
|
90
90
|
return;
|
|
91
91
|
const [validId] = id.split("?");
|
|
92
92
|
return cssMap.get(validId);
|
|
@@ -94,7 +94,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
94
94
|
transform: {
|
|
95
95
|
order: "pre",
|
|
96
96
|
async handler(code, id) {
|
|
97
|
-
if (import_loadTamagui.disableStatic ||
|
|
97
|
+
if (import_loadTamagui.disableStatic || isNative(this.environment))
|
|
98
98
|
return;
|
|
99
99
|
const [validId] = id.split("?");
|
|
100
100
|
if (!validId.endsWith(".tsx"))
|
|
@@ -112,10 +112,7 @@ ${code}
|
|
|
112
112
|
|
|
113
113
|
`)), shouldDisable)
|
|
114
114
|
return;
|
|
115
|
-
const
|
|
116
|
-
// same cache key for ssr and web since they are the same
|
|
117
|
-
"web"
|
|
118
|
-
) : this.environment.name, cacheKey = getHash(`${cacheEnv}${code}${id}`), cached = memoryCache[cacheKey];
|
|
115
|
+
const isSSR = isNotClient(this.environment), cacheKey = getHash(`${this.environment.name}${code}${id}`), cached = memoryCache[cacheKey];
|
|
119
116
|
if (cached)
|
|
120
117
|
return cached;
|
|
121
118
|
let extracted;
|
|
@@ -123,7 +120,10 @@ ${code}
|
|
|
123
120
|
extracted = await Static.extractToClassNames({
|
|
124
121
|
source: code,
|
|
125
122
|
sourcePath: validId,
|
|
126
|
-
options:
|
|
123
|
+
options: {
|
|
124
|
+
...import_loadTamagui.tamaguiOptions
|
|
125
|
+
// run full extraction on both SSR and client for hydration parity
|
|
126
|
+
},
|
|
127
127
|
shouldPrintDebug
|
|
128
128
|
});
|
|
129
129
|
} catch (err) {
|
|
@@ -134,7 +134,7 @@ ${code}
|
|
|
134
134
|
return;
|
|
135
135
|
const rootRelativeId = `${validId}${virtualExt}`, absoluteId = getAbsoluteVirtualFileId(rootRelativeId);
|
|
136
136
|
let source = extracted.js;
|
|
137
|
-
extracted.styles && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
137
|
+
extracted.styles && !isSSR && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
138
138
|
import "${rootRelativeId}";`, cssMap.set(absoluteId, extracted.styles));
|
|
139
139
|
const codeOut = source.toString(), out = {
|
|
140
140
|
code: codeOut,
|
package/dist/cjs/extract.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extract.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,aAAwB,+CACxB,uBAAiC,mCACjC,mBAAiB,kCAEjB,cAAgD,iBAChD,qBAAsE,0BAEtE,qBAA2B;AAEpB,SAAS,qBAAqB,WAA6C;AAChF,MAAI,WAAW;AACb,WAAO;AAAA,MACL,MAAM;AAAA,IACR;AAGF,QAAM,UAAU,CAAC,cAAkB,+BAAW,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,QAAQ,GAE7E,qBAAqB,MAAM;AAC/B,kBAAc,CAAC,GACf,YAAY;AAAA,EACd;AAEA,MAAI,cAAc,CAAC,GACf,YAAY;AAEhB,QAAM,SAAS,oBAAI,IAAoB;AAEvC,MAAI,QACA;AACJ,QAAM,aAAa,gBAEb,2BAA2B,CAAC,aAC5B,SAAS,WAAW,OAAO,IAAI,IAC1B,eAEF,2BAAc,iBAAAA,QAAK,KAAK,OAAO,MAAM,QAAQ,CAAC;AAGvD,WAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["path", "module"]
|
|
6
6
|
}
|
package/dist/esm/extract.js
CHANGED
|
@@ -16,10 +16,10 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
16
16
|
const cssMap = /* @__PURE__ */ new Map();
|
|
17
17
|
let config, server;
|
|
18
18
|
const virtualExt = ".tamagui.css", getAbsoluteVirtualFileId = (filePath) => filePath.startsWith(config.root) ? filePath : normalizePath(path.join(config.root, filePath));
|
|
19
|
-
function
|
|
19
|
+
function isNotClient(environment) {
|
|
20
20
|
return environment?.name && environment.name !== "client";
|
|
21
21
|
}
|
|
22
|
-
function
|
|
22
|
+
function isNative(environment) {
|
|
23
23
|
return environment?.name && (environment.name === "ios" || environment.name === "android");
|
|
24
24
|
}
|
|
25
25
|
function invalidateModule(absoluteId) {
|
|
@@ -47,7 +47,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
47
47
|
config = resolvedConfig;
|
|
48
48
|
},
|
|
49
49
|
async resolveId(source) {
|
|
50
|
-
if (
|
|
50
|
+
if (isNative(this.environment) || isNotClient(this.environment))
|
|
51
51
|
return;
|
|
52
52
|
const [validId, query] = source.split("?");
|
|
53
53
|
if (!validId.endsWith(virtualExt))
|
|
@@ -64,7 +64,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
64
64
|
*
|
|
65
65
|
*/
|
|
66
66
|
async load(id) {
|
|
67
|
-
if (disableStatic ||
|
|
67
|
+
if (disableStatic || isNative(this.environment) || isNotClient(this.environment))
|
|
68
68
|
return;
|
|
69
69
|
const [validId] = id.split("?");
|
|
70
70
|
return cssMap.get(validId);
|
|
@@ -72,7 +72,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
72
72
|
transform: {
|
|
73
73
|
order: "pre",
|
|
74
74
|
async handler(code, id) {
|
|
75
|
-
if (disableStatic ||
|
|
75
|
+
if (disableStatic || isNative(this.environment))
|
|
76
76
|
return;
|
|
77
77
|
const [validId] = id.split("?");
|
|
78
78
|
if (!validId.endsWith(".tsx"))
|
|
@@ -90,10 +90,7 @@ ${code}
|
|
|
90
90
|
|
|
91
91
|
`)), shouldDisable)
|
|
92
92
|
return;
|
|
93
|
-
const
|
|
94
|
-
// same cache key for ssr and web since they are the same
|
|
95
|
-
"web"
|
|
96
|
-
) : this.environment.name, cacheKey = getHash(`${cacheEnv}${code}${id}`), cached = memoryCache[cacheKey];
|
|
93
|
+
const isSSR = isNotClient(this.environment), cacheKey = getHash(`${this.environment.name}${code}${id}`), cached = memoryCache[cacheKey];
|
|
97
94
|
if (cached)
|
|
98
95
|
return cached;
|
|
99
96
|
let extracted;
|
|
@@ -101,7 +98,10 @@ ${code}
|
|
|
101
98
|
extracted = await Static.extractToClassNames({
|
|
102
99
|
source: code,
|
|
103
100
|
sourcePath: validId,
|
|
104
|
-
options:
|
|
101
|
+
options: {
|
|
102
|
+
...tamaguiOptions
|
|
103
|
+
// run full extraction on both SSR and client for hydration parity
|
|
104
|
+
},
|
|
105
105
|
shouldPrintDebug
|
|
106
106
|
});
|
|
107
107
|
} catch (err) {
|
|
@@ -112,7 +112,7 @@ ${code}
|
|
|
112
112
|
return;
|
|
113
113
|
const rootRelativeId = `${validId}${virtualExt}`, absoluteId = getAbsoluteVirtualFileId(rootRelativeId);
|
|
114
114
|
let source = extracted.js;
|
|
115
|
-
extracted.styles && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
115
|
+
extracted.styles && !isSSR && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
116
116
|
import "${rootRelativeId}";`, cssMap.set(absoluteId, extracted.styles));
|
|
117
117
|
const codeOut = source.toString(), out = {
|
|
118
118
|
code: codeOut,
|
package/dist/esm/extract.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/extract.ts"],
|
|
4
|
-
"mappings": "AAGA,YAAY,YAAY;AACxB,SAAS,wBAAwB;AACjC,OAAO,UAAU;AAEjB,SAAS,qBAAuC;AAChD,SAAS,eAAe,wBAAwB,sBAAsB;AAEtE,SAAS,kBAAkB;AAEpB,SAAS,qBAAqB,WAA6C;AAChF,MAAI,WAAW;AACb,WAAO;AAAA,MACL,MAAM;AAAA,IACR;AAGF,QAAM,UAAU,CAAC,UAAkB,WAAW,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,QAAQ,GAE7E,qBAAqB,MAAM;AAC/B,kBAAc,CAAC,GACf,YAAY;AAAA,EACd;AAEA,MAAI,cAAc,CAAC,GACf,YAAY;AAEhB,QAAM,SAAS,oBAAI,IAAoB;AAEvC,MAAI,QACA;AACJ,QAAM,aAAa,gBAEb,2BAA2B,CAAC,aAC5B,SAAS,WAAW,OAAO,IAAI,IAC1B,WAEF,cAAc,KAAK,KAAK,OAAO,MAAM,QAAQ,CAAC;AAGvD,WAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/extract.mjs
CHANGED
|
@@ -18,10 +18,10 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
18
18
|
let config, server;
|
|
19
19
|
const virtualExt = ".tamagui.css",
|
|
20
20
|
getAbsoluteVirtualFileId = filePath => filePath.startsWith(config.root) ? filePath : normalizePath(path.join(config.root, filePath));
|
|
21
|
-
function
|
|
21
|
+
function isNotClient(environment) {
|
|
22
22
|
return environment?.name && environment.name !== "client";
|
|
23
23
|
}
|
|
24
|
-
function
|
|
24
|
+
function isNative(environment) {
|
|
25
25
|
return environment?.name && (environment.name === "ios" || environment.name === "android");
|
|
26
26
|
}
|
|
27
27
|
function invalidateModule(absoluteId) {
|
|
@@ -49,7 +49,7 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
49
49
|
config = resolvedConfig;
|
|
50
50
|
},
|
|
51
51
|
async resolveId(source) {
|
|
52
|
-
if (
|
|
52
|
+
if (isNative(this.environment) || isNotClient(this.environment)) return;
|
|
53
53
|
const [validId, query] = source.split("?");
|
|
54
54
|
if (!validId.endsWith(virtualExt)) return;
|
|
55
55
|
const absoluteId = source.startsWith(config.root) ? source : getAbsoluteVirtualFileId(validId);
|
|
@@ -63,14 +63,14 @@ function tamaguiExtractPlugin(optionsIn) {
|
|
|
63
63
|
*
|
|
64
64
|
*/
|
|
65
65
|
async load(id) {
|
|
66
|
-
if (disableStatic ||
|
|
66
|
+
if (disableStatic || isNative(this.environment) || isNotClient(this.environment)) return;
|
|
67
67
|
const [validId] = id.split("?");
|
|
68
68
|
return cssMap.get(validId);
|
|
69
69
|
},
|
|
70
70
|
transform: {
|
|
71
71
|
order: "pre",
|
|
72
72
|
async handler(code, id) {
|
|
73
|
-
if (disableStatic ||
|
|
73
|
+
if (disableStatic || isNative(this.environment)) return;
|
|
74
74
|
const [validId] = id.split("?");
|
|
75
75
|
if (!validId.endsWith(".tsx")) return;
|
|
76
76
|
const firstCommentIndex = code.indexOf("// "),
|
|
@@ -87,10 +87,8 @@ Original source:
|
|
|
87
87
|
${code}
|
|
88
88
|
|
|
89
89
|
`)), shouldDisable) return;
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
"web" : this.environment.name,
|
|
93
|
-
cacheKey = getHash(`${cacheEnv}${code}${id}`),
|
|
90
|
+
const isSSR = isNotClient(this.environment),
|
|
91
|
+
cacheKey = getHash(`${this.environment.name}${code}${id}`),
|
|
94
92
|
cached = memoryCache[cacheKey];
|
|
95
93
|
if (cached) return cached;
|
|
96
94
|
let extracted;
|
|
@@ -98,7 +96,10 @@ ${code}
|
|
|
98
96
|
extracted = await Static.extractToClassNames({
|
|
99
97
|
source: code,
|
|
100
98
|
sourcePath: validId,
|
|
101
|
-
options:
|
|
99
|
+
options: {
|
|
100
|
+
...tamaguiOptions
|
|
101
|
+
// run full extraction on both SSR and client for hydration parity
|
|
102
|
+
},
|
|
102
103
|
shouldPrintDebug
|
|
103
104
|
});
|
|
104
105
|
} catch (err) {
|
|
@@ -109,7 +110,7 @@ ${code}
|
|
|
109
110
|
const rootRelativeId = `${validId}${virtualExt}`,
|
|
110
111
|
absoluteId = getAbsoluteVirtualFileId(rootRelativeId);
|
|
111
112
|
let source = extracted.js;
|
|
112
|
-
extracted.styles && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
113
|
+
extracted.styles && !isSSR && (this.addWatchFile(rootRelativeId), server && cssMap.has(absoluteId) && invalidateModule(rootRelativeId), source = `${source}
|
|
113
114
|
import "${rootRelativeId}";`, cssMap.set(absoluteId, extracted.styles));
|
|
114
115
|
const codeOut = source.toString(),
|
|
115
116
|
out = {
|
package/dist/esm/extract.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Static","getPragmaOptions","path","normalizePath","disableStatic","loadTamaguiBuildConfig","tamaguiOptions","createHash","tamaguiExtractPlugin","optionsIn","disable","name","getHash","input","update","digest","clearCompilerCache","memoryCache","cacheSize","cssMap","Map","config","server","virtualExt","getAbsoluteVirtualFileId","filePath","startsWith","root","join","
|
|
1
|
+
{"version":3,"names":["Static","getPragmaOptions","path","normalizePath","disableStatic","loadTamaguiBuildConfig","tamaguiOptions","createHash","tamaguiExtractPlugin","optionsIn","disable","name","getHash","input","update","digest","clearCompilerCache","memoryCache","cacheSize","cssMap","Map","config","server","virtualExt","getAbsoluteVirtualFileId","filePath","startsWith","root","join","isNotClient","environment","isNative","invalidateModule","absoluteId","moduleGraph","modules","getModulesByFile","module","lastHMRTimestamp","lastInvalidationTimestamp","Date","now","enforce","configureServer","_server","buildStart","closeBundle","userConf","optimizeDeps","include","push","configResolved","resolvedConfig","resolveId","source","validId","query","split","endsWith","has","load","id","get","transform","order","handler","code","firstCommentIndex","indexOf","shouldDisable","shouldPrintDebug","slice","console","trace","info","isSSR","cacheKey","cached","extracted","extractToClassNames","sourcePath","options","err","error","Error","message","String","rootRelativeId","js","styles","addWatchFile","set","codeOut","toString","out","map","length"],"sources":["../../src/extract.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/vite-plugin-cjs",
|
|
3
|
-
"version": "2.0.0-rc.7",
|
|
3
|
+
"version": "2.0.0-rc.7-1770543309730",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -11,6 +11,6 @@
|
|
|
11
11
|
"build": "cp -r ../vite-plugin/dist . || true"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@tamagui/vite-plugin": "2.0.0-rc.7"
|
|
14
|
+
"@tamagui/vite-plugin": "2.0.0-rc.7-1770543309730"
|
|
15
15
|
}
|
|
16
16
|
}
|