@rnx-kit/cli 0.16.17 → 0.16.18

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,16 @@
1
1
  # Change Log - @rnx-kit/cli
2
2
 
3
+ ## 0.16.18
4
+
5
+ ### Patch Changes
6
+
7
+ - 2885f73c: Ensure correct Metro dependencies are used by traversing the dependency chain starting from `react-native`
8
+ - Updated dependencies [2885f73c]
9
+ - @rnx-kit/metro-serializer-esbuild@0.1.31
10
+ - @rnx-kit/metro-serializer@1.0.13
11
+ - @rnx-kit/metro-service@3.1.5
12
+ - @rnx-kit/tools-react-native@1.3.4
13
+
3
14
  ## 0.16.17
4
15
 
5
16
  ### Patch Changes
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1696927372100" clover="3.2.0">
3
- <project timestamp="1696927372100" name="All files">
2
+ <coverage generated="1697438522310" clover="3.2.0">
3
+ <project timestamp="1697438522310" name="All files">
4
4
  <metrics statements="285" coveredstatements="158" conditionals="180" coveredconditionals="92" methods="35" coveredmethods="27" elements="500" coveredelements="277" complexity="0" loc="285" ncloc="285" 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
119
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
121
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
149
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
316
+ at Mon Oct 16 2023 06:42:02 GMT+0000 (Coordinated Universal Time)
317
317
  </div>
318
318
  <script src="../../prettify.js"></script>
319
319
  <script>
@@ -268,7 +268,7 @@ export async function metroBundle(
268
268
  <div class='footer quiet pad2 space-top1 center small'>
269
269
  Code coverage generated by
270
270
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
271
- at Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
271
+ at Mon Oct 16 2023 06:42:02 GMT+0000 (Coordinated Universal Time)
272
272
  </div>
273
273
  <script src="../../prettify.js"></script>
274
274
  <script>
@@ -223,7 +223,7 @@ export function applyBundleConfigOverrides(
223
223
  <div class='footer quiet pad2 space-top1 center small'>
224
224
  Code coverage generated by
225
225
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
226
- at Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
226
+ at Mon Oct 16 2023 06:42:02 GMT+0000 (Coordinated Universal Time)
227
227
  </div>
228
228
  <script src="../../prettify.js"></script>
229
229
  <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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
1711
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
134
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
697
+ at Mon Oct 16 2023 06:42:02 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 Tue Oct 10 2023 08:42:52 GMT+0000 (Coordinated Universal Time)
457
+ at Mon Oct 16 2023 06:42:02 GMT+0000 (Coordinated Universal Time)
458
458
  </div>
459
459
  <script src="../prettify.js"></script>
460
460
  <script>
@@ -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,CA+Lf"}
1
+ {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAkBhE,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,CA8Lf"}
package/lib/start.js CHANGED
@@ -62,12 +62,12 @@ async function rnxStart(_argv, ctx, args) {
62
62
  }
63
63
  : undefined),
64
64
  });
65
- // create a Metro terminal and reporter for writing to the console
66
- const { terminal, reporter: terminalReporter } = (0, metro_service_1.createTerminal)(args.customLogReporterPath);
65
+ const { projectRoot, watchFolders } = metroConfig;
66
+ const terminal = (0, metro_service_1.makeTerminal)(projectRoot);
67
67
  // customize the metro config to include plugins, presets, etc.
68
68
  const log = (message) => terminal.log(message);
69
69
  (0, metro_config_1.customizeMetroConfig)(metroConfig, serverConfig, log);
70
- const { projectRoot, server: { port }, watchFolders, } = metroConfig;
70
+ const { port } = metroConfig.server;
71
71
  const scheme = args.https === true ? "https" : "http";
72
72
  const serverStatus = await (0, metro_service_1.isDevServerRunning)(scheme, args.host, port, projectRoot);
73
73
  switch (serverStatus) {
@@ -126,6 +126,7 @@ async function rnxStart(_argv, ctx, args) {
126
126
  reportEventDelegate = devServer.eventsSocketEndpoint.reportEvent;
127
127
  }
128
128
  const help = (0, help_1.makeHelp)(terminal, { hasDebugger: Boolean(coreDevMiddleware) });
129
+ const terminalReporter = (0, metro_service_1.makeReporter)(args.customLogReporterPath, terminal, projectRoot);
129
130
  // @ts-expect-error We want to override `reporter`
130
131
  metroConfig.reporter = {
131
132
  update(event) {
package/lib/start.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
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.17",
3
+ "version": "0.16.18",
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",
@@ -25,13 +25,13 @@
25
25
  "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.1",
26
26
  "@rnx-kit/metro-plugin-duplicates-checker": "^2.1.1",
27
27
  "@rnx-kit/metro-plugin-typescript": "^0.4.4",
28
- "@rnx-kit/metro-serializer": "^1.0.12",
29
- "@rnx-kit/metro-serializer-esbuild": "^0.1.29",
30
- "@rnx-kit/metro-service": "^3.1.4",
28
+ "@rnx-kit/metro-serializer": "^1.0.13",
29
+ "@rnx-kit/metro-serializer-esbuild": "^0.1.31",
30
+ "@rnx-kit/metro-service": "^3.1.5",
31
31
  "@rnx-kit/third-party-notices": "^1.3.4",
32
32
  "@rnx-kit/tools-language": "^2.0.0",
33
33
  "@rnx-kit/tools-node": "^2.1.0",
34
- "@rnx-kit/tools-react-native": "^1.3.2",
34
+ "@rnx-kit/tools-react-native": "^1.3.4",
35
35
  "chalk": "^4.1.0",
36
36
  "find-up": "^5.0.0",
37
37
  "fs-extra": "^10.0.0",
package/src/start.ts CHANGED
@@ -1,9 +1,10 @@
1
1
  import type { Config } from "@react-native-community/cli-types";
2
2
  import * as logger from "@rnx-kit/console";
3
3
  import {
4
- createTerminal,
5
4
  isDevServerRunning,
6
5
  loadMetroConfig,
6
+ makeReporter,
7
+ makeTerminal,
7
8
  startServer,
8
9
  } from "@rnx-kit/metro-service";
9
10
  import type { ReportableEvent, Reporter, RunServerOptions } from "metro";
@@ -65,20 +66,14 @@ export async function rnxStart(
65
66
  : undefined),
66
67
  });
67
68
 
68
- // create a Metro terminal and reporter for writing to the console
69
- const { terminal, reporter: terminalReporter } = createTerminal(
70
- args.customLogReporterPath
71
- );
69
+ const { projectRoot, watchFolders } = metroConfig;
70
+ const terminal = makeTerminal(projectRoot);
72
71
 
73
72
  // customize the metro config to include plugins, presets, etc.
74
73
  const log = (message: string): void => terminal.log(message);
75
74
  customizeMetroConfig(metroConfig, serverConfig, log);
76
75
 
77
- const {
78
- projectRoot,
79
- server: { port },
80
- watchFolders,
81
- } = metroConfig;
76
+ const { port } = metroConfig.server;
82
77
  const scheme = args.https === true ? "https" : "http";
83
78
  const serverStatus = await isDevServerRunning(
84
79
  scheme,
@@ -160,6 +155,11 @@ export async function rnxStart(
160
155
  }
161
156
 
162
157
  const help = makeHelp(terminal, { hasDebugger: Boolean(coreDevMiddleware) });
158
+ const terminalReporter = makeReporter(
159
+ args.customLogReporterPath,
160
+ terminal,
161
+ projectRoot
162
+ );
163
163
 
164
164
  // @ts-expect-error We want to override `reporter`
165
165
  metroConfig.reporter = {