@rnx-kit/cli 0.15.4 → 0.16.0

package/coverage/lcov.info

@@ -290,54 +290,139 @@ BRH:45
 end_of_record
 TN:
 SF:src/metro-config.ts
-FN:20,customizeMetroConfig
-FNF:1
-FNH:1
+FN:24,resolvePlugin
+FN:32,importPlugin
+FN:37,readLegacyOptions
+FN:71,(anonymous_3)
+FN:97,customizeMetroConfig
+FN:190,(anonymous_5)
+FNF:6
+FNH:4
+FNDA:21,resolvePlugin
+FNDA:21,importPlugin
+FNDA:10,readLegacyOptions
+FNDA:0,(anonymous_3)
 FNDA:10,customizeMetroConfig
-DA:32,10
-DA:34,10
-DA:35,10
-DA:36,1
-DA:37,9
-DA:38,5
-DA:40,10
-DA:41,1
-DA:42,9
-DA:43,5
-DA:46,10
-DA:47,1
-DA:48,1
-DA:49,9
-DA:60,7
-DA:64,2
-DA:67,10
-DA:68,10
-LF:18
-LH:18
-BRDA:35,0,0,1
-BRDA:35,0,1,9
-BRDA:37,1,0,5
-BRDA:37,1,1,4
-BRDA:40,2,0,1
-BRDA:40,2,1,9
-BRDA:42,3,0,5
-BRDA:42,3,1,4
-BRDA:46,4,0,1
-BRDA:46,4,1,9
-BRDA:49,5,0,7
-BRDA:49,5,1,2
-BRF:12
-BRH:12
+FNDA:0,(anonymous_5)
+DA:25,21
+DA:26,21
+DA:28,0
+DA:33,21
+DA:34,21
+DA:42,10
+DA:43,10
+DA:45,10
+DA:46,0
+DA:47,0
+DA:50,10
+DA:51,0
+DA:52,0
+DA:55,10
+DA:56,0
+DA:57,0
+DA:61,10
+DA:62,10
+DA:65,0
+DA:72,0
+DA:73,0
+DA:76,0
+DA:78,0
+DA:104,10
+DA:106,10
+DA:110,10
+DA:112,10
+DA:113,10
+DA:114,0
+DA:120,0
+DA:122,0
+DA:123,0
+DA:124,0
+DA:125,0
+DA:128,0
+DA:129,0
+DA:130,0
+DA:131,0
+DA:134,0
+DA:135,0
+DA:136,0
+DA:139,10
+DA:140,10
+DA:141,21
+DA:144,21
+DA:145,21
+DA:147,12
+DA:148,12
+DA:151,9
+DA:152,9
+DA:155,0
+DA:160,10
+DA:161,1
+DA:163,1
+DA:164,9
+DA:175,7
+DA:179,2
+DA:182,10
+DA:183,10
+DA:185,1
+DA:187,9
+DA:188,9
+DA:190,0
+DA:191,0
+DA:192,0
+DA:195,0
+LF:66
+LH:36
+BRDA:34,0,0,21
+BRDA:34,0,1,6
+BRDA:45,1,0,0
+BRDA:45,1,1,10
+BRDA:50,2,0,0
+BRDA:50,2,1,10
+BRDA:55,3,0,0
+BRDA:55,3,1,10
+BRDA:61,4,0,10
+BRDA:61,4,1,0
+BRDA:72,5,0,0
+BRDA:72,5,1,0
+BRDA:113,6,0,0
+BRDA:113,6,1,10
+BRDA:122,7,0,0
+BRDA:122,7,1,0
+BRDA:124,8,0,0
+BRDA:124,8,1,0
+BRDA:128,9,0,0
+BRDA:128,9,1,0
+BRDA:130,10,0,0
+BRDA:130,10,1,0
+BRDA:134,11,0,0
+BRDA:134,11,1,0
+BRDA:139,12,0,10
+BRDA:139,12,1,1
+BRDA:141,13,0,2
+BRDA:141,13,1,19
+BRDA:145,14,0,12
+BRDA:145,14,1,9
+BRDA:145,14,2,0
+BRDA:160,15,0,1
+BRDA:160,15,1,9
+BRDA:164,16,0,7
+BRDA:164,16,1,2
+BRDA:183,17,0,1
+BRDA:183,17,1,9
+BRDA:183,17,2,0
+BRF:38
+BRH:19
 end_of_record
 TN:
 SF:src/bundle/defaultPlugins.ts
-FN:3,getDefaultBundlerPlugins
+FN:14,getDefaultBundlerPlugins
 FNF:1
 FNH:1
-FNDA:10,getDefaultBundlerPlugins
-DA:4,10
-LF:1
-LH:1
+FNDA:11,getDefaultBundlerPlugins
+DA:5,3
+DA:15,11
+LF:2
+LH:2
 BRF:0
 BRH:0
 end_of_record

package/lib/bundle/defaultPlugins.d.ts

@@ -1,3 +1,5 @@
-import type { BundlerPlugins } from "@rnx-kit/config";
-export declare function getDefaultBundlerPlugins(): Required<BundlerPlugins>;
+import type { BundleParameters } from "@rnx-kit/config";
+type DefaultPlugins = Pick<Required<BundleParameters>, "plugins" | "treeShake">;
+export declare function getDefaultBundlerPlugins(): DefaultPlugins;
+export {};
 //# sourceMappingURL=defaultPlugins.d.ts.map

package/lib/bundle/defaultPlugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultPlugins.d.ts","sourceRoot":"","sources":["../../src/bundle/defaultPlugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,wBAAgB,wBAAwB,IAAI,QAAQ,CAAC,cAAc,CAAC,CAOnE"}
+{"version":3,"file":"defaultPlugins.d.ts","sourceRoot":"","sources":["../../src/bundle/defaultPlugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,KAAK,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,GAAG,WAAW,CAAC,CAAC;AAWhF,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}

package/lib/bundle/defaultPlugins.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultBundlerPlugins = void 0;
+const defaultPlugins = {
+    plugins: [
+        "@rnx-kit/metro-plugin-cyclic-dependencies-detector",
+        "@rnx-kit/metro-plugin-duplicates-checker",
+        "@rnx-kit/metro-plugin-typescript",
+    ],
+    treeShake: false,
+};
 function getDefaultBundlerPlugins() {
-    return {
-        detectCyclicDependencies: true,
-        detectDuplicateDependencies: true,
-        typescriptValidation: true,
-        treeShake: false,
-    };
+    return defaultPlugins;
 }
 exports.getDefaultBundlerPlugins = getDefaultBundlerPlugins;
 //# sourceMappingURL=defaultPlugins.js.map

package/lib/bundle/defaultPlugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultPlugins.js","sourceRoot":"","sources":["../../src/bundle/defaultPlugins.ts"],"names":[],"mappings":";;;AAEA,SAAgB,wBAAwB;IACtC,OAAO;QACL,wBAAwB,EAAE,IAAI;QAC9B,2BAA2B,EAAE,IAAI;QACjC,oBAAoB,EAAE,IAAI;QAC1B,SAAS,EAAE,KAAK;KACjB,CAAC;AACJ,CAAC;AAPD,4DAOC"}
+{"version":3,"file":"defaultPlugins.js","sourceRoot":"","sources":["../../src/bundle/defaultPlugins.ts"],"names":[],"mappings":";;;AAIA,MAAM,cAAc,GAAmB;IACrC,OAAO,EAAE;QACP,oDAAoD;QACpD,0CAA0C;QAC1C,kCAAkC;KACnC;IACD,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,SAAgB,wBAAwB;IACtC,OAAO,cAAc,CAAC;AACxB,CAAC;AAFD,4DAEC"}

package/lib/bundle/types.d.ts

@@ -19,7 +19,7 @@ export type CLICommonBundleOptions = {
     resetCache?: boolean;
     config?: string;
 };
-export type CliPlatformBundleConfig = BundleParameters & Required<Pick<BundleParameters, "entryFile" | "bundleOutput" | "sourcemapUseAbsolutePath" | "detectCyclicDependencies" | "detectDuplicateDependencies" | "typescriptValidation" | "treeShake">> & {
+export type CliPlatformBundleConfig = BundleParameters & Required<Pick<BundleParameters, "entryFile" | "bundleOutput" | "sourcemapUseAbsolutePath" | "treeShake" | "plugins">> & {
     unstableTransformProfile?: TransformProfile;
     /**
      * Target platform for the bundle

package/lib/bundle/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/bundle/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,gBAAgB,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GACpD,QAAQ,CACN,IAAI,CACF,gBAAgB,EACd,WAAW,GACX,cAAc,GACd,0BAA0B,GAC1B,0BAA0B,GAC1B,6BAA6B,GAC7B,sBAAsB,GACtB,WAAW,CACd,CACF,GAAG;IACF,wBAAwB,CAAC,EAAE,gBAAgB,CAAC;IAE5C;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/bundle/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,gBAAgB,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GACpD,QAAQ,CACN,IAAI,CACF,gBAAgB,EACd,WAAW,GACX,cAAc,GACd,0BAA0B,GAC1B,WAAW,GACX,SAAS,CACZ,CACF,GAAG;IACF,wBAAwB,CAAC,EAAE,gBAAgB,CAAC;IAE5C;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB,CAAC"}

package/lib/metro-config.d.ts

@@ -1,11 +1,13 @@
-import type { BundlerPlugins } from "@rnx-kit/config";
+import type { BundleParameters } from "@rnx-kit/config";
 import type { InputConfigT } from "metro-config";
+type MetroExtraParams = Pick<BundleParameters, "detectCyclicDependencies" | "detectDuplicateDependencies" | "typescriptValidation" | "plugins" | "treeShake">;
 /**
  * Customize the Metro configuration.
  *
  * @param metroConfigReadonly Metro configuration
- * @param bundlerPlugins Plugins used to further customize Metro configuration
+ * @param extraParams Parameters used to further customize Metro configuration
  * @param print Optional function to use when printing status messages to the Metro console
  */
-export declare function customizeMetroConfig(metroConfigReadonly: InputConfigT, { detectCyclicDependencies, detectDuplicateDependencies, treeShake, typescriptValidation, }: BundlerPlugins, print?: (message: string) => void): void;
+export declare function customizeMetroConfig(metroConfigReadonly: InputConfigT, extraParams: MetroExtraParams, print?: (message: string) => void): void;
+export {};
 //# sourceMappingURL=metro-config.d.ts.map

package/lib/metro-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.d.ts","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAUtD,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AAEpE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,EACE,wBAAwB,EACxB,2BAA2B,EAC3B,SAAS,EACT,oBAAoB,GACrB,EAAE,cAAc,EACjB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,IAAI,CAwCN"}
+{"version":3,"file":"metro-config.d.ts","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWxD,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,cAAc,CAAC;AAGpE,KAAK,gBAAgB,GAAG,IAAI,CAC1B,gBAAgB,EACd,0BAA0B,GAC1B,6BAA6B,GAC7B,sBAAsB,GACtB,SAAS,GACT,WAAW,CACd,CAAC;AAoEF;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,YAAY,EACjC,WAAW,EAAE,gBAAgB,EAC7B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,IAAI,CAgGN"}

package/lib/metro-config.js

@@ -1,40 +1,128 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customizeMetroConfig = void 0;
+const console_1 = require("@rnx-kit/console");
 const metro_plugin_cyclic_dependencies_detector_1 = require("@rnx-kit/metro-plugin-cyclic-dependencies-detector");
 const metro_plugin_duplicates_checker_1 = require("@rnx-kit/metro-plugin-duplicates-checker");
 const metro_plugin_typescript_1 = require("@rnx-kit/metro-plugin-typescript");
 const metro_serializer_1 = require("@rnx-kit/metro-serializer");
 const metro_serializer_esbuild_1 = require("@rnx-kit/metro-serializer-esbuild");
+const defaultPlugins_1 = require("./bundle/defaultPlugins");
+function resolvePlugin(name) {
+    try {
+        return require.resolve(name);
+    }
+    catch (_) {
+        return require.resolve(name, { paths: [process.cwd()] });
+    }
+}
+function importPlugin(name) {
+    const plugin = require(resolvePlugin(name));
+    return plugin.default || plugin;
+}
+function readLegacyOptions({ detectCyclicDependencies, detectDuplicateDependencies, typescriptValidation, }) {
+    const oldOptions = [];
+    const deprecatedOptions = {};
+    if (detectCyclicDependencies) {
+        oldOptions.push("detectCyclicDependencies");
+        deprecatedOptions["@rnx-kit/metro-plugin-cyclic-dependencies-detector"] =
+            detectCyclicDependencies;
+    }
+    if (detectDuplicateDependencies) {
+        oldOptions.push("detectDuplicateDependencies");
+        deprecatedOptions["@rnx-kit/metro-plugin-duplicates-checker"] =
+            detectDuplicateDependencies;
+    }
+    if (typescriptValidation) {
+        oldOptions.push("typescriptValidation");
+        deprecatedOptions["@rnx-kit/metro-plugin-typescript"] =
+            typescriptValidation;
+    }
+    if (oldOptions.length === 0) {
+        return undefined;
+    }
+    return (`'${oldOptions.join("', '")}' have been replaced by a new 'plugins' ` +
+        "option. Below is an equivalent config:\n" +
+        "\n" +
+        '    "plugins": [\n' +
+        Object.entries(deprecatedOptions)
+            .map(([name, options]) => {
+            if (typeof options === "object") {
+                const json = JSON.stringify(options, null, 2)
+                    .split("\n")
+                    .join("\n      ");
+                return `      ["${name}", ${json}]`;
+            }
+            else {
+                return `      "${name}"`;
+            }
+        })
+            .join(",\n") +
+        "\n" +
+        "    ]\n" +
+        "\n" +
+        "For more details, see " +
+        "https://github.com/microsoft/rnx-kit/tree/main/packages/cli#readme");
+}
 /**
  * Customize the Metro configuration.
  *
  * @param metroConfigReadonly Metro configuration
- * @param bundlerPlugins Plugins used to further customize Metro configuration
+ * @param extraParams Parameters used to further customize Metro configuration
  * @param print Optional function to use when printing status messages to the Metro console
  */
-function customizeMetroConfig(metroConfigReadonly, { detectCyclicDependencies, detectDuplicateDependencies, treeShake, typescriptValidation, }, print) {
-    //  We will be making changes to the Metro configuration. Coerce from a
-    //  type with readonly props to a type where the props are writeable.
+function customizeMetroConfig(metroConfigReadonly, extraParams, print) {
+    // We will be making changes to the Metro configuration. Coerce from a type
+    // with readonly props to a type where the props are writeable.
     const metroConfig = metroConfigReadonly;
-    const plugins = [];
-    if (typeof detectDuplicateDependencies === "object") {
-        plugins.push((0, metro_plugin_duplicates_checker_1.DuplicateDependencies)(detectDuplicateDependencies));
-    }
-    else if (detectDuplicateDependencies !== false) {
-        plugins.push((0, metro_plugin_duplicates_checker_1.DuplicateDependencies)());
+    const metroPlugins = [];
+    const serializerHooks = {};
+    const legacyWarning = readLegacyOptions(extraParams);
+    if (legacyWarning) {
+        (0, console_1.warn)(legacyWarning);
+        const { detectCyclicDependencies, detectDuplicateDependencies, typescriptValidation, } = extraParams;
+        if (typeof detectDuplicateDependencies === "object") {
+            metroPlugins.push((0, metro_plugin_duplicates_checker_1.DuplicateDependencies)(detectDuplicateDependencies));
+        }
+        else if (detectDuplicateDependencies !== false) {
+            metroPlugins.push((0, metro_plugin_duplicates_checker_1.DuplicateDependencies)());
+        }
+        if (typeof detectCyclicDependencies === "object") {
+            metroPlugins.push((0, metro_plugin_cyclic_dependencies_detector_1.CyclicDependencies)(detectCyclicDependencies));
+        }
+        else if (detectCyclicDependencies !== false) {
+            metroPlugins.push((0, metro_plugin_cyclic_dependencies_detector_1.CyclicDependencies)());
+        }
+        if (typescriptValidation !== false) {
+            const plugin = (0, metro_plugin_typescript_1.TypeScriptPlugin)(typescriptValidation, print);
+            serializerHooks["@rnx-kit/metro-plugin-typescript"] = plugin;
+        }
     }
-    if (typeof detectCyclicDependencies === "object") {
-        plugins.push((0, metro_plugin_cyclic_dependencies_detector_1.CyclicDependencies)(detectCyclicDependencies));
-    }
-    else if (detectCyclicDependencies !== false) {
-        plugins.push((0, metro_plugin_cyclic_dependencies_detector_1.CyclicDependencies)());
+    else {
+        const plugins = extraParams.plugins || (0, defaultPlugins_1.getDefaultBundlerPlugins)().plugins;
+        for (const entry of plugins) {
+            const [module, options] = Array.isArray(entry)
+                ? entry
+                : [entry, undefined];
+            const plugin = importPlugin(module);
+            switch (plugin.type) {
+                case "serializer":
+                    metroPlugins.push(plugin(options));
+                    break;
+                case "serializerHook":
+                    serializerHooks[module] = plugin(options, print);
+                    break;
+                default:
+                    throw new Error(`${module}: unknown plugin type: ${plugin.type}`);
+            }
+        }
     }
-    if (treeShake) {
-        metroConfig.serializer.customSerializer = (0, metro_serializer_esbuild_1.MetroSerializer)(plugins);
+    if (extraParams.treeShake) {
+        metroConfig.serializer.customSerializer =
+            (0, metro_serializer_esbuild_1.MetroSerializer)(metroPlugins);
         Object.assign(metroConfig.transformer, metro_serializer_esbuild_1.esbuildTransformerConfig);
     }
-    else if (plugins.length > 0) {
+    else if (metroPlugins.length > 0) {
         // MetroSerializer acts as a CustomSerializer, and it works with both
         // older and newer versions of Metro. Older versions expect a return
         // value, while newer versions expect a promise.
@@ -45,13 +133,26 @@ function customizeMetroConfig(metroConfigReadonly, { detectCyclicDependencies, d
         //
         // Since it can handle either scenario, just coerce it to whatever
         // the current version of Metro expects.
-        metroConfig.serializer.customSerializer = (0, metro_serializer_1.MetroSerializer)(plugins);
+        metroConfig.serializer.customSerializer = (0, metro_serializer_1.MetroSerializer)(metroPlugins);
     }
     else {
         delete metroConfig.serializer.customSerializer;
     }
-    const hook = (0, metro_plugin_typescript_1.TypeScriptPlugin)(typescriptValidation, print);
-    metroConfig.serializer.experimentalSerializerHook = hook;
+    const hooks = Object.values(serializerHooks);
+    switch (hooks.length) {
+        case 0:
+            break;
+        case 1:
+            metroConfig.serializer.experimentalSerializerHook = hooks[0];
+            break;
+        default:
+            metroConfig.serializer.experimentalSerializerHook = (graph, delta) => {
+                for (const hook of hooks) {
+                    hook(graph, delta);
+                }
+            };
+            break;
+    }
 }
 exports.customizeMetroConfig = customizeMetroConfig;
 //# sourceMappingURL=metro-config.js.map

package/lib/metro-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":";;;AACA,kHAAwF;AACxF,8FAAiF;AACjF,8EAAoE;AAEpE,gEAA4D;AAC5D,gFAG2C;AAG3C;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,mBAAiC,EACjC,EACE,wBAAwB,EACxB,2BAA2B,EAC3B,SAAS,EACT,oBAAoB,GACL,EACjB,KAAiC;IAEjC,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,WAAW,GAAG,mBAAmC,CAAC;IAExD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,IAAI,OAAO,2BAA2B,KAAK,QAAQ,EAAE;QACnD,OAAO,CAAC,IAAI,CAAC,IAAA,uDAAqB,EAAC,2BAA2B,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,2BAA2B,KAAK,KAAK,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,IAAA,uDAAqB,GAAE,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,wBAAwB,KAAK,QAAQ,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,IAAA,8DAAkB,EAAC,wBAAwB,CAAC,CAAC,CAAC;KAC5D;SAAM,IAAI,wBAAwB,KAAK,KAAK,EAAE;QAC7C,OAAO,CAAC,IAAI,CAAC,IAAA,8DAAkB,GAAE,CAAC,CAAC;KACpC;IAED,IAAI,SAAS,EAAE;QACb,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,mDAAwB,CAAC,CAAC;KAClE;SAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,qEAAqE;QACrE,oEAAoE;QACpE,gDAAgD;QAChD,EAAE;QACF,kEAAkE;QAClE,sEAAsE;QACtE,mCAAmC;QACnC,EAAE;QACF,kEAAkE;QAClE,wCAAwC;QACxC,WAAW,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAA,kCAAe,EACvD,OAAO,CACiC,CAAC;KAC5C;SAAM;QACL,OAAO,WAAW,CAAC,UAAU,CAAC,gBAAgB,CAAC;KAChD;IAED,MAAM,IAAI,GAAG,IAAA,0CAAgB,EAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC3D,WAAW,CAAC,UAAU,CAAC,0BAA0B,GAAG,IAAI,CAAC;AAC3D,CAAC;AAjDD,oDAiDC"}
+{"version":3,"file":"metro-config.js","sourceRoot":"","sources":["../src/metro-config.ts"],"names":[],"mappings":"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"}

package/lib/serve/kit-config.d.ts

@@ -1,10 +1,13 @@
-import type { ServerConfig, BundlerPlugins } from "@rnx-kit/config";
-export type ServerConfigOverrides = {
+import type { ServerConfig } from "@rnx-kit/config";
+type ServerConfigOverrides = {
     projectRoot?: string;
     assetPlugins?: string[];
     sourceExts?: string[];
 };
-export type CliServerConfig = ServerConfig & Required<BundlerPlugins>;
+type CliServerConfig = ServerConfig & {
+    plugins: Required<ServerConfig>["plugins"];
+    treeShake: false;
+};
 /**
  * Get the server configuration from the rnx-kit configuration. Apply any overrides.
  *
@@ -12,4 +15,5 @@ export type CliServerConfig = ServerConfig & Required<BundlerPlugins>;
  * @returns Server configuration
  */
 export declare function getKitServerConfig(overrides: ServerConfigOverrides): CliServerConfig;
+export {};
 //# sourceMappingURL=kit-config.d.ts.map

package/lib/serve/kit-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kit-config.d.ts","sourceRoot":"","sources":["../../src/serve/kit-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAKpE,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEtE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,qBAAqB,GAC/B,eAAe,CAqBjB"}
+{"version":3,"file":"kit-config.d.ts","sourceRoot":"","sources":["../../src/serve/kit-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKpD,KAAK,qBAAqB,GAAG;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,KAAK,eAAe,GAAG,YAAY,GAAG;IACpC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3C,SAAS,EAAE,KAAK,CAAC;CAClB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,qBAAqB,GAC/B,eAAe,CAqBjB"}

package/lib/serve/kit-config.js

@@ -20,7 +20,7 @@ function getKitServerConfig(overrides) {
                 "detectCyclicDependencies",
                 "detectDuplicateDependencies",
                 "typescriptValidation",
-                //"treeShake",  // don't pull in treeShake yet, since it doesn't work with the server
+                "plugins",
             ]);
         }
     }

package/lib/serve/kit-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"kit-config.js","sourceRoot":"","sources":["../../src/serve/kit-config.ts"],"names":[],"mappings":";;;AACA,4CAAgE;AAChE,mEAAgE;AAChE,6DAAoE;AAUpE;;;;;GAKG;AACH,SAAgB,kBAAkB,CAChC,SAAgC;IAEhC,MAAM,SAAS,GAAG,IAAA,qBAAY,GAAE,CAAC;IACjC,IAAI,YAAY,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC;IACrC,IAAI,CAAC,YAAY,IAAI,SAAS,EAAE;QAC9B,MAAM,iBAAiB,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,CAAC;QACrD,IAAI,iBAAiB,EAAE;YACrB,YAAY,GAAG,IAAA,uBAAU,EAAC,iBAAiB,EAAE;gBAC3C,0BAA0B;gBAC1B,6BAA6B;gBAC7B,sBAAsB;gBACtB,qFAAqF;aACtF,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,GAAG,IAAA,yCAAwB,GAAE;QAC7B,GAAG,YAAY;QACf,SAAS,EAAE,KAAK;QAChB,GAAG,IAAA,uBAAU,EAAC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;KACxE,CAAC;AACJ,CAAC;AAvBD,gDAuBC"}
+{"version":3,"file":"kit-config.js","sourceRoot":"","sources":["../../src/serve/kit-config.ts"],"names":[],"mappings":";;;AACA,4CAAgE;AAChE,mEAAgE;AAChE,6DAAoE;AAapE;;;;;GAKG;AACH,SAAgB,kBAAkB,CAChC,SAAgC;IAEhC,MAAM,SAAS,GAAG,IAAA,qBAAY,GAAE,CAAC;IACjC,IAAI,YAAY,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC;IACrC,IAAI,CAAC,YAAY,IAAI,SAAS,EAAE;QAC9B,MAAM,iBAAiB,GAAG,IAAA,wBAAe,EAAC,SAAS,CAAC,CAAC;QACrD,IAAI,iBAAiB,EAAE;YACrB,YAAY,GAAG,IAAA,uBAAU,EAAC,iBAAiB,EAAE;gBAC3C,0BAA0B;gBAC1B,6BAA6B;gBAC7B,sBAAsB;gBACtB,SAAS;aACV,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,GAAG,IAAA,yCAAwB,GAAE;QAC7B,GAAG,YAAY;QACf,SAAS,EAAE,KAAK;QAChB,GAAG,IAAA,uBAAU,EAAC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;KACxE,CAAC;AACJ,CAAC;AAvBD,gDAuBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.15.4",
+  "version": "0.16.0",
   "description": "Command-line interface for working with kit packages in your repo",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli",
   "license": "MIT",
@@ -20,11 +20,11 @@
   },
   "dependencies": {
     "@rnx-kit/align-deps": "^2.0.1",
-    "@rnx-kit/config": "^0.5.2",
+    "@rnx-kit/config": "^0.6.0",
     "@rnx-kit/console": "^1.0.11",
-    "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.0.21",
-    "@rnx-kit/metro-plugin-duplicates-checker": "^2.0.0",
-    "@rnx-kit/metro-plugin-typescript": "^0.2.0",
+    "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.0",
+    "@rnx-kit/metro-plugin-duplicates-checker": "^2.1.0",
+    "@rnx-kit/metro-plugin-typescript": "^0.3.0",
     "@rnx-kit/metro-serializer": "^1.0.11",
     "@rnx-kit/metro-serializer-esbuild": "^0.1.18",
     "@rnx-kit/metro-service": "^3.0.2",
@@ -59,7 +59,6 @@
     "@types/metro-config": "^0.66.0",
     "@types/qrcode": "^1.4.2",
     "jest": "^27.0.0",
-    "jest-extended": "^2.0.0",
     "memfs": "^3.4.1",
     "metro-config": "^0.67.0"
   },
@@ -75,9 +74,6 @@
     "extends": "@rnx-kit/eslint-config"
   },
   "jest": {
-    "preset": "@rnx-kit/scripts",
-    "setupFilesAfterEnv": [
-      "jest-extended/all"
-    ]
+    "preset": "@rnx-kit/scripts"
   }
 }

package/src/bundle/defaultPlugins.ts

@@ -1,10 +1,16 @@
-import type { BundlerPlugins } from "@rnx-kit/config";
+import type { BundleParameters } from "@rnx-kit/config";
 
-export function getDefaultBundlerPlugins(): Required<BundlerPlugins> {
-  return {
-    detectCyclicDependencies: true,
-    detectDuplicateDependencies: true,
-    typescriptValidation: true,
-    treeShake: false,
-  };
+type DefaultPlugins = Pick<Required<BundleParameters>, "plugins" | "treeShake">;
+
+const defaultPlugins: DefaultPlugins = {
+  plugins: [
+    "@rnx-kit/metro-plugin-cyclic-dependencies-detector",
+    "@rnx-kit/metro-plugin-duplicates-checker",
+    "@rnx-kit/metro-plugin-typescript",
+  ],
+  treeShake: false,
+};
+
+export function getDefaultBundlerPlugins(): DefaultPlugins {
+  return defaultPlugins;
 }

package/src/bundle/types.ts

@@ -28,10 +28,8 @@ export type CliPlatformBundleConfig = BundleParameters &
       | "entryFile"
       | "bundleOutput"
       | "sourcemapUseAbsolutePath"
-      | "detectCyclicDependencies"
-      | "detectDuplicateDependencies"
-      | "typescriptValidation"
       | "treeShake"
+      | "plugins"
     >
   > & {
     unstableTransformProfile?: TransformProfile;