@rnx-kit/cli 0.16.14 → 0.16.16

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/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # Change Log - @rnx-kit/cli
2
2
 
3
+ ## 0.16.16
4
+
5
+ ### Patch Changes
6
+
7
+ - 55756581: Resolve correct `@react-native-community/cli-clean` instance through `react-native`
8
+ - b231d457: Synced latest changes from upstream: https://github.com/facebook/react-native/commit/982f6f99d43b21b3a81d3388591934d6f83afa63
9
+ - Updated dependencies [55756581]
10
+ - Updated dependencies [55756581]
11
+ - @rnx-kit/tools-node@2.1.0
12
+ - @rnx-kit/metro-service@3.1.4
13
+
14
+ ## 0.16.15
15
+
16
+ ### Patch Changes
17
+
18
+ - 8ba65d6f: Use `node-fetch` only as fallback when current Node version doesn't implement Fetch API
19
+ - Updated dependencies [c9e7641b]
20
+ - Updated dependencies [8ba65d6f]
21
+ - @rnx-kit/metro-service@3.1.3
22
+
3
23
  ## 0.16.14
4
24
 
5
25
  ### Patch Changes
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1695033001882" clover="3.2.0">
3
- <project timestamp="1695033001882" name="All files">
2
+ <coverage generated="1695653804668" clover="3.2.0">
3
+ <project timestamp="1695653804668" name="All files">
4
4
  <metrics statements="279" coveredstatements="156" conditionals="174" coveredconditionals="91" methods="35" coveredmethods="27" elements="488" coveredelements="274" complexity="0" loc="279" ncloc="279" packages="2" files="7" classes="7"/>
5
5
  <package name="src">
6
6
  <metrics statements="248" coveredstatements="125" conditionals="151" coveredconditionals="71" methods="27" coveredmethods="19"/>
@@ -116,7 +116,7 @@
116
116
  <div class='footer quiet pad2 space-top1 center small'>
117
117
  Code coverage generated by
118
118
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
119
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
120
120
  </div>
121
121
  <script src="prettify.js"></script>
122
122
  <script>
