@tamagui/cli 1.43.9 → 1.43.11
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/cli.js +18 -18
- package/dist/cli.js.map +1 -1
- package/dist/studio.js +39 -5
- package/dist/studio.js.map +2 -2
- package/dist/utils.js +4 -0
- package/dist/utils.js.map +1 -1
- package/package.json +10 -8
- package/src/cli.ts +18 -18
- package/src/studio.ts +48 -5
- package/src/utils.ts +7 -0
- package/types/studio.d.ts.map +1 -1
- package/types/utils.d.ts.map +1 -1
package/dist/cli.js
CHANGED
|
@@ -118,25 +118,25 @@ const COMMAND_MAP = {
|
|
|
118
118
|
});
|
|
119
119
|
await dev(options);
|
|
120
120
|
}
|
|
121
|
+
},
|
|
122
|
+
studio: {
|
|
123
|
+
shorthands: ["s"],
|
|
124
|
+
description: `Studio`,
|
|
125
|
+
flags: {
|
|
126
|
+
"--help": Boolean,
|
|
127
|
+
"--debug": Boolean,
|
|
128
|
+
"--verbose": Boolean,
|
|
129
|
+
"--remote": Boolean
|
|
130
|
+
},
|
|
131
|
+
async run() {
|
|
132
|
+
const { _, ...flags2 } = (0, import_arg.default)(this.flags);
|
|
133
|
+
const { studio } = require("./studio");
|
|
134
|
+
const options = await (0, import_utils.getOptions)({
|
|
135
|
+
debug: flags2["--debug"] ? flags2["--verbose"] ? "verbose" : true : false
|
|
136
|
+
});
|
|
137
|
+
await studio(options, flags2["--remote"]);
|
|
138
|
+
}
|
|
121
139
|
}
|
|
122
|
-
// studio: {
|
|
123
|
-
// shorthands: ['s'],
|
|
124
|
-
// description: `Studio`,
|
|
125
|
-
// flags: {
|
|
126
|
-
// '--help': Boolean,
|
|
127
|
-
// '--debug': Boolean,
|
|
128
|
-
// '--verbose': Boolean,
|
|
129
|
-
// '--local': Boolean,
|
|
130
|
-
// },
|
|
131
|
-
// async run() {
|
|
132
|
-
// const { _, ...flags } = arg(this.flags)
|
|
133
|
-
// const { studio } = await import('./studio')
|
|
134
|
-
// const options = await getOptions({
|
|
135
|
-
// debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
|
|
136
|
-
// })
|
|
137
|
-
// await studio(options, !flags['--local'])
|
|
138
|
-
// },
|
|
139
|
-
// },
|
|
140
140
|
};
|
|
141
141
|
const commandEntries = Object.keys(COMMAND_MAP).flatMap((command2) => {
|
|
142
142
|
const definition2 = COMMAND_MAP[command2];
|
package/dist/cli.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/cli.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AACA,iBAAgB;AAChB,mBAAkB;AAElB,iBAAsC;AACtC,mBAAuC;AAEtC,CAAC,QAAQ,QAAQ,EAAE,QAAQ,CAAC,MAAM;AACjC,UAAQ,GAAG,GAAG,MAAM;AAClB,iCAAW;AACX,YAAQ,KAAK;AAAA,EACf,CAAC;AACH,CAAC;AAED,MAAM,cAAc;AAAA,EAClB,mBAAmB;AAAA,IACjB,YAAY,CAAC,IAAI;AAAA,IACjB,aAAa;AAAA,IACb,OAAO;AAAA,MACL,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,IACf;AAAA,IACA,MAAM,MAAM;AACV,YAAM,EAAE,GAAG,GAAGA,OAAM,QAAI,WAAAC,SAAI,KAAK,KAAK;AACtC,YAAM,UAAU,UAAM,yBAAW;AAAA,QAC/B,OAAOD,OAAM,SAAS,IAAKA,OAAM,WAAW,IAAI,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,CAAC,MAAM,QAAQ,OAAO,IAAI;AAChC,UAAI,CAAC,UAAU,CAAC,SAAS;AACvB,cAAM,IAAI;AAAA,UACR,iEAAiE,oBAAoB;AAAA,QACvF;AAAA,MACF;AAEA,YAAM,EAAE,gBAAgB,qBAAqB,IAAI,QAAQ,0BAA0B;AAEnF,YAAM;AAAA,QACJ,QAAQ,MAAM;AAAA,QACd;AAAA,QACA,MAAM,eAAe,MAAM;AAAA,MAC7B;AAAA,IACF;AAAA,EACF;AAAA,EAEA,KAAK;AAAA,IACH,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa,iEAAiE,iCAAsB;AAAA,MAClG;AAAA,IACF;AAAA,IACA,OAAO;AAAA,MACL,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,IACf;AAAA,IACA,MAAM,MAAM;AACV,YAAM,EAAE,GAAG,GAAGA,OAAM,QAAI,WAAAC,SAAI,KAAK,KAAK;AACtC,YAAM,EAAE,wBAAwB,IAAI,QAAQ,UAAU;AACtD,YAAM,CAAC,KAAK,MAAM,IAAI,IAAI;AAI1B,YAAM,wBAAwB,MAAM,IAAI;AAAA,IAC1C;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EA6BA,KAAK;AAAA,IACH,YAAY,CAAC,GAAG;AAAA,IAChB,aAAa;AAAA,IACb,OAAO;AAAA,MACL,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,IACf;AAAA,IACA,MAAM,MAAM;AACV,YAAM,EAAE,GAAG,GAAGD,OAAM,QAAI,WAAAC,SAAI,KAAK,KAAK;AACtC,YAAM,EAAE,IAAI,IAAI,QAAQ,OAAO;AAC/B,YAAM,UAAU,UAAM,yBAAW;AAAA,QAC/B,OAAOD,OAAM,SAAS,IAAKA,OAAM,WAAW,IAAI,YAAY,OAAQ;AAAA,MACtE,CAAC;AACD,YAAM,IAAI,OAAO;AAAA,IACnB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["flags", "arg", "command", "definition", "chalk"]
|
|
6
6
|
}
|
package/dist/studio.js
CHANGED
|
@@ -38,12 +38,13 @@ var import_vite_plugin = require("@tamagui/vite-plugin");
|
|
|
38
38
|
var import_plugin_react_swc = __toESM(require("@vitejs/plugin-react-swc"));
|
|
39
39
|
var import_chalk = __toESM(require("chalk"));
|
|
40
40
|
var import_express = __toESM(require("express"));
|
|
41
|
-
var import_express_http_proxy = __toESM(require("express-http-proxy"));
|
|
42
41
|
var import_fs_extra = __toESM(require("fs-extra"));
|
|
42
|
+
var import_http_proxy_middleware = require("http-proxy-middleware");
|
|
43
43
|
var import_vite = require("vite");
|
|
44
|
+
var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"));
|
|
44
45
|
const import_meta = {};
|
|
45
46
|
const resolve = "url" in import_meta ? (0, import_module.createRequire)(import_meta.url).resolve : require.resolve;
|
|
46
|
-
const studio = async (options, isRemote =
|
|
47
|
+
const studio = async (options, isRemote = false) => {
|
|
47
48
|
var _a;
|
|
48
49
|
process.env.TAMAGUI_TARGET = "web";
|
|
49
50
|
await (0, import_fs_extra.ensureDir)(options.paths.dotDir);
|
|
@@ -59,7 +60,8 @@ const studio = async (options, isRemote = true) => {
|
|
|
59
60
|
});
|
|
60
61
|
const { default: getPort } = await import("get-port");
|
|
61
62
|
const { paths } = options;
|
|
62
|
-
const root = (0, import_path.dirname)(resolve("@
|
|
63
|
+
const root = (0, import_path.dirname)((0, import_path.dirname)((0, import_path.dirname)(resolve("@tamagui/studio"))));
|
|
64
|
+
console.log("root", root);
|
|
63
65
|
const [serverPort, vitePort] = await Promise.all([
|
|
64
66
|
getPort({
|
|
65
67
|
port: 1421
|
|
@@ -80,7 +82,8 @@ const studio = async (options, isRemote = true) => {
|
|
|
80
82
|
(0, import_vite_plugin.tamaguiPlugin)({
|
|
81
83
|
components: ["tamagui"]
|
|
82
84
|
}),
|
|
83
|
-
(0, import_plugin_react_swc.default)()
|
|
85
|
+
(0, import_plugin_react_swc.default)(),
|
|
86
|
+
(0, import_vite_tsconfig_paths.default)()
|
|
84
87
|
]
|
|
85
88
|
});
|
|
86
89
|
await server.listen();
|
|
@@ -92,7 +95,38 @@ const studio = async (options, isRemote = true) => {
|
|
|
92
95
|
const conf = await import_fs_extra.default.readJSON(paths.conf);
|
|
93
96
|
res.status(200).json(conf);
|
|
94
97
|
});
|
|
95
|
-
app.
|
|
98
|
+
app.get("/pingz", async (req, res) => {
|
|
99
|
+
res.status(200).json({
|
|
100
|
+
hi: true
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
app.get("/api/tamagui.config.json", async (req, res) => {
|
|
104
|
+
try {
|
|
105
|
+
res.status(200).json(await import_fs_extra.default.readJSON(paths.conf));
|
|
106
|
+
} catch (err) {
|
|
107
|
+
res.status(500).json({
|
|
108
|
+
error: `${err.message}`
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
app.get("/api/tamagui.themes.json", async (req, res) => {
|
|
113
|
+
try {
|
|
114
|
+
res.status(200).json(await import_fs_extra.default.readJSON((0, import_path.join)(paths.dotDir, "theme-builder.json")));
|
|
115
|
+
} catch (err) {
|
|
116
|
+
res.status(500).json({
|
|
117
|
+
error: `${err.message}`
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
const target = `http://${info.address}:${vitePort}`;
|
|
122
|
+
console.log("target", target);
|
|
123
|
+
app.use(
|
|
124
|
+
"/",
|
|
125
|
+
(0, import_http_proxy_middleware.createProxyMiddleware)({
|
|
126
|
+
target,
|
|
127
|
+
ws: true
|
|
128
|
+
})
|
|
129
|
+
);
|
|
96
130
|
const appServer = app.listen(serverPort);
|
|
97
131
|
localServerPromise = new Promise((res) => appServer.on("close", res));
|
|
98
132
|
console.log(`Listening on`, import_chalk.default.green(`http://localhost:${serverPort}`));
|
package/dist/studio.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/studio.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA8B;AAE9B,
|
|
5
|
-
"names": ["viteReactPlugin", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["viteReactPlugin", "viteTsConfigPaths", "express", "fs", "chalk"]
|
|
6
6
|
}
|
package/dist/utils.js
CHANGED
|
@@ -46,6 +46,10 @@ async function getOptions({
|
|
|
46
46
|
host,
|
|
47
47
|
debug
|
|
48
48
|
} = {}) {
|
|
49
|
+
if (root.includes("tamagui/apps/studio")) {
|
|
50
|
+
console.log(`Running in studio mode, loading the site config`);
|
|
51
|
+
root = root.replace("apps/studio", "apps/site");
|
|
52
|
+
}
|
|
49
53
|
const tsConfigFilePath = (0, import_path.join)(root, tsconfigPath);
|
|
50
54
|
ensure(await import_fs_extra.default.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`);
|
|
51
55
|
const dotDir = (0, import_path.join)(root, ".tamagui");
|
package/dist/utils.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/utils.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAGrB,oBAAiD;AAEjD,mBAAkB;AAClB,sBAAyC;AAEzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA6B,CAAC,GAAgC;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAGrB,oBAAiD;AAEjD,mBAAkB;AAClB,sBAAyC;AAEzC,eAAsB,WAAW;AAAA,EAC/B,OAAO,QAAQ,IAAI;AAAA,EACnB,eAAe;AAAA,EACf;AAAA,EACA;AAAA,EACA;AACF,IAA6B,CAAC,GAAgC;AAE5D,MAAI,KAAK,SAAS,qBAAqB,GAAG;AAExC,YAAQ,IAAI,iDAAiD;AAC7D,WAAO,KAAK,QAAQ,eAAe,WAAW;AAAA,EAChD;AAEA,QAAM,uBAAmB,kBAAK,MAAM,YAAY;AAChD,SAAO,MAAM,gBAAAA,QAAG,WAAW,gBAAgB,GAAG,sBAAsB,kBAAkB;AACtF,QAAM,aAAS,kBAAK,MAAM,UAAU;AACpC,QAAM,UAAU,UAAM,8BAAS,kBAAK,MAAM,cAAc,CAAC;AACzD,MAAI,SAAS;AACb,MAAI;AACF,aAAS,MAAM,4BAA4B;AAAA,EAC7C,QAAE;AAAA,EAEF;AAEA,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;AAAA,MACA,GAAG;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,UAAM,kBAAK,QAAQ,qBAAqB;AAAA,MACxC,WAAO,kBAAK,QAAQ,YAAY;AAAA,IAClC;AAAA,EACF;AACF;AAEO,SAAS,OAAO,WAAoB,SAAiB;AAC1D,MAAI,CAAC,WAAW;AACd,YAAQ,MAAM,aAAAC,QAAM,IAAI,KAAK,QAAQ,GAAG,aAAAA,QAAM,OAAO,GAAG,SAAS,CAAC;AAClE,YAAQ,KAAK,CAAC;AAAA,EAChB;AACF;AAEA,MAAM,eAAe,CAAC,yBAAqB,kBAAK,OAAO,mBAAmB,CAAC;AAC3E,IAAI,aAAa;AACjB,eAAe,8BAA8B;AAC3C,MAAI;AAAY,WAAO;AACvB,QAAM,gBAAgB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,aAAS,4BAAW,IAAI,CAAC,CAAC;AACpF,QAAM,WAAW,cAAc,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,QAAM,QAAQ,aAAa,QAAQ;AACnC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,4BAA4B;AAAA,EAC9C;AACA,eAAa;AACb,SAAO;AACT;AAEA,IAAI,SAAoC;AACjC,MAAM,cAAc,OACzB,SACuC;AACvC,QAAM,SAAS,UAAM,cAAAC,aAAkB;AAAA,IACrC,QAAQ,MAAM,4BAA4B;AAAA,IAC1C,YAAY,CAAC,SAAS;AAAA,IACtB,GAAG;AAAA,EACL,CAAC;AACD,MAAI,QAAQ;AACV,aAAS;AAAA,EACX;AACA,SAAO;AACT;AAEA,MAAM,YAAY,oBAAI,IAAc;AAE7B,SAAS,gBAAgB,IAAgB;AAC9C,YAAU,IAAI,EAAE;AAClB;AAEO,SAAS,aAAa;AAC3B,YAAU,QAAQ,CAAC,OAAO,GAAG,CAAC;AAChC;",
|
|
5
5
|
"names": ["fs", "chalk", "loadTamaguiStatic"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/cli",
|
|
3
|
-
"version": "1.43.
|
|
3
|
+
"version": "1.43.11",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"main": "dist",
|
|
@@ -27,12 +27,13 @@
|
|
|
27
27
|
"@callstack/repack-debugger-app": "^1.0.0",
|
|
28
28
|
"@fastify/sensible": "^4.1.0",
|
|
29
29
|
"@fastify/static": "^5.0.2",
|
|
30
|
-
"@tamagui/build": "1.43.
|
|
31
|
-
"@tamagui/create-theme": "1.43.
|
|
32
|
-
"@tamagui/generate-themes": "1.43.
|
|
33
|
-
"@tamagui/static": "1.43.
|
|
34
|
-
"@tamagui/
|
|
35
|
-
"@tamagui/
|
|
30
|
+
"@tamagui/build": "1.43.11",
|
|
31
|
+
"@tamagui/create-theme": "1.43.11",
|
|
32
|
+
"@tamagui/generate-themes": "1.43.11",
|
|
33
|
+
"@tamagui/static": "1.43.11",
|
|
34
|
+
"@tamagui/studio": "1.43.10",
|
|
35
|
+
"@tamagui/types": "1.43.11",
|
|
36
|
+
"@tamagui/vite-plugin": "1.43.11",
|
|
36
37
|
"@types/compression": "^1.7.2",
|
|
37
38
|
"@types/morgan": "^1.9.3",
|
|
38
39
|
"@vitejs/plugin-react-swc": "^3.3.0",
|
|
@@ -44,7 +45,6 @@
|
|
|
44
45
|
"esbuild": "^0.17.17",
|
|
45
46
|
"execa": "^5.0.0",
|
|
46
47
|
"express": "^4.18.1",
|
|
47
|
-
"express-http-proxy": "^1.6.3",
|
|
48
48
|
"fast-glob": "^3.2.11",
|
|
49
49
|
"fastify": "^3.29.0",
|
|
50
50
|
"fastify-favicon": "^3.2.0",
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"fs-extra": "^11.1.0",
|
|
53
53
|
"get-port": "^6.1.2",
|
|
54
54
|
"graphology": "^0.24.1",
|
|
55
|
+
"http-proxy-middleware": "^2.0.6",
|
|
55
56
|
"kill-port": "^2.0.1",
|
|
56
57
|
"lodash.debounce": "^4.0.8",
|
|
57
58
|
"marked": "^5.1.0",
|
|
@@ -67,6 +68,7 @@
|
|
|
67
68
|
"typescript": "^5.1.3",
|
|
68
69
|
"url": "^0.11.0",
|
|
69
70
|
"vite": "^4.3.0",
|
|
71
|
+
"vite-tsconfig-paths": "^4.2.0",
|
|
70
72
|
"ws": "^8.7.0",
|
|
71
73
|
"zx": "^7.1.1"
|
|
72
74
|
},
|
package/src/cli.ts
CHANGED
|
@@ -109,24 +109,24 @@ const COMMAND_MAP = {
|
|
|
109
109
|
},
|
|
110
110
|
},
|
|
111
111
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
112
|
+
studio: {
|
|
113
|
+
shorthands: ['s'],
|
|
114
|
+
description: `Studio`,
|
|
115
|
+
flags: {
|
|
116
|
+
'--help': Boolean,
|
|
117
|
+
'--debug': Boolean,
|
|
118
|
+
'--verbose': Boolean,
|
|
119
|
+
'--remote': Boolean,
|
|
120
|
+
},
|
|
121
|
+
async run() {
|
|
122
|
+
const { _, ...flags } = arg(this.flags)
|
|
123
|
+
const { studio } = require('./studio')
|
|
124
|
+
const options = await getOptions({
|
|
125
|
+
debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
|
|
126
|
+
})
|
|
127
|
+
await studio(options, flags['--remote'])
|
|
128
|
+
},
|
|
129
|
+
},
|
|
130
130
|
}
|
|
131
131
|
|
|
132
132
|
type CommandDefinitions = typeof COMMAND_MAP
|
package/src/studio.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRequire } from 'module'
|
|
2
2
|
import { AddressInfo } from 'net'
|
|
3
|
-
import { dirname } from 'path'
|
|
3
|
+
import { dirname, join } from 'path'
|
|
4
4
|
|
|
5
5
|
import { watchTamaguiConfig } from '@tamagui/static'
|
|
6
6
|
import { CLIResolvedOptions } from '@tamagui/types'
|
|
@@ -8,14 +8,20 @@ import { tamaguiPlugin } from '@tamagui/vite-plugin'
|
|
|
8
8
|
import viteReactPlugin from '@vitejs/plugin-react-swc'
|
|
9
9
|
import chalk from 'chalk'
|
|
10
10
|
import express from 'express'
|
|
11
|
-
import proxy from 'express-http-proxy'
|
|
12
11
|
import fs, { ensureDir } from 'fs-extra'
|
|
12
|
+
import {
|
|
13
|
+
Filter,
|
|
14
|
+
Options,
|
|
15
|
+
RequestHandler,
|
|
16
|
+
createProxyMiddleware,
|
|
17
|
+
} from 'http-proxy-middleware'
|
|
13
18
|
import { createServer } from 'vite'
|
|
19
|
+
import viteTsConfigPaths from 'vite-tsconfig-paths'
|
|
14
20
|
|
|
15
21
|
const resolve =
|
|
16
22
|
'url' in import.meta ? createRequire(import.meta.url).resolve : require.resolve
|
|
17
23
|
|
|
18
|
-
export const studio = async (options: CLIResolvedOptions, isRemote =
|
|
24
|
+
export const studio = async (options: CLIResolvedOptions, isRemote = false) => {
|
|
19
25
|
process.env.TAMAGUI_TARGET = 'web'
|
|
20
26
|
|
|
21
27
|
await ensureDir(options.paths.dotDir)
|
|
@@ -30,9 +36,11 @@ export const studio = async (options: CLIResolvedOptions, isRemote = true) => {
|
|
|
30
36
|
process.exit(0)
|
|
31
37
|
}
|
|
32
38
|
})
|
|
39
|
+
|
|
33
40
|
const { default: getPort } = await import('get-port')
|
|
34
41
|
const { paths } = options
|
|
35
|
-
const root = dirname(resolve('@
|
|
42
|
+
const root = dirname(dirname(dirname(resolve('@tamagui/studio'))))
|
|
43
|
+
console.log('root', root)
|
|
36
44
|
|
|
37
45
|
const [serverPort, vitePort] = await Promise.all([
|
|
38
46
|
getPort({
|
|
@@ -56,6 +64,7 @@ export const studio = async (options: CLIResolvedOptions, isRemote = true) => {
|
|
|
56
64
|
components: ['tamagui'],
|
|
57
65
|
}),
|
|
58
66
|
viteReactPlugin(),
|
|
67
|
+
viteTsConfigPaths(),
|
|
59
68
|
],
|
|
60
69
|
})
|
|
61
70
|
|
|
@@ -75,7 +84,41 @@ export const studio = async (options: CLIResolvedOptions, isRemote = true) => {
|
|
|
75
84
|
res.status(200).json(conf)
|
|
76
85
|
})
|
|
77
86
|
|
|
78
|
-
app.
|
|
87
|
+
app.get('/pingz', async (req, res) => {
|
|
88
|
+
res.status(200).json({
|
|
89
|
+
hi: true,
|
|
90
|
+
})
|
|
91
|
+
})
|
|
92
|
+
|
|
93
|
+
app.get('/api/tamagui.config.json', async (req, res) => {
|
|
94
|
+
try {
|
|
95
|
+
res.status(200).json(await fs.readJSON(paths.conf))
|
|
96
|
+
} catch (err) {
|
|
97
|
+
res.status(500).json({
|
|
98
|
+
error: `${(err as any).message}`,
|
|
99
|
+
})
|
|
100
|
+
}
|
|
101
|
+
})
|
|
102
|
+
|
|
103
|
+
app.get('/api/tamagui.themes.json', async (req, res) => {
|
|
104
|
+
try {
|
|
105
|
+
res.status(200).json(await fs.readJSON(join(paths.dotDir, 'theme-builder.json')))
|
|
106
|
+
} catch (err) {
|
|
107
|
+
res.status(500).json({
|
|
108
|
+
error: `${(err as any).message}`,
|
|
109
|
+
})
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
|
|
113
|
+
const target = `http://${info.address}:${vitePort}`
|
|
114
|
+
console.log('target', target)
|
|
115
|
+
app.use(
|
|
116
|
+
'/',
|
|
117
|
+
createProxyMiddleware({
|
|
118
|
+
target,
|
|
119
|
+
ws: true,
|
|
120
|
+
})
|
|
121
|
+
)
|
|
79
122
|
|
|
80
123
|
const appServer = app.listen(serverPort)
|
|
81
124
|
|
package/src/utils.ts
CHANGED
|
@@ -13,6 +13,13 @@ export async function getOptions({
|
|
|
13
13
|
host,
|
|
14
14
|
debug,
|
|
15
15
|
}: Partial<CLIUserOptions> = {}): Promise<CLIResolvedOptions> {
|
|
16
|
+
//
|
|
17
|
+
if (root.includes('tamagui/apps/studio')) {
|
|
18
|
+
// rome-ignore lint/nursery/noConsoleLog: <explanation>
|
|
19
|
+
console.log(`Running in studio mode, loading the site config`)
|
|
20
|
+
root = root.replace('apps/studio', 'apps/site')
|
|
21
|
+
}
|
|
22
|
+
|
|
16
23
|
const tsConfigFilePath = join(root, tsconfigPath)
|
|
17
24
|
ensure(await fs.pathExists(tsConfigFilePath), `No tsconfig found: ${tsConfigFilePath}`)
|
|
18
25
|
const dotDir = join(root, '.tamagui')
|
package/types/studio.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../src/studio.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../src/studio.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAkBnD,eAAO,MAAM,MAAM,YAAmB,kBAAkB,sCA6GvD,CAAA"}
|
package/types/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEzE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAInE,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,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEzE,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAInE,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,CAqC5D;AAED,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAKzD;AAiBD,eAAO,MAAM,WAAW,SAChB,QAAQ,cAAc,CAAC,KAC5B,QAAQ,kBAAkB,GAAG,IAAI,CAUnC,CAAA;AAID,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,IAAI,QAE7C;AAED,wBAAgB,UAAU,SAEzB"}
|