@rnx-kit/cli 0.12.5 → 0.14.0

package/coverage/lcov-report/src/copy-assets.ts.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.36% </span>
+                <span class="strong">54.6% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>81/149</span>
+                <span class='fraction'>83/152</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">47.36% </span>
+                <span class="strong">46.46% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>45/95</span>
+                <span class='fraction'>46/99</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">76.47% </span>
+                <span class="strong">77.77% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>13/17</span>
+                <span class='fraction'>14/18</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">54.05% </span>
+                <span class="strong">54.3% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>80/148</span>
+                <span class='fraction'>82/151</span>
             </div>
         
             
@@ -620,7 +620,16 @@
 <a name='L555'></a><a href='#L555'>555</a>
 <a name='L556'></a><a href='#L556'>556</a>
 <a name='L557'></a><a href='#L557'>557</a>
-<a name='L558'></a><a href='#L558'>558</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L558'></a><a href='#L558'>558</a>
+<a name='L559'></a><a href='#L559'>559</a>
+<a name='L560'></a><a href='#L560'>560</a>
+<a name='L561'></a><a href='#L561'>561</a>
+<a name='L562'></a><a href='#L562'>562</a>
+<a name='L563'></a><a href='#L563'>563</a>
+<a name='L564'></a><a href='#L564'>564</a>
+<a name='L565'></a><a href='#L565'>565</a>
+<a name='L566'></a><a href='#L566'>566</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -796,6 +805,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1188,6 +1204,7 @@ import {
 } from "@rnx-kit/tools-node/package";
 import type { AllPlatforms } from "@rnx-kit/tools-react-native";
 import { parsePlatform } from "@rnx-kit/tools-react-native";
+import type { SpawnSyncOptions } from "child_process";
 import { spawnSync } from "child_process";
 import * as fs from "fs-extra";
 import * as os from "os";
@@ -1352,6 +1369,13 @@ function getAndroidPaths(
   }
 }
 &nbsp;
