@rnx-kit/cli 0.12.1 → 0.12.4

package/test/__mocks__/fs-extra.js

@@ -14,7 +14,9 @@ fs.__toJSON = () => vol.toJSON();
 
 fs.copy = (...args) => vol.promises.copyFile(...args);
 fs.ensureDir = (dir) => vol.promises.mkdir(dir, { recursive: true });
+fs.existsSync = (...args) => vol.existsSync(...args);
 fs.pathExists = (...args) => Promise.resolve(vol.existsSync(...args));
 fs.readFile = (...args) => vol.promises.readFile(...args);
+fs.writeFile = (...args) => vol.promises.writeFile(...args);
 
 module.exports = fs;

package/test/__mocks__/fs.js

@@ -0,0 +1,19 @@
+const fs = jest.createMockFromModule("fs");
+
+const { vol } = require("memfs");
+
+/** @type {(newMockFiles: { [filename: string]: string }) => void} */
+fs.__setMockFiles = (files) => {
+  vol.reset();
+  vol.fromJSON(files);
+};
+
+fs.__toJSON = () => vol.toJSON();
+
+fs.lstat = (...args) => Promise.resolve(vol.lstat(...args));
+fs.lstatSync = (...args) => vol.lstatSync(...args);
+fs.readFileSync = (...args) => vol.readFileSync(...args);
+fs.stat = (...args) => Promise.resolve(vol.stat(...args));
+fs.statSync = (...args) => vol.statSync(...args);
+
+module.exports = fs;

package/test/bundle/kit-config.test.ts

@@ -80,7 +80,7 @@ describe("CLI > Bundle > Kit Config > getKitBundleConfigs", () => {
     detectCyclicDependencies: true,
     detectDuplicateDependencies: true,
     typescriptValidation: true,
-    experimental_treeShake: true,
+    treeShake: true,
     targets: ["ios", "android"],
     platforms: {
       ios: {
@@ -123,4 +123,26 @@ describe("CLI > Bundle > Kit Config > getKitBundleConfigs", () => {
       platform: "android",
     });
   });
+
+  test("uses deprecated experimental_treeShake", () => {
+    const d: Record<string, unknown> = { ...definition };
+    delete d.treeShake;
+    d.experimental_treeShake = true;
+    rnxKitConfig.__setMockConfig({
+      bundle: {
+        ...d,
+      },
+    });
+    consoleWarnSpy.mockReset();
+
+    const kitBundleConfigs = getKitBundleConfigs(undefined, "ios");
+    expect(kitBundleConfigs[0].treeShake).toBe(true);
+    expect(consoleWarnSpy).toBeCalledTimes(1);
+    expect(consoleWarnSpy).toBeCalledWith(
+      expect.stringContaining("deprecated")
+    );
+    expect(consoleWarnSpy).toBeCalledWith(
+      expect.stringContaining("experimental_treeShake")
+    );
+  });
 });

package/test/bundle/metro.test.ts

