@tamagui/static 1.62.0 → 1.62.2
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/generateTamaguiStudioConfig.js +13 -13
- package/dist/cjs/extractor/generateTamaguiStudioConfig.js.map +1 -1
- package/dist/cjs/extractor/generateTamaguiStudioConfig.native.js +13 -13
- package/dist/cjs/extractor/generateTamaguiStudioConfig.native.js.map +1 -1
- package/dist/esm/extractor/generateTamaguiStudioConfig.js +14 -14
- package/dist/esm/extractor/generateTamaguiStudioConfig.js.map +1 -1
- package/package.json +15 -15
- package/src/extractor/generateTamaguiStudioConfig.ts +24 -21
- package/types/extractor/generateTamaguiStudioConfig.d.ts +1 -1
- package/types/extractor/generateTamaguiStudioConfig.d.ts.map +1 -1
|
@@ -34,8 +34,17 @@ async function generateTamaguiStudioConfig(tamaguiOptions, configIn, rebuild = !
|
|
|
34
34
|
const config = configIn ?? await (0, import_bundleConfig.getBundledConfig)(tamaguiOptions, rebuild);
|
|
35
35
|
if (!config)
|
|
36
36
|
return;
|
|
37
|
-
const out = transformConfig(config);
|
|
38
|
-
import_fs_extra.default.writeJSON(confFile, out, {
|
|
37
|
+
const out = transformConfig(config, tamaguiOptions.platform);
|
|
38
|
+
await import_fs_extra.default.ensureDir((0, import_path.dirname)(confFile)), await import_fs_extra.default.writeJSON(confFile, out, {
|
|
39
|
+
spaces: 2
|
|
40
|
+
});
|
|
41
|
+
} catch (err) {
|
|
42
|
+
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
46
|
+
try {
|
|
47
|
+
import_fs_extra.default.ensureDirSync((0, import_path.dirname)(confFile)), import_fs_extra.default.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform), {
|
|
39
48
|
spaces: 2
|
|
40
49
|
});
|
|
41
50
|
} catch (err) {
|
|
@@ -62,24 +71,15 @@ async function generateTamaguiThemes(tamaguiOptions) {
|
|
|
62
71
|
return hasChanged && await (0, import_generate_themes.writeGeneratedThemes)(tamaguiDir, outPath, generatedOutput), hasChanged;
|
|
63
72
|
}
|
|
64
73
|
const resolveRelativePath = (inputPath) => inputPath.startsWith(".") ? (0, import_path.join)(process.cwd(), inputPath) : require.resolve(inputPath);
|
|
65
|
-
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
66
|
-
try {
|
|
67
|
-
import_fs_extra.default.writeJSONSync(confFile, transformConfig(config), {
|
|
68
|
-
spaces: 2
|
|
69
|
-
});
|
|
70
|
-
} catch (err) {
|
|
71
|
-
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
74
|
function cloneDeepSafe(x, excludeKeys = {}) {
|
|
75
75
|
return x && (Array.isArray(x) ? x.map((_) => cloneDeepSafe(_)) : typeof x == "function" ? "Function" : typeof x != "object" ? x : "$$typeof" in x ? "Component" : Object.fromEntries(
|
|
76
76
|
Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]])
|
|
77
77
|
));
|
|
78
78
|
}
|
|
79
|
-
function transformConfig(config) {
|
|
79
|
+
function transformConfig(config, platform) {
|
|
80
80
|
if (!config)
|
|
81
81
|
return null;
|
|
82
|
-
const { getVariableValue } = (0, import_requireTamaguiCore.requireTamaguiCore)(
|
|
82
|
+
const { getVariableValue } = (0, import_requireTamaguiCore.requireTamaguiCore)(platform), next = cloneDeepSafe(config, {
|
|
83
83
|
validStyles: !0
|
|
84
84
|
}), { components, nameToPaths, tamaguiConfig } = next, { themes, tokens } = tamaguiConfig;
|
|
85
85
|
for (const key in themes) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/generateTamaguiStudioConfig.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fs"]
|
|
6
6
|
}
|
|
@@ -35,8 +35,17 @@ async function generateTamaguiStudioConfig(tamaguiOptions, configIn, rebuild = !
|
|
|
35
35
|
const config = configIn ?? await (0, import_bundleConfig.getBundledConfig)(tamaguiOptions, rebuild);
|
|
36
36
|
if (!config)
|
|
37
37
|
return;
|
|
38
|
-
const out = transformConfig(config);
|
|
39
|
-
import_fs_extra.default.writeJSON(confFile, out, {
|
|
38
|
+
const out = transformConfig(config, tamaguiOptions.platform);
|
|
39
|
+
await import_fs_extra.default.ensureDir((0, import_path.dirname)(confFile)), await import_fs_extra.default.writeJSON(confFile, out, {
|
|
40
|
+
spaces: 2
|
|
41
|
+
});
|
|
42
|
+
} catch (err) {
|
|
43
|
+
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
47
|
+
try {
|
|
48
|
+
import_fs_extra.default.ensureDirSync((0, import_path.dirname)(confFile)), import_fs_extra.default.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform), {
|
|
40
49
|
spaces: 2
|
|
41
50
|
});
|
|
42
51
|
} catch (err) {
|
|
@@ -63,24 +72,15 @@ async function generateTamaguiThemes(tamaguiOptions) {
|
|
|
63
72
|
return hasChanged && await (0, import_generate_themes.writeGeneratedThemes)(tamaguiDir, outPath, generatedOutput), hasChanged;
|
|
64
73
|
}
|
|
65
74
|
const resolveRelativePath = (inputPath) => inputPath.startsWith(".") ? (0, import_path.join)(process.cwd(), inputPath) : require.resolve(inputPath);
|
|
66
|
-
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
67
|
-
try {
|
|
68
|
-
import_fs_extra.default.writeJSONSync(confFile, transformConfig(config), {
|
|
69
|
-
spaces: 2
|
|
70
|
-
});
|
|
71
|
-
} catch (err) {
|
|
72
|
-
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
75
|
function cloneDeepSafe(x, excludeKeys = {}) {
|
|
76
76
|
return x && (Array.isArray(x) ? x.map((_) => cloneDeepSafe(_)) : typeof x == "function" ? "Function" : typeof x != "object" ? x : "$$typeof" in x ? "Component" : Object.fromEntries(
|
|
77
77
|
Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]])
|
|
78
78
|
));
|
|
79
79
|
}
|
|
80
|
-
function transformConfig(config) {
|
|
80
|
+
function transformConfig(config, platform) {
|
|
81
81
|
if (!config)
|
|
82
82
|
return null;
|
|
83
|
-
const { getVariableValue } = (0, import_requireTamaguiCore.requireTamaguiCore)(
|
|
83
|
+
const { getVariableValue } = (0, import_requireTamaguiCore.requireTamaguiCore)(platform), next = cloneDeepSafe(config, {
|
|
84
84
|
validStyles: !0
|
|
85
85
|
}), { components, nameToPaths, tamaguiConfig } = next, { themes, tokens } = tamaguiConfig;
|
|
86
86
|
for (const key in themes) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/generateTamaguiStudioConfig.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fs"]
|
|
6
6
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join } from "path";
|
|
1
|
+
import { dirname, join } from "path";
|
|
2
2
|
import { generateThemes, writeGeneratedThemes } from "@tamagui/generate-themes";
|
|
3
3
|
import fs, { readFile } from "fs-extra";
|
|
4
4
|
import { requireTamaguiCore } from "../helpers/requireTamaguiCore";
|
|
@@ -9,8 +9,17 @@ async function generateTamaguiStudioConfig(tamaguiOptions, configIn, rebuild = !
|
|
|
9
9
|
const config = configIn ?? await getBundledConfig(tamaguiOptions, rebuild);
|
|
10
10
|
if (!config)
|
|
11
11
|
return;
|
|
12
|
-
const out = transformConfig(config);
|
|
13
|
-
fs.writeJSON(confFile, out, {
|
|
12
|
+
const out = transformConfig(config, tamaguiOptions.platform);
|
|
13
|
+
await fs.ensureDir(dirname(confFile)), await fs.writeJSON(confFile, out, {
|
|
14
|
+
spaces: 2
|
|
15
|
+
});
|
|
16
|
+
} catch (err) {
|
|
17
|
+
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
21
|
+
try {
|
|
22
|
+
fs.ensureDirSync(dirname(confFile)), fs.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform), {
|
|
14
23
|
spaces: 2
|
|
15
24
|
});
|
|
16
25
|
} catch (err) {
|
|
@@ -37,24 +46,15 @@ async function generateTamaguiThemes(tamaguiOptions) {
|
|
|
37
46
|
return hasChanged && await writeGeneratedThemes(tamaguiDir, outPath, generatedOutput), hasChanged;
|
|
38
47
|
}
|
|
39
48
|
const resolveRelativePath = (inputPath) => inputPath.startsWith(".") ? join(process.cwd(), inputPath) : require.resolve(inputPath);
|
|
40
|
-
function generateTamaguiStudioConfigSync(_tamaguiOptions, config) {
|
|
41
|
-
try {
|
|
42
|
-
fs.writeJSONSync(confFile, transformConfig(config), {
|
|
43
|
-
spaces: 2
|
|
44
|
-
});
|
|
45
|
-
} catch (err) {
|
|
46
|
-
(process.env.DEBUG?.includes("tamagui") || process.env.IS_TAMAGUI_DEV) && console.warn("generateTamaguiStudioConfig error", err);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
49
|
function cloneDeepSafe(x, excludeKeys = {}) {
|
|
50
50
|
return x && (Array.isArray(x) ? x.map((_) => cloneDeepSafe(_)) : typeof x == "function" ? "Function" : typeof x != "object" ? x : "$$typeof" in x ? "Component" : Object.fromEntries(
|
|
51
51
|
Object.entries(x).flatMap(([k, v]) => excludeKeys[k] ? [] : [[k, cloneDeepSafe(v)]])
|
|
52
52
|
));
|
|
53
53
|
}
|
|
54
|
-
function transformConfig(config) {
|
|
54
|
+
function transformConfig(config, platform) {
|
|
55
55
|
if (!config)
|
|
56
56
|
return null;
|
|
57
|
-
const { getVariableValue } = requireTamaguiCore(
|
|
57
|
+
const { getVariableValue } = requireTamaguiCore(platform), next = cloneDeepSafe(config, {
|
|
58
58
|
validStyles: !0
|
|
59
59
|
}), { components, nameToPaths, tamaguiConfig } = next, { themes, tokens } = tamaguiConfig;
|
|
60
60
|
for (const key in themes) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/extractor/generateTamaguiStudioConfig.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,YAAY;
|
|
4
|
+
"mappings": "AAAA,SAAS,SAAS,YAAY;AAE9B,SAAS,gBAAgB,4BAA4B;AAErD,OAAO,MAAM,gBAAgB;AAE7B,SAAS,0BAA0B;AAEnC,SAAwB,wBAAwB;AAEhD,MAAM,aAAa,KAAK,QAAQ,IAAI,GAAG,UAAU,GAC3C,WAAW,KAAK,YAAY,qBAAqB;AAMvD,eAAsB,4BACpB,gBACA,UACA,UAAU,IACV;AACA,MAAI;AACF,UAAM,SAAS,YAAa,MAAM,iBAAiB,gBAAgB,OAAO;AAC1E,QAAI,CAAC;AAAQ;AACb,UAAM,MAAM,gBAAgB,QAAQ,eAAe,QAAQ;AAE3D,UAAM,GAAG,UAAU,QAAQ,QAAQ,CAAC,GACpC,MAAM,GAAG,UAAU,UAAU,KAAK;AAAA,MAChC,QAAQ;AAAA,IACV,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,KAAI,QAAQ,IAAI,OAAO,SAAS,SAAS,KAAK,QAAQ,IAAI,mBACxD,QAAQ,KAAK,qCAAqC,GAAG;AAAA,EAGzD;AACF;AAEO,SAAS,gCACd,iBACA,QACA;AACA,MAAI;AACF,OAAG,cAAc,QAAQ,QAAQ,CAAC,GAClC,GAAG,cAAc,UAAU,gBAAgB,QAAQ,gBAAgB,QAAQ,GAAG;AAAA,MAC5E,QAAQ;AAAA,IACV,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,KAAI,QAAQ,IAAI,OAAO,SAAS,SAAS,KAAK,QAAQ,IAAI,mBACxD,QAAQ,KAAK,qCAAqC,GAAG;AAAA,EAGzD;AACF;AAEA,eAAsB,sBAAsB,gBAAgC;AAC1E,MAAI,CAAC,eAAe;AAClB;AAGF,QAAM,EAAE,OAAO,OAAO,IAAI,eAAe,cACnC,SAAS,oBAAoB,KAAK,GAClC,UAAU,oBAAoB,MAAM,GACpC,kBAAkB,MAAM,eAAe,MAAM,GAG7C,aAAa,OAAO,YAAY;AACpC,QAAI;AAIF,UAAI,CAH2B,MAAM,GAAG;AAAA,QACtC,KAAK,YAAY,oBAAoB;AAAA,MACvC;AAC6B,eAAO;AACpC,UAAI,CAAC;AAAiB,eAAO;AAC7B,YAAM,OAAO,gBAAgB,WACvB,UAAU,MAAM,SAAS,SAAS,OAAO;AAC/C,aAAO,SAAS;AAAA,IAClB,QAAc;AAAA,IAEd;AACA,WAAO;AAAA,EACT,GAAG;AAEH,SAAI,cACF,MAAM,qBAAqB,YAAY,SAAS,eAAe,GAG1D;AACT;AAEA,MAAM,sBAAsB,CAAC,cAC3B,UAAU,WAAW,GAAG,IAAI,KAAK,QAAQ,IAAI,GAAG,SAAS,IAAI,QAAQ,QAAQ,SAAS;AAExF,SAAS,cAAc,GAAQ,cAAc,CAAC,GAAG;AAC/C,SAAK,MACD,MAAM,QAAQ,CAAC,IAAU,EAAE,IAAI,CAAC,MAAM,cAAc,CAAC,CAAC,IACtD,OAAO,KAAM,aAAmB,aAChC,OAAO,KAAM,WAAiB,IAC9B,cAAc,IAAU,cACrB,OAAO;AAAA,IACZ,OAAO,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAE;AAAA,EACvF;AACF;AAEA,SAAS,gBAAgB,QAAuB,UAA2B;AACzE,MAAI,CAAC;AACH,WAAO;AAGT,QAAM,EAAE,iBAAiB,IAAI,mBAAmB,QAAQ,GAGlD,OAAO,cAAc,QAAQ;AAAA,IACjC,aAAa;AAAA,EACf,CAAC,GAEK,EAAE,YAAY,aAAa,cAAc,IAAI,MAC7C,EAAE,QAAQ,OAAO,IAAI;AAK3B,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,OAAO,GAAG;AAExB,UAAM,KAAK;AACX,eAAW,QAAQ;AACjB,YAAM,IAAI,IAAI,iBAAiB,MAAM,IAAI,CAAC;AAAA,EAE9C;AAGA,aAAW,OAAO,QAAQ;AACxB,UAAM,QAAQ,EAAE,GAAG,OAAO,GAAG,EAAE;AAC/B,eAAW,QAAQ;AACjB,YAAM,IAAI,IAAI,iBAAiB,MAAM,IAAI,CAAC;AAAA,EAE9C;AAGA,aAAW,aAAa;AACtB,eAAW,KAAK,UAAU,YAAY;AAEpC,YAAM,iBAAiB,EAAE,GAAG,UAAU,WAAW,CAAC,EAAE;AACpD,gBAAU,WAAW,CAAC,IAAI;AAE1B,YAAM,EAAE,oBAAoB,GAAG,KAAK,IAAI,eAAe;AACvD,qBAAe,eAAe;AAAA,IAChC;AAIF,OAAK,cAAc,CAAC;AACpB,aAAW,OAAO;AAChB,SAAK,YAAY,GAAG,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC;AAI9C,QAAM,EAAE,aAAa,QAAQ,cAAc,aAAa,GAAG,cAAc,IACvE,KAAK;AAEP,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA,eAAe;AAAA,EACjB;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/static",
|
|
3
|
-
"version": "1.62.
|
|
3
|
+
"version": "1.62.2",
|
|
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.21.5",
|
|
36
36
|
"@babel/traverse": "^7.21.5",
|
|
37
37
|
"@babel/types": "^7.21.5",
|
|
38
|
-
"@tamagui/build": "1.62.
|
|
39
|
-
"@tamagui/cli-color": "1.62.
|
|
40
|
-
"@tamagui/config-default": "1.62.
|
|
41
|
-
"@tamagui/core": "1.62.
|
|
42
|
-
"@tamagui/fake-react-native": "1.62.
|
|
43
|
-
"@tamagui/generate-themes": "1.62.
|
|
44
|
-
"@tamagui/helpers": "1.62.
|
|
45
|
-
"@tamagui/helpers-node": "1.62.
|
|
46
|
-
"@tamagui/proxy-worm": "1.62.
|
|
47
|
-
"@tamagui/shorthands": "1.62.
|
|
48
|
-
"@tamagui/types": "1.62.
|
|
38
|
+
"@tamagui/build": "1.62.2",
|
|
39
|
+
"@tamagui/cli-color": "1.62.2",
|
|
40
|
+
"@tamagui/config-default": "1.62.2",
|
|
41
|
+
"@tamagui/core": "1.62.2",
|
|
42
|
+
"@tamagui/fake-react-native": "1.62.2",
|
|
43
|
+
"@tamagui/generate-themes": "1.62.2",
|
|
44
|
+
"@tamagui/helpers": "1.62.2",
|
|
45
|
+
"@tamagui/helpers-node": "1.62.2",
|
|
46
|
+
"@tamagui/proxy-worm": "1.62.2",
|
|
47
|
+
"@tamagui/shorthands": "1.62.2",
|
|
48
|
+
"@tamagui/types": "1.62.2",
|
|
49
49
|
"babel-literal-to-ast": "^2.1.0",
|
|
50
50
|
"esbuild": "^0.19.0",
|
|
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.62.
|
|
59
|
-
"react-native-web-lite": "1.62.
|
|
58
|
+
"react-native-web-internals": "1.62.2",
|
|
59
|
+
"react-native-web-lite": "1.62.2"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@babel/plugin-syntax-typescript": "^7.21.4",
|
|
63
63
|
"@expo/match-media": "^0.4.0",
|
|
64
|
-
"@tamagui/test-design-system": "1.62.
|
|
64
|
+
"@tamagui/test-design-system": "1.62.2",
|
|
65
65
|
"@testing-library/react": "^14.0.0",
|
|
66
66
|
"@types/babel__generator": "^7.6.4",
|
|
67
67
|
"@types/babel__traverse": "^7.18.2",
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { join } from 'path'
|
|
1
|
+
import { dirname, join } from 'path'
|
|
2
2
|
|
|
3
3
|
import { generateThemes, writeGeneratedThemes } from '@tamagui/generate-themes'
|
|
4
4
|
import { TamaguiOptions } from '@tamagui/types'
|
|
5
5
|
import fs, { readFile } from 'fs-extra'
|
|
6
6
|
|
|
7
7
|
import { requireTamaguiCore } from '../helpers/requireTamaguiCore'
|
|
8
|
+
import { TamaguiPlatform } from '../types'
|
|
8
9
|
import { BundledConfig, getBundledConfig } from './bundleConfig'
|
|
9
10
|
|
|
10
11
|
const tamaguiDir = join(process.cwd(), '.tamagui')
|
|
@@ -22,9 +23,27 @@ export async function generateTamaguiStudioConfig(
|
|
|
22
23
|
try {
|
|
23
24
|
const config = configIn ?? (await getBundledConfig(tamaguiOptions, rebuild))
|
|
24
25
|
if (!config) return
|
|
25
|
-
const out = transformConfig(config)
|
|
26
|
+
const out = transformConfig(config, tamaguiOptions.platform)
|
|
26
27
|
|
|
27
|
-
fs.
|
|
28
|
+
await fs.ensureDir(dirname(confFile))
|
|
29
|
+
await fs.writeJSON(confFile, out, {
|
|
30
|
+
spaces: 2,
|
|
31
|
+
})
|
|
32
|
+
} catch (err) {
|
|
33
|
+
if (process.env.DEBUG?.includes('tamagui') || process.env.IS_TAMAGUI_DEV) {
|
|
34
|
+
console.warn('generateTamaguiStudioConfig error', err)
|
|
35
|
+
}
|
|
36
|
+
// ignore for now
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export function generateTamaguiStudioConfigSync(
|
|
41
|
+
_tamaguiOptions: TamaguiOptions,
|
|
42
|
+
config: BundledConfig
|
|
43
|
+
) {
|
|
44
|
+
try {
|
|
45
|
+
fs.ensureDirSync(dirname(confFile))
|
|
46
|
+
fs.writeJSONSync(confFile, transformConfig(config, _tamaguiOptions.platform), {
|
|
28
47
|
spaces: 2,
|
|
29
48
|
})
|
|
30
49
|
} catch (err) {
|
|
@@ -72,22 +91,6 @@ export async function generateTamaguiThemes(tamaguiOptions: TamaguiOptions) {
|
|
|
72
91
|
const resolveRelativePath = (inputPath: string) =>
|
|
73
92
|
inputPath.startsWith('.') ? join(process.cwd(), inputPath) : require.resolve(inputPath)
|
|
74
93
|
|
|
75
|
-
export function generateTamaguiStudioConfigSync(
|
|
76
|
-
_tamaguiOptions: TamaguiOptions,
|
|
77
|
-
config: BundledConfig
|
|
78
|
-
) {
|
|
79
|
-
try {
|
|
80
|
-
fs.writeJSONSync(confFile, transformConfig(config), {
|
|
81
|
-
spaces: 2,
|
|
82
|
-
})
|
|
83
|
-
} catch (err) {
|
|
84
|
-
if (process.env.DEBUG?.includes('tamagui') || process.env.IS_TAMAGUI_DEV) {
|
|
85
|
-
console.warn('generateTamaguiStudioConfig error', err)
|
|
86
|
-
}
|
|
87
|
-
// ignore for now
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
|
|
91
94
|
function cloneDeepSafe(x: any, excludeKeys = {}) {
|
|
92
95
|
if (!x) return x
|
|
93
96
|
if (Array.isArray(x)) return x.map((_) => cloneDeepSafe(_))
|
|
@@ -99,12 +102,12 @@ function cloneDeepSafe(x: any, excludeKeys = {}) {
|
|
|
99
102
|
)
|
|
100
103
|
}
|
|
101
104
|
|
|
102
|
-
function transformConfig(config: BundledConfig) {
|
|
105
|
+
function transformConfig(config: BundledConfig, platform: TamaguiPlatform) {
|
|
103
106
|
if (!config) {
|
|
104
107
|
return null
|
|
105
108
|
}
|
|
106
109
|
|
|
107
|
-
const { getVariableValue } = requireTamaguiCore(
|
|
110
|
+
const { getVariableValue } = requireTamaguiCore(platform)
|
|
108
111
|
|
|
109
112
|
// ensure we don't mangle anything in the original
|
|
110
113
|
const next = cloneDeepSafe(config, {
|
|
@@ -4,6 +4,6 @@ import { BundledConfig } from './bundleConfig';
|
|
|
4
4
|
* Sort of a super-set of bundleConfig(), this code needs some refactoring ideally
|
|
5
5
|
*/
|
|
6
6
|
export declare function generateTamaguiStudioConfig(tamaguiOptions: TamaguiOptions, configIn?: BundledConfig | null, rebuild?: boolean): Promise<void>;
|
|
7
|
-
export declare function generateTamaguiThemes(tamaguiOptions: TamaguiOptions): Promise<boolean | undefined>;
|
|
8
7
|
export declare function generateTamaguiStudioConfigSync(_tamaguiOptions: TamaguiOptions, config: BundledConfig): void;
|
|
8
|
+
export declare function generateTamaguiThemes(tamaguiOptions: TamaguiOptions): Promise<boolean | undefined>;
|
|
9
9
|
//# sourceMappingURL=generateTamaguiStudioConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTamaguiStudioConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/generateTamaguiStudioConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"generateTamaguiStudioConfig.d.ts","sourceRoot":"","sources":["../../src/extractor/generateTamaguiStudioConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAK/C,OAAO,EAAE,aAAa,EAAoB,MAAM,gBAAgB,CAAA;AAKhE;;GAEG;AAEH,wBAAsB,2BAA2B,CAC/C,cAAc,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,aAAa,GAAG,IAAI,EAC/B,OAAO,UAAQ,iBAiBhB;AAED,wBAAgB,+BAA+B,CAC7C,eAAe,EAAE,cAAc,EAC/B,MAAM,EAAE,aAAa,QAatB;AAED,wBAAsB,qBAAqB,CAAC,cAAc,EAAE,cAAc,gCAgCzE"}
|