@@ -118,7 +118,7 @@ export function getDefaultBundlerPlugins(): DefaultPlugins {
118
118
  <div class='footer quiet pad2 space-top1 center small'>
119
119
  Code coverage generated by
120
120
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
121
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
121
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
122
122
  </div>
123
123
  <script src="../../prettify.js"></script>
124
124
  <script>
@@ -146,7 +146,7 @@
146
146
  <div class='footer quiet pad2 space-top1 center small'>
147
147
  Code coverage generated by
148
148
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
149
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
149
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
150
150
  </div>
151
151
  <script src="../../prettify.js"></script>
152
152
  <script>
@@ -313,7 +313,7 @@ export function getCliPlatformBundleConfigs(
313
313
  <div class='footer quiet pad2 space-top1 center small'>
314
314
  Code coverage generated by
315
315
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
316
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
316
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
317
317
  </div>
318
318
  <script src="../../prettify.js"></script>
319
319
  <script>
@@ -241,7 +241,7 @@ export async function metroBundle(
241
241
  <div class='footer quiet pad2 space-top1 center small'>
242
242
  Code coverage generated by
243
243
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
244
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
244
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
245
245
  </div>
246
246
  <script src="../../prettify.js"></script>
247
247
  <script>
@@ -220,7 +220,7 @@ export function applyBundleConfigOverrides(
220
220
  <div class='footer quiet pad2 space-top1 center small'>
221
221
  Code coverage generated by
222
222
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
223
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
223
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
224
224
  </div>
225
225
  <script src="../../prettify.js"></script>
226
226
  <script>
@@ -1708,7 +1708,7 @@ export const rnxCopyAssetsCommand = {
1708
1708
  <div class='footer quiet pad2 space-top1 center small'>
1709
1709
  Code coverage generated by
1710
1710
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
1711
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
1711
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
1712
1712
  </div>
1713
1713
  <script src="../prettify.js"></script>
1714
1714
  <script>
@@ -131,7 +131,7 @@
131
131
  <div class='footer quiet pad2 space-top1 center small'>
132
132
  Code coverage generated by
133
133
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
134
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
134
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
135
135
  </div>
136
136
  <script src="../prettify.js"></script>
137
137
  <script>
@@ -694,7 +694,7 @@ export function customizeMetroConfig(
694
694
  <div class='footer quiet pad2 space-top1 center small'>
695
695
  Code coverage generated by
696
696
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
697
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
697
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
698
698
  </div>
699
699
  <script src="../prettify.js"></script>
700
700
  <script>
@@ -454,7 +454,7 @@ export const rnxTestCommand = {
454
454
  <div class='footer quiet pad2 space-top1 center small'>
455
455
  Code coverage generated by
456
456
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
457
- at Mon Sep 18 2023 10:30:01 GMT+0000 (Coordinated Universal Time)
457
+ at Mon Sep 25 2023 14:56:44 GMT+0000 (Coordinated Universal Time)
458
458
  </div>
459
459
  <script src="../prettify.js"></script>
460
460
  <script>
@@ -1 +1 @@
1
- {"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAO7E,KAAK,IAAI,GAAG;IACV,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AASF,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,SAAS,EAClB,UAAU,EAAE,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CA4Hf"}
1
+ {"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAQ7E,KAAK,IAAI,GAAG;IACV,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AASF,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,SAAS,EAClB,UAAU,EAAE,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CA4Hf"}
package/lib/clean.js CHANGED
@@ -32,6 +32,7 @@ const fs = __importStar(require("fs-extra"));
32
32
  const ora_1 = __importDefault(require("ora"));
33
33
  const os = __importStar(require("os"));
34
34
  const path = __importStar(require("path"));
35
+ const external_1 = require("./serve/external");
35
36
  async function rnxClean(_argv, _config, cliOptions) {
36
37
  var _a, _b, _c;
37
38
  const projectRoot = (_a = cliOptions.projectRoot) !== null && _a !== void 0 ? _a : process.cwd();
@@ -40,7 +41,7 @@ async function rnxClean(_argv, _config, cliOptions) {
40
41
  }
41
42
  const spinner = (0, ora_1.default)();
42
43
  try {
43
- require.resolve("@react-native-community/cli-clean");
44
+ (0, external_1.requireExternal)("@react-native-community/cli-clean");
44
45
  spinner.warn("`rnx-clean` has been upstreamed to `@react-native-community/cli`. Please use `npx react-native clean` instead.");
45
46
  }
46
47
  catch (_) {
package/lib/clean.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clean.js","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clean.js","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,7 @@
1
1
  import type { CliServerApi, CoreDevMiddleware } from "./types";
2
+ type CliClean = typeof import("@react-native-community/cli-clean");
3
+ export declare function requireExternal(module: "@react-native-community/cli-clean"): CliClean;
2
4
  export declare function requireExternal(module: "@react-native-community/cli-server-api"): CliServerApi;
3
5
  export declare function requireExternal(module: "@react-native/dev-middleware"): CoreDevMiddleware;
6
+ export {};
4
7
  //# sourceMappingURL=external.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"external.d.ts","sourceRoot":"","sources":["../../src/serve/external.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAwB/D,wBAAgB,eAAe,CAC7B,MAAM,EAAE,wCAAwC,GAC/C,YAAY,CAAC;AAEhB,wBAAgB,eAAe,CAC7B,MAAM,EAAE,8BAA8B,GACrC,iBAAiB,CAAC"}
1
+ {"version":3,"file":"external.d.ts","sourceRoot":"","sources":["../../src/serve/external.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE/D,KAAK,QAAQ,GAAG,cAAc,mCAAmC,CAAC,CAAC;AAuBnE,wBAAgB,eAAe,CAC7B,MAAM,EAAE,mCAAmC,GAC1C,QAAQ,CAAC;AAEZ,wBAAgB,eAAe,CAC7B,MAAM,EAAE,wCAAwC,GAC/C,YAAY,CAAC;AAEhB,wBAAgB,eAAe,CAC7B,MAAM,EAAE,8BAA8B,GACrC,iBAAiB,CAAC"}
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.requireExternal = void 0;
4
+ const package_1 = require("@rnx-kit/tools-node/package");
4
5
  function friendlyRequire(...modules) {
5
6
  try {
6
- const modulePath = modules.reduce((startDir, module) => {
7
- return require.resolve(module, { paths: [startDir] });
8
- }, process.cwd());
7
+ const modulePath = (0, package_1.resolveDependencyChain)(modules);
9
8
  return require(modulePath);
10
9
  }
11
10
  catch (_) {
@@ -19,6 +18,8 @@ function friendlyRequire(...modules) {
19
18
  }
20
19
  function requireExternal(module) {
21
20
  switch (module) {
21
+ case "@react-native-community/cli-clean":
22
+ return friendlyRequire("react-native", "@react-native-community/cli", "@react-native-community/cli-clean");
22
23
  case "@react-native-community/cli-server-api":
23
24
  return friendlyRequire("react-native", "@react-native-community/cli", "@react-native-community/cli-server-api");
24
25
  case "@react-native/dev-middleware":
@@ -1 +1 @@
1
- {"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/serve/external.ts"],"names":[],"mappings":";;;AAMA,SAAS,eAAe,CAAI,GAAG,OAAiB;IAC9C,IAAI;QACF,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YACrD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxD,CAAC,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAClB,OAAO,OAAO,CAAC,UAAU,CAAM,CAAC;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,uBAAuB,MAAM,8BAA8B;YACzD,sEAAsE;YACtE,oEAAoE;YACpE,sEAAsE;YACtE,4DAA4D,CAC/D,CAAC;KACH;AACH,CAAC;AAUD,SAAgB,eAAe,CAC7B,MAAsB;IAEtB,QAAQ,MAAM,EAAE;QACd,KAAK,wCAAwC;YAC3C,OAAO,eAAe,CACpB,cAAc,EACd,6BAA6B,EAC7B,wCAAwC,CACzC,CAAC;QACJ,KAAK,8BAA8B;YACjC,OAAO,eAAe,CACpB,cAAc,EACd,oCAAoC,EACpC,8BAA8B,CAC/B,CAAC;KACL;AACH,CAAC;AAjBD,0CAiBC"}
1
+ {"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/serve/external.ts"],"names":[],"mappings":";;;AAAA,yDAAqE;AAUrE,SAAS,eAAe,CAAI,GAAG,OAAiB;IAC9C,IAAI;QACF,MAAM,UAAU,GAAG,IAAA,gCAAsB,EAAC,OAAO,CAAC,CAAC;QACnD,OAAO,OAAO,CAAC,UAAU,CAAM,CAAC;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,uBAAuB,MAAM,8BAA8B;YACzD,sEAAsE;YACtE,oEAAoE;YACpE,sEAAsE;YACtE,4DAA4D,CAC/D,CAAC;KACH;AACH,CAAC;AAcD,SAAgB,eAAe,CAC7B,MAAsB;IAEtB,QAAQ,MAAM,EAAE;QACd,KAAK,mCAAmC;YACtC,OAAO,eAAe,CACpB,cAAc,EACd,6BAA6B,EAC7B,mCAAmC,CACpC,CAAC;QACJ,KAAK,wCAAwC;YAC3C,OAAO,eAAe,CACpB,cAAc,EACd,6BAA6B,EAC7B,wCAAwC,CACzC,CAAC;QACJ,KAAK,8BAA8B;YACjC,OAAO,eAAe,CACpB,cAAc,EACd,oCAAoC,EACpC,8BAA8B,CAC/B,CAAC;KACL;AACH,CAAC;AAvBD,0CAuBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../src/serve/keyboard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,qBAAqB,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IACpE,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACrC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,IAAI,EACJ,qBAAqB,EACrB,QAAQ,GACT,EAAE,OAAO,QAqDT"}
1
+ {"version":3,"file":"keyboard.d.ts","sourceRoot":"","sources":["../../src/serve/keyboard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,KAAK,OAAO,GAAG;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,qBAAqB,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IACpE,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACrC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,IAAI,EACJ,qBAAqB,EACrB,QAAQ,GACT,EAAE,OAAO,QAwDT"}
@@ -33,7 +33,10 @@ function attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal
33
33
  help();
34
34
  break;
35
35
  case "j": {
36
- (0, node_fetch_1.default)(devServerUrl + "/open-debugger", { method: "POST" });
36
+ (0, console_1.info)("Opening debugger...");
37
+ // TODO: Remove `node-fetch` when we drop support for Node 16
38
+ const ftch = "fetch" in globalThis ? fetch : node_fetch_1.default;
39
+ ftch(devServerUrl + "/open-debugger", { method: "POST" });
37
40
  break;
38
41
  }
39
42
  case "q": {
@@ -1 +1 @@
1
- {"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../src/serve/keyboard.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAwC;AAExC,4DAA+B;AAC/B,oDAA4B;AAC5B,wDAAgC;AAUhC,SAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,IAAI,EACJ,qBAAqB,EACrB,QAAQ,GACA;IACR,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC1C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC5B,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,QAAQ,IAAI,EAAE;gBACZ,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,YAAY,CAAC,CAAC;oBACnB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM;gBACR,KAAK,GAAG;oBACN,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACnC,MAAM;aACT;SACF;aAAM;YACL,QAAQ,IAAI,EAAE;gBACZ,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,2BAA2B,CAAC,CAAC;oBAClC,qBAAqB,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACtD,MAAM;gBAER,KAAK,GAAG;oBACN,IAAI,EAAE,CAAC;oBACP,MAAM;gBAER,KAAK,GAAG,CAAC,CAAC;oBACR,IAAA,oBAAK,EAAC,YAAY,GAAG,gBAAgB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC3D,MAAM;iBACP;gBAED,KAAK,GAAG,CAAC,CAAC;oBACR,MAAM,GAAG,GAAG,GAAG,YAAY,eAAe,CAAC;oBAC3C,gBAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;wBACtD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACjB,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;wBACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACnB,CAAC,CAAC,CAAC;oBACH,MAAM;iBACP;gBAED,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,kBAAkB,CAAC,CAAC;oBACzB,qBAAqB,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBACrD,MAAM;gBAER,KAAK,QAAQ;oBACX,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACjB,MAAM;aACT;SACF;IACH,CAAC,CAAC,CAAC;IAEH,kBAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AA1DD,8CA0DC"}
1
+ {"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../src/serve/keyboard.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAwC;AAExC,4DAAmC;AACnC,oDAA4B;AAC5B,wDAAgC;AAUhC,SAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,IAAI,EACJ,qBAAqB,EACrB,QAAQ,GACA;IACR,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC1C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC5B,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,QAAQ,IAAI,EAAE;gBACZ,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,YAAY,CAAC,CAAC;oBACnB,OAAO,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM;gBACR,KAAK,GAAG;oBACN,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACnC,MAAM;aACT;SACF;aAAM;YACL,QAAQ,IAAI,EAAE;gBACZ,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,2BAA2B,CAAC,CAAC;oBAClC,qBAAqB,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACtD,MAAM;gBAER,KAAK,GAAG;oBACN,IAAI,EAAE,CAAC;oBACP,MAAM;gBAER,KAAK,GAAG,CAAC,CAAC;oBACR,IAAA,cAAI,EAAC,qBAAqB,CAAC,CAAC;oBAC5B,6DAA6D;oBAC7D,MAAM,IAAI,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAS,CAAC;oBACvD,IAAI,CAAC,YAAY,GAAG,gBAAgB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC1D,MAAM;iBACP;gBAED,KAAK,GAAG,CAAC,CAAC;oBACR,MAAM,GAAG,GAAG,GAAG,YAAY,eAAe,CAAC;oBAC3C,gBAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;wBACtD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACjB,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;wBACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACnB,CAAC,CAAC,CAAC;oBACH,MAAM;iBACP;gBAED,KAAK,GAAG;oBACN,IAAA,cAAI,EAAC,kBAAkB,CAAC,CAAC;oBACzB,qBAAqB,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBACrD,MAAM;gBAER,KAAK,QAAQ;oBACX,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACjB,MAAM;aACT;SACF;IACH,CAAC,CAAC,CAAC;IAEH,kBAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AA7DD,8CA6DC"}
@@ -63,6 +63,7 @@ type DevMiddlewareAPI = {
63
63
  };
64
64
  type DevMiddlewareOptions = {
65
65
  projectRoot: string;
66
+ serverBaseUrl: string;
66
67
  logger?: typeof logger;
67
68
  unstable_browserLauncher?: unknown;
68
69
  unstable_eventReporter?: unknown;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/serve/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/serve/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAiBhE,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAQvB,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,IAAI,CAAC,CAsMf"}
1
+ {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAiBhE,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAQvB,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,IAAI,CAAC,CA+Lf"}
package/lib/start.js CHANGED
@@ -83,13 +83,15 @@ async function rnxStart(_argv, ctx, args) {
83
83
  // create middleware -- a collection of plugins which handle incoming
84
84
  // http(s) requests, routing them to static pages or JS functions.
85
85
  const host = ((_a = args.host) === null || _a === void 0 ? void 0 : _a.length) ? args.host : "localhost";
86
+ const devServerUrl = `${scheme}://${host}:${port}`;
86
87
  const devServer = createDevServerMiddleware({ host, port, watchFolders });
87
88
  const coreDevMiddleware = (() => {
88
89
  try {
89
- // https://github.com/facebook/react-native/blob/3e7a873f2d1c5170a7f4c88064897e74a149c5d5/packages/community-cli-plugin/src/commands/start/runServer.js#L115
90
+ // https://github.com/facebook/react-native/blob/7888338295476f4d4f00733309e54b8d22318e1e/packages/community-cli-plugin/src/commands/start/runServer.js#L115
90
91
  const { createDevMiddleware } = (0, external_1.requireExternal)("@react-native/dev-middleware");
91
92
  return createDevMiddleware({
92
93
  projectRoot,
94
+ serverBaseUrl: devServerUrl,
93
95
  logger,
94
96
  unstable_experiments: {
95
97
  // NOTE: Only affects the /open-debugger endpoint
@@ -123,18 +125,14 @@ async function rnxStart(_argv, ctx, args) {
123
125
  // bind our `reportEvent` delegate to the Metro server
124
126
  reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
125
127
  }
126
- const printHelp = (0, help_1.makeHelp)(terminal, {
127
- hasDebugger: Boolean(coreDevMiddleware),
128
- });
128
+ const help = (0, help_1.makeHelp)(terminal, { hasDebugger: Boolean(coreDevMiddleware) });
129
129
  // @ts-expect-error We want to override `reporter`
130
130
  metroConfig.reporter = {
131
131
  update(event) {
132
132
  terminalReporter.update(event);
133
- if (reportEventDelegate) {
134
- reportEventDelegate(event);
135
- }
133
+ reportEventDelegate === null || reportEventDelegate === void 0 ? void 0 : reportEventDelegate(event);
136
134
  if (interactive && event.type === "dep_graph_loading") {
137
- printHelp();
135
+ help();
138
136
  }
139
137
  },
140
138
  };
@@ -182,12 +180,7 @@ async function rnxStart(_argv, ctx, args) {
182
180
  // in interactive mode, listen for keyboard events from stdin and bind
183
181
  // them to specific actions.
184
182
  if (interactive) {
185
- (0, keyboard_1.attachKeyHandlers)({
186
- devServerUrl: `${scheme}://${host}:${port}`,
187
- help: printHelp,
188
- messageSocketEndpoint,
189
- terminal,
190
- });
183
+ (0, keyboard_1.attachKeyHandlers)({ devServerUrl, help, messageSocketEndpoint, terminal });
191
184
  }
192
185
  }
193
186
  exports.rnxStart = rnxStart;
package/lib/start.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAA2C;AAC3C,0DAKgC;AAIhC,2CAA6B;AAC7B,iDAAsD;AACtD,+CAAmD;AACnD,uCAAwC;AACxC,+CAAqD;AACrD,mDAAwD;AAOxD,SAAS,yBAAyB,CAChC,SAAqD;IAErD,OAAO,gBAAgB,IAAI,SAAS,CAAC;AACvC,CAAC;AAEM,KAAK,UAAU,QAAQ,CAC5B,KAAe,EACf,GAAW,EACX,IAAsB;;IAEtB,MAAM,YAAY,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IAE9C,MAAM,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,GAAG,IAAA,0BAAe,EACxE,wCAAwC,CACzC,CAAC;IAEF,gDAAgD;IAChD,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACnC,IAAI,WAAW,EAAE;QACf,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;SACtE;KACF;IAED,qEAAqE;IACrE,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAe,EAAC,GAAG,EAAE;QAC7C,GAAG,IAAI;QACP,GAAG,CAAC,YAAY,CAAC,WAAW;YAC1B,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YACzD,CAAC,CAAC,SAAS,CAAC;QACd,GAAG,CAAC,YAAY,CAAC,UAAU;YACzB,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE;YACzC,CAAC,CAAC,SAAS,CAAC;QACd,GAAG,CAAC,YAAY,CAAC,YAAY;YAC3B,CAAC,CAAC;gBACE,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CACnB;aACF;YACH,CAAC,CAAC,SAAS,CAAC;KACf,CAAC,CAAC;IAEH,kEAAkE;IAClE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,8BAAc,EAC7D,IAAI,CAAC,qBAAqB,CAC3B,CAAC;IAEF,+DAA+D;IAC/D,MAAM,GAAG,GAAG,CAAC,OAAe,EAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7D,IAAA,mCAAoB,EAAC,WAAW,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IAErD,MAAM,EACJ,WAAW,EACX,MAAM,EAAE,EAAE,IAAI,EAAE,EAChB,YAAY,GACb,GAAG,WAAW,CAAC;IAChB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACtD,MAAM,YAAY,GAAG,MAAM,IAAA,kCAAkB,EAC3C,MAAM,EACN,IAAI,CAAC,IAAI,EACT,IAAI,EACJ,WAAW,CACZ,CAAC;IAEF,QAAQ,YAAY,EAAE;QACpB,KAAK,iBAAiB;YACpB,MAAM,CAAC,IAAI,CACT,4DAA4D,IAAI,IAAI;gBAClE,YAAY,CACf,CAAC;YACF,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,KAAK,CACV,iCAAiC,IAAI,0BAA0B;gBAC7D,2DAA2D,CAC9D,CAAC;YACF,OAAO;KACV;IAED,qEAAqE;IACrE,kEAAkE;IAClE,MAAM,IAAI,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IACzD,MAAM,SAAS,GAAG,yBAAyB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IAE1E,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE;QAC9B,IAAI;YACF,4JAA4J;YAC5J,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,0BAAe,EAC7C,8BAA8B,CAC/B,CAAC;YACF,OAAO,mBAAmB,CAAC;gBACzB,WAAW;gBACX,MAAM;gBACN,oBAAoB,EAAE;oBACpB,iDAAiD;oBACjD,4BAA4B,EAAE,IAAI;iBACnC;aACF,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,4CAA4C;YAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;YACxC,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAEpC,wDAAwD;YACxD,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAC/D,2DAA2D;YAC3D,WAAW,CAAC,MAAM,CAAC,iBAAiB,GAAG,CACrC,eAA2B,EAC3B,WAAmB,EACnB,EAAE;gBACF,OAAO,UAAU,CAAC,GAAG,CACnB,iBAAiB;oBACf,CAAC,CAAC,iBAAiB,CAAC,eAAe,EAAE,WAAW,CAAC;oBACjD,CAAC,CAAC,eAAe,CACpB,CAAC;YACJ,CAAC,CAAC;YACF,OAAO,SAAS,CAAC;SAClB;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,yDAAyD;IACzD,0DAA0D;IAC1D,IAAI,kBAAkB,GAA2C,SAAS,CAAC;IAC3E,IAAI,qBAAmE,CAAC;IACxE,IAAI,mBAAmB,GAAmC,SAAS,CAAC;IAEpE,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE;QACzC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;QAClD,qBAAqB,GAAG,SAAS,CAAC,qBAAqB,CAAC;QAExD,sDAAsD;QACtD,mBAAmB,GAAG,SAAS,CAAC,oBAAoB,CAAC,WAAW,CAAC;KAClE;IAED,MAAM,SAAS,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE;QACnC,WAAW,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACxC,CAAC,CAAC;IAEH,kDAAkD;IAClD,WAAW,CAAC,QAAQ,GAAG;QACrB,MAAM,CAAC,KAAsB;YAC3B,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,mBAAmB,EAAE;gBACvB,mBAAmB,CAAC,KAAK,CAAC,CAAC;aAC5B;YACD,IAAI,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;gBACrD,SAAS,EAAE,CAAC;aACb;QACH,CAAC;KACF,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAW,EAAC,WAAW,EAAE;QACpD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,KAAK;QAClB,UAAU,EAAE,IAAI,CAAC,IAAI;QACrB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,GAAG,CAAC,iBAAiB;YACnB,CAAC,CAAC;gBACE,wBAAwB,EAAE;oBACxB,SAAS,CAAC,UAAU;oBACpB,mBAAmB;oBACnB,iBAAiB,CAAC,UAAU;iBAC7B;gBACD,kBAAkB,EAAE;oBAClB,GAAG,kBAAkB;oBACrB,GAAG,iBAAiB,CAAC,kBAAkB;iBACxC;aACF;YACH,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC5B,CAAC,CAAC;IAEH,IAAI,yBAAyB,CAAC,SAAS,CAAC,EAAE;QACxC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GACnC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QAC3C,qBAAqB,GAAG,aAAa,CAAC;QAEtC,sDAAsD;QACtD,mBAAmB,GAAG,YAAY,CAAC,WAAW,CAAC;KAChD;SAAM;QACL,wEAAwE;QACxE,4BAA4B;QAC5B,qBAAqB,GAAG,SAAS,CAAC,qBAAqB,CAAC;KACzD;IAED,4EAA4E;IAC5E,6EAA6E;IAC7E,qEAAqE;IACrE,oBAAoB;IACpB,EAAE;IACF,6EAA6E;IAC7E,iEAAiE;IACjE,EAAE;IACF,6DAA6D;IAC7D,EAAE;IACF,cAAc,CAAC,gBAAgB,GAAG,KAAK,CAAC;IAExC,sEAAsE;IACtE,4BAA4B;IAC5B,IAAI,WAAW,EAAE;QACf,IAAA,4BAAiB,EAAC;YAChB,YAAY,EAAE,GAAG,MAAM,MAAM,IAAI,IAAI,IAAI,EAAE;YAC3C,IAAI,EAAE,SAAS;YACf,qBAAqB;YACrB,QAAQ;SACT,CAAC,CAAC;KACJ;AACH,CAAC;AA1MD,4BA0MC"}
1
+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rnx-kit/cli",
3
- "version": "0.16.14",
3
+ "version": "0.16.16",
4
4
  "description": "Command-line interface for working with kit packages in your repo",
5
5
  "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli#readme",
6
6
  "license": "MIT",
@@ -27,10 +27,10 @@
27
27
  "@rnx-kit/metro-plugin-typescript": "^0.4.4",
28
28
  "@rnx-kit/metro-serializer": "^1.0.12",
29
29
  "@rnx-kit/metro-serializer-esbuild": "^0.1.29",
30
- "@rnx-kit/metro-service": "^3.1.2",
30
+ "@rnx-kit/metro-service": "^3.1.4",
31
31
  "@rnx-kit/third-party-notices": "^1.3.4",
32
32
  "@rnx-kit/tools-language": "^2.0.0",
33
- "@rnx-kit/tools-node": "^2.0.0",
33
+ "@rnx-kit/tools-node": "^2.1.0",
34
34
  "@rnx-kit/tools-react-native": "^1.3.2",
35
35
  "chalk": "^4.1.0",
36
36
  "find-up": "^5.0.0",
@@ -41,22 +41,10 @@
41
41
  "readline": "^1.3.0"
42
42
  },
43
43
  "peerDependencies": {
44
- "@react-native-community/cli": ">=5.0.1",
45
- "@react-native-community/cli-clean": ">=8.0.0",
46
- "@react-native-community/cli-server-api": ">=5.0.1",
47
44
  "jest-cli": ">=26.0",
48
45
  "react-native": ">=0.64"
49
46
  },
50
47
  "peerDependenciesMeta": {
51
- "@react-native-community/cli": {
52
- "optional": true
53
- },
54
- "@react-native-community/cli-clean": {
55
- "optional": true
56
- },
57
- "@react-native-community/cli-server-api": {
58
- "optional": true
59
- },
60
48
  "jest-cli": {
61
49
  "optional": true
62
50
  },
package/src/clean.ts CHANGED
@@ -4,6 +4,7 @@ import * as fs from "fs-extra";
4
4
  import ora from "ora";
5
5
  import * as os from "os";
6
6
  import * as path from "path";
7
+ import { requireExternal } from "./serve/external";
7
8
 
8
9
  type Args = {
9
10
  include?: string;
@@ -30,7 +31,7 @@ export async function rnxClean(
30
31
 
31
32
  const spinner = ora();
32
33
  try {
33
- require.resolve("@react-native-community/cli-clean");
34
+ requireExternal("@react-native-community/cli-clean");
34
35
  spinner.warn(
35
36
  "`rnx-clean` has been upstreamed to `@react-native-community/cli`. Please use `npx react-native clean` instead."
36
37
  );
@@ -1,14 +1,16 @@
1
+ import { resolveDependencyChain } from "@rnx-kit/tools-node/package";
1
2
  import type { CliServerApi, CoreDevMiddleware } from "./types";
2
3
 
4
+ type CliClean = typeof import("@react-native-community/cli-clean");
5
+
3
6
  type ExternalModule =
7
+ | "@react-native-community/cli-clean"
4
8
  | "@react-native-community/cli-server-api"
5
9
  | "@react-native/dev-middleware";
6
10
 
7
11
  function friendlyRequire<T>(...modules: string[]): T {
8
12
  try {
9
- const modulePath = modules.reduce((startDir, module) => {
10
- return require.resolve(module, { paths: [startDir] });
11
- }, process.cwd());
13
+ const modulePath = resolveDependencyChain(modules);
12
14
  return require(modulePath) as T;
13
15
  } catch (_) {
14
16
  const module = modules[modules.length - 1];
@@ -22,6 +24,10 @@ function friendlyRequire<T>(...modules: string[]): T {
22
24
  }
23
25
  }
24
26
 
27
+ export function requireExternal(
28
+ module: "@react-native-community/cli-clean"
29
+ ): CliClean;
30
+
25
31
  export function requireExternal(
26
32
  module: "@react-native-community/cli-server-api"
27
33
  ): CliServerApi;
@@ -32,8 +38,14 @@ export function requireExternal(
32
38
 
33
39
  export function requireExternal(
34
40
  module: ExternalModule
35
- ): CliServerApi | CoreDevMiddleware {
41
+ ): CliClean | CliServerApi | CoreDevMiddleware {
36
42
  switch (module) {
43
+ case "@react-native-community/cli-clean":
44
+ return friendlyRequire<CliClean>(
45
+ "react-native",
46
+ "@react-native-community/cli",
47
+ "@react-native-community/cli-clean"
48
+ );
37
49
  case "@react-native-community/cli-server-api":
38
50
  return friendlyRequire<CliServerApi>(
39
51
  "react-native",
@@ -1,6 +1,6 @@
1
1
  import { info } from "@rnx-kit/console";
2
2
  import type { MetroTerminal } from "@rnx-kit/metro-service";
3
- import fetch from "node-fetch";
3
+ import nodeFetch from "node-fetch";
4
4
  import qrcode from "qrcode";
5
5
  import readline from "readline";
6
6
  import type { DevServerMiddleware } from "./types";
@@ -43,7 +43,10 @@ export function attachKeyHandlers({
43
43
  break;
44
44
 
45
45
  case "j": {
46
- fetch(devServerUrl + "/open-debugger", { method: "POST" });
46
+ info("Opening debugger...");
47
+ // TODO: Remove `node-fetch` when we drop support for Node 16
48
+ const ftch = "fetch" in globalThis ? fetch : nodeFetch;
49
+ ftch(devServerUrl + "/open-debugger", { method: "POST" });
47
50
  break;
48
51
  }
49
52
 
@@ -74,6 +74,7 @@ type DevMiddlewareAPI = {
74
74
 
75
75
  type DevMiddlewareOptions = {
76
76
  projectRoot: string;
77
+ serverBaseUrl: string;
77
78
  logger?: typeof logger;
78
79
  unstable_browserLauncher?: unknown;
79
80
  unstable_eventReporter?: unknown;
package/src/start.ts CHANGED
@@ -105,16 +105,18 @@ export async function rnxStart(
105
105
  // create middleware -- a collection of plugins which handle incoming
106
106
  // http(s) requests, routing them to static pages or JS functions.
107
107
  const host = args.host?.length ? args.host : "localhost";
108
+ const devServerUrl = `${scheme}://${host}:${port}`;
108
109
  const devServer = createDevServerMiddleware({ host, port, watchFolders });
109
110
 
110
111
  const coreDevMiddleware = (() => {
111
112
  try {
112
- // https://github.com/facebook/react-native/blob/3e7a873f2d1c5170a7f4c88064897e74a149c5d5/packages/community-cli-plugin/src/commands/start/runServer.js#L115
113
+ // https://github.com/facebook/react-native/blob/7888338295476f4d4f00733309e54b8d22318e1e/packages/community-cli-plugin/src/commands/start/runServer.js#L115
113
114
  const { createDevMiddleware } = requireExternal(
114
115
  "@react-native/dev-middleware"
115
116
  );
116
117
  return createDevMiddleware({
117
118
  projectRoot,
119
+ serverBaseUrl: devServerUrl,
118
120
  logger,
119
121
  unstable_experiments: {
120
122
  // NOTE: Only affects the /open-debugger endpoint
@@ -157,19 +159,15 @@ export async function rnxStart(
157
159
  reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
158
160
  }
159
161
 
160
- const printHelp = makeHelp(terminal, {
161
- hasDebugger: Boolean(coreDevMiddleware),
162
- });
162
+ const help = makeHelp(terminal, { hasDebugger: Boolean(coreDevMiddleware) });
163
163
 
164
164
  // @ts-expect-error We want to override `reporter`
165
165
  metroConfig.reporter = {
166
166
  update(event: ReportableEvent) {
167
167
  terminalReporter.update(event);
168
- if (reportEventDelegate) {
169
- reportEventDelegate(event);
170
- }
168
+ reportEventDelegate?.(event);
171
169
  if (interactive && event.type === "dep_graph_loading") {
172
- printHelp();
170
+ help();
173
171
  }
174
172
  },
175
173
  };
@@ -222,11 +220,6 @@ export async function rnxStart(
222
220
  // in interactive mode, listen for keyboard events from stdin and bind
223
221
  // them to specific actions.
224
222
  if (interactive) {
225
- attachKeyHandlers({
226
- devServerUrl: `${scheme}://${host}:${port}`,
227
- help: printHelp,
228
- messageSocketEndpoint,
229
- terminal,
230
- });
223
+ attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal });
231
224
  }
232
225
  }