fix: 修复TypeScript编译错误，添加.gitignore忽略规则

Author: Amigo-Bot

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 build
 coverage/
+package-lock.json
+plugin/**/*.js

plugin/src/android/appBuildGradle.ts

@@ -6,8 +6,9 @@
 import { ExpoConfig } from 'expo/config';
 import { withAppBuildGradle } from 'expo/config-plugins';
 import { ResolvedJPushPluginProps, VendorChannelConfig } from '../types';
-import { mergeContents } from '../utils/generateCode';
+import { mergeContents, removeGeneratedContents, syncGeneratedContentsAtLine, syncGeneratedContentsAtEnd } from '../utils/generateCode';
 import { Validator } from '../utils/codeValidator';
+import { ensureNestedBlock, ensureTopLevelBlock, findLineIndex } from '../utils/sourceCode';
 
 /**
  * 生成 NDK abiFilters 配置
@@ -196,6 +197,13 @@ function removeLegacyGeneratedSections(contents: string, tags: string[]): string
   }, contents);
 }
 
+/**
+ * 生成 defaultConfig 代码片段
+ */
+function getDefaultConfigSnippet(): string {
+  return `${getNdkConfig()}\n${getManifestPlaceholders('', {})}`;
+}
+
 export function applyAndroidAppBuildGradle(contents: string): string {
   let nextContents = removeLegacyGeneratedSections(contents, LEGACY_DEFAULT_CONFIG_TAGS);
   nextContents = ensureNestedBlock(nextContents, /^\s*android\s*\{/, 'defaultConfig');
@@ -272,58 +280,14 @@ export function withAndroidAppBuildGradle(
         src,
         newSrc: getManifestPlaceholders(props.packageName, props.vendorChannels),
         tag: 'jpush-manifest-placeholders',
-        anchor: /defaultConfig\s*\{/,
-        offset: 1,
-        comment: '//',
-      });
-    });
-
-    validator.register('fileTree', (src) => {
-      console.log('\n[MX_JPush_Expo] 配置 build.gradle libs 目录依赖 ...');
-
-      return mergeContents({
-        src,
-        newSrc: `implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')`,
-        tag: 'jpush-libs-filetree',
-        anchor: /dependencies \{/,
-        offset: 1,
-        comment: '//',
-      });
-    });
-
-    validator.register("implementation project(':jpush-react-native')", (src) => {
-      console.log('\n[MX_JPush_Expo] 配置 build.gradle dependencies ...');
-
-      return mergeContents({
-        src,
-        newSrc: getJPushDependencies(props.vendorChannels),
-        tag: 'jpush-dependencies',
-        anchor: /dependencies \{/,
+        anchor: /versionName\s+["'][\d.]+["']/,
         offset: 1,
         comment: '//',
       });
     });
 
-    const applyPlugins = getApplyPlugins(props.vendorChannels);
-    if (applyPlugins) {
-      validator.register('apply plugin:', (src) => {
-        console.log('\n[MX_JPush_Expo] 配置 build.gradle apply plugins ...');
-
-        if (src.includes('// @generated begin jpush-apply-plugins')) {
-          return { contents: src, didMerge: false, didClear: false };
-        }
-
-        const newContents =
-          src +
-          '\n\n// @generated begin jpush-apply-plugins - expo prebuild (DO NOT MODIFY)\n' +
-          applyPlugins +
-          '\n// @generated end jpush-apply-plugins\n';
-
-        return { contents: newContents, didMerge: true, didClear: false };
-      });
-    }
-
     nextConfig.modResults.contents = validator.invoke();
+
     return nextConfig;
   });
 }

plugin/src/android/gradleProperties.ts

@@ -5,7 +5,8 @@
 
 import { ExpoConfig } from 'expo/config';
 import { withGradleProperties } from 'expo/config-plugins';
