Merge pull request #16 from BlackishGreen33/bg/plugin/explicit-config-passing

refactor(plugin): replace global config state with explicit internal config passing

Author: konodioda727

plugin/__tests__/nativeAndroidMods.test.ts

@@ -1,3 +1,5 @@
+import { compileModsAsync } from 'expo/config-plugins';
+import withJPush from '../src';
 import {
   ANDROID_MANIFEST_PATH,
   APP_BUILD_GRADLE_PATH,
@@ -9,6 +11,7 @@ import {
   readFixtureFile,
   registerAndroidFixtureLifecycleHooks,
 } from './androidFixture';
+import { createExpoConfig, createPluginProps } from './testProps';
 
 registerAndroidFixtureLifecycleHooks();
 
@@ -201,4 +204,96 @@ describe('native Android config mods', () => {
       )
     ).toBe(1);
   });
+
+  it('keeps Android config values isolated across independently configured plugin instances', async () => {
+    const projectRootA = createProjectRoot();
+    const projectRootB = createProjectRoot();
+    const configA = withJPush(
+      createExpoConfig(),
+      createPluginProps({ packageName: 'com.example.alpha' })
+    );
+    const configB = withJPush(
+      createExpoConfig(),
+      createPluginProps({
+        packageName: 'com.example.beta',
+        vendorChannels: { huawei: { enabled: true } },
+      })
+    );
+
+    await compileModsAsync(configA, {
+      projectRoot: projectRootA,
+      platforms: ['android'],
+    });
+    await compileModsAsync(configB, {
+      projectRoot: projectRootB,
+      platforms: ['android'],
+    });
+
+    const appBuildGradleA = readFixtureFile(projectRootA, APP_BUILD_GRADLE_PATH);
+    const appBuildGradleB = readFixtureFile(projectRootB, APP_BUILD_GRADLE_PATH);
+    const gradlePropertiesA = readFixtureFile(
+      projectRootA,
+      GRADLE_PROPERTIES_PATH
+    );
+    const gradlePropertiesB = readFixtureFile(
+      projectRootB,
+      GRADLE_PROPERTIES_PATH
+    );
+
+    expect(appBuildGradleA).toContain('"com.example.alpha"');
+    expect(appBuildGradleA).not.toContain(
+      "implementation 'com.huawei.hms:push:6.13.0.300'"
+    );
+    expect(gradlePropertiesA).not.toContain('apmsInstrumentationEnabled=false');
+
+    expect(appBuildGradleB).toContain('"com.example.beta"');
+    expect(appBuildGradleB).toContain(
+      "implementation 'com.huawei.hms:push:6.13.0.300'"
+    );
+    expect(gradlePropertiesB).toContain('apmsInstrumentationEnabled=false');
+  });
+
+  it('does not inject Huawei or FCM integrations when their enabled flags are false', async () => {
+    const projectRoot = createProjectRoot();
+
+    await compileAndroidMods(projectRoot, {
+      vendorChannels: {
+        huawei: { enabled: false },
+        fcm: { enabled: false },
+      },
+    });
+
+    const appBuildGradle = readFixtureFile(projectRoot, APP_BUILD_GRADLE_PATH);
+    const projectBuildGradle = readFixtureFile(
+      projectRoot,
+      PROJECT_BUILD_GRADLE_PATH
+    );
+    const gradleProperties = readFixtureFile(
+      projectRoot,
+      GRADLE_PROPERTIES_PATH
+    );
+
+    expect(appBuildGradle).not.toContain(
+      "implementation 'com.huawei.hms:push:6.13.0.300'"
+    );
+    expect(appBuildGradle).not.toContain(
+      "implementation 'com.google.firebase:firebase-messaging:24.1.0'"
+    );
+    expect(appBuildGradle).not.toContain(
+      "apply plugin: 'com.google.gms.google-services'"
+    );
+    expect(appBuildGradle).not.toContain(
+      "apply plugin: 'com.huawei.agconnect'"
+    );
+    expect(projectBuildGradle).not.toContain(
+      "classpath 'com.google.gms:google-services:4.4.0'"
+    );
+    expect(projectBuildGradle).not.toContain(
+      "classpath 'com.huawei.agconnect:agcp:1.9.3.302'"
+    );
+    expect(projectBuildGradle).not.toContain(
+      "maven { url 'https://developer.huawei.com/repo/' }"
+    );
+    expect(gradleProperties).not.toContain('apmsInstrumentationEnabled=false');
+  });
 });

plugin/__tests__/nativeIosMods.test.ts

@@ -1,4 +1,6 @@
 import * as fs from 'fs';
+import { compileModsAsync } from 'expo/config-plugins';
+import withJPush from '../src';
 import {
   APP_BRIDGING_HEADER_PATH,
   J_PUSH_IMPORTS,
@@ -13,6 +15,7 @@ import {
   removeBridgingHeaderBuildSetting,
   writeInfoPlist,
 } from './iosFixture';
+import { createExpoConfig, createPluginProps } from './testProps';
 
 registerIosFixtureLifecycleHooks();
 
@@ -124,4 +127,34 @@ describe('native iOS config mods', () => {
       )
     ).toBe(true);
   });
+
+  it('keeps iOS Info.plist values isolated across independently configured plugin instances', async () => {
+    const projectRootA = createProjectRoot();
+    const projectRootB = createProjectRoot();
+    const configA = withJPush(
+      createExpoConfig(),
+      createPluginProps({ appKey: 'ios-a', channel: 'chan-a' })
+    );
+    const configB = withJPush(
+      createExpoConfig(),
+      createPluginProps({ appKey: 'ios-b', channel: 'chan-b' })
+    );
+
+    await compileModsAsync(configA, {
+      projectRoot: projectRootA,
+      platforms: ['ios'],
+    });
+    await compileModsAsync(configB, {
+      projectRoot: projectRootB,
+      platforms: ['ios'],
+    });
+
+    const infoPlistA = readInfoPlist(projectRootA);
+    const infoPlistB = readInfoPlist(projectRootB);
+
+    expect(infoPlistA.JPUSH_APPKEY).toBe('ios-a');
+    expect(infoPlistA.JPUSH_CHANNEL).toBe('chan-a');
+    expect(infoPlistB.JPUSH_APPKEY).toBe('ios-b');
+    expect(infoPlistB.JPUSH_CHANNEL).toBe('chan-b');
+  });
 });

plugin/__tests__/withJPush.test.ts

@@ -63,4 +63,30 @@ describe('withJPush', () => {
       });
     }).toThrow('[MX_JPush_Expo] apsForProduction 必须是布尔值');
   });
+
+  it('should require vendorChannels.huawei.enabled when Huawei config is present', () => {
+    expect(() => {
+      validateProps({
+        appKey: 'test-app-key',
+        channel: 'test-channel',
+        packageName: 'com.example.test',
+        vendorChannels: {
+          huawei: {} as any,
+        },
+      });
+    }).toThrow('[MX_JPush_Expo] vendorChannels.huawei.enabled 必须存在且为布尔值');
+  });
+
+  it('should require vendorChannels.fcm.enabled to be a boolean when FCM config is present', () => {
+    expect(() => {
+      validateProps({
+        appKey: 'test-app-key',
+        channel: 'test-channel',
+        packageName: 'com.example.test',
+        vendorChannels: {
+          fcm: { enabled: 'true' as any },
+        },
+      });
+    }).toThrow('[MX_JPush_Expo] vendorChannels.fcm.enabled 必须存在且为布尔值');
+  });
 });