@rnx-kit/cli 0.12.7 → 0.14.0

package/coverage/lcov-report/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">48.34% </span>
+                <span class="strong">48.78% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>146/302</span>
+                <span class='fraction'>140/287</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">46.99% </span>
+                <span class="strong">47.92% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>86/183</span>
+                <span class='fraction'>81/169</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">51.11% </span>
+                <span class="strong">53.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>23/45</span>
+                <span class='fraction'>24/45</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">48.65% </span>
+                <span class="strong">49.11% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>145/298</span>
+                <span class='fraction'>139/283</span>
             </div>
         
             
@@ -80,32 +80,32 @@
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="src"><a href="src/index.html">src</a></td>
-	<td data-value="52.38" class="pic medium">
+	<td data-value="52.6" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 52%"></div><div class="cover-empty" style="width: 48%"></div></div>
 	</td>
-	<td data-value="52.38" class="pct medium">52.38%</td>
-	<td data-value="210" class="abs medium">110/210</td>
-	<td data-value="45.8" class="pct low">45.8%</td>
-	<td data-value="131" class="abs low">60/131</td>
-	<td data-value="57.14" class="pct medium">57.14%</td>
-	<td data-value="28" class="abs medium">16/28</td>
-	<td data-value="52.4" class="pct medium">52.4%</td>
-	<td data-value="208" class="abs medium">109/208</td>
+	<td data-value="52.6" class="pct medium">52.6%</td>
+	<td data-value="211" class="abs medium">111/211</td>
+	<td data-value="46.56" class="pct low">46.56%</td>
+	<td data-value="131" class="abs low">61/131</td>
+	<td data-value="58.62" class="pct medium">58.62%</td>
+	<td data-value="29" class="abs medium">17/29</td>
+	<td data-value="52.63" class="pct medium">52.63%</td>
+	<td data-value="209" class="abs medium">110/209</td>
 	</tr>
 
 <tr>
-	<td class="file medium" data-value="src/bundle"><a href="src/bundle/index.html">src/bundle</a></td>
-	<td data-value="78.04" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 78%"></div><div class="cover-empty" style="width: 22%"></div></div>
+	<td class="file high" data-value="src/bundle"><a href="src/bundle/index.html">src/bundle</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="78.04" class="pct medium">78.04%</td>
-	<td data-value="41" class="abs medium">32/41</td>
-	<td data-value="76.47" class="pct medium">76.47%</td>
-	<td data-value="34" class="abs medium">26/34</td>
-	<td data-value="85.71" class="pct high">85.71%</td>
-	<td data-value="7" class="abs high">6/7</td>
-	<td data-value="78.04" class="pct medium">78.04%</td>
-	<td data-value="41" class="abs medium">32/41</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="25" class="abs high">25/25</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="20" class="abs high">20/20</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="6" class="abs high">6/6</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="25" class="abs high">25/25</td>
 	</tr>
 
 <tr>
@@ -131,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 19 2022 01:42:49 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/bundle/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.04% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>32/41</span>
+                <span class='fraction'>25/25</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">76.47% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>26/34</span>
+                <span class='fraction'>20/20</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.71% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>6/7</span>
+                <span class='fraction'>6/6</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.04% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>32/41</span>
+                <span class='fraction'>25/25</span>
             </div>
         
             
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line medium'></div>
+    <div class='status-line high'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -80,32 +80,32 @@
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="kit-config.ts"><a href="kit-config.ts.html">kit-config.ts</a></td>
-	<td data-value="95.23" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 95%"></div><div class="cover-empty" style="width: 5%"></div></div>
+	<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="95.23" class="pct high">95.23%</td>
-	<td data-value="21" class="abs high">20/21</td>
-	<td data-value="93.75" class="pct high">93.75%</td>
-	<td data-value="16" class="abs high">15/16</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="14" class="abs high">14/14</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="14" class="abs high">14/14</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="4" class="abs high">4/4</td>
-	<td data-value="95.23" class="pct high">95.23%</td>
-	<td data-value="21" class="abs high">20/21</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="14" class="abs high">14/14</td>
 	</tr>
 
 <tr>