@@ -8,7 +8,7 @@ describe("CLI > Bundle > Metro > createMetroBundleArgs", () => {
     detectCyclicDependencies: true,
     detectDuplicateDependencies: true,
     typescriptValidation: true,
-    experimental_treeShake: true,
+    treeShake: true,
     entryPath: "out/entry.js",
     distPath: "out",
     assetsPath: "out/assets",

package/test/bundle/overrides.test.ts

@@ -7,7 +7,7 @@ describe("CLI > Bundle > Overrides > applyKitBundleConfigOverrides", () => {
     detectCyclicDependencies: true,
     detectDuplicateDependencies: true,
     typescriptValidation: true,
-    experimental_treeShake: true,
+    treeShake: true,
     entryPath: "dist/index.js",
     distPath: "dist",
     assetsPath: "dist",
@@ -63,17 +63,7 @@ describe("CLI > Bundle > Overrides > applyKitBundleConfigOverrides", () => {
     testOverride("sourcemapSourcesRoot", "out");
   });
 
-  test("set experimental_treeShake using override experimentalTreeShake", () => {
-    const copy = { ...config };
-    applyKitBundleConfigOverrides(
-      {
-        experimentalTreeShake: true,
-      },
-      [copy]
-    );
-    expect(copy).toEqual({
-      ...config,
-      experimental_treeShake: true,
-    });
+  test("changes treeShake using an override", () => {
+    testOverride("treeShake", true);
   });
 });

package/test/copy-assets/assembleAarBundle.test.ts

@@ -0,0 +1,306 @@
+import { spawnSync } from "child_process";
+import * as path from "path";
+import { findFiles, mockFiles } from "./helpers";
+import { assembleAarBundle } from "../../src/copy-assets";
+
+jest.mock("child_process");
+jest.mock("fs");
+
+export const options = {
+  platform: "android" as const,
+  assetsDest: "dist",
+  bundleAar: true,
+};
+
+export const context = {
+  projectRoot: path.resolve(__dirname, "..", ".."),
+  manifest: {
+    name: "@rnx-kit/cli",
+    version: "0.0.0-dev",
+  },
+  options,
+};
+
+describe("assembleAarBundle", () => {
+  const consoleWarnSpy = jest.spyOn(global.console, "warn");
+
+  afterEach(() => {
+    mockFiles();
+    consoleWarnSpy.mockReset();
+    spawnSync.mockReset();
+  });
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  test("returns early if there is nothing to assemble", async () => {
+    await assembleAarBundle(context, context.manifest.name, {});
+
+    expect(consoleWarnSpy).not.toHaveBeenCalled();
+    expect(findFiles()).toEqual([]);
+  });
+
+  test("returns early if Gradle wrapper cannot be found", async () => {
+    await assembleAarBundle(context, context.manifest.name, { aar: {} });
+
+    expect(consoleWarnSpy).toHaveBeenCalledWith(
+      expect.anything(),
+      expect.stringMatching(/cannot find `gradlew`$/)
+    );
+    expect(spawnSync).not.toHaveBeenCalled();
+    expect(findFiles()).toEqual([]);
+  });
+
+  test("throws if target package cannot be found", async () => {
+    mockFiles({
+      gradlew: "",
+      "gradlew.bat": "",
+    });
+
+    expect(
+      assembleAarBundle(context, context.manifest.name, { aar: {} })
+    ).rejects.toThrow();
+    expect(findFiles()).toEqual([
+      [expect.stringMatching(/[/\\]gradlew$/), ""],
+      [expect.stringMatching(/[/\\]gradlew.bat$/), ""],
+    ]);
+  });
+
+  test("returns early if Gradle project cannot be found", async () => {
+    mockFiles({
+      gradlew: "",
+      "gradlew.bat": "",
+      "node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
+        version: "0.0.0-dev",
+      }),
+    });
+
+    await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
+
+    expect(consoleWarnSpy).toHaveBeenCalledWith(
+      expect.anything(),
+      expect.stringMatching(/cannot find `build.gradle`/)
+    );
+    expect(spawnSync).not.toHaveBeenCalled();
+    expect(findFiles()).toEqual([
+      [expect.stringMatching(/[/\\]gradlew$/), ""],
+      [expect.stringMatching(/[/\\]gradlew.bat$/), ""],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
+        ),
+        JSON.stringify({ version: "0.0.0-dev" }),
+      ],
+    ]);
+  });
+
+  test("generates Android project if necessary", async () => {
+    mockFiles({
+      gradlew: "",
+      "gradlew.bat": "",
+      "node_modules/@rnx-kit/react-native-auth/android/build.gradle":
+        "build.gradle",
+      "node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
+        "rnx-kit_react-native-auth-release.aar",
+      "node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
+        version: "0.0.0-dev",
+      }),
+      "node_modules/react-native/package.json": JSON.stringify({
+        version: "1000.0.0-dev",
+      }),
+    });
+
+    await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
+
+    expect(consoleWarnSpy).not.toHaveBeenCalled();
+    expect(spawnSync).toHaveBeenCalledWith(
+      expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
+      [":rnx-kit_react-native-auth:assembleRelease"],
+      expect.objectContaining({
+        cwd: expect.stringMatching(
+          /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth$/
+        ),
+      })
+    );
+    expect(findFiles()).toEqual([
+      [expect.stringMatching(/[/\\]gradlew$/), ""],
+      [expect.stringMatching(/[/\\]gradlew.bat$/), ""],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build.gradle$/
+        ),
+        "build.gradle",
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build[/\\]outputs[/\\]aar[/\\]rnx-kit_react-native-auth-release.aar$/
+        ),
+        "rnx-kit_react-native-auth-release.aar",
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
+        ),
+        JSON.stringify({ version: "0.0.0-dev" }),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]react-native[/\\]package.json$/
+        ),
+        JSON.stringify({ version: "1000.0.0-dev" }),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]build.gradle$/
+        ),
+        expect.stringMatching(/^buildscript/),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]gradle.properties/
+        ),
+        expect.stringMatching(/^android.useAndroidX=true/),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]settings.gradle$/
+        ),
+        expect.stringMatching(
+          /include\(":rnx-kit_react-native-auth"\)\nproject\(":rnx-kit_react-native-auth"\).projectDir = file\(".*?[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android"\)/
+        ),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]dist[/\\]aar[/\\]rnx-kit_react-native-auth-0.0.0-dev.aar$/
+        ),
+        "rnx-kit_react-native-auth-release.aar",
+      ],
+    ]);
+  });
+
+  test("assembles Android archive using existing project", async () => {
+    mockFiles({
+      gradlew: "",
+      "gradlew.bat": "",
+      "node_modules/@rnx-kit/react-native-auth/android/build.gradle":
+        "build.gradle",
+      "node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
+        "rnx-kit_react-native-auth-release.aar",
+      "node_modules/@rnx-kit/react-native-auth/android/settings.gradle":
+        "settings.gradle",
+      "node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
+        version: "0.0.0-dev",
+      }),
+      "node_modules/react-native/package.json": JSON.stringify({
+        version: "1000.0.0-dev",
+      }),
+    });
+
+    await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
+
+    expect(consoleWarnSpy).not.toHaveBeenCalled();
+    expect(spawnSync).toHaveBeenCalledWith(
+      expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
+      [":rnx-kit_react-native-auth:assembleRelease"],
+      expect.objectContaining({
+        cwd: expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android$/
+        ),
+      })
+    );
+    expect(findFiles()).toEqual([
+      [expect.stringMatching(/[/\\]gradlew$/), ""],
+      [expect.stringMatching(/[/\\]gradlew.bat$/), ""],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build.gradle$/
+        ),
+        "build.gradle",
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build[/\\]outputs[/\\]aar[/\\]rnx-kit_react-native-auth-release.aar$/
+        ),
+        "rnx-kit_react-native-auth-release.aar",
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]settings.gradle$/
+        ),
+        "settings.gradle",
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
+        ),
+        JSON.stringify({ version: "0.0.0-dev" }),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]node_modules[/\\]react-native[/\\]package.json$/
+        ),
+        JSON.stringify({ version: "1000.0.0-dev" }),
+      ],
+      [
+        expect.stringMatching(
+          /[/\\]dist[/\\]aar[/\\]rnx-kit_react-native-auth-0.0.0-dev.aar$/
+        ),
+        "rnx-kit_react-native-auth-release.aar",
+      ],
+    ]);
+  });
+
+  test("allows the generated Android project to be configured", async () => {
+    mockFiles({
+      gradlew: "",
+      "gradlew.bat": "",
+      "node_modules/@rnx-kit/react-native-auth/android/build.gradle":
+        "build.gradle",
+      "node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
+        "rnx-kit_react-native-auth-release.aar",
+      "node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
+        version: "0.0.0-dev",
+      }),
+      "node_modules/react-native/package.json": JSON.stringify({
+        version: "1000.0.0-dev",
+      }),
+    });
+
+    await assembleAarBundle(context, "@rnx-kit/react-native-auth", {
+      aar: {
+        android: {
+          androidPluginVersion: "7.1.3",
+          compileSdkVersion: 31,
+          defaultConfig: {
+            minSdkVersion: 26,
+            targetSdkVersion: 30,
+          },
+        },
+      },
+    });
+
+    expect(consoleWarnSpy).not.toHaveBeenCalled();
+    expect(spawnSync).toHaveBeenCalledWith(
+      expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
+      [":rnx-kit_react-native-auth:assembleRelease"],
+      expect.objectContaining({
+        cwd: expect.stringMatching(
+          /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth$/
+        ),
+      })
+    );
+    expect(findFiles()).toEqual(
+      expect.arrayContaining([
+        [
+          expect.stringMatching(
+            /[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]build.gradle$/
+          ),
+          expect.stringMatching(
+            /compileSdkVersion = 31\s+minSdkVersion = 26\s+targetSdkVersion = 30\s+androidPluginVersion = "7\.1\.3"/
+          ),
+        ],
+      ])
+    );
+  });
+});

