Merge pull request #1800 from flexn-io/fix/overrides_when_version_cha…

…nges fix/overrides_when_version_changes + add --skipOverridesCheck
flexn-io · Nov 29, 2024 · ed0ea0f · ed0ea0f
2 parents 90531b9 + d536485
commit ed0ea0f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
@@ -832,6 +832,7 @@ export const overrideFileContents = (
             } else if (overrideExists) {
                 if (originalExists) {
                     if (fk.includes(override[fk])) {
+                        foundRegEx = true;
                         fileToFix = fileToFix.replace(originalRegEx, `${override[fk]}`);
                         logSuccess(
                             `${chalk().bold.white(dest)} requires override by: ${chalk().bold.white(
@@ -875,6 +876,8 @@ export const overrideFileContents = (
             appliedOverrides[packageName].version = packageVersion;
             fsWriteFileSync(dest, fileToFix);
             _writeAppliedOverrides(appliedOverrides, appliedOverrideFilePath);
+        } else if (foundRegEx) {
+            fsWriteFileSync(dest, fileToFix);
         }
     } else {
         logDebug(`overrideFileContents Warning: path does not exist ${dest}`);
@@ -1095,7 +1098,11 @@ export const overrideTemplatePlugins = async () => {
     logDefault('overrideTemplatePlugins');
 
     const c = getContext();
-
+    const { skipOverridesCheck } = c.program.opts();
+    if (skipOverridesCheck) {
+        logInfo(`Plugin overrides will not be applied because --skipOverridesCheck parameter was passed.`);
+        return true;
+    }
     const rnvPluginsDirs = c.paths.scopedConfigTemplates.pluginTemplatesDirs;
     const appPluginDirs = c.paths.appConfig.pluginDirs;
 

diff --git a/packages/core/src/tasks/taskOptions.ts b/packages/core/src/tasks/taskOptions.ts
@@ -99,6 +99,12 @@ export const RnvTaskOptions = createTaskOptionsMap([
         altKey: 'skipDependencyCheck',
         description: 'Skips auto update of npm dependencies if mismatch found',
     },
+    {
+        key: 'skip-overrides-check',
+        altKey: 'skipOverridesCheck',
+        description:
+            'Skips applying plugin overrides. Useful for avoiding unnecessary checks on every run when overrides are already applied.',
+    },
     {
         key: 'offline',
         description: 'Run without connecting to the internet whenever possible',
@@ -238,6 +244,7 @@ export const RnvTaskCoreOptionPresets = createTaskOptionsPreset({
         RnvTaskOptions.noIntro,
         RnvTaskOptions.offline,
         RnvTaskOptions.skipDependencyCheck,
+        RnvTaskOptions.skipOverridesCheck,
     ],
 });
 

diff --git a/packages/template-starter/scripts/postinstall.js b/packages/template-starter/scripts/postinstall.js
@@ -11,6 +11,7 @@ const {
     logError,
     RnvFileName,
     fsExistsSync,
+    fsMkdirSync,
     fsReadFileSync,
     removeDirSync,
     revertOverrideToOriginal,
@@ -40,7 +41,11 @@ const RNV_HOME_DIR = path.join(__dirname, '..');
 })();
 
 const resetOverrides = async () => {
-    const overrideDir = path.join(process.cwd(), '.rnv', 'overrides');
+    const rnvFolder = path.join(process.cwd(), '.rnv');
+    if (!fsExistsSync(rnvFolder)) {
+        fsMkdirSync(rnvFolder);
+    }
+    const overrideDir = path.join(rnvFolder, 'overrides');
 
     const appliedOverrideFilePath = path.join(overrideDir, RnvFileName.appliedOverride);