-	<td class="file medium" data-value="metro.ts"><a href="metro.ts.html">metro.ts</a></td>
-	<td data-value="50" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 50%"></div><div class="cover-empty" style="width: 50%"></div></div>
+	<td class="file high" data-value="metro.ts"><a href="metro.ts.html">metro.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="50" class="pct medium">50%</td>
-	<td data-value="16" class="abs medium">8/16</td>
-	<td data-value="56.25" class="pct medium">56.25%</td>
-	<td data-value="16" class="abs medium">9/16</td>
-	<td data-value="50" class="pct medium">50%</td>
-	<td data-value="2" class="abs medium">1/2</td>
-	<td data-value="50" class="pct medium">50%</td>
-	<td data-value="16" class="abs medium">8/16</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="7" class="abs high">7/7</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="4" class="abs high">4/4</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="7" class="abs high">7/7</td>
 	</tr>
 
 <tr>
@@ -131,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 19 2022 01:42:49 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/bundle/kit-config.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">95.23% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>20/21</span>
+                <span class='fraction'>14/14</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.75% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>15/16</span>
+                <span class='fraction'>14/14</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">95.23% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>20/21</span>
+                <span class='fraction'>14/14</span>
             </div>
         
             
@@ -144,26 +144,7 @@
 <a name='L79'></a><a href='#L79'>79</a>
 <a name='L80'></a><a href='#L80'>80</a>
 <a name='L81'></a><a href='#L81'>81</a>
-<a name='L82'></a><a href='#L82'>82</a>
-<a name='L83'></a><a href='#L83'>83</a>
-<a name='L84'></a><a href='#L84'>84</a>
-<a name='L85'></a><a href='#L85'>85</a>
-<a name='L86'></a><a href='#L86'>86</a>
-<a name='L87'></a><a href='#L87'>87</a>
-<a name='L88'></a><a href='#L88'>88</a>
-<a name='L89'></a><a href='#L89'>89</a>
-<a name='L90'></a><a href='#L90'>90</a>
-<a name='L91'></a><a href='#L91'>91</a>
-<a name='L92'></a><a href='#L92'>92</a>
-<a name='L93'></a><a href='#L93'>93</a>
-<a name='L94'></a><a href='#L94'>94</a>
-<a name='L95'></a><a href='#L95'>95</a>
-<a name='L96'></a><a href='#L96'>96</a>
-<a name='L97'></a><a href='#L97'>97</a>
-<a name='L98'></a><a href='#L98'>98</a>
-<a name='L99'></a><a href='#L99'>99</a>
-<a name='L100'></a><a href='#L100'>100</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L82'></a><a href='#L82'>82</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>
@@ -182,35 +163,23 @@
 <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">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">1x</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">10x</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">1x</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">1x</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">1x</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">3x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</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">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>
+<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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -220,13 +189,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">7x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</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>
@@ -238,75 +201,38 @@
 <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">7x</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</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>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</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-yes">4x</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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</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-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></td><td class="text"><pre class="prettyprint lang-js">import type { BundleDefinitionWithRequiredParameters } from "@rnx-kit/config";
