sparkling-app-cli 2.1.0-rc.2 → 2.1.0-rc.20
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/README.md +18 -0
- package/dist/commands/dev.d.ts +1 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +106 -7
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/run-android.d.ts.map +1 -1
- package/dist/commands/run-android.js +71 -2
- package/dist/commands/run-android.js.map +1 -1
- package/dist/commands/run-ios.d.ts.map +1 -1
- package/dist/commands/run-ios.js +19 -48
- package/dist/commands/run-ios.js.map +1 -1
- package/dist/config.d.ts +7 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +80 -5
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +9 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/dev-server.d.ts +3 -0
- package/dist/utils/dev-server.d.ts.map +1 -0
- package/dist/utils/dev-server.js +83 -0
- package/dist/utils/dev-server.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -38,6 +38,24 @@ sparkling run:ios
|
|
|
38
38
|
|
|
39
39
|
Run `sparkling --help` to see all available commands and options.
|
|
40
40
|
|
|
41
|
+
## Dev Server Port And Host Behavior
|
|
42
|
+
|
|
43
|
+
- `sparkling dev` resolves the port from (highest to lowest): `--port` -> `app.config.ts` `dev.server.port` -> `app.config.ts` `lynxConfig.server.port` -> `5969`.
|
|
44
|
+
- `sparkling dev --port <x>` persists the selected port back to `app.config.ts` as `dev.server.port`.
|
|
45
|
+
- `sparkling run:ios` and `sparkling run:android` reuse the same resolved port and auto-start a dev server when needed.
|
|
46
|
+
- For Android, `run:android` auto-detects connected targets:
|
|
47
|
+
- emulator: app uses `127.0.0.1` and CLI applies `adb reverse tcp:<port> tcp:<port>`
|
|
48
|
+
- physical device: app uses your local LAN IPv4 and CLI starts the server on `0.0.0.0`
|
|
49
|
+
|
|
50
|
+
## Template Debug/Release Loading
|
|
51
|
+
|
|
52
|
+
In the app template:
|
|
53
|
+
|
|
54
|
+
- **Debug** builds can load either:
|
|
55
|
+
- remote URL source (for example `http://<host>:<port>/main.lynx.bundle`), or
|
|
56
|
+
- local asset bundle source (for example `main.lynx.bundle`).
|
|
57
|
+
- **Release** builds do not rely on debug-tool and load from assets only (`bundle=...`).
|
|
58
|
+
|
|
41
59
|
## Local testing
|
|
42
60
|
|
|
43
61
|
When developing inside the Sparkling monorepo, see [LOCAL_TESTING.md](./LOCAL_TESTING.md) for building this CLI, running `sparkling` / `sparkling-app-cli` from the workspace, and trying commands from an app directory.
|
package/dist/commands/dev.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAoBD,wBAAsB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4GnE"}
|
package/dist/commands/dev.js
CHANGED
|
@@ -7,22 +7,121 @@ exports.devProject = devProject;
|
|
|
7
7
|
// Copyright (c) 2026 TikTok Pte. Ltd.
|
|
8
8
|
// Licensed under the Apache License Version 2.0 that can be found in the
|
|
9
9
|
// LICENSE file in the root directory of this source tree.
|
|
10
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
10
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const node_child_process_1 = require("node:child_process");
|
|
11
13
|
const config_1 = require("../config");
|
|
12
|
-
const constants_1 = require("../constants");
|
|
13
|
-
const exec_1 = require("../utils/exec");
|
|
14
14
|
const ui_1 = require("../utils/ui");
|
|
15
15
|
const verbose_1 = require("../utils/verbose");
|
|
16
|
+
function getEntryKeys(config) {
|
|
17
|
+
const lynxConfig = config.lynxConfig;
|
|
18
|
+
const source = lynxConfig?.source;
|
|
19
|
+
const entry = source?.entry;
|
|
20
|
+
if (!entry || typeof entry !== 'object')
|
|
21
|
+
return [];
|
|
22
|
+
return Object.keys(entry).sort();
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Clear require cache for the app config so loadAppConfig picks up fresh content.
|
|
26
|
+
*/
|
|
27
|
+
function clearConfigRequireCache(cwd, configPath) {
|
|
28
|
+
const resolvedConfig = node_path_1.default.resolve(configPath);
|
|
29
|
+
const tempLoader = node_path_1.default.resolve(cwd, '.sparkling', 'app.config.cjs');
|
|
30
|
+
delete require.cache[resolvedConfig];
|
|
31
|
+
delete require.cache[tempLoader];
|
|
32
|
+
}
|
|
16
33
|
async function devProject(options) {
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
const
|
|
34
|
+
const configFile = options.configFile ?? 'app.config.ts';
|
|
35
|
+
const { config, configPath } = await (0, config_1.loadAppConfig)(options.cwd, configFile);
|
|
36
|
+
const { devPort, lynxPort } = (0, config_1.getConfiguredDevServerPorts)(config);
|
|
37
|
+
if (devPort !== undefined && lynxPort !== undefined && devPort !== lynxPort) {
|
|
38
|
+
console.warn(ui_1.ui.warn(`Port config mismatch detected: dev.server.port=${devPort} and lynxConfig.server.port=${lynxPort}. ` +
|
|
39
|
+
`sparkling-app-cli uses dev.server.port (${devPort}).`));
|
|
40
|
+
}
|
|
41
|
+
const configuredPort = (0, config_1.resolveDevServerPort)(config);
|
|
42
|
+
const port = options.port ?? configuredPort;
|
|
43
|
+
if (options.port !== undefined && options.port !== configuredPort) {
|
|
44
|
+
const updated = (0, config_1.updateDevServerPortInAppConfig)(configPath, options.port);
|
|
45
|
+
if (updated) {
|
|
46
|
+
console.log(ui_1.ui.info(`Updated app.config.ts dev.server.port to ${options.port}.`));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
20
49
|
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
21
50
|
(0, verbose_1.verboseLog)(`App config path: ${configPath}`);
|
|
22
|
-
(0, verbose_1.verboseLog)(`Temp Lynx config: ${tempConfigPath}`);
|
|
23
51
|
(0, verbose_1.verboseLog)(`Dev server port: ${port}`);
|
|
52
|
+
if (options.host) {
|
|
53
|
+
(0, verbose_1.verboseLog)(`Dev server host: ${options.host}`);
|
|
54
|
+
}
|
|
24
55
|
}
|
|
56
|
+
let currentEntryKeys = getEntryKeys(config);
|
|
25
57
|
console.log(ui_1.ui.headline(`Starting Rspeedy dev server on port ${port} with config from ${node_path_1.default.relative(options.cwd, configPath)}`));
|
|
26
|
-
|
|
58
|
+
let restarting = false;
|
|
59
|
+
let child = null;
|
|
60
|
+
let debounceTimer;
|
|
61
|
+
const watcher = node_fs_1.default.watch(configPath, () => {
|
|
62
|
+
if (debounceTimer)
|
|
63
|
+
clearTimeout(debounceTimer);
|
|
64
|
+
debounceTimer = setTimeout(async () => {
|
|
65
|
+
try {
|
|
66
|
+
clearConfigRequireCache(options.cwd, configPath);
|
|
67
|
+
const { config: newConfig } = await (0, config_1.loadAppConfig)(options.cwd, configFile);
|
|
68
|
+
const newEntryKeys = getEntryKeys(newConfig);
|
|
69
|
+
if (newEntryKeys.length === currentEntryKeys.length
|
|
70
|
+
&& newEntryKeys.every((key, i) => key === currentEntryKeys[i])) {
|
|
71
|
+
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
72
|
+
(0, verbose_1.verboseLog)('app.config.ts changed but entries unchanged, skipping restart');
|
|
73
|
+
}
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
console.log(ui_1.ui.headline('Detected entry change in app.config.ts, restarting dev server...'));
|
|
77
|
+
currentEntryKeys = newEntryKeys;
|
|
78
|
+
restarting = true;
|
|
79
|
+
if (child) {
|
|
80
|
+
child.kill('SIGTERM');
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
catch (err) {
|
|
84
|
+
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
85
|
+
(0, verbose_1.verboseLog)(`Failed to reload app.config.ts: ${err}`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}, 300);
|
|
89
|
+
});
|
|
90
|
+
try {
|
|
91
|
+
while (true) {
|
|
92
|
+
const tempConfigPath = (0, config_1.createDevLynxConfig)(options.cwd, configPath, port, options.host);
|
|
93
|
+
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
94
|
+
(0, verbose_1.verboseLog)(`Temp Lynx config: ${tempConfigPath}`);
|
|
95
|
+
}
|
|
96
|
+
child = (0, node_child_process_1.spawn)('rspeedy', ['dev', '--config', tempConfigPath], {
|
|
97
|
+
cwd: options.cwd,
|
|
98
|
+
env: process.env,
|
|
99
|
+
stdio: 'inherit',
|
|
100
|
+
shell: false,
|
|
101
|
+
});
|
|
102
|
+
await new Promise((resolve, reject) => {
|
|
103
|
+
child.on('error', reject);
|
|
104
|
+
child.on('close', (code) => {
|
|
105
|
+
if (restarting) {
|
|
106
|
+
resolve();
|
|
107
|
+
}
|
|
108
|
+
else if (code) {
|
|
109
|
+
reject(new Error(`rspeedy exited with code ${code}`));
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
resolve();
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
if (!restarting)
|
|
117
|
+
break;
|
|
118
|
+
restarting = false;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
watcher.close();
|
|
123
|
+
if (debounceTimer)
|
|
124
|
+
clearTimeout(debounceTimer);
|
|
125
|
+
}
|
|
27
126
|
}
|
|
28
127
|
//# sourceMappingURL=dev.js.map
|
package/dist/commands/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":";;;;;AAyCA,gCA4GC;AArJD,sCAAsC;AACtC,yEAAyE;AACzE,0DAA0D;AAC1D,sDAAyB;AACzB,0DAA6B;AAC7B,2DAA8D;AAC9D,sCAMmB;AACnB,oCAAiC;AACjC,8CAAgE;AAShE,SAAS,YAAY,CAAC,MAA+B;IACnD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAqC,CAAC;IAChE,MAAM,MAAM,GAAG,UAAU,EAAE,MAA6C,CAAC;IACzE,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;IAC5B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IACnD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAAC,GAAW,EAAE,UAAkB;IAC9D,MAAM,cAAc,GAAG,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,mBAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC;IACrE,OAAO,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,OAAmB;IAClD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,eAAe,CAAC;IACzD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,sBAAa,EAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC5E,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,oCAA2B,EAAC,MAAM,CAAC,CAAC;IAClE,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC5E,OAAO,CAAC,IAAI,CAAC,OAAE,CAAC,IAAI,CAClB,kDAAkD,OAAO,+BAA+B,QAAQ,IAAI;YACpG,2CAA2C,OAAO,IAAI,CACvD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAoB,EAAC,MAAM,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,cAAc,CAAC;IAE5C,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAClE,MAAM,OAAO,GAAG,IAAA,uCAA8B,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,OAAE,CAAC,IAAI,CAAC,4CAA4C,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAED,IAAI,IAAA,0BAAgB,GAAE,EAAE,CAAC;QACvB,IAAA,oBAAU,EAAC,oBAAoB,UAAU,EAAE,CAAC,CAAC;QAC7C,IAAA,oBAAU,EAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;QACvC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAA,oBAAU,EAAC,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,OAAE,CAAC,QAAQ,CACT,uCAAuC,IAAI,qBAAqB,mBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CACzG,CACF,CAAC;IAEF,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,KAAK,GAAwB,IAAI,CAAC;IAEtC,IAAI,aAAwD,CAAC;IAC7D,MAAM,OAAO,GAAG,iBAAE,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE;QACxC,IAAI,aAAa;YAAE,YAAY,CAAC,aAAa,CAAC,CAAC;QAC/C,aAAa,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACpC,IAAI,CAAC;gBACH,uBAAuB,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBACjD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,sBAAa,EAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBAC3E,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;gBAE7C,IACE,YAAY,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM;uBAC5C,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAC9D,CAAC;oBACD,IAAI,IAAA,0BAAgB,GAAE,EAAE,CAAC;wBACvB,IAAA,oBAAU,EAAC,+DAA+D,CAAC,CAAC;oBAC9E,CAAC;oBACD,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,GAAG,CACT,OAAE,CAAC,QAAQ,CAAC,kEAAkE,CAAC,CAChF,CAAC;gBACF,gBAAgB,GAAG,YAAY,CAAC;gBAChC,UAAU,GAAG,IAAI,CAAC;gBAClB,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,IAAA,0BAAgB,GAAE,EAAE,CAAC;oBACvB,IAAA,oBAAU,EAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACxF,IAAI,IAAA,0BAAgB,GAAE,EAAE,CAAC;gBACvB,IAAA,oBAAU,EAAC,qBAAqB,cAAc,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,KAAK,GAAG,IAAA,0BAAK,EAAC,SAAS,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE;gBAC5D,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YAEH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,KAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC3B,KAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC1B,IAAI,UAAU,EAAE,CAAC;wBACf,OAAO,EAAE,CAAC;oBACZ,CAAC;yBAAM,IAAI,IAAI,EAAE,CAAC;wBAChB,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,CAAC;oBACxD,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU;gBAAE,MAAM;YACvB,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,IAAI,aAAa;YAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-android.d.ts","sourceRoot":"","sources":["../../src/commands/run-android.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-android.d.ts","sourceRoot":"","sources":["../../src/commands/run-android.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA+FD,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4D1E"}
|
|
@@ -9,11 +9,55 @@ exports.runAndroid = runAndroid;
|
|
|
9
9
|
// LICENSE file in the root directory of this source tree.
|
|
10
10
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
11
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
13
|
+
const node_child_process_1 = require("node:child_process");
|
|
14
|
+
const config_1 = require("../config");
|
|
12
15
|
const autolink_1 = require("./autolink");
|
|
13
16
|
const build_1 = require("./build");
|
|
14
17
|
const exec_1 = require("../utils/exec");
|
|
15
18
|
const ui_1 = require("../utils/ui");
|
|
16
19
|
const verbose_1 = require("../utils/verbose");
|
|
20
|
+
const dev_server_1 = require("../utils/dev-server");
|
|
21
|
+
function listConnectedAndroidDevices() {
|
|
22
|
+
try {
|
|
23
|
+
const output = (0, node_child_process_1.execSync)('adb devices', { encoding: 'utf8' });
|
|
24
|
+
const lines = output.split(/\r?\n/).slice(1);
|
|
25
|
+
const devices = [];
|
|
26
|
+
for (const line of lines) {
|
|
27
|
+
const trimmed = line.trim();
|
|
28
|
+
if (!trimmed)
|
|
29
|
+
continue;
|
|
30
|
+
const [serial, state] = trimmed.split(/\s+/);
|
|
31
|
+
if (state !== 'device')
|
|
32
|
+
continue;
|
|
33
|
+
devices.push({ serial, isEmulator: serial.startsWith('emulator-') });
|
|
34
|
+
}
|
|
35
|
+
return devices;
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function resolveLocalIPv4() {
|
|
42
|
+
const interfaces = node_os_1.default.networkInterfaces();
|
|
43
|
+
const preferredOrder = ['en0', 'en1', 'wlan0'];
|
|
44
|
+
for (const name of preferredOrder) {
|
|
45
|
+
const candidates = interfaces[name] ?? [];
|
|
46
|
+
for (const addr of candidates) {
|
|
47
|
+
if (addr.family === 'IPv4' && !addr.internal) {
|
|
48
|
+
return addr.address;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
for (const candidates of Object.values(interfaces)) {
|
|
53
|
+
for (const addr of candidates ?? []) {
|
|
54
|
+
if (addr.family === 'IPv4' && !addr.internal) {
|
|
55
|
+
return addr.address;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return '127.0.0.1';
|
|
60
|
+
}
|
|
17
61
|
function resolveAndroidAppGradle(cwd) {
|
|
18
62
|
const kts = node_path_1.default.resolve(cwd, 'android/app/build.gradle.kts');
|
|
19
63
|
const groovy = node_path_1.default.resolve(cwd, 'android/app/build.gradle');
|
|
@@ -64,6 +108,27 @@ function resolveAndroidLaunchActivity(cwd, pkg) {
|
|
|
64
108
|
return `${pkg}.MainActivity`;
|
|
65
109
|
}
|
|
66
110
|
async function runAndroid(options) {
|
|
111
|
+
const { config } = await (0, config_1.loadAppConfig)(options.cwd);
|
|
112
|
+
const { devPort: configuredDevPort, lynxPort } = (0, config_1.getConfiguredDevServerPorts)(config);
|
|
113
|
+
if (configuredDevPort !== undefined && lynxPort !== undefined && configuredDevPort !== lynxPort) {
|
|
114
|
+
console.warn(ui_1.ui.warn(`Port config mismatch detected: dev.server.port=${configuredDevPort} and lynxConfig.server.port=${lynxPort}. ` +
|
|
115
|
+
`run:android uses dev.server.port (${configuredDevPort}).`));
|
|
116
|
+
}
|
|
117
|
+
const devPort = (0, config_1.resolveDevServerPort)(config);
|
|
118
|
+
const connectedDevices = listConnectedAndroidDevices();
|
|
119
|
+
const emulatorSerials = connectedDevices.filter(d => d.isEmulator).map(d => d.serial);
|
|
120
|
+
const devServerHostForApp = emulatorSerials.length > 0 ? '127.0.0.1' : resolveLocalIPv4();
|
|
121
|
+
const devServerHostForCli = emulatorSerials.length > 0 ? '127.0.0.1' : '0.0.0.0';
|
|
122
|
+
await (0, dev_server_1.ensureDevServerRunning)(options.cwd, devPort, devServerHostForCli);
|
|
123
|
+
for (const serial of emulatorSerials) {
|
|
124
|
+
await (0, exec_1.runCommand)('adb', ['-s', serial, 'reverse', `tcp:${devPort}`, `tcp:${devPort}`], {
|
|
125
|
+
cwd: options.cwd,
|
|
126
|
+
ignoreFailure: true,
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
130
|
+
(0, verbose_1.verboseLog)(`run:android options -> skipCopy: ${options.skipCopy === true}, devPort: ${devPort}, devHost: ${devServerHostForApp}, emulatorCount: ${emulatorSerials.length}`);
|
|
131
|
+
}
|
|
67
132
|
await (0, autolink_1.autolink)({ cwd: options.cwd, platform: 'android' });
|
|
68
133
|
await (0, build_1.buildProject)({ cwd: options.cwd, skipCopy: options.skipCopy });
|
|
69
134
|
const gradleCmd = resolveGradle(options.cwd);
|
|
@@ -75,10 +140,14 @@ async function runAndroid(options) {
|
|
|
75
140
|
(0, verbose_1.verboseLog)(`Env overrides: ${JSON.stringify(env)}`);
|
|
76
141
|
}
|
|
77
142
|
// Always build first so artifacts exist even when no device is connected
|
|
78
|
-
|
|
143
|
+
const gradleArgs = [
|
|
144
|
+
`-PsparklingDevServerHost=${devServerHostForApp}`,
|
|
145
|
+
`-PsparklingDevServerPort=${devPort}`,
|
|
146
|
+
];
|
|
147
|
+
await (0, exec_1.runCommand)(gradleCmd, ['assembleDebug', ...gradleArgs], { cwd: androidDir, env });
|
|
79
148
|
// Try to install if a device is connected; ignore failure so CI/headless environments are not blocked
|
|
80
149
|
console.log(ui_1.ui.tip('Attempting device install (if any devices are connected)...'));
|
|
81
|
-
await (0, exec_1.runCommand)(gradleCmd, ['installDebug'], { cwd: androidDir, ignoreFailure: true, env });
|
|
150
|
+
await (0, exec_1.runCommand)(gradleCmd, ['installDebug', ...gradleArgs], { cwd: androidDir, ignoreFailure: true, env });
|
|
82
151
|
// Attempt to launch the app on a connected device
|
|
83
152
|
const pkg = resolveAndroidPackageId(options.cwd);
|
|
84
153
|
const activity = resolveAndroidLaunchActivity(options.cwd, pkg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-android.js","sourceRoot":"","sources":["../../src/commands/run-android.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"run-android.js","sourceRoot":"","sources":["../../src/commands/run-android.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-ios.d.ts","sourceRoot":"","sources":["../../src/commands/run-ios.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-ios.d.ts","sourceRoot":"","sources":["../../src/commands/run-ios.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AA4OD,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA6KlE"}
|
package/dist/commands/run-ios.js
CHANGED
|
@@ -10,11 +10,13 @@ exports.runIos = runIos;
|
|
|
10
10
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
11
11
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
12
|
const node_child_process_1 = require("node:child_process");
|
|
13
|
+
const config_1 = require("../config");
|
|
13
14
|
const autolink_1 = require("./autolink");
|
|
14
15
|
const build_1 = require("./build");
|
|
15
16
|
const exec_1 = require("../utils/exec");
|
|
16
17
|
const ui_1 = require("../utils/ui");
|
|
17
18
|
const verbose_1 = require("../utils/verbose");
|
|
19
|
+
const dev_server_1 = require("../utils/dev-server");
|
|
18
20
|
const DEFAULT_BUNDLE_ID = 'com.sparkling.app.SparklingGo';
|
|
19
21
|
/**
|
|
20
22
|
* Read the main app bundle identifier from the Xcode project.
|
|
@@ -97,29 +99,6 @@ async function ensureRequiredBundler(gemfileDir) {
|
|
|
97
99
|
return;
|
|
98
100
|
}
|
|
99
101
|
console.log(ui_1.ui.info(`Installing required Bundler version ${requiredVersion}...`));
|
|
100
|
-
// #region agent log
|
|
101
|
-
fetch('http://127.0.0.1:7242/ingest/6802e160-a55d-4751-84f7-c7cc9d523b20', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ location: 'run-ios.ts:ensureRequiredBundler', message: 'Ruby env info before gem install', data: { whichRuby: (() => { try {
|
|
102
|
-
return (0, node_child_process_1.execSync)('which ruby', { stdio: 'pipe' }).toString().trim();
|
|
103
|
-
}
|
|
104
|
-
catch {
|
|
105
|
-
return 'unknown';
|
|
106
|
-
} })(), whichGem: (() => { try {
|
|
107
|
-
return (0, node_child_process_1.execSync)('which gem', { stdio: 'pipe' }).toString().trim();
|
|
108
|
-
}
|
|
109
|
-
catch {
|
|
110
|
-
return 'unknown';
|
|
111
|
-
} })(), gemEnv: (() => { try {
|
|
112
|
-
return (0, node_child_process_1.execSync)('gem environment home', { stdio: 'pipe' }).toString().trim();
|
|
113
|
-
}
|
|
114
|
-
catch {
|
|
115
|
-
return 'unknown';
|
|
116
|
-
} })(), rubyVersion: (() => { try {
|
|
117
|
-
return (0, node_child_process_1.execSync)('ruby --version', { stdio: 'pipe' }).toString().trim();
|
|
118
|
-
}
|
|
119
|
-
catch {
|
|
120
|
-
return 'unknown';
|
|
121
|
-
} })(), requiredVersion }, timestamp: Date.now(), runId: 'run1', hypothesisId: 'H1' }) }).catch(() => { });
|
|
122
|
-
// #endregion
|
|
123
102
|
// First try with --user-install to avoid permission issues with system Ruby
|
|
124
103
|
try {
|
|
125
104
|
await (0, exec_1.runCommand)('gem', ['install', '--user-install', `bundler:${requiredVersion}`], { cwd: gemfileDir });
|
|
@@ -136,31 +115,8 @@ async function ensureRequiredBundler(gemfileDir) {
|
|
|
136
115
|
}
|
|
137
116
|
// After install, the user gem bin may not be in PATH. Ensure bundle can find it.
|
|
138
117
|
if (!isBundlerVersionInstalled(requiredVersion)) {
|
|
139
|
-
// #region agent log
|
|
140
|
-
fetch('http://127.0.0.1:7242/ingest/6802e160-a55d-4751-84f7-c7cc9d523b20', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ location: 'run-ios.ts:ensureRequiredBundler:postInstall', message: 'Bundler still not found after install attempt', data: { gemList: (() => { try {
|
|
141
|
-
return (0, node_child_process_1.execSync)('gem list bundler --exact --versions', { stdio: 'pipe' }).toString().trim();
|
|
142
|
-
}
|
|
143
|
-
catch {
|
|
144
|
-
return 'unknown';
|
|
145
|
-
} })(), userGemDir: (() => { try {
|
|
146
|
-
return (0, node_child_process_1.execSync)('ruby -e "puts Gem.user_dir"', { stdio: 'pipe' }).toString().trim();
|
|
147
|
-
}
|
|
148
|
-
catch {
|
|
149
|
-
return 'unknown';
|
|
150
|
-
} })() }, timestamp: Date.now(), runId: 'run1', hypothesisId: 'H2' }) }).catch(() => { });
|
|
151
|
-
// #endregion
|
|
152
118
|
console.warn(ui_1.ui.warn(`Bundler ${requiredVersion} could not be verified after install. Proceeding anyway...`));
|
|
153
119
|
}
|
|
154
|
-
else {
|
|
155
|
-
// #region agent log
|
|
156
|
-
fetch('http://127.0.0.1:7242/ingest/6802e160-a55d-4751-84f7-c7cc9d523b20', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ location: 'run-ios.ts:ensureRequiredBundler:success', message: 'Bundler installed successfully', data: { requiredVersion, gemList: (() => { try {
|
|
157
|
-
return (0, node_child_process_1.execSync)('gem list bundler --exact --versions', { stdio: 'pipe' }).toString().trim();
|
|
158
|
-
}
|
|
159
|
-
catch {
|
|
160
|
-
return 'unknown';
|
|
161
|
-
} })() }, timestamp: Date.now(), runId: 'run1', hypothesisId: 'H1' }) }).catch(() => { });
|
|
162
|
-
// #endregion
|
|
163
|
-
}
|
|
164
120
|
}
|
|
165
121
|
async function ensureBundleInstall(gemfileDir) {
|
|
166
122
|
await ensureRequiredBundler(gemfileDir);
|
|
@@ -261,8 +217,16 @@ function pickSimulator(preferred) {
|
|
|
261
217
|
})[0] ?? null;
|
|
262
218
|
}
|
|
263
219
|
async function runIos(options) {
|
|
220
|
+
const { config } = await (0, config_1.loadAppConfig)(options.cwd);
|
|
221
|
+
const { devPort: configuredDevPort, lynxPort } = (0, config_1.getConfiguredDevServerPorts)(config);
|
|
222
|
+
if (configuredDevPort !== undefined && lynxPort !== undefined && configuredDevPort !== lynxPort) {
|
|
223
|
+
console.warn(ui_1.ui.warn(`Port config mismatch detected: dev.server.port=${configuredDevPort} and lynxConfig.server.port=${lynxPort}. ` +
|
|
224
|
+
`run:ios uses dev.server.port (${configuredDevPort}).`));
|
|
225
|
+
}
|
|
226
|
+
const devPort = (0, config_1.resolveDevServerPort)(config);
|
|
227
|
+
await (0, dev_server_1.ensureDevServerRunning)(options.cwd, devPort);
|
|
264
228
|
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
265
|
-
(0, verbose_1.verboseLog)(`run:ios options -> skipCopy: ${options.skipCopy === true}, device: ${options.device ?? '(auto)'}, skipPodInstall: ${options.skipPodInstall === true}`);
|
|
229
|
+
(0, verbose_1.verboseLog)(`run:ios options -> skipCopy: ${options.skipCopy === true}, device: ${options.device ?? '(auto)'}, skipPodInstall: ${options.skipPodInstall === true}, devPort: ${devPort}`);
|
|
266
230
|
}
|
|
267
231
|
const preferredDevice = options.device ?? process.env.SPARKLING_IOS_SIMULATOR;
|
|
268
232
|
const device = pickSimulator(preferredDevice);
|
|
@@ -405,7 +369,14 @@ async function runIos(options) {
|
|
|
405
369
|
console.log(ui_1.ui.info('Installing app on simulator...'));
|
|
406
370
|
await (0, exec_1.runCommand)('xcrun', ['simctl', 'install', device.udid, appPath], { cwd: options.cwd, ignoreFailure: true });
|
|
407
371
|
console.log(ui_1.ui.info(`Launching ${bundleId}...`));
|
|
408
|
-
await (0, exec_1.runCommand)('xcrun', ['simctl', 'launch', device.udid, bundleId], {
|
|
372
|
+
await (0, exec_1.runCommand)('xcrun', ['simctl', 'launch', device.udid, bundleId], {
|
|
373
|
+
cwd: options.cwd,
|
|
374
|
+
ignoreFailure: true,
|
|
375
|
+
env: {
|
|
376
|
+
SIMCTL_CHILD_SPARKLING_DEV_SERVER_PORT: String(devPort),
|
|
377
|
+
SIMCTL_CHILD_SPARKLING_DEV_SERVER_HOST: '127.0.0.1',
|
|
378
|
+
},
|
|
379
|
+
});
|
|
409
380
|
}
|
|
410
381
|
}
|
|
411
382
|
//# sourceMappingURL=run-ios.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-ios.js","sourceRoot":"","sources":["../../src/commands/run-ios.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-ios.js","sourceRoot":"","sources":["../../src/commands/run-ios.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import type { AppConfig } from './types';
|
|
2
2
|
export declare function createTempLynxConfig(cwd: string, appConfigPath: string): string;
|
|
3
|
-
export declare function createDevLynxConfig(cwd: string, appConfigPath: string, port: number): string;
|
|
3
|
+
export declare function createDevLynxConfig(cwd: string, appConfigPath: string, port: number, host?: string): string;
|
|
4
|
+
export declare function getConfiguredDevServerPorts(config: AppConfig): {
|
|
5
|
+
devPort?: number;
|
|
6
|
+
lynxPort?: number;
|
|
7
|
+
};
|
|
8
|
+
export declare function resolveDevServerPort(config: AppConfig): number;
|
|
9
|
+
export declare function updateDevServerPortInAppConfig(configPath: string, port: number): boolean;
|
|
4
10
|
export declare function loadAppConfig(cwd: string, configFile?: string): Promise<{
|
|
5
11
|
config: AppConfig;
|
|
6
12
|
configPath: string;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AA4CzC,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAY/E;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAa3G;AAmBD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,SAAS,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAKtG;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAS9D;AAED,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CA6CxF;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,SAAkB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAiDjI"}
|
package/dist/config.js
CHANGED
|
@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createTempLynxConfig = createTempLynxConfig;
|
|
7
7
|
exports.createDevLynxConfig = createDevLynxConfig;
|
|
8
|
+
exports.getConfiguredDevServerPorts = getConfiguredDevServerPorts;
|
|
9
|
+
exports.resolveDevServerPort = resolveDevServerPort;
|
|
10
|
+
exports.updateDevServerPortInAppConfig = updateDevServerPortInAppConfig;
|
|
8
11
|
exports.loadAppConfig = loadAppConfig;
|
|
9
12
|
/// <reference types="node" />
|
|
10
13
|
// Copyright (c) 2025 TikTok Pte. Ltd.
|
|
@@ -15,6 +18,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
15
18
|
const child_process_1 = require("child_process");
|
|
16
19
|
const url_1 = require("url");
|
|
17
20
|
const module_1 = require("module");
|
|
21
|
+
const constants_1 = require("./constants");
|
|
18
22
|
let registeredTsNode = false;
|
|
19
23
|
const pkgRequire = (0, module_1.createRequire)(__filename);
|
|
20
24
|
function isEsmProject(cwd) {
|
|
@@ -57,7 +61,7 @@ function ensureTsNodeRegistered() {
|
|
|
57
61
|
function createTempLynxConfig(cwd, appConfigPath) {
|
|
58
62
|
const tempDir = path_1.default.resolve(cwd, '.sparkling');
|
|
59
63
|
fs_1.default.mkdirSync(tempDir, { recursive: true });
|
|
60
|
-
const tempConfigPath = path_1.default.join(tempDir, 'lynx.config.ts');
|
|
64
|
+
const tempConfigPath = path_1.default.join(tempDir, 'lynx.build.config.ts');
|
|
61
65
|
const rel = path_1.default.relative(tempDir, path_1.default.resolve(appConfigPath)).split(path_1.default.sep).join('/');
|
|
62
66
|
const content = [
|
|
63
67
|
`import cfgModule from '${rel.startsWith('.') ? rel : './' + rel}'`,
|
|
@@ -67,20 +71,91 @@ function createTempLynxConfig(cwd, appConfigPath) {
|
|
|
67
71
|
fs_1.default.writeFileSync(tempConfigPath, content);
|
|
68
72
|
return tempConfigPath;
|
|
69
73
|
}
|
|
70
|
-
function createDevLynxConfig(cwd, appConfigPath, port) {
|
|
74
|
+
function createDevLynxConfig(cwd, appConfigPath, port, host) {
|
|
71
75
|
const tempDir = path_1.default.resolve(cwd, '.sparkling');
|
|
72
76
|
fs_1.default.mkdirSync(tempDir, { recursive: true });
|
|
73
|
-
const tempConfigPath = path_1.default.join(tempDir, 'lynx.config.ts');
|
|
77
|
+
const tempConfigPath = path_1.default.join(tempDir, 'lynx.dev.config.ts');
|
|
74
78
|
const rel = path_1.default.relative(tempDir, path_1.default.resolve(appConfigPath)).split(path_1.default.sep).join('/');
|
|
75
79
|
const content = [
|
|
76
80
|
`import cfgModule from '${rel.startsWith('.') ? rel : './' + rel}'`,
|
|
77
81
|
'const cfg: any = (cfgModule as any).default ?? cfgModule',
|
|
78
82
|
'const lynxCfg = cfg.lynxConfig ?? cfg',
|
|
79
|
-
`export default { ...lynxCfg, server: { ...lynxCfg.server, port: ${port}, strictPort: true } } as any`,
|
|
83
|
+
`export default { ...lynxCfg, server: { ...lynxCfg.server, port: ${port}, strictPort: true${host ? `, host: ${JSON.stringify(host)}` : ''} } } as any`,
|
|
80
84
|
].join('\n');
|
|
81
85
|
fs_1.default.writeFileSync(tempConfigPath, content);
|
|
82
86
|
return tempConfigPath;
|
|
83
87
|
}
|
|
88
|
+
function isValidPort(value) {
|
|
89
|
+
return typeof value === 'number' && Number.isInteger(value) && value > 0 && value <= 65535;
|
|
90
|
+
}
|
|
91
|
+
function toValidPort(value) {
|
|
92
|
+
if (isValidPort(value)) {
|
|
93
|
+
return value;
|
|
94
|
+
}
|
|
95
|
+
if (typeof value === 'string') {
|
|
96
|
+
const parsed = Number.parseInt(value, 10);
|
|
97
|
+
if (isValidPort(parsed)) {
|
|
98
|
+
return parsed;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return undefined;
|
|
102
|
+
}
|
|
103
|
+
function getConfiguredDevServerPorts(config) {
|
|
104
|
+
const devPort = toValidPort(config.dev?.server?.port);
|
|
105
|
+
const lynxCfg = config.lynxConfig;
|
|
106
|
+
const lynxPort = toValidPort(lynxCfg?.server?.port);
|
|
107
|
+
return { devPort, lynxPort };
|
|
108
|
+
}
|
|
109
|
+
function resolveDevServerPort(config) {
|
|
110
|
+
const { devPort, lynxPort } = getConfiguredDevServerPorts(config);
|
|
111
|
+
if (devPort !== undefined) {
|
|
112
|
+
return devPort;
|
|
113
|
+
}
|
|
114
|
+
if (lynxPort !== undefined) {
|
|
115
|
+
return lynxPort;
|
|
116
|
+
}
|
|
117
|
+
return constants_1.DEV_SERVER_PORT;
|
|
118
|
+
}
|
|
119
|
+
function updateDevServerPortInAppConfig(configPath, port) {
|
|
120
|
+
if (!isValidPort(port) || !fs_1.default.existsSync(configPath)) {
|
|
121
|
+
return false;
|
|
122
|
+
}
|
|
123
|
+
const original = fs_1.default.readFileSync(configPath, 'utf8');
|
|
124
|
+
if (/\bdev\s*:\s*\{[\s\S]*?\bserver\s*:\s*\{[\s\S]*?\bport\s*:/.test(original)) {
|
|
125
|
+
const replaced = original.replace(/(\bdev\s*:\s*\{[\s\S]*?\bserver\s*:\s*\{[\s\S]*?\bport\s*:\s*)\d+/, `$1${port}`);
|
|
126
|
+
if (replaced !== original) {
|
|
127
|
+
fs_1.default.writeFileSync(configPath, replaced);
|
|
128
|
+
return true;
|
|
129
|
+
}
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
if (/\bdev\s*:\s*\{[\s\S]*?\bserver\s*:\s*\{/.test(original)) {
|
|
133
|
+
const replaced = original.replace(/(\bdev\s*:\s*\{[\s\S]*?\bserver\s*:\s*\{)/, `$1\n port: ${port},`);
|
|
134
|
+
if (replaced !== original) {
|
|
135
|
+
fs_1.default.writeFileSync(configPath, replaced);
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (/\bdev\s*:\s*\{/.test(original)) {
|
|
140
|
+
const replaced = original.replace(/(\bdev\s*:\s*\{)/, `$1\n server: {\n port: ${port},\n },`);
|
|
141
|
+
if (replaced !== original) {
|
|
142
|
+
fs_1.default.writeFileSync(configPath, replaced);
|
|
143
|
+
return true;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
const configDecl = original.match(/const\s+config\s*(?::[^=]+)?=\s*\{/);
|
|
147
|
+
if (!configDecl || configDecl.index === undefined) {
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
150
|
+
const insertPos = configDecl.index + configDecl[0].length;
|
|
151
|
+
const after = original.slice(insertPos);
|
|
152
|
+
const nextLineIndent = after.match(/\n(\s*)\S/);
|
|
153
|
+
const indent = nextLineIndent?.[1] ?? ' ';
|
|
154
|
+
const insertion = `\n${indent}dev: {\n${indent} server: {\n${indent} port: ${port},\n${indent} },\n${indent}},`;
|
|
155
|
+
const updated = `${original.slice(0, insertPos)}${insertion}${original.slice(insertPos)}`;
|
|
156
|
+
fs_1.default.writeFileSync(configPath, updated);
|
|
157
|
+
return true;
|
|
158
|
+
}
|
|
84
159
|
async function loadAppConfig(cwd, configFile = 'app.config.ts') {
|
|
85
160
|
const configPath = path_1.default.resolve(cwd, configFile);
|
|
86
161
|
if (!fs_1.default.existsSync(configPath)) {
|
|
@@ -138,7 +213,7 @@ function loadAppConfigViaEsm(cwd, configPath, originalError) {
|
|
|
138
213
|
`const url = ${JSON.stringify(fileUrl)};`,
|
|
139
214
|
'const mod = await import(url);',
|
|
140
215
|
'const cfg = (mod.default ?? mod);',
|
|
141
|
-
'const out = { lynxConfig: cfg.lynxConfig ?? {}, platform: cfg.platform ?? {}, paths: cfg.paths ?? {}, appName: cfg.appName, devtool: cfg.devtool };',
|
|
216
|
+
'const out = { lynxConfig: cfg.lynxConfig ?? {}, platform: cfg.platform ?? {}, paths: cfg.paths ?? {}, appName: cfg.appName, devtool: cfg.devtool, dev: cfg.dev };',
|
|
142
217
|
'process.stdout.write(JSON.stringify(out));',
|
|
143
218
|
].join('\n');
|
|
144
219
|
fs_1.default.writeFileSync(readerScript, script);
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAgBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAgBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAuIzC,YAAY,EAAE,SAAS,EAAE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -55,14 +55,19 @@ program
|
|
|
55
55
|
.command('dev')
|
|
56
56
|
.description('Start Lynx dev server with HMR using app.config.ts')
|
|
57
57
|
.option('--config <path>', 'Path to app.config.ts', 'app.config.ts')
|
|
58
|
-
.option('--port <number>', `Dev server port (default: ${constants_1.DEV_SERVER_PORT})
|
|
58
|
+
.option('--port <number>', `Dev server port (default: app.config.ts dev.server.port or ${constants_1.DEV_SERVER_PORT})`)
|
|
59
|
+
.option('--host <host>', 'Dev server host (e.g. 127.0.0.1)')
|
|
59
60
|
.action(async (opts) => {
|
|
60
61
|
const cwd = process.cwd();
|
|
61
|
-
const
|
|
62
|
+
const rawPort = opts.port === undefined ? undefined : Number.parseInt(String(opts.port), 10);
|
|
63
|
+
if (opts.port !== undefined && !Number.isFinite(rawPort)) {
|
|
64
|
+
throw new Error(`Invalid --port value: ${opts.port}`);
|
|
65
|
+
}
|
|
62
66
|
await (0, dev_1.devProject)({
|
|
63
67
|
cwd,
|
|
64
68
|
configFile: opts.config,
|
|
65
|
-
port:
|
|
69
|
+
port: rawPort,
|
|
70
|
+
host: opts.host,
|
|
66
71
|
});
|
|
67
72
|
});
|
|
68
73
|
program
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,yEAAyE;AACzE,0DAA0D;AAC1D,yCAAoC;AAEpC,kDAA+C;AAC/C,4CAAgD;AAChD,wDAAoD;AACpD,wCAA4C;AAC5C,8CAA2C;AAC3C,wDAAoD;AACpD,gDAA4C;AAC5C,2CAA8C;AAC9C,mCAAgC;AAChC,6CAAqF;AAGrF,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;AAChF,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,sCAAsC,CAAC,CAAC;AACxE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;IACxC,MAAM,IAAI,GAAG,WAAW,CAAC,eAAe,EAAyB,CAAC;IAClE,IAAA,8BAAoB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,IAAA,0BAAgB,GAAE,EAAE,CAAC;QACvB,IAAA,oBAAU,EAAC,yBAAyB,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAS,eAAe,CAAC,IAA4C;IACnE,0CAA0C;IAC1C,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAC5B,yCAAyC;IACzC,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC/B,mDAAmD;IACnD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,4DAA4D,CAAC;KACzE,MAAM,CAAC,iBAAiB,EAAE,uBAAuB,EAAE,eAAe,CAAC;KACnE,MAAM,CAAC,QAAQ,EAAE,8BAA8B,CAAC;KAChD,MAAM,CAAC,aAAa,EAAE,sCAAsC,CAAC;KAC7D,MAAM,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;IACnB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,IAAA,oBAAY,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,iBAAiB,EAAE,uBAAuB,EAAE,eAAe,CAAC;KACnE,MAAM,CAAC,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -27,6 +27,15 @@ export interface SplashScreenPluginConfig {
|
|
|
27
27
|
export type PluginConfig = ['splash-screen', SplashScreenPluginConfig] | [string, Record<string, unknown>?];
|
|
28
28
|
export interface AppConfig {
|
|
29
29
|
lynxConfig: LynxConfig;
|
|
30
|
+
/** Sparkling CLI dev settings. */
|
|
31
|
+
dev?: {
|
|
32
|
+
server?: {
|
|
33
|
+
/** Preferred dev server port for sparkling-app-cli dev/run commands. Defaults to 5969. */
|
|
34
|
+
port?: number;
|
|
35
|
+
/** Preferred dev server host for sparkling-app-cli dev command. */
|
|
36
|
+
host?: string;
|
|
37
|
+
};
|
|
38
|
+
};
|
|
30
39
|
appName?: string;
|
|
31
40
|
platform?: PlatformConfig;
|
|
32
41
|
paths?: {
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AAEjC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GACpB,CAAC,eAAe,EAAE,wBAAwB,CAAC,GAC3C,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAEvC,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,KAAK,CAAC,EAAE;QACN,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,gIAAgI;IAChI,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,8HAA8H;IAC9H,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AAEjC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GACpB,CAAC,eAAe,EAAE,wBAAwB,CAAC,GAC3C,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAEvC,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,kCAAkC;IAClC,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE;YACP,0FAA0F;YAC1F,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,mEAAmE;YACnE,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;KACH,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,KAAK,CAAC,EAAE;QACN,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,gIAAgI;IAChI,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,8HAA8H;IAC9H,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/utils/dev-server.ts"],"names":[],"mappings":"AAuCA,wBAAsB,kBAAkB,CAAC,IAAI,SAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEjF;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,SAAkB,EAAE,IAAI,SAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CnH"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.isDevServerRunning = isDevServerRunning;
|
|
7
|
+
exports.ensureDevServerRunning = ensureDevServerRunning;
|
|
8
|
+
// Copyright (c) 2026 TikTok Pte. Ltd.
|
|
9
|
+
// Licensed under the Apache License Version 2.0 that can be found in the
|
|
10
|
+
// LICENSE file in the root directory of this source tree.
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const node_child_process_1 = require("node:child_process");
|
|
13
|
+
const constants_1 = require("../constants");
|
|
14
|
+
const ui_1 = require("./ui");
|
|
15
|
+
const verbose_1 = require("./verbose");
|
|
16
|
+
function sleep(ms) {
|
|
17
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
18
|
+
}
|
|
19
|
+
async function pingDevServer(port) {
|
|
20
|
+
const hosts = ['127.0.0.1', 'localhost'];
|
|
21
|
+
for (const host of hosts) {
|
|
22
|
+
if (await pingDevServerHost(host, port)) {
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
async function pingDevServerHost(host, port) {
|
|
29
|
+
const controller = new AbortController();
|
|
30
|
+
const timer = setTimeout(() => controller.abort(), 1000);
|
|
31
|
+
try {
|
|
32
|
+
await fetch(`http://${host}:${port}/`, {
|
|
33
|
+
method: 'GET',
|
|
34
|
+
signal: controller.signal,
|
|
35
|
+
});
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
finally {
|
|
42
|
+
clearTimeout(timer);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async function isDevServerRunning(port = constants_1.DEV_SERVER_PORT) {
|
|
46
|
+
return pingDevServer(port);
|
|
47
|
+
}
|
|
48
|
+
async function ensureDevServerRunning(cwd, port = constants_1.DEV_SERVER_PORT, host = '127.0.0.1') {
|
|
49
|
+
if (await isDevServerRunning(port)) {
|
|
50
|
+
if ((0, verbose_1.isVerboseEnabled)()) {
|
|
51
|
+
(0, verbose_1.verboseLog)(`Detected running sparkling dev server on port ${port}.`);
|
|
52
|
+
}
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const cliEntry = process.argv[1];
|
|
56
|
+
if (!cliEntry) {
|
|
57
|
+
throw new Error('Unable to determine sparkling-app-cli entry script from argv.');
|
|
58
|
+
}
|
|
59
|
+
const cliPath = node_path_1.default.resolve(cliEntry);
|
|
60
|
+
console.log(ui_1.ui.info(`No sparkling dev server found on port ${port}; starting one...`));
|
|
61
|
+
const isDarwin = process.platform === 'darwin';
|
|
62
|
+
const command = isDarwin ? 'script' : process.execPath;
|
|
63
|
+
const args = isDarwin
|
|
64
|
+
? ['-q', '/dev/null', process.execPath, cliPath, 'dev', '--port', String(port), '--host', host]
|
|
65
|
+
: [cliPath, 'dev', '--port', String(port), '--host', host];
|
|
66
|
+
const child = (0, node_child_process_1.spawn)(command, args, {
|
|
67
|
+
cwd,
|
|
68
|
+
detached: true,
|
|
69
|
+
stdio: 'ignore',
|
|
70
|
+
env: process.env,
|
|
71
|
+
});
|
|
72
|
+
child.unref();
|
|
73
|
+
for (let i = 0; i < 30; i += 1) {
|
|
74
|
+
if (await isDevServerRunning(port)) {
|
|
75
|
+
console.log(ui_1.ui.success(`Sparkling dev server is running on port ${port}.`));
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
await sleep(500);
|
|
79
|
+
}
|
|
80
|
+
console.warn(ui_1.ui.warn(`Timed out waiting for sparkling dev server on port ${port}. ` +
|
|
81
|
+
'run:ios/run:android will continue, but localhost bundle loading may fail.'));
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=dev-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/utils/dev-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED