@tamagui/static 1.16.4 → 1.16.6
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/extractor/bundleConfig.js +32 -24
- package/dist/cjs/extractor/bundleConfig.js.map +1 -1
- package/dist/cjs/extractor/loadTamagui.js +8 -2
- package/dist/cjs/extractor/loadTamagui.js.map +1 -1
- package/dist/cjs/require.js +7 -5
- package/dist/cjs/require.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.js +32 -24
- package/dist/esm/extractor/bundleConfig.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.mjs +32 -24
- package/dist/esm/extractor/bundleConfig.mjs.map +1 -1
- package/dist/esm/extractor/loadTamagui.js +8 -2
- package/dist/esm/extractor/loadTamagui.js.map +1 -1
- package/dist/esm/extractor/loadTamagui.mjs +8 -2
- package/dist/esm/extractor/loadTamagui.mjs.map +1 -1
- package/dist/esm/require.js +7 -5
- package/dist/esm/require.js.map +1 -1
- package/dist/esm/require.mjs +7 -5
- package/dist/esm/require.mjs.map +1 -1
- package/package.json +15 -18
- package/src/extractor/bundleConfig.ts +32 -28
- package/src/extractor/loadTamagui.ts +14 -3
- package/src/require.ts +15 -6
- package/types/extractor/bundleConfig.d.ts +1 -1
- package/types/extractor/bundleConfig.d.ts.map +1 -1
- package/types/extractor/loadTamagui.d.ts.map +1 -1
- package/types/require.d.ts.map +1 -1
|
@@ -62,15 +62,15 @@ const esbuildOptions = {
|
|
|
62
62
|
jsx: "transform",
|
|
63
63
|
platform: "node"
|
|
64
64
|
};
|
|
65
|
-
let
|
|
65
|
+
let currentBundle = null;
|
|
66
66
|
let isBundling = false;
|
|
67
|
+
let lastBundle = null;
|
|
67
68
|
const waitForBundle = /* @__PURE__ */ new Set();
|
|
68
|
-
let last;
|
|
69
69
|
async function hasBundledConfigChanged() {
|
|
70
|
-
if (
|
|
70
|
+
if (lastBundle === currentBundle) {
|
|
71
71
|
return false;
|
|
72
72
|
}
|
|
73
|
-
|
|
73
|
+
lastBundle = currentBundle;
|
|
74
74
|
return true;
|
|
75
75
|
}
|
|
76
76
|
async function getBundledConfig(props, rebuild = false) {
|
|
@@ -78,10 +78,10 @@ async function getBundledConfig(props, rebuild = false) {
|
|
|
78
78
|
await new Promise((res) => {
|
|
79
79
|
waitForBundle.add(res);
|
|
80
80
|
});
|
|
81
|
-
} else if (!
|
|
82
|
-
await bundleConfig(props);
|
|
81
|
+
} else if (!currentBundle || rebuild) {
|
|
82
|
+
return await bundleConfig(props);
|
|
83
83
|
}
|
|
84
|
-
return
|
|
84
|
+
return currentBundle;
|
|
85
85
|
}
|
|
86
86
|
async function bundleConfig(props) {
|
|
87
87
|
var _a, _b, _c;
|
|
@@ -109,14 +109,16 @@ async function bundleConfig(props) {
|
|
|
109
109
|
props.config ? (0, import_bundle.bundle)({
|
|
110
110
|
entryPoints: [configEntry],
|
|
111
111
|
external,
|
|
112
|
-
outfile: configOutPath
|
|
112
|
+
outfile: configOutPath,
|
|
113
|
+
target: "node16"
|
|
113
114
|
}) : null,
|
|
114
115
|
...baseComponents.map((componentModule, i) => {
|
|
115
116
|
return (0, import_bundle.bundle)({
|
|
116
117
|
entryPoints: [componentModule],
|
|
117
118
|
resolvePlatformSpecificEntries: true,
|
|
118
119
|
external,
|
|
119
|
-
outfile: componentOutPaths[i]
|
|
120
|
+
outfile: componentOutPaths[i],
|
|
121
|
+
target: "node16"
|
|
120
122
|
});
|
|
121
123
|
})
|
|
122
124
|
]);
|
|
@@ -138,7 +140,15 @@ async function bundleConfig(props) {
|
|
|
138
140
|
);
|
|
139
141
|
}
|
|
140
142
|
delete require.cache[import_path.default.resolve(configOutPath)];
|
|
141
|
-
|
|
143
|
+
let out;
|
|
144
|
+
const unregister = (0, import_require.registerRequire)();
|
|
145
|
+
try {
|
|
146
|
+
out = require(configOutPath);
|
|
147
|
+
} catch (err) {
|
|
148
|
+
throw err;
|
|
149
|
+
} finally {
|
|
150
|
+
unregister();
|
|
151
|
+
}
|
|
142
152
|
const config = out.default || out;
|
|
143
153
|
if (!config) {
|
|
144
154
|
throw new Error(`No config: ${config}`);
|
|
@@ -176,7 +186,7 @@ async function bundleConfig(props) {
|
|
|
176
186
|
nameToPaths: {},
|
|
177
187
|
tamaguiConfig: config
|
|
178
188
|
};
|
|
179
|
-
|
|
189
|
+
currentBundle = res;
|
|
180
190
|
return res;
|
|
181
191
|
} catch (err) {
|
|
182
192
|
console.log(
|
|
@@ -197,6 +207,7 @@ function loadComponents(props) {
|
|
|
197
207
|
if (cacheComponents[key]) {
|
|
198
208
|
return cacheComponents[key];
|
|
199
209
|
}
|
|
210
|
+
const unregister = (0, import_require.registerRequire)();
|
|
200
211
|
try {
|
|
201
212
|
const info = componentsModules.flatMap((name) => {
|
|
202
213
|
var _a;
|
|
@@ -220,19 +231,14 @@ function loadComponents(props) {
|
|
|
220
231
|
if (process.env.DEBUG === "tamagui") {
|
|
221
232
|
console.log(`loadModule`, loadModule, require.resolve(loadModule));
|
|
222
233
|
}
|
|
223
|
-
const
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
nameToInfo
|
|
232
|
-
};
|
|
233
|
-
} finally {
|
|
234
|
-
unregister();
|
|
235
|
-
}
|
|
234
|
+
const nameToInfo = getComponentStaticConfigByName(
|
|
235
|
+
name,
|
|
236
|
+
interopDefaultExport(require(loadModule))
|
|
237
|
+
);
|
|
238
|
+
return {
|
|
239
|
+
moduleName: name,
|
|
240
|
+
nameToInfo
|
|
241
|
+
};
|
|
236
242
|
}
|
|
237
243
|
const dispose = () => {
|
|
238
244
|
isDynamic && (0, import_fs_extra.removeSync)(loadModule);
|
|
@@ -296,6 +302,8 @@ isDynamic: `,
|
|
|
296
302
|
} catch (err) {
|
|
297
303
|
console.log(`Tamagui error bundling components`, err.message, err.stack);
|
|
298
304
|
return null;
|
|
305
|
+
} finally {
|
|
306
|
+
unregister();
|
|
299
307
|
}
|
|
300
308
|
}
|
|
301
309
|
const esbuildit = (src, target) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/bundleConfig.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAA6B;AAC7B,kBAAsE;AAEtE,uBAAqB;AACrB,sBAAqB;AACrB,QAAmB;AACnB,uBAAgC;AAEhC,qBAAoB;AACpB,sBAAqD;AAErD,qBAAgC;AAEhC,wBAA2B;AAC3B,oBAAuB;AAEvB,IAAI,mBAAmB;AAsBvB,MAAM,WAAW;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,KAAK;AAAA,EACL,UAAU;AACZ;AAKA,IAAI;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["path", "esbuild", "traverse", "generate"]
|
|
6
6
|
}
|
|
@@ -55,14 +55,20 @@ async function loadTamagui(propsIn) {
|
|
|
55
55
|
const props = getFilledOptions(propsIn);
|
|
56
56
|
const bundleInfo = await (0, import_bundleConfig.getBundledConfig)(props);
|
|
57
57
|
if (!bundleInfo) {
|
|
58
|
+
console.warn(
|
|
59
|
+
`No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs.`
|
|
60
|
+
);
|
|
58
61
|
return null;
|
|
59
62
|
}
|
|
63
|
+
if (bundleInfo) {
|
|
64
|
+
(0, import_core_node.createTamagui)(bundleInfo.tamaguiConfig);
|
|
65
|
+
}
|
|
60
66
|
if (!(0, import_bundleConfig.hasBundledConfigChanged)()) {
|
|
61
67
|
return bundleInfo;
|
|
62
68
|
}
|
|
63
|
-
|
|
69
|
+
try {
|
|
64
70
|
await (0, import_generateTamaguiStudioConfig.generateTamaguiStudioConfig)(props, bundleInfo);
|
|
65
|
-
|
|
71
|
+
} catch {
|
|
66
72
|
}
|
|
67
73
|
return bundleInfo;
|
|
68
74
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/loadTamagui.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA0D;AAE1D,iCAAwC;AACxC,uBAA8B;AAG9B,qBAAoB;AACpB,sBAAqD;AAErD,uBAA6B;AAC7B,qBAAgD;AAChD,0BAMO;AACP,yCAGO;AAEP,MAAM,mBAAmB,CAAC,aAAsD;AAAA;AAAA,EAE9E,QAAQ;AAAA,EACR,YAAY,CAAC,SAAS;AAAA,EACtB,GAAI;AACN;AAEA,eAAsB,YACpB,SACoC;AACpC,QAAM,QAAQ,iBAAiB,OAAO;AACtC,QAAM,aAAa,UAAM,sCAAiB,KAAK;AAC/C,MAAI,CAAC,YAAY;AACf,WAAO;AAAA,EACT;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fs", "esbuild"]
|
|
6
6
|
}
|
package/dist/cjs/require.js
CHANGED
|
@@ -29,14 +29,14 @@ const og = Module.prototype.require;
|
|
|
29
29
|
globalThis["ogRequire"] = og;
|
|
30
30
|
const getNameToPaths = () => nameToPaths;
|
|
31
31
|
function registerRequire() {
|
|
32
|
-
if (Module.prototype.require
|
|
32
|
+
if (Module.prototype.require["isTamaguiRequire"]) {
|
|
33
33
|
return () => {
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
const proxyWorm = require("@tamagui/proxy-worm");
|
|
37
37
|
const rnw = require("react-native-web");
|
|
38
38
|
const core = require("@tamagui/core-node");
|
|
39
|
-
|
|
39
|
+
function tamaguiRequire(path) {
|
|
40
40
|
var _a;
|
|
41
41
|
if (/\.(gif|jpe?g|png|svg|ttf|otf|woff2?|bmp|webp)$/.test(path)) {
|
|
42
42
|
return {};
|
|
@@ -44,11 +44,11 @@ function registerRequire() {
|
|
|
44
44
|
if (path === "@gorhom/bottom-sheet" || path.startsWith("react-native-reanimated") || path === "expo-linear-gradient" || path === "@expo/vector-icons") {
|
|
45
45
|
return proxyWorm;
|
|
46
46
|
}
|
|
47
|
-
if (path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
47
|
+
if (path === "react-native-web-lite" || path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
48
48
|
!path.startsWith("react-native-web/dist/cjs/exports".replace(/\//g, import_path.sep))) {
|
|
49
49
|
return rnw;
|
|
50
50
|
}
|
|
51
|
-
if (path === "@tamagui/core" || path === "@tamagui/web") {
|
|
51
|
+
if (path === "@tamagui/core" || path === "@tamagui/core-node" || path === "@tamagui/web") {
|
|
52
52
|
return core;
|
|
53
53
|
}
|
|
54
54
|
try {
|
|
@@ -71,7 +71,9 @@ function registerRequire() {
|
|
|
71
71
|
}
|
|
72
72
|
return proxyWorm;
|
|
73
73
|
}
|
|
74
|
-
}
|
|
74
|
+
}
|
|
75
|
+
tamaguiRequire["isTamaguiRequire"] = true;
|
|
76
|
+
Module.prototype.require = tamaguiRequire;
|
|
75
77
|
return () => {
|
|
76
78
|
Module.prototype.require = og;
|
|
77
79
|
};
|
package/dist/cjs/require.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/require.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA8B;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA8B;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,QAAQ,kBAAkB,GAAG;AAEhD,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAE/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,OAAO,QAAQ,oBAAoB;AAEzC,WAAS,eAA0B,MAAc;AAtBnD;AAuBI,QAAI,iDAAiD,KAAK,IAAI,GAAG;AAC/D,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,sBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,2BACR,KAAK,WAAW,cAAc;AAAA,IAE7B,CAAC,KAAK,WAAW,oCAAoC,QAAQ,OAAO,eAAG,CAAC,GAC1E;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,mBACT,SAAS,wBACT,SAAS,gBACT;AACA,aAAO;AAAA,IACT;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AAwBpC,aAAO;AAAA,IACT,SAAS,KAAP;AAMA,WAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAE5C,gBAAQ;AAAA,UACN;AAAA;AAAA,IAEN,IAAI;AAAA,IACJ,IAAI;AAAA;AAAA;AAAA;AAAA,qBAIS,sBAAS,QAAQ,IAAI,GAAG,IAAI;AAAA;AAAA;AAAA,QAGrC;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,iBAAe,kBAAkB,IAAI;AAErC,SAAO,UAAU,UAAU;AAE3B,SAAO,MAAM;AAEX,WAAO,UAAU,UAAU;AAAA,EAC7B;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -25,15 +25,15 @@ const esbuildOptions = {
|
|
|
25
25
|
jsx: "transform",
|
|
26
26
|
platform: "node"
|
|
27
27
|
};
|
|
28
|
-
let
|
|
28
|
+
let currentBundle = null;
|
|
29
29
|
let isBundling = false;
|
|
30
|
+
let lastBundle = null;
|
|
30
31
|
const waitForBundle = /* @__PURE__ */ new Set();
|
|
31
|
-
let last;
|
|
32
32
|
async function hasBundledConfigChanged() {
|
|
33
|
-
if (
|
|
33
|
+
if (lastBundle === currentBundle) {
|
|
34
34
|
return false;
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
lastBundle = currentBundle;
|
|
37
37
|
return true;
|
|
38
38
|
}
|
|
39
39
|
async function getBundledConfig(props, rebuild = false) {
|
|
@@ -41,10 +41,10 @@ async function getBundledConfig(props, rebuild = false) {
|
|
|
41
41
|
await new Promise((res) => {
|
|
42
42
|
waitForBundle.add(res);
|
|
43
43
|
});
|
|
44
|
-
} else if (!
|
|
45
|
-
await bundleConfig(props);
|
|
44
|
+
} else if (!currentBundle || rebuild) {
|
|
45
|
+
return await bundleConfig(props);
|
|
46
46
|
}
|
|
47
|
-
return
|
|
47
|
+
return currentBundle;
|
|
48
48
|
}
|
|
49
49
|
async function bundleConfig(props) {
|
|
50
50
|
var _a, _b, _c;
|
|
@@ -72,14 +72,16 @@ async function bundleConfig(props) {
|
|
|
72
72
|
props.config ? bundle({
|
|
73
73
|
entryPoints: [configEntry],
|
|
74
74
|
external,
|
|
75
|
-
outfile: configOutPath
|
|
75
|
+
outfile: configOutPath,
|
|
76
|
+
target: "node16"
|
|
76
77
|
}) : null,
|
|
77
78
|
...baseComponents.map((componentModule, i) => {
|
|
78
79
|
return bundle({
|
|
79
80
|
entryPoints: [componentModule],
|
|
80
81
|
resolvePlatformSpecificEntries: true,
|
|
81
82
|
external,
|
|
82
|
-
outfile: componentOutPaths[i]
|
|
83
|
+
outfile: componentOutPaths[i],
|
|
84
|
+
target: "node16"
|
|
83
85
|
});
|
|
84
86
|
})
|
|
85
87
|
]);
|
|
@@ -101,7 +103,15 @@ async function bundleConfig(props) {
|
|
|
101
103
|
);
|
|
102
104
|
}
|
|
103
105
|
delete require.cache[path.resolve(configOutPath)];
|
|
104
|
-
|
|
106
|
+
let out;
|
|
107
|
+
const unregister = registerRequire();
|
|
108
|
+
try {
|
|
109
|
+
out = require(configOutPath);
|
|
110
|
+
} catch (err) {
|
|
111
|
+
throw err;
|
|
112
|
+
} finally {
|
|
113
|
+
unregister();
|
|
114
|
+
}
|
|
105
115
|
const config = out.default || out;
|
|
106
116
|
if (!config) {
|
|
107
117
|
throw new Error(`No config: ${config}`);
|
|
@@ -139,7 +149,7 @@ async function bundleConfig(props) {
|
|
|
139
149
|
nameToPaths: {},
|
|
140
150
|
tamaguiConfig: config
|
|
141
151
|
};
|
|
142
|
-
|
|
152
|
+
currentBundle = res;
|
|
143
153
|
return res;
|
|
144
154
|
} catch (err) {
|
|
145
155
|
console.log(
|
|
@@ -160,6 +170,7 @@ function loadComponents(props) {
|
|
|
160
170
|
if (cacheComponents[key]) {
|
|
161
171
|
return cacheComponents[key];
|
|
162
172
|
}
|
|
173
|
+
const unregister = registerRequire();
|
|
163
174
|
try {
|
|
164
175
|
const info = componentsModules.flatMap((name) => {
|
|
165
176
|
var _a;
|
|
@@ -183,19 +194,14 @@ function loadComponents(props) {
|
|
|
183
194
|
if (process.env.DEBUG === "tamagui") {
|
|
184
195
|
console.log(`loadModule`, loadModule, require.resolve(loadModule));
|
|
185
196
|
}
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
nameToInfo
|
|
195
|
-
};
|
|
196
|
-
} finally {
|
|
197
|
-
unregister();
|
|
198
|
-
}
|
|
197
|
+
const nameToInfo = getComponentStaticConfigByName(
|
|
198
|
+
name,
|
|
199
|
+
interopDefaultExport(require(loadModule))
|
|
200
|
+
);
|
|
201
|
+
return {
|
|
202
|
+
moduleName: name,
|
|
203
|
+
nameToInfo
|
|
204
|
+
};
|
|
199
205
|
}
|
|
200
206
|
const dispose = () => {
|
|
201
207
|
isDynamic && removeSync(loadModule);
|
|
@@ -259,6 +265,8 @@ isDynamic: `,
|
|
|
259
265
|
} catch (err) {
|
|
260
266
|
console.log(`Tamagui error bundling components`, err.message, err.stack);
|
|
261
267
|
return null;
|
|
268
|
+
} finally {
|
|
269
|
+
unregister();
|
|
262
270
|
}
|
|
263
271
|
}
|
|
264
272
|
const esbuildit = (src, target) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/bundleConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,oBAAoB;AAC7B,OAAO,QAAQ,UAAU,SAAS,SAAS,MAAM,UAAU,WAAW;AAEtE,OAAO,cAAc;AACrB,OAAO,cAAc;AACrB,YAAY,OAAO;AACnB,SAAS,OAAO,gBAAgB;AAEhC,OAAO,aAAa;AACpB,SAAS,WAAW,YAAY,qBAAqB;AAErD,SAAS,uBAAuB;AAEhC,SAAS,kBAAkB;AAC3B,SAAS,cAAc;AAEvB,IAAI,mBAAmB;AAsBvB,MAAM,WAAW;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,KAAK;AAAA,EACL,UAAU;AACZ;AAKA,IAAI;
|
|
4
|
+
"mappings": "AAAA,SAAS,oBAAoB;AAC7B,OAAO,QAAQ,UAAU,SAAS,SAAS,MAAM,UAAU,WAAW;AAEtE,OAAO,cAAc;AACrB,OAAO,cAAc;AACrB,YAAY,OAAO;AACnB,SAAS,OAAO,gBAAgB;AAEhC,OAAO,aAAa;AACpB,SAAS,WAAW,YAAY,qBAAqB;AAErD,SAAS,uBAAuB;AAEhC,SAAS,kBAAkB;AAC3B,SAAS,cAAc;AAEvB,IAAI,mBAAmB;AAsBvB,MAAM,WAAW;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,KAAK;AAAA,EACL,UAAU;AACZ;AAKA,IAAI,gBAAsC;AAC1C,IAAI,aAAa;AACjB,IAAI,aAAmC;AACvC,MAAM,gBAAgB,oBAAI,IAAc;AAExC,eAAsB,0BAA0B;AAC9C,MAAI,eAAe,eAAe;AAChC,WAAO;AAAA,EACT;AACA,eAAa;AACb,SAAO;AACT;AAEA,eAAsB,iBAAiB,OAAuB,UAAU,OAAO;AAC7E,MAAI,YAAY;AACd,UAAM,IAAI,QAAQ,CAAC,QAAQ;AACzB,oBAAc,IAAI,GAAG;AAAA,IACvB,CAAC;AAAA,EACH,WAAW,CAAC,iBAAiB,SAAS;AACpC,WAAO,MAAM,aAAa,KAAK;AAAA,EACjC;AACA,SAAO;AACT;AAEA,eAAsB,aAAa,OAAuB;AAlF1D;AAmFE,MAAI;AACF,iBAAa;AAEb,UAAM,cAAc,MAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,MAAM,MAAM,IAAI;AACvE,UAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,UAAU;AAC7C,UAAM,gBAAgB,KAAK,QAAQ,oBAAoB;AACvD,UAAM,iBAAiB,MAAM,WAAW,OAAO,CAAC,MAAM,MAAM,eAAe;AAC3E,UAAM,oBAAoB,eAAe;AAAA,MAAI,CAAC,oBAC5C;AAAA,QACE;AAAA,QACA,GAAG,gBACA,MAAM,GAAG,EACT,KAAK,GAAG,EACR,QAAQ,gBAAgB,EAAE;AAAA,MAC/B;AAAA,IACF;AAEA,QACE,QAAQ,IAAI,aAAa,mBACzB,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,aAC9B;AACA,cAAQ,IAAI,yBAAyB,WAAW;AAAA,IAClD;AAGA,QAAI;AACF,YAAM,UAAU,MAAM;AAAA,IACxB,QAAE;AAAA,IAEF;AAEA,UAAM,QAAQ,KAAK,IAAI;AAEvB,UAAM,QAAQ,IAAI;AAAA,MAChB,MAAM,SACF,OAAO;AAAA,QACL,aAAa,CAAC,WAAW;AAAA,QACzB;AAAA,QACA,SAAS;AAAA,QACT,QAAQ;AAAA,MACV,CAAC,IACD;AAAA,MACJ,GAAG,eAAe,IAAI,CAAC,iBAAiB,MAAM;AAC5C,eAAO,OAAO;AAAA,UACZ,aAAa,CAAC,eAAe;AAAA,UAC7B,gCAAgC;AAAA,UAChC;AAAA,UACA,SAAS,kBAAkB,CAAC;AAAA,UAC5B,QAAQ;AAAA,QACV,CAAC;AAAA,MACH,CAAC;AAAA,IACH,CAAC;AAED,QAAI,CAAC,kBAAkB;AACrB,yBAAmB;AACnB;AAAA,QACE,MAAM;AAAA,QACN;AAAA,+CACuC,KAAK,IAAI,IAAI;AAAA,MACtD;AACA;AAAA,QACE,MAAM;AAAA,QACN;AAAA,wBACgB,MAAM,SAAS,QAAQ,IAAI,GAAG,aAAa;AAAA,uBAC5C;AAAA,UACX,GAAG,kBAAkB,IAAI,CAAC,MAAM,IAAI,MAAM,SAAS,QAAQ,IAAI,GAAG,CAAC,GAAG;AAAA,QACxE,EAAE,KAAK,iBAAiB;AAAA;AAAA,MAE5B;AAAA,IACF;AAGA,WAAO,QAAQ,MAAM,KAAK,QAAQ,aAAa,CAAC;AAEhD,QAAI;AACJ,UAAM,aAAa,gBAAgB;AACnC,QAAI;AACF,YAAM,QAAQ,aAAa;AAAA,IAC7B,SAAS,KAAP;AACA,YAAM;AAAA,IACR,UAAE;AACA,iBAAW;AAAA,IACb;AACA,UAAM,SAAS,IAAI,WAAW;AAE9B,QAAI,CAAC,QAAQ;AACX,YAAM,IAAI,MAAM,cAAc,QAAQ;AAAA,IACxC;AAEA,QAAI,aAAa,eAAe;AAAA,MAC9B,GAAG;AAAA,MACH,YAAY;AAAA,IACd,CAAC;AAED,QAAI,CAAC,YAAY;AACf,YAAM,IAAI,MAAM,wBAAwB,kBAAkB,KAAK,IAAI,GAAG;AAAA,IACxE;AAGA,eAAW,aAAa,YAAY;AAClC,gBAAU,aACR,eAAe,kBAAkB,QAAQ,UAAU,UAAU,CAAC;AAEhE,UAAI,CAAC,UAAU,YAAY;AACzB,gBAAQ;AAAA,UACN,sCAA4B,UAAU,cAAc,KAAK;AAAA,YACvD;AAAA,UACF,QAAQ,KAAK,UAAU,iBAAiB;AAAA,QAC1C;AAAA,MACF;AAAA,IACF;AAGA,UAAM,iBAAiB,eAAe;AAAA,MACpC,GAAG;AAAA,MACH,YAAY,CAAC,oBAAoB;AAAA,IACnC,CAAC;AACD,QAAI,gBAAgB;AAClB,qBAAe,CAAC,EAAE,aAAa;AAC/B,mBAAa,CAAC,GAAG,YAAY,GAAG,cAAc;AAAA,IAChD;AAEA,QACE,QAAQ,IAAI,aAAa,mBACzB,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,aAC9B;AACA,cAAQ,IAAI,qBAAqB,UAAU;AAAA,IAC7C;AAEA,UAAM,MAAM;AAAA,MACV;AAAA,MACA,aAAa,CAAC;AAAA,MACd,eAAe;AAAA,IACjB;AAEA,oBAAgB;AAEhB,WAAO;AAAA,EACT,SAAS,KAAP;AACA,YAAQ;AAAA,MACN,kCAAkC,2BAAK;AAAA,IACzC;AACA,SAAI,aAAQ,IAAI,UAAZ,mBAAmB,SAAS,YAAY;AAC1C,cAAQ,IAAI,IAAI,KAAK;AAAA,IACvB;AAAA,EACF,UAAE;AACA,iBAAa;AACb,kBAAc,QAAQ,CAAC,OAAO,GAAG,CAAC;AAClC,kBAAc,MAAM;AAAA,EACtB;AACF;AAEO,SAAS,eAAe,OAAkD;AAC/E,QAAM,oBAAoB,MAAM;AAChC,QAAM,MAAM,kBAAkB,KAAK,EAAE;AACrC,MAAI,gBAAgB,GAAG,GAAG;AACxB,WAAO,gBAAgB,GAAG;AAAA,EAC5B;AAEA,QAAM,aAAa,gBAAgB;AAEnC,MAAI;AACF,UAAM,OAA2B,kBAAkB,QAAQ,CAAC,SAAS;AArPzE;AAsPM,YAAM,YAAY,QAAQ,IAAI;AAC9B,YAAM,UAAU,QAAQ,SAAS;AAEjC,YAAM,YAAY,WAAW,CAAC,MAAM;AAEpC,UAAI,aAAa,CAAC,QAAQ,IAAI,6BAA6B;AACzD,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,eAAe,YAAY,aAAa,MAAM,OAAO,IAAI;AAC/D,YAAM,aAAa,YACf,KAAK,QAAQ,IAAI,GAAG,yBAAyB,SAAS,IAAI,OAAO,IACjE;AACJ,UAAI,kBAAkB;AACtB,UAAI,WAAW;AAEf,eAAS,YAAY,EAAE,eAAe,MAAM,IAAI,CAAC,GAAG;AAElD,YAAI,WAAW;AACb,4BAAkB,eACd;AAAA,YACE,oBAAoB,WAAW,UAAU,cAAc,QAAQ,CAAC,CAAC;AAAA,UACnE,IACA,UAAU,YAAY;AAE1B,wBAAc,YAAY,eAAe;AAAA,QAC3C;AAEA,YAAI,QAAQ,IAAI,UAAU,WAAW;AACnC,kBAAQ,IAAI,cAAc,YAAY,QAAQ,QAAQ,UAAU,CAAC;AAAA,QACnE;AAEA,cAAM,aAAa;AAAA,UACjB;AAAA,UACA,qBAAqB,QAAQ,UAAU,CAAC;AAAA,QAC1C;AAEA,eAAO;AAAA,UACL,YAAY;AAAA,UACZ;AAAA,QACF;AAAA,MACF;AAEA,YAAM,UAAU,MAAM;AACpB,qBAAa,WAAW,UAAU;AAAA,MACpC;AAEA,UAAI;AACF,cAAM,MAAM,YAAY;AAAA,UACtB,cAAc;AAAA,QAChB,CAAC;AACD,mBAAW;AACX,eAAO;AAAA,MACT,SAAS,KAAP;AACA,gBAAQ,IAAI,aAAa,KAAK,eAAe;AAE7C,0BAAkB;AAClB,aAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAC5C,kBAAQ,IAAI,8BAA8B,GAAG;AAAA,QAC/C;AAAA,MACF,UAAE;AACA,gBAAQ;AAAA,MACV;AAEA,UAAI;AACF,eAAO,YAAY;AAAA,UACjB,cAAc;AAAA,QAChB,CAAC;AAAA,MACH,SAAS,KAAP;AACA,YAAI,CAAC,QAAQ,IAAI,mCAAmC;AAClD,kBAAQ,IAAI;AAAA;AAAA;AAAA,IAGlB;AAAA;AAAA;AAAA;AAAA;AAAA,qCAKiC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,CAMpC;AACS,kBAAQ,IAAI,GAAG;AACf,kBAAQ;AAAA,YACN,OAAO;AAAA,YACP;AAAA,YAAe;AAAA,YACf;AAAA;AAAA,YACA;AAAA,YACA;AAAA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AACA,eAAO,CAAC;AAAA,MACV,UAAE;AACA,gBAAQ;AAAA,MACV;AAAA,IACF,CAAC;AACD,oBAAgB,GAAG,IAAI;AACvB,WAAO;AAAA,EACT,SAAS,KAAP;AACA,YAAQ,IAAI,qCAAqC,IAAI,SAAS,IAAI,KAAK;AACvE,WAAO;AAAA,EACT,UAAE;AACA,eAAW;AAAA,EACb;AACF;AAEA,MAAM,YAAY,CAAC,KAAa,WAAsB;AACpD,SAAO,QAAQ,cAAc,KAAK;AAAA,IAChC,GAAG;AAAA,IACH,GAAI,WAAW,YAAY;AAAA,MACzB,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,QAAQ;AAAA,IACV;AAAA,EACF,CAAC,EAAE;AACL;AAEA,SAAS,+BAA+B,MAAc,UAAe;AACnE,QAAM,aAAmE,CAAC;AAC1E,MAAI;AACF,QAAI,CAAC,YAAY,OAAO,aAAa,YAAY,MAAM,QAAQ,QAAQ,GAAG;AACxE,YAAM,IAAI,MAAM,+BAA+B,SAAS,OAAO,UAAU;AAAA,IAC3E;AACA,eAAW,OAAO,UAAU;AAC1B,YAAM,QAAQ,oBAAoB,KAAK,SAAS,GAAG,CAAC;AACpD,UAAI,OAAO;AAET,cAAM,EAAE,WAAW,GAAG,GAAG,IAAI,MAAM;AACnC,mBAAW,GAAG,IAAI,EAAE,cAAc,GAAG;AAAA,MACvC;AAAA,IACF;AAAA,EACF,SAAS,KAAP;AACA,QAAI,QAAQ,IAAI,sCAAsC,KAAK;AACzD,cAAQ;AAAA,QACN,+BAA+B;AAAA,MACjC;AACA,cAAQ,MAAM,GAAG;AAAA,IACnB;AAAA,EACF;AACA,SAAO;AACT;AAEA,SAAS,oBACP,MACA,WACkD;AAClD,MAAI,KAAK,CAAC,EAAE,YAAY,MAAM,KAAK,CAAC,GAAG;AACrC;AAAA,EACF;AACA,QAAM,eAAe,uCAAW;AAChC,MAAI,cAAc;AAChB,WAAO;AAAA,EACT;AACF;AAEA,SAAS,qBAAqB,KAAU;AACtC,UAAO,2BAAK,YAAW;AACzB;AAEA,MAAM,kBAAsD,CAAC;AAE7D,SAAS,oBAAoB,KAAa;AACxC,QAAM,YAAY,oBAAI,IAAY;AAIlC,WAAS,KAAK;AAAA,IACZ,uBAAuB,UAAU;AAC/B,UAAI,SAAS,KAAK,YAAY;AAC5B,mBAAW,QAAQ,SAAS,KAAK,YAAY;AAC3C,oBAAU;AAAA,YACR,EAAE,aAAa,KAAK,QAAQ,IAAI,KAAK,SAAS,OAAO,KAAK,SAAS;AAAA,UACrE;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAGD,WAAS,KAAK;AAAA,IACZ,oBAAoB,UAAU;AAE5B,UAAI,CAAC,EAAE,UAAU,SAAS,MAAM;AAAG;AACnC,YAAM,OAAO,SAAS,KAAK;AAC3B,UAAI,KAAK,SAAS;AAAG;AACrB,YAAM,CAAC,GAAG,IAAI;AACd,UAAI,CAAC,EAAE,aAAa,IAAI,EAAE;AAAG;AAC7B,UAAI,CAAC,IAAI;AAAM;AACf,UAAI,UAAU,IAAI,IAAI,GAAG,IAAI;AAAG;AAChC,gBAAU,IAAI,IAAI,GAAG,IAAI;AACzB,eAAS;AAAA,QACP,EAAE,uBAAuB,EAAE,oBAAoB,OAAO,CAAC,GAAG,CAAC,GAAG;AAAA,UAC5D,EAAE,gBAAgB,EAAE,WAAW,IAAI,GAAG,IAAI,GAAG,EAAE,WAAW,IAAI,GAAG,IAAI,CAAC;AAAA,QACxE,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,CAAC;AAGD,SAAO,SAAS,KAAY;AAAA,IAC1B,SAAS;AAAA,IACT,UAAU;AAAA,IACV,aAAa;AAAA,IACb,YAAY;AAAA,EACd,CAAC,EAAE;AACL;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -25,15 +25,15 @@ const esbuildOptions = {
|
|
|
25
25
|
jsx: "transform",
|
|
26
26
|
platform: "node"
|
|
27
27
|
};
|
|
28
|
-
let
|
|
28
|
+
let currentBundle = null;
|
|
29
29
|
let isBundling = false;
|
|
30
|
+
let lastBundle = null;
|
|
30
31
|
const waitForBundle = /* @__PURE__ */ new Set();
|
|
31
|
-
let last;
|
|
32
32
|
async function hasBundledConfigChanged() {
|
|
33
|
-
if (
|
|
33
|
+
if (lastBundle === currentBundle) {
|
|
34
34
|
return false;
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
lastBundle = currentBundle;
|
|
37
37
|
return true;
|
|
38
38
|
}
|
|
39
39
|
async function getBundledConfig(props, rebuild = false) {
|
|
@@ -41,10 +41,10 @@ async function getBundledConfig(props, rebuild = false) {
|
|
|
41
41
|
await new Promise((res) => {
|
|
42
42
|
waitForBundle.add(res);
|
|
43
43
|
});
|
|
44
|
-
} else if (!
|
|
45
|
-
await bundleConfig(props);
|
|
44
|
+
} else if (!currentBundle || rebuild) {
|
|
45
|
+
return await bundleConfig(props);
|
|
46
46
|
}
|
|
47
|
-
return
|
|
47
|
+
return currentBundle;
|
|
48
48
|
}
|
|
49
49
|
async function bundleConfig(props) {
|
|
50
50
|
var _a, _b, _c;
|
|
@@ -72,14 +72,16 @@ async function bundleConfig(props) {
|
|
|
72
72
|
props.config ? bundle({
|
|
73
73
|
entryPoints: [configEntry],
|
|
74
74
|
external,
|
|
75
|
-
outfile: configOutPath
|
|
75
|
+
outfile: configOutPath,
|
|
76
|
+
target: "node16"
|
|
76
77
|
}) : null,
|
|
77
78
|
...baseComponents.map((componentModule, i) => {
|
|
78
79
|
return bundle({
|
|
79
80
|
entryPoints: [componentModule],
|
|
80
81
|
resolvePlatformSpecificEntries: true,
|
|
81
82
|
external,
|
|
82
|
-
outfile: componentOutPaths[i]
|
|
83
|
+
outfile: componentOutPaths[i],
|
|
84
|
+
target: "node16"
|
|
83
85
|
});
|
|
84
86
|
})
|
|
85
87
|
]);
|
|
@@ -101,7 +103,15 @@ async function bundleConfig(props) {
|
|
|
101
103
|
);
|
|
102
104
|
}
|
|
103
105
|
delete require.cache[path.resolve(configOutPath)];
|
|
104
|
-
|
|
106
|
+
let out;
|
|
107
|
+
const unregister = registerRequire();
|
|
108
|
+
try {
|
|
109
|
+
out = require(configOutPath);
|
|
110
|
+
} catch (err) {
|
|
111
|
+
throw err;
|
|
112
|
+
} finally {
|
|
113
|
+
unregister();
|
|
114
|
+
}
|
|
105
115
|
const config = out.default || out;
|
|
106
116
|
if (!config) {
|
|
107
117
|
throw new Error(`No config: ${config}`);
|
|
@@ -139,7 +149,7 @@ async function bundleConfig(props) {
|
|
|
139
149
|
nameToPaths: {},
|
|
140
150
|
tamaguiConfig: config
|
|
141
151
|
};
|
|
142
|
-
|
|
152
|
+
currentBundle = res;
|
|
143
153
|
return res;
|
|
144
154
|
} catch (err) {
|
|
145
155
|
console.log(
|
|
@@ -160,6 +170,7 @@ function loadComponents(props) {
|
|
|
160
170
|
if (cacheComponents[key]) {
|
|
161
171
|
return cacheComponents[key];
|
|
162
172
|
}
|
|
173
|
+
const unregister = registerRequire();
|
|
163
174
|
try {
|
|
164
175
|
const info = componentsModules.flatMap((name) => {
|
|
165
176
|
var _a;
|
|
@@ -183,19 +194,14 @@ function loadComponents(props) {
|
|
|
183
194
|
if (process.env.DEBUG === "tamagui") {
|
|
184
195
|
console.log(`loadModule`, loadModule, require.resolve(loadModule));
|
|
185
196
|
}
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
nameToInfo
|
|
195
|
-
};
|
|
196
|
-
} finally {
|
|
197
|
-
unregister();
|
|
198
|
-
}
|
|
197
|
+
const nameToInfo = getComponentStaticConfigByName(
|
|
198
|
+
name,
|
|
199
|
+
interopDefaultExport(require(loadModule))
|
|
200
|
+
);
|
|
201
|
+
return {
|
|
202
|
+
moduleName: name,
|
|
203
|
+
nameToInfo
|
|
204
|
+
};
|
|
199
205
|
}
|
|
200
206
|
const dispose = () => {
|
|
201
207
|
isDynamic && removeSync(loadModule);
|
|
@@ -259,6 +265,8 @@ isDynamic: `,
|
|
|
259
265
|
} catch (err) {
|
|
260
266
|
console.log(`Tamagui error bundling components`, err.message, err.stack);
|
|
261
267
|
return null;
|
|
268
|
+
} finally {
|
|
269
|
+
unregister();
|
|
262
270
|
}
|
|
263
271
|
}
|
|
264
272
|
const esbuildit = (src, target) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/bundleConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,oBAAoB;AAC7B,OAAO,QAAQ,UAAU,SAAS,SAAS,MAAM,UAAU,WAAW;AAEtE,OAAO,cAAc;AACrB,OAAO,cAAc;AACrB,YAAY,OAAO;AACnB,SAAS,OAAO,gBAAgB;AAEhC,OAAO,aAAa;AACpB,SAAS,WAAW,YAAY,qBAAqB;AAErD,SAAS,uBAAuB;AAEhC,SAAS,kBAAkB;AAC3B,SAAS,cAAc;AAEvB,IAAI,mBAAmB;AAsBvB,MAAM,WAAW;AAAA,EACf;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,iBAAiB;AAAA,EAC5B,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,KAAK;AAAA,EACL,UAAU;AACZ;AAKA,IAAI;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -26,14 +26,20 @@ async function loadTamagui(propsIn) {
|
|
|
26
26
|
const props = getFilledOptions(propsIn);
|
|
27
27
|
const bundleInfo = await getBundledConfig(props);
|
|
28
28
|
if (!bundleInfo) {
|
|
29
|
+
console.warn(
|
|
30
|
+
`No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs.`
|
|
31
|
+
);
|
|
29
32
|
return null;
|
|
30
33
|
}
|
|
34
|
+
if (bundleInfo) {
|
|
35
|
+
createTamagui(bundleInfo.tamaguiConfig);
|
|
36
|
+
}
|
|
31
37
|
if (!hasBundledConfigChanged()) {
|
|
32
38
|
return bundleInfo;
|
|
33
39
|
}
|
|
34
|
-
|
|
40
|
+
try {
|
|
35
41
|
await generateTamaguiStudioConfig(props, bundleInfo);
|
|
36
|
-
|
|
42
|
+
} catch {
|
|
37
43
|
}
|
|
38
44
|
return bundleInfo;
|
|
39
45
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/loadTamagui.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,SAAS,SAAS,MAAM,eAAe;AAE1D,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAG9B,OAAO,aAAa;AACpB,OAAO,MAAM,YAAY,YAAY,gBAAgB;AAErD,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB,uBAAuB;AAChD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEP,MAAM,mBAAmB,CAAC,aAAsD;AAAA;AAAA,EAE9E,QAAQ;AAAA,EACR,YAAY,CAAC,SAAS;AAAA,EACtB,GAAI;AACN;AAEA,eAAsB,YACpB,SACoC;AACpC,QAAM,QAAQ,iBAAiB,OAAO;AACtC,QAAM,aAAa,MAAM,iBAAiB,KAAK;AAC/C,MAAI,CAAC,YAAY;AACf,WAAO;AAAA,EACT;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -26,14 +26,20 @@ async function loadTamagui(propsIn) {
|
|
|
26
26
|
const props = getFilledOptions(propsIn);
|
|
27
27
|
const bundleInfo = await getBundledConfig(props);
|
|
28
28
|
if (!bundleInfo) {
|
|
29
|
+
console.warn(
|
|
30
|
+
`No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs.`
|
|
31
|
+
);
|
|
29
32
|
return null;
|
|
30
33
|
}
|
|
34
|
+
if (bundleInfo) {
|
|
35
|
+
createTamagui(bundleInfo.tamaguiConfig);
|
|
36
|
+
}
|
|
31
37
|
if (!hasBundledConfigChanged()) {
|
|
32
38
|
return bundleInfo;
|
|
33
39
|
}
|
|
34
|
-
|
|
40
|
+
try {
|
|
35
41
|
await generateTamaguiStudioConfig(props, bundleInfo);
|
|
36
|
-
|
|
42
|
+
} catch {
|
|
37
43
|
}
|
|
38
44
|
return bundleInfo;
|
|
39
45
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/loadTamagui.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,SAAS,SAAS,MAAM,eAAe;AAE1D,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAG9B,OAAO,aAAa;AACpB,OAAO,MAAM,YAAY,YAAY,gBAAgB;AAErD,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB,uBAAuB;AAChD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEP,MAAM,mBAAmB,CAAC,aAAsD;AAAA;AAAA,EAE9E,QAAQ;AAAA,EACR,YAAY,CAAC,SAAS;AAAA,EACtB,GAAI;AACN;AAEA,eAAsB,YACpB,SACoC;AACpC,QAAM,QAAQ,iBAAiB,OAAO;AACtC,QAAM,aAAa,MAAM,iBAAiB,KAAK;AAC/C,MAAI,CAAC,YAAY;AACf,WAAO;AAAA,EACT;
|
|
4
|
+
"mappings": "AAAA,SAAS,UAAU,SAAS,SAAS,MAAM,eAAe;AAE1D,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAG9B,OAAO,aAAa;AACpB,OAAO,MAAM,YAAY,YAAY,gBAAgB;AAErD,SAAS,oBAAoB;AAC7B,SAAS,gBAAgB,uBAAuB;AAChD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAEP,MAAM,mBAAmB,CAAC,aAAsD;AAAA;AAAA,EAE9E,QAAQ;AAAA,EACR,YAAY,CAAC,SAAS;AAAA,EACtB,GAAI;AACN;AAEA,eAAsB,YACpB,SACoC;AACpC,QAAM,QAAQ,iBAAiB,OAAO;AACtC,QAAM,aAAa,MAAM,iBAAiB,KAAK;AAC/C,MAAI,CAAC,YAAY;AACf,YAAQ;AAAA,MACN;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,MAAI,YAAY;AAEd,kBAAc,WAAW,aAAa;AAAA,EACxC;AAEA,MAAI,CAAC,wBAAwB,GAAG;AAC9B,WAAO;AAAA,EACT;AAEA,MAAI;AACF,UAAM,4BAA4B,OAAO,UAAU;AAAA,EACrD,QAAE;AAAA,EAEF;AAEA,SAAO;AACT;AAGO,SAAS,gBAAgB,SAA6C;AAC3E,QAAM,QAAQ,iBAAiB,OAAO;AACtC,QAAM,EAAE,WAAW,IAAI,QAAQ,4BAA4B,EAAE,SAAS,cAAc;AAEpF,QAAM,oBAAoB,gBAAgB;AAC1C,MAAI;AAGF,YAAQ,IAAI,YAAY;AACxB,UAAM,aAAa,WAAW,SAAgB;AAC9C,eAAW,SAAgB,IAAI,QAAQ,IAAI,aAAa;AAExD,QAAI;AAEF,UAAI,gBAA8C;AAClD,UAAI,MAAM,QAAQ;AAChB,cAAM,aAAa,KAAK,QAAQ,IAAI,GAAG,MAAM,MAAM;AACnD,cAAM,MAAM,QAAQ,UAAU;AAC9B,wBAAiB,IAAI,SAAS,KAAK;AACnC,YAAI,CAAC,iBAAiB,CAAC,cAAc,QAAQ;AAC3C,gBAAM,WAAW,QAAQ,QAAQ,UAAU;AAC3C,gBAAM,IAAI,MAAM,8BAA8B;AAAA;AAAA,2CAEb;AAAA,QACnC;AAAA,MACF;AAGA,YAAM,aAAa,eAAe,KAAK;AACvC,UAAI,CAAC,YAAY;AACf,cAAM,IAAI,MAAM,sBAAsB;AAAA,MACxC;AACA,UAAI,QAAQ,IAAI,UAAU,WAAW;AACnC,gBAAQ,IAAI,cAAc,UAAU;AAAA,MACtC;AAGA,cAAQ,IAAI,YAAY;AACxB,iBAAW,SAAgB,IAAI;AAG/B,UAAI,MAAM,UAAU,eAAe;AACjC,sBAAc,aAAoB;AAAA,MACpC;AAEA,YAAM,OAAO;AAAA,QACX;AAAA,QACA;AAAA,QACA,aAAa,eAAe;AAAA,MAC9B;AAEA,sCAAgC,OAAO,IAAI;AAE3C,aAAO;AAAA,IACT,SAAS,KAAP;AACA,UAAI,eAAe,OAAO;AACxB,gBAAQ;AAAA,UACN;AAAA,QACF;AACA,gBAAQ,IAAI;AAAA;AAAA,MAAW,IAAI;AAAA;AAAA,CAAa;AACxC,YAAI,cAAc;AAChB,kBAAQ,IAAI,IAAI,KAAK;AAAA,QACvB;AAAA,MACF,OAAO;AACL,gBAAQ,MAAM,mCAAmC,GAAG;AAAA,MACtD;AAEA,aAAO;AAAA,QACL,YAAY,CAAC;AAAA,QACb,eAAe,wBAAwB;AAAA,QACvC,aAAa,CAAC;AAAA,MAChB;AAAA,IACF;AAAA,EACF,UAAE;AACA,eAAW;AACX,sBAAkB;AAAA,EACpB;AACF;AAEA,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA6B,CAAC,GAAgC;AAC5D,QAAM,mBAAmB,KAAK,MAAM,YAAY;AAEhD,MAAI,CAAE,MAAM,GAAG,WAAW,gBAAgB,GAAI;AAC5C,UAAM,IAAI,MAAM,sBAAsB,kBAAkB;AAAA,EAC1D;AAEA,QAAM,SAAS,KAAK,MAAM,UAAU;AACpC,QAAM,UAAU,MAAM,SAAS,KAAK,MAAM,cAAc,CAAC;AAEzD,SAAO;AAAA,IACL,MAAM,QAAQ,IAAI,aAAa,eAAe,eAAe;AAAA,IAC7D;AAAA,IACA,MAAM,QAAQ;AAAA,IACd;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,MACd,YAAY,CAAC,SAAS;AAAA,MACtB,GAAG;AAAA,MACH,QAAQ,MAAM,4BAA4B,MAAM,iDAAgB,MAAM;AAAA,IACxE;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,MAAM,KAAK,QAAQ,qBAAqB;AAAA,MACxC,OAAO,KAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,gCAAgC,OAAe;AAC7D,QAAM,gBAAgB,QAAQ;AAC9B,QAAM,WAAW,QAAQ,QAAQ,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;AAClE,QAAM,MAAM,QAAQ,QAAQ;AAC5B,QAAM,WAAW,SAAS,QAAQ,EAAE,QAAQ,KAAK,EAAE;AACnD,QAAM,cAAc,QAAQ,IAAI,mBAAmB,QAAQ,QAAQ;AACnE,QAAM,eAAe,KAAK,QAAQ,QAAQ,GAAG,WAAW,MAAM,cAAc,GAAG;AAC/E,MAAI,WAAW,YAAY,GAAG;AAC5B,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,MAAM,eAAe,CAAC,qBAAqB,KAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,gBAAgB;AAEpB,eAAe,4BAA4B,MAAc,YAAqB;AAC5E,QAAM,cAAc;AAAA,IAClB,GAAG,IAAI;AAAA,MACL,CAAC,YAAY,GAAG,YAAY,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,MAAM,KAAK,MAAM,CAAW,CAAC;AAAA,IAClF;AAAA,EACF;AAEA,aAAW,QAAQ,aAAa;AAC9B,QAAI,MAAM,WAAW,IAAI,GAAG;AAC1B,aAAO;AAAA,IACT;AAAA,EACF;AAEA,MAAI,CAAC,eAAe;AAClB,oBAAgB;AAChB,YAAQ,KAAK,wFAAwF;AAAA,MACnG,YAAY,KAAK;AAAA,GAAM;AAAA,GAC1B;AAAA,EACD;AACF;AAIA,eAAsB,mBAAmB,gBAAgC;AACvE,QAAM,UAAU,MAAM,WAAW,EAAE,eAAe,CAAC;AAEnD,MAAI,CAAC,QAAQ,eAAe,QAAQ;AAClC,UAAM,IAAI,MAAM,WAAW;AAAA,EAC7B;AAGA,MAAI,aAAa;AAEjB,QAAM,UAAU,MAAM,QAAQ,QAAQ;AAAA,IACpC,aAAa,CAAC,QAAQ,eAAe,MAAM;AAAA,IAC3C,WAAW;AAAA;AAAA,IAEX,OAAO;AAAA,IAEP,SAAS;AAAA,MACP;AAAA,QACE,MAAM;AAAA,QACN,MAAM,EAAE,MAAM,GAAG;AACf,gBAAM,MAAM;AACV,gBAAI,CAAC,YAAY;AACf,2BAAa;AACb;AAAA,YACF,OAAO;AACL,mBAAK,4BAA4B,QAAQ,gBAAgB,MAAM,IAAI;AAAA,YACrE;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAED,QAAM,UAAU,QAAQ,MAAM;AAE9B,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/require.js
CHANGED
|
@@ -5,14 +5,14 @@ const og = Module.prototype.require;
|
|
|
5
5
|
globalThis["ogRequire"] = og;
|
|
6
6
|
const getNameToPaths = () => nameToPaths;
|
|
7
7
|
function registerRequire() {
|
|
8
|
-
if (Module.prototype.require
|
|
8
|
+
if (Module.prototype.require["isTamaguiRequire"]) {
|
|
9
9
|
return () => {
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
const proxyWorm = require("@tamagui/proxy-worm");
|
|
13
13
|
const rnw = require("react-native-web");
|
|
14
14
|
const core = require("@tamagui/core-node");
|
|
15
|
-
|
|
15
|
+
function tamaguiRequire(path) {
|
|
16
16
|
var _a;
|
|
17
17
|
if (/\.(gif|jpe?g|png|svg|ttf|otf|woff2?|bmp|webp)$/.test(path)) {
|
|
18
18
|
return {};
|
|
@@ -20,11 +20,11 @@ function registerRequire() {
|
|
|
20
20
|
if (path === "@gorhom/bottom-sheet" || path.startsWith("react-native-reanimated") || path === "expo-linear-gradient" || path === "@expo/vector-icons") {
|
|
21
21
|
return proxyWorm;
|
|
22
22
|
}
|
|
23
|
-
if (path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
23
|
+
if (path === "react-native-web-lite" || path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
24
24
|
!path.startsWith("react-native-web/dist/cjs/exports".replace(/\//g, sep))) {
|
|
25
25
|
return rnw;
|
|
26
26
|
}
|
|
27
|
-
if (path === "@tamagui/core" || path === "@tamagui/web") {
|
|
27
|
+
if (path === "@tamagui/core" || path === "@tamagui/core-node" || path === "@tamagui/web") {
|
|
28
28
|
return core;
|
|
29
29
|
}
|
|
30
30
|
try {
|
|
@@ -47,7 +47,9 @@ function registerRequire() {
|
|
|
47
47
|
}
|
|
48
48
|
return proxyWorm;
|
|
49
49
|
}
|
|
50
|
-
}
|
|
50
|
+
}
|
|
51
|
+
tamaguiRequire["isTamaguiRequire"] = true;
|
|
52
|
+
Module.prototype.require = tamaguiRequire;
|
|
51
53
|
return () => {
|
|
52
54
|
Module.prototype.require = og;
|
|
53
55
|
};
|
package/dist/esm/require.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/require.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,WAAW;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,
|
|
4
|
+
"mappings": "AAAA,SAAS,UAAU,WAAW;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,QAAQ,kBAAkB,GAAG;AAEhD,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAE/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,OAAO,QAAQ,oBAAoB;AAEzC,WAAS,eAA0B,MAAc;AAtBnD;AAuBI,QAAI,iDAAiD,KAAK,IAAI,GAAG;AAC/D,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,sBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,2BACR,KAAK,WAAW,cAAc;AAAA,IAE7B,CAAC,KAAK,WAAW,oCAAoC,QAAQ,OAAO,GAAG,CAAC,GAC1E;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,mBACT,SAAS,wBACT,SAAS,gBACT;AACA,aAAO;AAAA,IACT;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AAwBpC,aAAO;AAAA,IACT,SAAS,KAAP;AAMA,WAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAE5C,gBAAQ;AAAA,UACN;AAAA;AAAA,IAEN,IAAI;AAAA,IACJ,IAAI;AAAA;AAAA;AAAA;AAAA,iBAIS,SAAS,QAAQ,IAAI,GAAG,IAAI;AAAA;AAAA;AAAA,QAGrC;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,iBAAe,kBAAkB,IAAI;AAErC,SAAO,UAAU,UAAU;AAE3B,SAAO,MAAM;AAEX,WAAO,UAAU,UAAU;AAAA,EAC7B;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/require.mjs
CHANGED
|
@@ -5,14 +5,14 @@ const og = Module.prototype.require;
|
|
|
5
5
|
globalThis["ogRequire"] = og;
|
|
6
6
|
const getNameToPaths = () => nameToPaths;
|
|
7
7
|
function registerRequire() {
|
|
8
|
-
if (Module.prototype.require
|
|
8
|
+
if (Module.prototype.require["isTamaguiRequire"]) {
|
|
9
9
|
return () => {
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
const proxyWorm = require("@tamagui/proxy-worm");
|
|
13
13
|
const rnw = require("react-native-web");
|
|
14
14
|
const core = require("@tamagui/core-node");
|
|
15
|
-
|
|
15
|
+
function tamaguiRequire(path) {
|
|
16
16
|
var _a;
|
|
17
17
|
if (/\.(gif|jpe?g|png|svg|ttf|otf|woff2?|bmp|webp)$/.test(path)) {
|
|
18
18
|
return {};
|
|
@@ -20,11 +20,11 @@ function registerRequire() {
|
|
|
20
20
|
if (path === "@gorhom/bottom-sheet" || path.startsWith("react-native-reanimated") || path === "expo-linear-gradient" || path === "@expo/vector-icons") {
|
|
21
21
|
return proxyWorm;
|
|
22
22
|
}
|
|
23
|
-
if (path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
23
|
+
if (path === "react-native-web-lite" || path.startsWith("react-native") && // allow our rnw.tsx imports through
|
|
24
24
|
!path.startsWith("react-native-web/dist/cjs/exports".replace(/\//g, sep))) {
|
|
25
25
|
return rnw;
|
|
26
26
|
}
|
|
27
|
-
if (path === "@tamagui/core" || path === "@tamagui/web") {
|
|
27
|
+
if (path === "@tamagui/core" || path === "@tamagui/core-node" || path === "@tamagui/web") {
|
|
28
28
|
return core;
|
|
29
29
|
}
|
|
30
30
|
try {
|
|
@@ -47,7 +47,9 @@ function registerRequire() {
|
|
|
47
47
|
}
|
|
48
48
|
return proxyWorm;
|
|
49
49
|
}
|
|
50
|
-
}
|
|
50
|
+
}
|
|
51
|
+
tamaguiRequire["isTamaguiRequire"] = true;
|
|
52
|
+
Module.prototype.require = tamaguiRequire;
|
|
51
53
|
return () => {
|
|
52
54
|
Module.prototype.require = og;
|
|
53
55
|
};
|
package/dist/esm/require.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/require.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,WAAW;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,
|
|
4
|
+
"mappings": "AAAA,SAAS,UAAU,WAAW;AAI9B,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,WAAW,IAAI;AAEnB,MAAM,iBAAiB,MAAM;AAE7B,SAAS,kBAAkB;AAChC,MAAI,OAAO,UAAU,QAAQ,kBAAkB,GAAG;AAEhD,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAE/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,OAAO,QAAQ,oBAAoB;AAEzC,WAAS,eAA0B,MAAc;AAtBnD;AAuBI,QAAI,iDAAiD,KAAK,IAAI,GAAG;AAC/D,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,sBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,2BACR,KAAK,WAAW,cAAc;AAAA,IAE7B,CAAC,KAAK,WAAW,oCAAoC,QAAQ,OAAO,GAAG,CAAC,GAC1E;AACA,aAAO;AAAA,IACT;AACA,QACE,SAAS,mBACT,SAAS,wBACT,SAAS,gBACT;AACA,aAAO;AAAA,IACT;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AAwBpC,aAAO;AAAA,IACT,SAAS,KAAP;AAMA,WAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAE5C,gBAAQ;AAAA,UACN;AAAA;AAAA,IAEN,IAAI;AAAA,IACJ,IAAI;AAAA;AAAA;AAAA;AAAA,iBAIS,SAAS,QAAQ,IAAI,GAAG,IAAI;AAAA;AAAA;AAAA,QAGrC;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,iBAAe,kBAAkB,IAAI;AAErC,SAAO,UAAU,UAAU;AAE3B,SAAO,MAAM;AAEX,WAAO,UAAU,UAAU;AAAA,EAC7B;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/static",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.6",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"main": "dist/cjs/index.js",
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
"@babel/plugin-transform-react-jsx": "^7.19.0",
|
|
35
35
|
"@babel/runtime": "^7.19.4",
|
|
36
36
|
"@babel/traverse": "^7.19.6",
|
|
37
|
-
"@tamagui/build": "1.16.
|
|
38
|
-
"@tamagui/cli-color": "1.16.
|
|
39
|
-
"@tamagui/config-default-node": "1.16.
|
|
40
|
-
"@tamagui/core-node": "1.16.
|
|
41
|
-
"@tamagui/fake-react-native": "1.16.
|
|
42
|
-
"@tamagui/helpers": "1.16.
|
|
43
|
-
"@tamagui/helpers-node": "1.16.
|
|
44
|
-
"@tamagui/proxy-worm": "1.16.
|
|
45
|
-
"@tamagui/shorthands": "1.16.
|
|
46
|
-
"@tamagui/types": "1.16.
|
|
37
|
+
"@tamagui/build": "1.16.6",
|
|
38
|
+
"@tamagui/cli-color": "1.16.6",
|
|
39
|
+
"@tamagui/config-default-node": "1.16.6",
|
|
40
|
+
"@tamagui/core-node": "1.16.6",
|
|
41
|
+
"@tamagui/fake-react-native": "1.16.6",
|
|
42
|
+
"@tamagui/helpers": "1.16.6",
|
|
43
|
+
"@tamagui/helpers-node": "1.16.6",
|
|
44
|
+
"@tamagui/proxy-worm": "1.16.6",
|
|
45
|
+
"@tamagui/shorthands": "1.16.6",
|
|
46
|
+
"@tamagui/types": "1.16.6",
|
|
47
47
|
"babel-literal-to-ast": "^2.1.0",
|
|
48
48
|
"esbuild": "^0.17.17",
|
|
49
49
|
"esbuild-register": "^3.4.2",
|
|
@@ -52,15 +52,16 @@
|
|
|
52
52
|
"fs-extra": "^11.1.0",
|
|
53
53
|
"invariant": "^2.2.4",
|
|
54
54
|
"lodash": "^4.17.21",
|
|
55
|
-
"react-native-web
|
|
56
|
-
"react-native-web-
|
|
55
|
+
"react-native-web": "^0.18.10",
|
|
56
|
+
"react-native-web-internals": "1.16.6",
|
|
57
|
+
"react-native-web-lite": "1.16.6"
|
|
57
58
|
},
|
|
58
59
|
"devDependencies": {
|
|
59
60
|
"@babel/plugin-syntax-typescript": "^7.18.6",
|
|
60
61
|
"@babel/types": "^7.19.4",
|
|
61
62
|
"@dish/babel-preset": "^0.0.6",
|
|
62
63
|
"@expo/match-media": "^0.4.0",
|
|
63
|
-
"@tamagui/test-design-system": "1.16.
|
|
64
|
+
"@tamagui/test-design-system": "1.16.6",
|
|
64
65
|
"@testing-library/react": "^13.4.0",
|
|
65
66
|
"@types/babel__generator": "^7.6.4",
|
|
66
67
|
"@types/babel__traverse": "^7.18.2",
|
|
@@ -73,15 +74,11 @@
|
|
|
73
74
|
"esbuild-loader": "^3.0.1",
|
|
74
75
|
"null-loader": "^4.0.1",
|
|
75
76
|
"react": "^18.2.0",
|
|
76
|
-
"react-native-web": "^0.18.10",
|
|
77
77
|
"react-test-renderer": "^18.2.0",
|
|
78
78
|
"style-loader": "^3.3.1",
|
|
79
79
|
"typescript": "^5.0.4",
|
|
80
80
|
"vitest": "^0.26.3",
|
|
81
81
|
"webpack": "^5.74.0"
|
|
82
82
|
},
|
|
83
|
-
"peerDependencies": {
|
|
84
|
-
"react-native-web": "*"
|
|
85
|
-
},
|
|
86
83
|
"gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
|
|
87
84
|
}
|
|
@@ -56,16 +56,16 @@ export const esbuildOptions = {
|
|
|
56
56
|
export type BundledConfig = Awaited<ReturnType<typeof bundleConfig>>
|
|
57
57
|
|
|
58
58
|
// will use cached one if watching
|
|
59
|
-
let
|
|
59
|
+
let currentBundle: BundledConfig | null = null
|
|
60
60
|
let isBundling = false
|
|
61
|
+
let lastBundle: BundledConfig | null = null
|
|
61
62
|
const waitForBundle = new Set<Function>()
|
|
62
63
|
|
|
63
|
-
let last: BundledConfig | undefined
|
|
64
64
|
export async function hasBundledConfigChanged() {
|
|
65
|
-
if (
|
|
65
|
+
if (lastBundle === currentBundle) {
|
|
66
66
|
return false
|
|
67
67
|
}
|
|
68
|
-
|
|
68
|
+
lastBundle = currentBundle
|
|
69
69
|
return true
|
|
70
70
|
}
|
|
71
71
|
|
|
@@ -74,10 +74,10 @@ export async function getBundledConfig(props: TamaguiOptions, rebuild = false) {
|
|
|
74
74
|
await new Promise((res) => {
|
|
75
75
|
waitForBundle.add(res)
|
|
76
76
|
})
|
|
77
|
-
} else if (!
|
|
78
|
-
await bundleConfig(props)
|
|
77
|
+
} else if (!currentBundle || rebuild) {
|
|
78
|
+
return await bundleConfig(props)
|
|
79
79
|
}
|
|
80
|
-
return
|
|
80
|
+
return currentBundle
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
export async function bundleConfig(props: TamaguiOptions) {
|
|
@@ -86,9 +86,7 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
86
86
|
|
|
87
87
|
const configEntry = props.config ? join(process.cwd(), props.config) : ''
|
|
88
88
|
const tmpDir = join(process.cwd(), '.tamagui')
|
|
89
|
-
|
|
90
89
|
const configOutPath = join(tmpDir, `tamagui.config.cjs`)
|
|
91
|
-
|
|
92
90
|
const baseComponents = props.components.filter((x) => x !== '@tamagui/core')
|
|
93
91
|
const componentOutPaths = baseComponents.map((componentModule) =>
|
|
94
92
|
join(
|
|
@@ -122,6 +120,7 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
122
120
|
entryPoints: [configEntry],
|
|
123
121
|
external,
|
|
124
122
|
outfile: configOutPath,
|
|
123
|
+
target: 'node16',
|
|
125
124
|
})
|
|
126
125
|
: null,
|
|
127
126
|
...baseComponents.map((componentModule, i) => {
|
|
@@ -130,6 +129,7 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
130
129
|
resolvePlatformSpecificEntries: true,
|
|
131
130
|
external,
|
|
132
131
|
outfile: componentOutPaths[i],
|
|
132
|
+
target: 'node16',
|
|
133
133
|
})
|
|
134
134
|
}),
|
|
135
135
|
])
|
|
@@ -155,9 +155,17 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
155
155
|
// get around node.js's module cache to get the new config...
|
|
156
156
|
delete require.cache[path.resolve(configOutPath)]
|
|
157
157
|
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
let out
|
|
159
|
+
const unregister = registerRequire()
|
|
160
|
+
try {
|
|
161
|
+
out = require(configOutPath)
|
|
162
|
+
} catch (err) {
|
|
163
|
+
throw err
|
|
164
|
+
} finally {
|
|
165
|
+
unregister()
|
|
166
|
+
}
|
|
160
167
|
const config = out.default || out
|
|
168
|
+
|
|
161
169
|
if (!config) {
|
|
162
170
|
throw new Error(`No config: ${config}`)
|
|
163
171
|
}
|
|
@@ -183,10 +191,6 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
183
191
|
)} in ${JSON.stringify(componentOutPaths)}`
|
|
184
192
|
)
|
|
185
193
|
}
|
|
186
|
-
|
|
187
|
-
// if (!component.moduleName) {
|
|
188
|
-
// throw new Error(`Tamagui internal err`)
|
|
189
|
-
// }
|
|
190
194
|
}
|
|
191
195
|
|
|
192
196
|
// always load core so we can optimize if directly importing
|
|
@@ -212,7 +216,7 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
|
212
216
|
tamaguiConfig: config,
|
|
213
217
|
}
|
|
214
218
|
|
|
215
|
-
|
|
219
|
+
currentBundle = res
|
|
216
220
|
|
|
217
221
|
return res
|
|
218
222
|
} catch (err: any) {
|
|
@@ -235,6 +239,9 @@ export function loadComponents(props: TamaguiOptions): null | LoadedComponents[]
|
|
|
235
239
|
if (cacheComponents[key]) {
|
|
236
240
|
return cacheComponents[key]
|
|
237
241
|
}
|
|
242
|
+
|
|
243
|
+
const unregister = registerRequire()
|
|
244
|
+
|
|
238
245
|
try {
|
|
239
246
|
const info: LoadedComponents[] = componentsModules.flatMap((name) => {
|
|
240
247
|
const extension = extname(name)
|
|
@@ -269,19 +276,14 @@ export function loadComponents(props: TamaguiOptions): null | LoadedComponents[]
|
|
|
269
276
|
console.log(`loadModule`, loadModule, require.resolve(loadModule))
|
|
270
277
|
}
|
|
271
278
|
|
|
272
|
-
const
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
interopDefaultExport(require(loadModule))
|
|
277
|
-
)
|
|
279
|
+
const nameToInfo = getComponentStaticConfigByName(
|
|
280
|
+
name,
|
|
281
|
+
interopDefaultExport(require(loadModule))
|
|
282
|
+
)
|
|
278
283
|
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
}
|
|
283
|
-
} finally {
|
|
284
|
-
unregister()
|
|
284
|
+
return {
|
|
285
|
+
moduleName: name,
|
|
286
|
+
nameToInfo,
|
|
285
287
|
}
|
|
286
288
|
}
|
|
287
289
|
|
|
@@ -347,6 +349,8 @@ Quiet this warning with environment variable:
|
|
|
347
349
|
} catch (err: any) {
|
|
348
350
|
console.log(`Tamagui error bundling components`, err.message, err.stack)
|
|
349
351
|
return null
|
|
352
|
+
} finally {
|
|
353
|
+
unregister()
|
|
350
354
|
}
|
|
351
355
|
}
|
|
352
356
|
|
|
@@ -34,16 +34,27 @@ export async function loadTamagui(
|
|
|
34
34
|
const props = getFilledOptions(propsIn)
|
|
35
35
|
const bundleInfo = await getBundledConfig(props)
|
|
36
36
|
if (!bundleInfo) {
|
|
37
|
+
console.warn(
|
|
38
|
+
`No bundled config generated, maybe an error in bundling. Set DEBUG=tamagui and re-run to get logs.`
|
|
39
|
+
)
|
|
37
40
|
return null
|
|
38
41
|
}
|
|
42
|
+
|
|
43
|
+
if (bundleInfo) {
|
|
44
|
+
// init core-node
|
|
45
|
+
createTamagui(bundleInfo.tamaguiConfig)
|
|
46
|
+
}
|
|
47
|
+
|
|
39
48
|
if (!hasBundledConfigChanged()) {
|
|
40
49
|
return bundleInfo
|
|
41
50
|
}
|
|
42
|
-
|
|
51
|
+
|
|
52
|
+
try {
|
|
43
53
|
await generateTamaguiStudioConfig(props, bundleInfo)
|
|
44
|
-
|
|
45
|
-
|
|
54
|
+
} catch {
|
|
55
|
+
// ok for now
|
|
46
56
|
}
|
|
57
|
+
|
|
47
58
|
return bundleInfo
|
|
48
59
|
}
|
|
49
60
|
|
package/src/require.ts
CHANGED
|
@@ -10,7 +10,7 @@ globalThis['ogRequire'] = og
|
|
|
10
10
|
export const getNameToPaths = () => nameToPaths
|
|
11
11
|
|
|
12
12
|
export function registerRequire() {
|
|
13
|
-
if (Module.prototype.require
|
|
13
|
+
if (Module.prototype.require['isTamaguiRequire']) {
|
|
14
14
|
// already registered
|
|
15
15
|
return () => {}
|
|
16
16
|
}
|
|
@@ -20,7 +20,7 @@ export function registerRequire() {
|
|
|
20
20
|
const rnw = require('react-native-web')
|
|
21
21
|
const core = require('@tamagui/core-node')
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
function tamaguiRequire(this: any, path: string) {
|
|
24
24
|
if (/\.(gif|jpe?g|png|svg|ttf|otf|woff2?|bmp|webp)$/.test(path)) {
|
|
25
25
|
return {}
|
|
26
26
|
}
|
|
@@ -33,13 +33,18 @@ export function registerRequire() {
|
|
|
33
33
|
return proxyWorm
|
|
34
34
|
}
|
|
35
35
|
if (
|
|
36
|
-
path
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
path === 'react-native-web-lite' ||
|
|
37
|
+
(path.startsWith('react-native') &&
|
|
38
|
+
// allow our rnw.tsx imports through
|
|
39
|
+
!path.startsWith('react-native-web/dist/cjs/exports'.replace(/\//g, sep)))
|
|
39
40
|
) {
|
|
40
41
|
return rnw
|
|
41
42
|
}
|
|
42
|
-
if (
|
|
43
|
+
if (
|
|
44
|
+
path === '@tamagui/core' ||
|
|
45
|
+
path === '@tamagui/core-node' ||
|
|
46
|
+
path === '@tamagui/web'
|
|
47
|
+
) {
|
|
43
48
|
return core
|
|
44
49
|
}
|
|
45
50
|
try {
|
|
@@ -94,6 +99,10 @@ export function registerRequire() {
|
|
|
94
99
|
}
|
|
95
100
|
}
|
|
96
101
|
|
|
102
|
+
tamaguiRequire['isTamaguiRequire'] = true
|
|
103
|
+
|
|
104
|
+
Module.prototype.require = tamaguiRequire
|
|
105
|
+
|
|
97
106
|
return () => {
|
|
98
107
|
// unregister
|
|
99
108
|
Module.prototype.require = og
|
|
@@ -27,7 +27,7 @@ export declare function getBundledConfig(props: TamaguiOptions, rebuild?: boolea
|
|
|
27
27
|
components: LoadedComponents[];
|
|
28
28
|
nameToPaths: {};
|
|
29
29
|
tamaguiConfig: any;
|
|
30
|
-
} | undefined>;
|
|
30
|
+
} | null | undefined>;
|
|
31
31
|
export declare function bundleConfig(props: TamaguiOptions): Promise<{
|
|
32
32
|
components: LoadedComponents[];
|
|
33
33
|
nameToPaths: {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAK7E,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAM5C,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,kBAAkB,CAAA;KACjC,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,gBAAgB,EAAE,CAAA;IAC9B,aAAa,EAAE,qBAAqB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAWD,eAAO,MAAM,cAAc;;;;;;CAMjB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAA;AAQpE,wBAAsB,uBAAuB,qBAM5C;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;
|
|
1
|
+
{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAK7E,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAM5C,KAAK,WAAW,GAAG;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN;QACE,YAAY,EAAE,kBAAkB,CAAA;KACjC,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,gBAAgB,EAAE,CAAA;IAC9B,aAAa,EAAE,qBAAqB,CAAA;IACpC,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAWD,eAAO,MAAM,cAAc;;;;;;CAMjB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAA;AAQpE,wBAAsB,uBAAuB,qBAM5C;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eAuJvD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,gBAAgB,EAAE,CAuH/E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEnF,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EACL,kBAAkB,EAKnB,MAAM,mBAAmB,CAAA;AAa1B,wBAAsB,WAAW,CAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"loadTamagui.d.ts","sourceRoot":"","sources":["../../src/extractor/loadTamagui.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEnF,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EACL,kBAAkB,EAKnB,MAAM,mBAAmB,CAAA;AAa1B,wBAAsB,WAAW,CAC/B,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CA0BpC;AAGD,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB,CA6E3E;AAED,wBAAsB,UAAU,CAAC,EAC/B,IAAoB,EACpB,YAA8B,EAC9B,cAAc,EACd,IAAI,EACJ,KAAK,GACN,GAAE,OAAO,CAAC,cAAc,CAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4B5D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,UAW5D;AA0BD,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAE7B,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,cAAc;;;;;;;;;;;GAuCtE"}
|
package/types/require.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../src/require.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,UAAoB,CAAA;AAE/C,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../src/require.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,UAAoB,CAAA;AAE/C,wBAAgB,eAAe,eAkG9B"}
|