-import {
-  getBundleDefinition,
-  getBundlePlatformDefinition,
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {
+  getBundleConfig,
+  getPlatformBundleConfig,
   getKitConfig,
 } from "@rnx-kit/config";
-import { warn } from "@rnx-kit/console";
 import type { AllPlatforms } from "@rnx-kit/tools-react-native/platform";
-import chalk from "chalk";
-import type { KitBundleConfig } from "./types";
-&nbsp;
-/**
- * Get a bundle definition from the kit configuration.
- *
- * @param id Optional bundle definition id. Only needed when the kit config has more than one definition.
- * @returns Bundle definition matching the id (if given), or the first bundle definition found. `undefined` if bundling is disabled or not supported for the kit.
- */
-export function getKitBundleDefinition(
-  id?: string
-): BundleDefinitionWithRequiredParameters | undefined {
-  const kitConfig = getKitConfig();
-  if (!kitConfig) {
-    throw new Error(
-      "No kit configuration found for this react-native experience"
-    );
-  }
-&nbsp;
-  if (kitConfig.bundle === null || kitConfig.bundle === undefined) {
-    warn(
-      chalk.yellow(
-        "No bundle configuration found for this react-native experience -- skipping bundling"
-      )
-    );
-    return undefined;
-  } else if (!kitConfig.bundle) {
-    warn(
-      chalk.yellow(
-        "Bundling is disabled for this react-native experience -- skipping"
-      )
-    );
-    return undefined;
-  }
-&nbsp;
-  // get the bundle definition
-  return getBundleDefinition(kitConfig.bundle, id);
-}
+import type { CliPlatformBundleConfig } from "./types";
+import { getDefaultBundlerPlugins } from "../bundler-plugin-defaults";
 &nbsp;
 /**
  * Get the list of target platforms for bundling.
@@ -326,36 +252,56 @@ export function getTargetPlatforms(
     return targetPlatforms;
   }
   throw new Error(
-    "No target platforms given. Update the kit configuration to include a target platform, or provide a target platform on the command-line."
+    "No target platforms given. Update the rnx-kit configuration to include a target platform, or provide a target platform on the command-line."
   );
 }
 &nbsp;
+function getDefaultBundleParameters(platform: string) {
+  const extension =
+    platform === "ios" || platform === "macos" ? "jsbundle" : "bundle";
+&nbsp;
+  return {
+    entryFile: "index.js",
+    bundleOutput: `index.${platform}.${extension}`,
+    sourcemapUseAbsolutePath: false,
+  };
+}
+&nbsp;
 /**
- * Get bundle configuration and target platform(s) from kit config. Create
- * one config per platform, applying any platform-specific customizations in
- * the kit config.
+ * Get the bundle configuration and target platform(s) from the rnx-kit
+ * configuration. Use them to create an array of platform-specific
+ * bundle configurations.
+ *
+ * If an id is given, search for the matching bundle definition. Otherwise, use the first bundle definition.
  *
- * @param id Optional bundle definition id. Only needed when the kit config has more than one definition.
+ * @param id Optional identity of the target bundle definition to return
  * @param overridePlatform Override platform, typically from the command-line. When given, this overrides the list of target platforms.
- * @returns Arrary of kit bundle configurations, one per target platform, or `undefined` if bundling is disabled
+ * @returns Arrary of platform-specific bundle configurations
  */
-export function getKitBundleConfigs(
+export function getCliPlatformBundleConfigs(
   id?: string,
   overridePlatform?: AllPlatforms
-): KitBundleConfig[] | undefined {
-  const bundleDefinition = getKitBundleDefinition(id);
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (!bundleDefinition) {
-<span class="cstat-no" title="statement not covered" >    return undefined;</span>
-  }
+): CliPlatformBundleConfig[] {
+  const kitConfig = getKitConfig();
+  const maybeBundleConfig = kitConfig
+    ? getBundleConfig(kitConfig, id)
+    : undefined;
+  const bundleConfig = maybeBundleConfig ?? {};
 &nbsp;
-  const platforms = getTargetPlatforms(
-    overridePlatform,
-    bundleDefinition.targets
-  );
+  const platforms = getTargetPlatforms(overridePlatform, bundleConfig.targets);
+&nbsp;
+  return platforms.map&lt;CliPlatformBundleConfig&gt;((platform) =&gt; {
+    const platformBundleConfig = getPlatformBundleConfig(
+      bundleConfig,
+      platform
+    );
+&nbsp;
+    // apply defaults to fill in any required props that are missing
 &nbsp;
-  return platforms.map&lt;KitBundleConfig&gt;((platform) =&gt; {
     return {
-      ...getBundlePlatformDefinition(bundleDefinition, platform),
+      ...getDefaultBundlerPlugins(),
+      ...getDefaultBundleParameters(platform),
+      ...platformBundleConfig,
       platform,
     };
   });
@@ -367,7 +313,7 @@ export function getKitBundleConfigs(
             <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 19 2022 01:42:49 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>