+function run(command: string, args: string[], options: SpawnSyncOptions) {
+  const { status } = spawnSync(command, args, options);
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (status !== 0) {
+<span class="cstat-no" title="statement not covered" >    process.exit(status || 1);</span>
+  }
+}
+&nbsp;
 export async function assembleAarBundle(
   context: Context,
   packageName: string,
@@ -1417,7 +1441,7 @@ export async function assembleAarBundle(
     }
 &nbsp;
     // Run only one Gradle task at a time
-    spawnSync(gradlew, targets, { cwd: androidProject, stdio: "inherit", env });
+    run(gradlew, targets, { cwd: androidProject, stdio: "inherit", env });
   } else {
     const reactNativePath = findPackageDependencyDir("react-native");
     <span class="missing-if-branch" title="if path not taken" >I</span>if (!reactNativePath) {
@@ -1496,7 +1520,7 @@ export async function assembleAarBundle(
     await fs.writeFile(path.join(buildDir, "settings.gradle"), settingsGradle);
 &nbsp;
     // Run only one Gradle task at a time
-    spawnSync(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
+    run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
   }
 &nbsp;
   await Promise.all(targetsToCopy.map(([src, dest]) =&gt; fs.copy(src, dest)));
@@ -1741,7 +1765,7 @@ export const rnxCopyAssetsCommand = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu May 12 2022 19:21:06 GMT+0000 (Coordinated Universal Time)
+                at Mon Jun 20 2022 17:47:27 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">52.17% </span>
+                <span class="strong">52.6% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>108/207</span>
+                <span class='fraction'>111/211</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">46.45% </span>
+                <span class="strong">46.56% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>59/127</span>
+                <span class='fraction'>61/131</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">55.55% </span>
+                <span class="strong">58.62% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>15/27</span>
+                <span class='fraction'>17/29</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">52.19% </span>
+                <span class="strong">52.63% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>107/205</span>
+                <span class='fraction'>110/209</span>
             </div>
         
             
@@ -79,18 +79,33 @@
 </tr>
 </thead>
 <tbody><tr>
+	<td class="file high" data-value="bundler-plugin-defaults.ts"><a href="bundler-plugin-defaults.ts.html">bundler-plugin-defaults.ts</a></td>
+	<td data-value="100" class="pic high">
+	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
+	</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="0" class="abs high">0/0</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	</tr>
+
+<tr>
 	<td class="file medium" data-value="copy-assets.ts"><a href="copy-assets.ts.html">copy-assets.ts</a></td>
-	<td data-value="54.36" class="pic medium">
+	<td data-value="54.6" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 54%"></div><div class="cover-empty" style="width: 46%"></div></div>
 	</td>
-	<td data-value="54.36" class="pct medium">54.36%</td>
-	<td data-value="149" class="abs medium">81/149</td>
-	<td data-value="47.36" class="pct low">47.36%</td>
-	<td data-value="95" class="abs low">45/95</td>
-	<td data-value="76.47" class="pct medium">76.47%</td>
-	<td data-value="17" class="abs medium">13/17</td>
-	<td data-value="54.05" class="pct medium">54.05%</td>
-	<td data-value="148" class="abs medium">80/148</td>
+	<td data-value="54.6" class="pct medium">54.6%</td>
+	<td data-value="152" class="abs medium">83/152</td>
+	<td data-value="46.46" class="pct low">46.46%</td>
+	<td data-value="99" class="abs low">46/99</td>
+	<td data-value="77.77" class="pct medium">77.77%</td>
+	<td data-value="18" class="abs medium">14/18</td>
+	<td data-value="54.3" class="pct medium">54.3%</td>
+	<td data-value="151" class="abs medium">82/151</td>
 	</tr>
 
 <tr>
@@ -100,8 +115,8 @@
 	</td>
 	<td data-value="46.55" class="pct low">46.55%</td>
 	<td data-value="58" class="abs low">27/58</td>
-	<td data-value="43.75" class="pct low">43.75%</td>
-	<td data-value="32" class="abs low">14/32</td>
+	<td data-value="46.87" class="pct low">46.87%</td>
+	<td data-value="32" class="abs low">15/32</td>
 	<td data-value="20" class="pct low">20%</td>
 	<td data-value="10" class="abs low">2/10</td>
 	<td data-value="47.36" class="pct low">47.36%</td>
@@ -116,7 +131,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu May 12 2022 19:21:06 GMT+0000 (Coordinated Universal Time)
+                at Mon Jun 20 2022 17:47:27 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/metro-config.ts.html

@@ -30,9 +30,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">43.75% </span>
+                <span class="strong">46.87% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>14/32</span>
+                <span class='fraction'>15/32</span>
             </div>
         
             
@@ -234,7 +234,13 @@
 <a name='L169'></a><a href='#L169'>169</a>
 <a name='L170'></a><a href='#L170'>170</a>
 <a name='L171'></a><a href='#L171'>171</a>
-<a name='L172'></a><a href='#L172'>172</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L172'></a><a href='#L172'>172</a>
+<a name='L173'></a><a href='#L173'>173</a>
+<a name='L174'></a><a href='#L174'>174</a>
+<a name='L175'></a><a href='#L175'>175</a>
+<a name='L176'></a><a href='#L176'>176</a>
+<a name='L177'></a><a href='#L177'>177</a>
+<a name='L178'></a><a href='#L178'>178</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -267,12 +273,16 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -337,7 +347,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
@@ -362,24 +372,26 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -394,18 +406,19 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { TypeScriptValidationOptions } from "@rnx-kit/config";
+import {
   CyclicDependencies,
   PluginOptions as CyclicDetectorOptions,
 } from "@rnx-kit/metro-plugin-cyclic-dependencies-detector";
@@ -422,7 +435,6 @@ import { AllPlatforms } from "@rnx-kit/tools-react-native/platform";
 import { Project } from "@rnx-kit/typescript-service";
 &nbsp;
 import { createProjectCache } from "./typescript/project-cache";
-import type { TypeScriptValidationOptions } from "./types";
 &nbsp;
 import type { DeltaResult, Graph } from "metro";
 import type { InputConfigT, SerializerConfigT } from "metro-config";
@@ -435,10 +447,14 @@ import type { InputConfigT, SerializerConfigT } from "metro-config";
  * Source file in node_modules (external packages) are ignored.
  *
  * @param options TypeScript validation options
+ * @param print Optional function to use when printing status messages to the Metro console
  * @returns Hook function
  */
-function createSerializerHook(options: TypeScriptValidationOptions) {
-  const projectCache = createProjectCache(options.print);
+function createSerializerHook(
+  options: TypeScriptValidationOptions,
+  print?: (message: string) =&gt; void
+) {
+  const projectCache = createProjectCache(print);
 &nbsp;
   const patternNodeModules = /[/\\]node_modules[/\\]/;
   const excludeNodeModules = <span class="fstat-no" title="function not covered" >(p</span>: string) =&gt; <span class="cstat-no" title="statement not covered" >!patternNodeModules.test(p);</span>
@@ -523,13 +539,15 @@ const emptySerializerHook = <span class="fstat-no" title="function not covered"
  * @param detectDuplicateDependencies When true, duplicate dependency checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the detection process.
  * @param typescriptValidation When true, TypeScript type-checking is enabled with a default set of options. Otherwise, the object allows for fine-grained control over the type-checking process.
  * @param treeShake When true, tree shaking is enabled.
+ * @param print Optional function to use when printing status messages to the Metro console
  */
 export function customizeMetroConfig(
   metroConfigReadonly: InputConfigT,
   detectCyclicDependencies: boolean | CyclicDetectorOptions,
   detectDuplicateDependencies: boolean | DuplicateDetectorOptions,
   typescriptValidation: boolean | TypeScriptValidationOptions,
-  treeShake: boolean
+  treeShake: boolean,
+  print?: (message: string) =&gt; void
 ): void {
   //  We will be making changes to the Metro configuration. Coerce from a
   //  type with readonly props to a type where the props are writeable.
@@ -570,9 +588,9 @@ export function customizeMetroConfig(
 &nbsp;
   let hook = emptySerializerHook;
   <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof typescriptValidation === "object") {
-<span class="cstat-no" title="statement not covered" >    hook = createSerializerHook(typescriptValidation);</span>
+<span class="cstat-no" title="statement not covered" >    hook = createSerializerHook(typescriptValidation, print);</span>
   } else if (typescriptValidation !== false) {
-    hook = createSerializerHook({});
+    hook = createSerializerHook({}, print);
   }
   metroConfig.serializer.experimentalSerializerHook = hook;
 }
@@ -583,7 +601,7 @@ export function customizeMetroConfig(
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu May 12 2022 19:21:06 GMT+0000 (Coordinated Universal Time)
+                at Mon Jun 20 2022 17:47:27 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/typescript/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu May 12 2022 19:21:06 GMT+0000 (Coordinated Universal Time)
+                at Mon Jun 20 2022 17:47:27 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/typescript/project-cache.ts.html

@@ -334,14 +334,14 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -476,7 +476,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -697,7 +697,7 @@ export function createProjectCache(
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu May 12 2022 19:21:06 GMT+0000 (Coordinated Universal Time)
+                at Mon Jun 20 2022 17:47:27 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>