@tamagui/static 1.79.8 → 1.79.9
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/cjs/extractor/bundleConfig.js +24 -8
- package/dist/cjs/extractor/bundleConfig.js.map +1 -1
- package/dist/cjs/extractor/bundleConfig.native.js +24 -8
- package/dist/cjs/extractor/bundleConfig.native.js.map +1 -1
- package/dist/cjs/extractor/createExtractor.js +4 -4
- package/dist/cjs/extractor/createExtractor.js.map +1 -1
- package/dist/cjs/extractor/createExtractor.native.js +4 -4
- package/dist/cjs/extractor/createExtractor.native.js.map +1 -1
- package/dist/cjs/getPragmaOptions.js +1 -1
- package/dist/cjs/getPragmaOptions.js.map +1 -1
- package/dist/cjs/getPragmaOptions.native.js +1 -1
- package/dist/cjs/getPragmaOptions.native.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.js +22 -7
- package/dist/esm/extractor/bundleConfig.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.native.js +22 -7
- package/dist/esm/extractor/bundleConfig.native.js.map +1 -1
- package/dist/esm/extractor/createExtractor.js +4 -4
- package/dist/esm/extractor/createExtractor.js.map +1 -1
- package/dist/esm/extractor/createExtractor.native.js +4 -4
- package/dist/esm/extractor/createExtractor.native.js.map +1 -1
- package/dist/esm/getPragmaOptions.js +1 -1
- package/dist/esm/getPragmaOptions.js.map +1 -1
- package/dist/esm/getPragmaOptions.native.js +1 -1
- package/dist/esm/getPragmaOptions.native.js.map +1 -1
- package/package.json +15 -15
- package/src/extractor/bundleConfig.ts +28 -12
- package/src/extractor/createExtractor.ts +7 -4
- package/src/getPragmaOptions.ts +1 -1
- package/types/extractor/bundleConfig.d.ts +2 -1
- package/types/extractor/bundleConfig.d.ts.map +1 -1
- package/types/extractor/createExtractor.d.ts.map +1 -1
@@ -11,7 +11,7 @@ function getPragmaOptions({
|
|
11
11
|
let shouldPrintDebug = !1, shouldDisable = !1;
|
12
12
|
const firstLine = source.slice(0, 800).split(`
|
13
13
|
`)[0];
|
14
|
-
return firstLine.includes("tamagui-ignore") && (shouldDisable = !0), firstLine.includes("debug") && (shouldPrintDebug = !0), firstLine.includes("debug-verbose") && (shouldPrintDebug = "verbose"), process.env.TAMAGUI_DEBUG_FILE && path.includes(process.env.TAMAGUI_DEBUG_FILE) && (shouldPrintDebug = "verbose"), process.env.DEBUG?.includes("tamagui") && (shouldPrintDebug
|
14
|
+
return firstLine.includes("tamagui-ignore") && (shouldDisable = !0), firstLine.includes("debug") && (shouldPrintDebug = !0), firstLine.includes("debug-verbose") && (shouldPrintDebug = "verbose"), process.env.TAMAGUI_DEBUG_FILE && path.includes(process.env.TAMAGUI_DEBUG_FILE) && (shouldPrintDebug = "verbose"), process.env.DEBUG?.includes("tamagui") && (shouldPrintDebug ||= !0), process.env.DEBUG?.includes("tamagui-verbose") && (shouldPrintDebug = "verbose"), {
|
15
15
|
shouldPrintDebug,
|
16
16
|
shouldDisable
|
17
17
|
};
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/getPragmaOptions.ts"],
|
4
|
-
"mappings": "AAAO,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,MAAI,CAAC,uBAAuB,CAAC,OAAO,WAAW,IAAI,KAAK,CAAC,OAAO,WAAW,IAAI;AAC7E,WAAO;AAAA,MACL,kBAAkB;AAAA,MAClB,eAAe;AAAA,IACjB;AAGF,MAAI,mBAAwC,IACxC,gBAAgB;AAGpB,QAAM,YAAY,OAAO,MAAM,GAAG,GAAG,EAAE,MAAM;AAAA,CAAI,EAAE,CAAC;AAEpD,SAAI,UAAU,SAAS,gBAAgB,MACrC,gBAAgB,KAGd,UAAU,SAAS,OAAO,MAC5B,mBAAmB,KAGjB,UAAU,SAAS,eAAe,MACpC,mBAAmB,YAGjB,QAAQ,IAAI,sBACV,KAAK,SAAS,QAAQ,IAAI,kBAAkB,MAC9C,mBAAmB,YAInB,QAAQ,IAAI,OAAO,SAAS,SAAS,MACvC,
|
4
|
+
"mappings": "AAAO,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,MAAI,CAAC,uBAAuB,CAAC,OAAO,WAAW,IAAI,KAAK,CAAC,OAAO,WAAW,IAAI;AAC7E,WAAO;AAAA,MACL,kBAAkB;AAAA,MAClB,eAAe;AAAA,IACjB;AAGF,MAAI,mBAAwC,IACxC,gBAAgB;AAGpB,QAAM,YAAY,OAAO,MAAM,GAAG,GAAG,EAAE,MAAM;AAAA,CAAI,EAAE,CAAC;AAEpD,SAAI,UAAU,SAAS,gBAAgB,MACrC,gBAAgB,KAGd,UAAU,SAAS,OAAO,MAC5B,mBAAmB,KAGjB,UAAU,SAAS,eAAe,MACpC,mBAAmB,YAGjB,QAAQ,IAAI,sBACV,KAAK,SAAS,QAAQ,IAAI,kBAAkB,MAC9C,mBAAmB,YAInB,QAAQ,IAAI,OAAO,SAAS,SAAS,MACvC,qBAAqB,KAGnB,QAAQ,IAAI,OAAO,SAAS,iBAAiB,MAC/C,mBAAmB,YAGd;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tamagui/static",
|
3
|
-
"version": "1.79.
|
3
|
+
"version": "1.79.9",
|
4
4
|
"source": "src/index.ts",
|
5
5
|
"types": "./types/index.d.ts",
|
6
6
|
"main": "dist/cjs/index.js",
|
@@ -35,17 +35,17 @@
|
|
35
35
|
"@babel/runtime": "^7.23.2",
|
36
36
|
"@babel/traverse": "^7.23.3",
|
37
37
|
"@babel/types": "^7.23.3",
|
38
|
-
"@tamagui/build": "1.79.
|
39
|
-
"@tamagui/cli-color": "1.79.
|
40
|
-
"@tamagui/config-default": "1.79.
|
41
|
-
"@tamagui/core": "1.79.
|
42
|
-
"@tamagui/fake-react-native": "1.79.
|
43
|
-
"@tamagui/generate-themes": "1.79.
|
44
|
-
"@tamagui/helpers": "1.79.
|
45
|
-
"@tamagui/helpers-node": "1.79.
|
46
|
-
"@tamagui/proxy-worm": "1.79.
|
47
|
-
"@tamagui/shorthands": "1.79.
|
48
|
-
"@tamagui/types": "1.79.
|
38
|
+
"@tamagui/build": "1.79.9",
|
39
|
+
"@tamagui/cli-color": "1.79.9",
|
40
|
+
"@tamagui/config-default": "1.79.9",
|
41
|
+
"@tamagui/core": "1.79.9",
|
42
|
+
"@tamagui/fake-react-native": "1.79.9",
|
43
|
+
"@tamagui/generate-themes": "1.79.9",
|
44
|
+
"@tamagui/helpers": "1.79.9",
|
45
|
+
"@tamagui/helpers-node": "1.79.9",
|
46
|
+
"@tamagui/proxy-worm": "1.79.9",
|
47
|
+
"@tamagui/shorthands": "1.79.9",
|
48
|
+
"@tamagui/types": "1.79.9",
|
49
49
|
"babel-literal-to-ast": "^2.1.0",
|
50
50
|
"esbuild": "~0.19.3",
|
51
51
|
"esbuild-register": "^3.4.2",
|
@@ -55,13 +55,13 @@
|
|
55
55
|
"invariant": "^2.2.4",
|
56
56
|
"lodash": "^4.17.21",
|
57
57
|
"react-native-web": "^0.19.6",
|
58
|
-
"react-native-web-internals": "1.79.
|
59
|
-
"react-native-web-lite": "1.79.
|
58
|
+
"react-native-web-internals": "1.79.9",
|
59
|
+
"react-native-web-lite": "1.79.9"
|
60
60
|
},
|
61
61
|
"devDependencies": {
|
62
62
|
"@babel/plugin-syntax-typescript": "^7.23.3",
|
63
63
|
"@expo/match-media": "^0.4.0",
|
64
|
-
"@tamagui/test-design-system": "1.79.
|
64
|
+
"@tamagui/test-design-system": "1.79.9",
|
65
65
|
"@testing-library/react": "^14.0.0",
|
66
66
|
"@types/babel__generator": "^7.6.4",
|
67
67
|
"@types/babel__traverse": "^7.18.2",
|
@@ -197,7 +197,8 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
197
197
|
// map from built back to original module names
|
198
198
|
for (const component of components) {
|
199
199
|
component.moduleName =
|
200
|
-
baseComponents[componentOutPaths.indexOf(component.moduleName)]
|
200
|
+
baseComponents[componentOutPaths.indexOf(component.moduleName)] ||
|
201
|
+
component.moduleName
|
201
202
|
|
202
203
|
if (!component.moduleName) {
|
203
204
|
if (process.env.DEBUG?.includes('tamagui') || process.env.IS_TAMAGUI_DEV) {
|
@@ -210,16 +211,6 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
210
211
|
}
|
211
212
|
}
|
212
213
|
|
213
|
-
// always load core so we can optimize if directly importing
|
214
|
-
const coreComponents = loadComponents({
|
215
|
-
...props,
|
216
|
-
components: ['@tamagui/core'],
|
217
|
-
})
|
218
|
-
if (coreComponents) {
|
219
|
-
coreComponents[0].moduleName = '@tamagui/core'
|
220
|
-
components = [...components, ...coreComponents]
|
221
|
-
}
|
222
|
-
|
223
214
|
if (
|
224
215
|
process.env.NODE_ENV === 'development' &&
|
225
216
|
process.env.DEBUG?.startsWith('tamagui')
|
@@ -250,7 +241,32 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
250
241
|
}
|
251
242
|
}
|
252
243
|
|
253
|
-
export function loadComponents(
|
244
|
+
export function loadComponents(props: TamaguiOptions, forceExports = false) {
|
245
|
+
const coreComponents = getCoreComponents(props)
|
246
|
+
const otherComponents = loadComponentsInner(props, forceExports)
|
247
|
+
return [...coreComponents, ...(otherComponents || [])]
|
248
|
+
}
|
249
|
+
|
250
|
+
function getCoreComponents(props: TamaguiOptions) {
|
251
|
+
const loaded = loadComponentsInner({
|
252
|
+
...props,
|
253
|
+
components: ['@tamagui/core'],
|
254
|
+
})
|
255
|
+
|
256
|
+
if (!loaded) {
|
257
|
+
throw new Error(`Core should always load`)
|
258
|
+
}
|
259
|
+
|
260
|
+
// always load core so we can optimize if directly importing
|
261
|
+
return [
|
262
|
+
{
|
263
|
+
...loaded[0],
|
264
|
+
moduleName: '@tamagui/core',
|
265
|
+
},
|
266
|
+
]
|
267
|
+
}
|
268
|
+
|
269
|
+
export function loadComponentsInner(
|
254
270
|
props: TamaguiOptions,
|
255
271
|
forceExports = false
|
256
272
|
): null | LoadedComponents[] {
|
@@ -328,9 +328,7 @@ export function createExtractor(
|
|
328
328
|
)
|
329
329
|
logger.info(
|
330
330
|
`valid import paths: ${JSON.stringify(
|
331
|
-
getValidComponentsPaths(propsWithFileInfo)
|
332
|
-
null,
|
333
|
-
2
|
331
|
+
getValidComponentsPaths(propsWithFileInfo)
|
334
332
|
)}`
|
335
333
|
)
|
336
334
|
}
|
@@ -2300,7 +2298,12 @@ export function createExtractor(
|
|
2300
2298
|
})
|
2301
2299
|
} catch (err: any) {
|
2302
2300
|
node.attributes = ogAttributes
|
2303
|
-
console.error(
|
2301
|
+
console.error(
|
2302
|
+
`@tamagui/static error, reverting optimization. In ${filePath} ${lineNumbers} on ${originalNodeName}: ${err.message}. For stack trace set environment TAMAGUI_DEBUG=1`
|
2303
|
+
)
|
2304
|
+
if (process.env.TAMAGUI_DEBUG === '1') {
|
2305
|
+
console.error(err.stack)
|
2306
|
+
}
|
2304
2307
|
} finally {
|
2305
2308
|
if (debugPropValue) {
|
2306
2309
|
shouldPrintDebug = ogDebug
|
package/src/getPragmaOptions.ts
CHANGED
@@ -36,6 +36,7 @@ export declare function bundleConfig(props: TamaguiOptions): Promise<{
|
|
36
36
|
nameToPaths: {};
|
37
37
|
tamaguiConfig: any;
|
38
38
|
} | undefined>;
|
39
|
-
export declare function loadComponents(props: TamaguiOptions, forceExports?: boolean):
|
39
|
+
export declare function loadComponents(props: TamaguiOptions, forceExports?: boolean): LoadedComponents[];
|
40
|
+
export declare function loadComponentsInner(props: TamaguiOptions, forceExports?: boolean): null | LoadedComponents[];
|
40
41
|
export {};
|
41
42
|
//# sourceMappingURL=bundleConfig.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,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,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;
|
1
|
+
{"version":3,"file":"bundleConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/bundleConfig.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAKzC,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,YAAY,CAAA;KAC3B,CACF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC/B,aAAa,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAA;IAC5C,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAgBD,eAAO,MAAM,cAAc;;;;;;;;CAMK,CAAA;AAEhC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;AAQxF,wBAAgB,uBAAuB,YAMtC;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,UAAQ;;;;sBAS5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc;;;;eA0JvD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,UAAQ,sBAIzE;AAqBD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EACrB,YAAY,UAAQ,GACnB,IAAI,GAAG,gBAAgB,EAAE,CAoI3B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;
|
1
|
+
{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAGA,OAAiB,EAAE,QAAQ,EAAmB,MAAM,iBAAiB,CAAA;AACrE,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAcjC,OAAO,KAAK,EAGV,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EAGf,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAcnD,OAAO,EAAE,iBAAiB,EAA6B,MAAM,6BAA6B,CAAA;AAmC1F,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAE1D,KAAK,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AAQ9C,wBAAgB,eAAe,CAC7B,EAAE,MAAgB,EAAE,GAAE,gBAAsC;;;;;yBA0CjC,cAAc;6BAPhB,cAAc;;mBAwBtB,UAAU,SAAS,mBAAmB;;;;;;;eAIpC,UAAU,SAAS,mBAAmB;;;;;;;EAuoE1D"}
|