package/test/{copy-assets.test.ts → copy-assets/copyAssets.test.ts}

@@ -1,6 +1,6 @@
-import fs from "fs-extra";
 import * as path from "path";
-import { copyAssets, gatherConfigs, versionOf } from "../src/copy-assets";
+import { findFiles, mockFiles } from "./helpers";
+import { copyAssets, gatherConfigs, versionOf } from "../../src/copy-assets";
 
 const options = {
   platform: "ios" as const,
@@ -10,7 +10,7 @@ const options = {
 };
 
 const context = {
-  projectRoot: path.resolve(__dirname, ".."),
+  projectRoot: path.resolve(__dirname, "..", ".."),
   manifest: {
     name: "@rnx-kit/cli",
     version: "0.0.0-dev",
@@ -18,16 +18,6 @@ const context = {
   options,
 };
 
-function findFiles() {
-  // @ts-ignore `__toJSON`
-  return Object.entries(fs.__toJSON());
-}
-
-function mockFiles(files: Record<string, string> = {}) {
-  // @ts-ignore `__setMockFiles`
-  fs.__setMockFiles(files);
-}
-
 describe("copyAssets", () => {
   afterEach(() => {
     mockFiles();

package/test/copy-assets/helpers.ts

@@ -0,0 +1,13 @@
+// istanbul ignore file
+
+import * as fs from "fs-extra";
+
+export function findFiles() {
+  // @ts-ignore `__toJSON`
+  return Object.entries(fs.__toJSON());
+}
+
+export function mockFiles(files: Record<string, string> = {}) {
+  // @ts-ignore `__setMockFiles`
+  fs.__setMockFiles(files);
+}