Merge pull request #1694 from flexn-io/fix/regex_overrides

improve regex overrides
flexn-io · Sep 19, 2024 · bd09da9 · bd09da9
2 parents 16d51b0 + e6e50bf
commit bd09da9
Show file tree

Hide file tree

Showing 9 changed files with 326 additions and 124 deletions.
diff --git a/.github/workflows/e2e-harness-android.yml b/.github/workflows/e2e-harness-android.yml
@@ -34,6 +34,7 @@ jobs:
             - name: Run
               run: |
                   cd packages/app-harness && yarn run:android-test & sleep 480
+
             - name: E2E
               run: |
                   cd packages/app-harness && yarn e2e:android && kill $(lsof -t -i:8093)

diff --git a/buildHooks/src/index.ts b/buildHooks/src/index.ts
@@ -1,7 +1,7 @@
 import { comparePluginTemplates } from './comparePluginTemplates';
 import { comparePluginOverrides } from './comparePluginOverrides';
-import { prePublish } from './prePublish';
 
+import { prePublish } from './prePublish';
 import { gitCommit, gitCommitAndTag, gitTag } from '@rnv/build-hooks-git';
 import { generateSchema } from '@rnv/build-hooks-schema';
 

diff --git a/packages/config-templates/pluginTemplates/@react-native-community/cli/overrides.json b/packages/config-templates/pluginTemplates/@react-native-community/cli/overrides.json
@@ -1,7 +1,7 @@
 {
     "overrides": {
         "build/bin.js": {
-            "require(\"./tools/gracefulifyFs\");": "require(\"./tools/gracefulifyFs\"/*RNV*/); var dotenv = require('dotenv'); if(dotenv) dotenv.config();"
+            "require(\"./tools/gracefulifyFs\");": "\nvar dotenv = require('dotenv'); if(dotenv) dotenv.config();"
         }
     }
 }
diff --git a/packages/config-templates/pluginTemplates/react-native-tvos/overrides.json b/packages/config-templates/pluginTemplates/react-native-tvos/overrides.json
@@ -1,7 +1,7 @@
 {
   "overrides": {
       "Libraries/Components/ScrollView/ScrollViewNativeComponent.js": {
-          "Platform';\n\nexport": "Platform';\nimport NativeModules from '../../BatchedBridge/NativeModules';\n\nexport",
+          "import Platform from '../../Utilities/Platform';": "\nimport NativeModules from '../../BatchedBridge/NativeModules';",
           "NativeComponentRegistry.get<Props>(\n    'RCTScrollView'": "NativeComponentRegistry.get<Props>(\n    Platform.isTV && 'RCTScrollViewTV' in NativeModules.UIManager && Platform.OS === 'android' ? 'RCTScrollViewTV' : 'RCTScrollView'",
           "Platform.OS === 'android'\n    ? {\n        uiViewClassName: 'RCTScrollView'": "Platform.OS === 'android'\n    ? {\n        uiViewClassName: Platform.isTV && 'RCTScrollViewTV' in NativeModules.UIManager ? 'RCTScrollViewTV' : 'RCTScrollView'"
       }

diff --git a/packages/core/src/enums/fileName.ts b/packages/core/src/enums/fileName.ts
@@ -10,5 +10,6 @@ export const RnvFileName = {
     renativePlatforms: 'renative.platforms.json',
     renativeEngine: 'renative.engine.json',
     package: 'package.json',
+    appliedOverride: 'applied_overrides.json',
     // renativeProject: 'renative.project.json',
 } as const;
diff --git a/packages/core/src/enums/taskName.ts b/packages/core/src/enums/taskName.ts
@@ -60,4 +60,5 @@ export const RnvTaskName = {
     telemetryEnable: 'telemetry enable',
     telemetryStatus: 'telemetry status',
     config: 'config',
+    patchReset: 'patch reset',
 } as const;