-import { ResolvedJPushPluginProps } from '../types';
+import { ResolvedJPushPluginProps, VendorChannelConfig } from '../types';
+import { getVendorChannels } from '../utils/vendorChannels';
 
 type GradleProperty =
   | {

plugin/src/android/projectBuildGradle.ts

@@ -6,11 +6,14 @@
 import { ExpoConfig } from 'expo/config';
 import { withProjectBuildGradle } from 'expo/config-plugins';
 import { ResolvedJPushPluginProps, VendorChannelConfig } from '../types';
-import { mergeContents } from '../utils/generateCode';
+import { mergeContents, removeGeneratedContents, syncGeneratedContentsAtLine } from '../utils/generateCode';
+import { ensureTopLevelBlock, ensureNestedBlock, findNestedBlockRange } from '../utils/sourceCode';
+import { getVendorChannels, getProjectVendorFlags, LEGACY_PROJECT_BUILD_TAGS, getBuildscriptRepositories } from '../utils/vendorChannels';
 import { Validator } from '../utils/codeValidator';
 
 /**
- * 生成厂商通道 classpath 依赖
+ * 获取厂商通道开启标记
+
  */
 const getVendorClasspaths = (vendorChannels?: VendorChannelConfig): string => {
   const isHuaweiEnabled = vendorChannels?.huawei?.enabled === true;
@@ -27,7 +30,7 @@ const getVendorClasspaths = (vendorChannels?: VendorChannelConfig): string => {
     classpaths.push(`classpath 'com.huawei.agconnect:agcp:1.9.3.302'`);
   }
 
-  return classpaths.join('\n        ');
+  return classpaths.join('\\n        ');
 };
 
 /**
@@ -45,19 +48,19 @@ const getAllprojectsRepositories = (): string => {
     repositories.push(`maven { url 'https://developer.hihonor.com/repo' }`);
   }
 
-  return repositories.join('\n        ');
+  return repositories.join('\\n        ');
 };
 
 function ensureProjectBuildscriptBlock(src: string): string {
   let nextContents = ensureTopLevelBlock(src, 'buildscript');
-  nextContents = ensureNestedBlock(nextContents, /^\s*buildscript\s*\{/, 'repositories');
-  nextContents = ensureNestedBlock(nextContents, /^\s*buildscript\s*\{/, 'dependencies');
+  nextContents = ensureNestedBlock(nextContents, /^\\s*buildscript\\s*\\{/, 'repositories');
+  nextContents = ensureNestedBlock(nextContents, /^\\s*buildscript\\s*\\{/, 'dependencies');
   return nextContents;
 }
 
 function ensureProjectAllprojectsBlock(src: string): string {
   let nextContents = ensureTopLevelBlock(src, 'allprojects');
-  nextContents = ensureNestedBlock(nextContents, /^\s*allprojects\s*\{/, 'repositories');
+  nextContents = ensureNestedBlock(nextContents, /^\\s*allprojects\\s*\\{/, 'repositories');
   return nextContents;
 }
 
@@ -83,8 +86,8 @@ export function applyAndroidProjectBuildGradle(contents: string): string {
 
   const buildscriptRepositoriesRange = findNestedBlockRange(
     nextContents,
-    /^\s*buildscript\s*\{/,
-    /^\s*repositories\s*\{/
+    /^\\s*buildscript\\s*\\{/,
+    /^\\s*repositories\\s*\\{/
   );
   if (buildscriptRepositoriesRange) {
     nextContents = syncGeneratedContentsAtLine({
@@ -99,8 +102,8 @@ export function applyAndroidProjectBuildGradle(contents: string): string {
 
   const buildscriptDependenciesRange = findNestedBlockRange(
     nextContents,
-    /^\s*buildscript\s*\{/,
-    /^\s*dependencies\s*\{/
+    /^\\s*buildscript\\s*\\{/,
+    /^\\s*dependencies\\s*\\{/
   );
   if (buildscriptDependenciesRange) {
     nextContents = syncGeneratedContentsAtLine({
@@ -115,8 +118,8 @@ export function applyAndroidProjectBuildGradle(contents: string): string {
 
   const allprojectsRepositoriesRange = findNestedBlockRange(
     nextContents,
-    /^\s*allprojects\s*\{/,
-    /^\s*repositories\s*\{/
+    /^\\s*allprojects\\s*\\{/,
+    /^\\s*repositories\\s*\\{/
   );
   if (allprojectsRepositoriesRange) {
     nextContents = syncGeneratedContentsAtLine({
@@ -145,33 +148,33 @@ export function withAndroidProjectBuildGradle(
     const validator = new Validator(nextConfig.modResults.contents);
 
     if (isHuaweiEnabled) {
-      validator.register('jpush-huawei-maven-buildscript', (src) => {
+      validator.register('jpush-huawei-maven-buildscript', (src: string) => {
         console.log(
-          '\n[MX_JPush_Expo] 配置 buildscript repositories 华为 Maven 仓库 ...'
+          '\\n[MX_JPush_Expo] 配置 buildscript repositories 华为 Maven 仓库 ...'
         );
 
         return mergeContents({
           src,
           newSrc: `maven { url 'https://developer.huawei.com/repo/' }`,
           tag: 'jpush-huawei-maven-buildscript',
-          anchor: /buildscript\s*\{/,
+          anchor: /buildscript\\s*\\{/,
           offset: 2,
           comment: '//',
         });
       });
     }
 
     if (vendorChannels?.honor) {
-      validator.register('jpush-honor-maven-buildscript', (src) => {
+      validator.register('jpush-honor-maven-buildscript', (src: string) => {
         console.log(
-          '\n[MX_JPush_Expo] 配置 buildscript repositories 荣耀 Maven 仓库 ...'
+          '\\n[MX_JPush_Expo] 配置 buildscript repositories 荣耀 Maven 仓库 ...'
         );
 
         return mergeContents({
           src,
           newSrc: `maven { url 'https://developer.hihonor.com/repo' }`,
           tag: 'jpush-honor-maven-buildscript',
-          anchor: /buildscript\s*\{/,
+          anchor: /buildscript\\s*\\{/,
           offset: 2,
           comment: '//',
         });
@@ -180,40 +183,40 @@ export function withAndroidProjectBuildGradle(
 
     const classpaths = getVendorClasspaths(vendorChannels);
     if (classpaths) {
-      validator.register('classpath', (src) => {
+      validator.register('classpath', (src: string) => {
         console.log(
-          '\n[MX_JPush_Expo] 配置 buildscript dependencies classpath ...'
+          '\\n[MX_JPush_Expo] 配置 buildscript dependencies classpath ...'
         );
 
         return mergeContents({
           src,
           newSrc: classpaths,
           tag: 'jpush-vendor-classpaths',
-          anchor: /dependencies\s*\{/,
+          anchor: /dependencies\\s*\\{/,
           offset: 1,
           comment: '//',
         });
       });
     }
 
     if (isHuaweiEnabled) {
-      validator.register('jpush-huawei-maven-allprojects', (src) => {
+      validator.register('jpush-huawei-maven-allprojects', (src: string) => {
         console.log(
-          '\n[MX_JPush_Expo] 配置 allprojects repositories 华为 Maven 仓库 ...'
+          '\\n[MX_JPush_Expo] 配置 allprojects repositories 华为 Maven 仓库 ...'
         );
 
-        if (!/allprojects\s*\{/.test(src)) {
+        if (!/allprojects\\s*\\{/.test(src)) {
           return { contents: src, didMerge: false, didClear: false };
         }
 
-        const hasRepositories = /allprojects\s*\{[^}]*repositories\s*\{/.test(src);
+        const hasRepositories = /allprojects\\s*\\{[^}]*repositories\\s*\\{/.test(src);
 
         if (hasRepositories) {
           return mergeContents({
             src,
             newSrc: `maven { url 'https://developer.huawei.com/repo/' }`,
             tag: 'jpush-huawei-maven-allprojects',
-            anchor: /allprojects\s*\{/,
+            anchor: /allprojects\\s*\\{/,
             offset: 2,
             comment: '//',
           });
@@ -225,7 +228,7 @@ export function withAndroidProjectBuildGradle(
         maven { url 'https://developer.huawei.com/repo/' }
     }`,
           tag: 'jpush-huawei-maven-allprojects',
-          anchor: /allprojects\s*\{/,
+          anchor: /allprojects\\s*\\{/,
           offset: 1,
           comment: '//',
         });
@@ -235,21 +238,21 @@ export function withAndroidProjectBuildGradle(
     if (vendorChannels?.honor) {
       validator.register('jpush-honor-maven-allprojects', (src) => {
         console.log(
-          '\n[MX_JPush_Expo] 配置 allprojects repositories 荣耀 Maven 仓库 ...'
+          '\\n[MX_JPush_Expo] 配置 allprojects repositories 荣耀 Maven 仓库 ...'
         );
 
-        if (!/allprojects\s*\{/.test(src)) {
+        if (!/allprojects\\s*\\{/.test(src)) {
           return { contents: src, didMerge: false, didClear: false };
         }
 
-        const hasRepositories = /allprojects\s*\{[^}]*repositories\s*\{/.test(src);
+        const hasRepositories = /allprojects\\s*\\{[^}]*repositories\\s*\\{/.test(src);
 
         if (hasRepositories) {
           return mergeContents({
             src,
             newSrc: `maven { url 'https://developer.hihonor.com/repo' }`,
             tag: 'jpush-honor-maven-allprojects',
-            anchor: /allprojects\s*\{/,
+            anchor: /allprojects\\s*\\{/,
             offset: 2,
             comment: '//',
           });
@@ -261,7 +264,7 @@ export function withAndroidProjectBuildGradle(
         maven { url 'https://developer.hihonor.com/repo' }
     }`,
           tag: 'jpush-honor-maven-allprojects',
-          anchor: /allprojects\s*\{/,
+          anchor: /allprojects\\s*\\{/,
           offset: 1,
           comment: '//',
         });
@@ -271,4 +274,4 @@ export function withAndroidProjectBuildGradle(
     nextConfig.modResults.contents = validator.invoke();
     return nextConfig;
   });
-}
+}

plugin/tsconfig.json

@@ -17,4 +17,4 @@
   },
   "include": ["./src"],
   "exclude": ["**/__mocks__/*", "**/__tests__/*", "build"]
-}
+}