codeplay-common 4.7.5 → 4.7.7

package/files/buildCodeplay/{codeplayBeforeBuild-6.3.js → codeplayBeforeBuild-6.4.js}

@@ -10,13 +10,37 @@ const { execSync } = require("child_process");
 
 
 const { readFileSync } = require("fs");
+const readline = require('readline');
+
+// Await import confirmation before continuing the remaining build steps.
+(async () => {
+
+// Standalone builds default to Android on every host OS.
+// npm run build:ios explicitly selects iOS through CODEPLAY_BUILD_PLATFORM.
+const buildPlatform = String(process.env.CODEPLAY_BUILD_PLATFORM || '').trim().toLowerCase() || 'android';
+
+if (!['android', 'ios'].includes(buildPlatform)) {
+  console.error(`❌ Unsupported build target: ${buildPlatform}. Expected android or ios.`);
+  process.exit(1);
+}
 
 const ENABLE_AUTO_UPDATE = true;
 const USE_LIVE_SERVER_VERSION = true;
 
+// Reuse directory traversal; refresh after generators or plugin downloads alter src.
+let sourceFileInventory = null;
+function getSourceFiles() {
+  if (!sourceFileInventory) {
+    const sourceRoot = path.join(process.cwd(), 'src');
+    sourceFileInventory = fs.existsSync(sourceRoot) ? walkSync(sourceRoot) : [];
+  }
+  return sourceFileInventory;
+}
+
 const configPath = path.join(process.cwd(), 'capacitor.config.json');
 const packageJsonPath = path.join(process.cwd(), 'package.json');
 const updateLogFile = path.join(process.cwd(), "", "plugin-update-log.txt");
+const ONESIGNAL_PLUGIN_NAME = "onesignal-cordova-plugin";
 const ADMOB_NEXTGEN_PLUGIN_NAME = "admob-emi-nextgen";
 const ADMOB_NEXTGEN_FILE_PATTERN = new RegExp(`^${ADMOB_NEXTGEN_PLUGIN_NAME}-\\d+(?:\\.\\d+)*\\.js$`);
 const ADMOB_NEXTGEN_CONFIG = "admob-ad-configuration-nextgen.json";
@@ -25,7 +49,10 @@ const AGENT_INSTRUCTIONS_VERSION_KEY = "agents";
 const AGENT_INSTRUCTIONS_ZIP_PREFIX = "agents";
 const AGENT_INSTRUCTIONS_FILE = "AGENTS.md";
 const AGENT_INSTRUCTIONS_DIR = "AGENTS";
-const AGENT_INSTRUCTIONS_VERSION_FILE = ".codeplay-version";
+const AGENT_INSTRUCTIONS_VERSION_FILE = ".codeplay-version";
+
+// Remove the retired plugin before any validation, patching or package updates.
+removeOneSignalPlugin();
 
 const parseVersionParts = (version) => String(version || "0")
   .trim()
@@ -77,7 +104,6 @@ const getLatestAdmobNextgenFileName = (adsDir) =>
   { pattern: /localization-(\d+\.\d+)\.js$/, minVersion: '1.5', required: true, baseDir: 'js',mandatoryUpdate: true },
   { pattern: /localNotification-(\d+\.\d+)\.js$/, minVersion: '2.2', required: true, baseDir: 'js',mandatoryUpdate: false },
   { pattern: /localNotification_AppSettings-(\d+\.\d+)\.js$/, minVersion: '1.0', required: true, baseDir: 'js',mandatoryUpdate: false },
-  { pattern: /onesignal-(\d+\.\d+)\.js$/, minVersion: '2.3', required: true, baseDir: 'js',mandatoryUpdate: false },
   { pattern: /saveToGalleryAndSaveAnyFile-(\d+\.\d+)(-ios)?\.js$/, minVersion: '3.1', required: true, baseDir: 'js',mandatoryUpdate: true },
   { pattern: /Ads[\/\\]admob-emi-(\d+\.\d+)\.js$/, minVersion: '3.7', required: true, baseDir: 'js',mandatoryUpdate: true },
 
@@ -200,7 +226,10 @@ function loadRequiredPlugins() {
 
   const json = JSON.parse(fs.readFileSync(versionsFile, "utf8"));
 
-  return json.plugins.map(p => ({
+  // OneSignal is retired; do not download its legacy helpers again.
+  return json.plugins.filter(p =>
+    !/^onesignal(?:-|$)/i.test(String(p.name || '')) && !/onesignal/i.test(String(p.pattern || ''))
+  ).map(p => ({
     ...p,
     pattern: new RegExp(p.pattern)
   }));
@@ -760,38 +789,43 @@ else {
 
 
 
-// saveToGalleryAndSaveAnyFile-x.x-ios.js file check for android and return error if exists  START
-
-const os = require('os');
-
-const saveToGalleryAndSaveFileCheck_iOS = () => {
-
-  // List of paths to scan
-  const SCAN_PATHS = [
-    path.resolve(__dirname, '../src/certificate'),
-    path.resolve(__dirname, '../src/pages'),
-    path.resolve(__dirname, '../src/js'),
-    path.resolve(__dirname, '../src/app.f7')
-  ];
+// Validate saveToGalleryAndSaveAnyFile imports for the build platform START
 
-  // Directory to exclude
-  const EXCLUDED_DIR = path.resolve(__dirname, '../src/js/Ads');
+const saveToGalleryAndSaveFileCheck_iOS = async () => {
 
+  const SOURCE_ROOT = path.resolve(__dirname, '../src');
+  const EXCLUDED_DIR = path.join(SOURCE_ROOT, 'js', 'Ads');
   const ANDROID_MANIFEST_PATH = path.resolve(__dirname, '../android/app/src/main/AndroidManifest.xml');
 
 
-  // Match iOS-specific imports (e.g., saveToGalleryAndSaveAnyFile-2.5-ios.js) not in comments
-const IOS_FILE_REGEX = /^(?!\s*\/\/).*['"](?:.*\/)?saveToGalleryAndSaveAnyFile-\d+(\.\d+)*-ios\.js['"]/m;
+  // Skip comments and unrelated strings; match static/dynamic imports, re-exports and require.
+  const COMMENT_OR_STRING_REGEX = /\/\/[^\r\n]*|\/\*[\s\S]*?\*\/|(['"`])(?:\\[\s\S]|(?!\1)[^\\])*\1/g;
+  const IMPORT_REGEX = /(['"`])(?:\\[\s\S]|(?!\1)[^\\])*\1|\b(?:import\s+(?:[^;'"`]*?\s+from\s*)?|export\s+[^;'"`]*?\s+from\s*|(?:import|require)\s*\(\s*)(['"])([^'"\r\n]+)\2/g;
+  const SAVE_FILE_REGEX = /^(.*[\/\\])?(saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*)(-ios)?(\.js)?([?#].*)?$/;
+  const pendingChanges = [];
 
-// Match Android-specific imports (e.g., saveToGalleryAndSaveAnyFile-2.5.js) not in comments
-const ANDROID_FILE_REGEX = /^(?!\s*\/\/).*['"](?:.*\/)?saveToGalleryAndSaveAnyFile-\d+(\.\d+)*\.js['"]/m;
+  const ALLOWED_EXTENSIONS = ['.js', '.mjs', '.ts', '.f7'];
+  const referencedVersions = new Set();
+  let aliasImportFound = false;
+  let hasForbiddenEditorImport = false;
+  const FORBIDDEN_REGEX = /editor\/editor-\d+(\.\d+)+/;
+const ERROR_MESSAGE = `const ERROR_MESSAGE = ❌ Invalid import detected!
 
+You are using a direct version-based path like: editor/editor-x.x/editor.js
 
+🚫 This is NOT allowed.
 
+👉 Please use the proper alias or updated import method.
+	Example: import { ... } from '@editor'
+	
+⚠️ Do not use version-based paths in imports.
+👉 Please add this manually in vite.config.js:
 
+alias: {
+  '@editor': path.resolve(__dirname, './src/js/editor/editor-x.x')
+}`
 
-  const ALLOWED_EXTENSIONS = ['.js', '.f7'];
-  const isMac = os.platform() === 'darwin';
+  const isIOSBuild = buildPlatform === 'ios';
 
   let iosImportFound = false;
   let androidImportFound = false;
@@ -809,13 +843,7 @@ const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.j
 const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
 
 
-const ONESIGNAL_OLD_FILES = [
-  path.resolve(__dirname, '../src/js/onesignal-settings.js')
-];
-const ONESIGNAL_VERSION_REGEX = /^onesignal-\d+(\.\d+)*\.js$/;
-
-function scanDirectory(dir) {
-
+function scanSourceFile(dir) {
 /*
   //#########################  DO NOT DELETE THIS - START [Appid base validation] #####################################
   const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
@@ -824,132 +852,187 @@ function scanDirectory(dir) {
   //#########################  DO NOT DELETE THIS - END [Appid base validation] #####################################
 */
 
-  const stat = fs.statSync(dir);
-
-  if (stat.isFile()) {
-
-
-
     const baseName = path.basename(dir);
-
-    const JS_ROOT = path.resolve(__dirname, '../src/js');
-    const ONESIGNAL_DIR = path.join(JS_ROOT, 'onesignal');
-
-    // 🚨 Block old OneSignal file locations (ONLY in src/js root)
-    if (path.dirname(dir) === JS_ROOT) {
-
-      // ❌ onesignal-settings.js
-      if (ONESIGNAL_OLD_FILES.includes(dir)) {
-        console.error(`\n❌ ERROR: onesignal-settings.js should not be in src/js/`);
-        console.error(`📁 Move it to: src/js/onesignal/`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
-      }
-
-      // ❌ onesignal-x.x.js
-      if (ONESIGNAL_VERSION_REGEX.test(baseName)) {
-        console.error(`\n❌ ERROR: ${baseName} should not be in src/js/`);
-        console.error(`📁 Move it to: src/js/onesignal/`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
-      }
-    } 
-
-    // 🚨 Special check ONLY for common-configuration.js
+    const isGalleryScope = ['certificate', 'pages', 'js'].some(folder =>
+      dir.startsWith(path.join(SOURCE_ROOT, folder) + path.sep)
+    ) || dir === path.join(SOURCE_ROOT, 'app.f7');
+    const shouldCheckGallery = isGalleryScope && !dir.startsWith(EXCLUDED_DIR + path.sep)
+      && !dir.split(path.sep).includes('node_modules') && !SKIP_FILES.includes(baseName)
+      && ALLOWED_EXTENSIONS.some(ext => dir.endsWith(ext));
+    const shouldCheckEditor = /\.(js|ts|f7)$/.test(dir);
+    const shouldCheckOneSignal = /\.(js|mjs|cjs|ts|tsx|jsx|f7)$/.test(dir);
+    if (!shouldCheckGallery && !shouldCheckEditor && !shouldCheckOneSignal) return;
+
+    const content = fs.readFileSync(dir, 'utf8');
+    if (shouldCheckEditor) {
+      content.split('\n').forEach((line, index) => {
+        if (!FORBIDDEN_REGEX.test(line)) return;
+        console.error(`❌ Forbidden import found:\nFile: ${dir}\nLine: ${index + 1}\nCode: ${line.trim()}\n`, ERROR_MESSAGE);
+        hasForbiddenEditorImport = true;
+      });
+    }
     if (dir === STATUSBAR_FILE) {
-      let content = fs.readFileSync(dir, 'utf8');
-
-      // 🧹 Remove ALL comments (single-line + multi-line)
-      const contentWithoutComments = content
-        .replace(/\/\/.*$/gm, '')          // remove // comments
-        .replace(/\/\*[\s\S]*?\*\//g, ''); // remove /* */ comments
-
-      // ✅ Now check only real code
+      const contentWithoutComments = content.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
       if (contentWithoutComments.includes('Capacitor.Plugins.StatusBar.setStyle')) {
-        console.error(`\n❌ ERROR: StatusBar.setStyle should NOT be used in common-configuration.js`);
-        console.error(`🚫 iOS status bar is controlled via other methods. Remove this line.`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
+        throw new Error(`❌ StatusBar.setStyle should NOT be used in common-configuration.js. File: ${dir}`);
       }
     }
 
-    // 🔥 Skip files in SKIP_FILES array
-
-    if (SKIP_FILES.includes(baseName)) {
-      // Just skip silently
-      return;
+    const code = content.replace(COMMENT_OR_STRING_REGEX, (match, quote) =>
+      quote ? match : match.replace(/[^\r\n]/g, ' ')
+    );
+    const replacements = [];
+    IMPORT_REGEX.lastIndex = 0;
+    let imported;
+    while ((imported = IMPORT_REGEX.exec(code)) !== null) {
+      if (!imported[3]) continue;
+      const importPath = imported[3];
+      if (importPath === ONESIGNAL_PLUGIN_NAME || importPath.startsWith(ONESIGNAL_PLUGIN_NAME + '/')) {
+        throw new Error(`❌ OneSignal was removed, but ${dir} still imports ${importPath}. Remove that import and its initialization before building.`);
+      }
+      if (!shouldCheckGallery) continue;
+      if (/^@saveGallery[?#]/.test(importPath)) {
+        throw new Error(`❌ ${importPath} in ${dir} requires a dedicated Vite alias for its query/hash suffix.`);
+      }
+      if (importPath === '@saveGallery') {
+        aliasImportFound = true;
+        continue;
+      }
+      const fileMatch = importPath.match(SAVE_FILE_REGEX);
+      if (!fileMatch) continue;
+      if (fileMatch[5]) {
+        throw new Error(`❌ Cannot migrate ${importPath} in ${dir} to a plain @saveGallery alias: its query/hash suffix requires a dedicated Vite alias.`);
+      }
+      referencedVersions.add(fileMatch[2]);
+      const nextImportPath = '@saveGallery';
+      const offset = imported.index + imported[0].lastIndexOf(imported[2] + importPath + imported[2]) + 1;
+      replacements.push({ offset, importPath, nextImportPath });
     }
 
-    // Only scan allowed file extensions
-    if (ALLOWED_EXTENSIONS.some(ext => dir.endsWith(ext))) {
-      process.stdout.write(`\r🔍 Scanning: ${dir} `);
+    if (replacements.length) {
+      let nextContent = content;
+      for (const replacement of [...replacements].reverse()) {
+        nextContent = nextContent.slice(0, replacement.offset) + replacement.nextImportPath
+          + nextContent.slice(replacement.offset + replacement.importPath.length);
+      }
+      pendingChanges.push({ filePath: dir, content, nextContent, replacements });
+    }
+}
 
-      const content = fs.readFileSync(dir, 'utf8');
+// One source content pass handles gallery migration, retired OneSignal imports, StatusBar and editor validation.
+for (const sourceFile of getSourceFiles()) scanSourceFile(sourceFile);
+if (hasForbiddenEditorImport) throw new Error('🚫 Build failed due to forbidden editor imports.');
+console.log('✅ No forbidden editor imports found.');
 
-      if (IOS_FILE_REGEX.test(content)) {
-        iosImportFound = true;
-        if (!isMac) {
-          console.error(`\n❌ ERROR: iOS-specific import detected in: ${dir}`);
-          console.error(`🚫 STOPPED: This file should not be imported in Android/Windows/Linux builds.\n`);
-          process.exit(1);
-        }
-      } 
-      else if (ANDROID_FILE_REGEX.test(content) && !content.includes('-ios.js')) {
-        androidImportFound = true;
-      }
+if (referencedVersions.size || aliasImportFound) {
+  const viteConfigPath = getViteConfigPath();
+  if (!viteConfigPath) throw new Error('❌ Cannot configure @saveGallery: vite.config.js or vite.config.mjs is missing.');
+  const viteContent = fs.readFileSync(viteConfigPath, 'utf8');
+  const viteCode = viteContent.replace(COMMENT_OR_STRING_REGEX, (match, quote) =>
+    quote ? match : match.replace(/[^\r\n]/g, ' ')
+  );
+  const aliasRegex = /(['"])@saveGallery\1\s*:\s*path\.resolve\(\s*__dirname\s*,\s*(['"])([^'"]+)\2\s*\)/g;
+  const aliasMatches = [...viteCode.matchAll(aliasRegex)];
+  if (aliasMatches.length > 1) throw new Error('❌ Multiple active @saveGallery alias entries found. Keep one entry.');
+  const aliasMatch = aliasMatches[0];
+  if (!aliasMatch && /['"]@saveGallery['"]\s*:/.test(viteCode)) {
+    throw new Error('❌ Unsupported @saveGallery alias format. Use path.resolve(__dirname, a literal file path).');
+  }
+  if (aliasImportFound && aliasMatch) {
+    const existingName = path.basename(aliasMatch[3]).match(SAVE_FILE_REGEX);
+    if (!existingName) throw new Error('❌ @saveGallery must point to a versioned saveToGalleryAndSaveAnyFile helper.');
+    referencedVersions.add(existingName[2]);
+  }
+  if (!referencedVersions.size) {
+    const jsDir = path.join(SOURCE_ROOT, 'js');
+    const pattern = isIOSBuild ? /^saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*-ios\.js$/ : /^saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*\.js$/;
+    const latestFile = getLatestVersionedFileName(jsDir, pattern);
+    if (!latestFile) throw new Error(`❌ No ${buildPlatform} save-gallery helper found in src/js.`);
+    referencedVersions.add(latestFile.match(SAVE_FILE_REGEX)[2]);
+  }
+  if (referencedVersions.size !== 1) {
+    throw new Error(`❌ @saveGallery cannot represent multiple helper versions: ${[...referencedVersions].join(', ')}. Align them before building.`);
+  }
+  const baseName = [...referencedVersions][0];
+  const targetRelativePath = `./src/js/${baseName}${isIOSBuild ? '-ios' : ''}.js`;
+  const targetPath = path.resolve(path.dirname(viteConfigPath), targetRelativePath);
+  if (!fs.existsSync(targetPath)) throw new Error(`❌ Cannot configure @saveGallery: target file does not exist: ${targetPath}`);
+  const aliasEntry = `'@saveGallery': path.resolve(__dirname, '${targetRelativePath}')`;
+  let nextViteContent = viteContent;
+  if (aliasMatch) {
+    if (path.resolve(path.dirname(viteConfigPath), aliasMatch[3]) !== targetPath) {
+      nextViteContent = viteContent.slice(0, aliasMatch.index) + aliasEntry + viteContent.slice(aliasMatch.index + aliasMatch[0].length);
     }
-  } 
-  else if (stat.isDirectory()) {
-    if (dir === EXCLUDED_DIR || path.basename(dir) === 'node_modules') return;
+  } else {
+    const aliasHeader = /\balias\s*:\s*\{/g.exec(viteCode);
+    const resolveHeader = /\bresolve\s*:\s*\{/g.exec(viteCode);
+    const returnHeader = /\breturn\s*\{/g.exec(viteCode);
+    const newline = viteContent.includes('\r\n') ? '\r\n' : '\n';
+    const header = aliasHeader || resolveHeader || returnHeader;
+    if (!header || (!aliasHeader && /\balias\s*:/.test(viteCode))) {
+      throw new Error('❌ Cannot safely insert @saveGallery in this Vite config. Add a resolve.alias object first.');
+    }
+    const insert = aliasHeader ? `${newline}        ${aliasEntry},`
+      : resolveHeader ? `${newline}      alias: { ${aliasEntry} },`
+      : `${newline}    resolve: { alias: { ${aliasEntry} } },`;
+    const offset = header.index + header[0].length;
+    nextViteContent = viteContent.slice(0, offset) + insert + viteContent.slice(offset);
+  }
+  nextViteContent = ensureImportOrRequire(nextViteContent, 'path', "import path from 'path';", "const path = require('path');");
+  if (nextViteContent !== viteContent) {
+    pendingChanges.unshift({ filePath: viteConfigPath, content: viteContent, nextContent: nextViteContent,
+      replacements: [{ importPath: aliasMatch ? aliasMatch[3] : '(missing @saveGallery alias)', nextImportPath: targetRelativePath }] });
+  }
+  if (isIOSBuild) iosImportFound = true;
+  else androidImportFound = true;
+}
 
-    const entries = fs.readdirSync(dir, { withFileTypes: true });
-    for (let entry of entries) {
-      scanDirectory(path.join(dir, entry.name));
+if (pendingChanges.length) {
+  console.warn(`\n⚠️ WARNING: This build is considered ${isIOSBuild ? 'iOS' : 'Android'}.`);
+  console.warn('The following source imports and Vite alias targets will be changed:');
+  for (const change of pendingChanges) {
+    console.warn(`\n📄 ${change.filePath}`);
+    for (const replacement of change.replacements) {
+      console.warn(`   ${replacement.importPath} → ${replacement.nextImportPath}`);
     }
   }
-}
 
+  const confirmed = await new Promise(resolve => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.on('close', () => resolve(false));
+    rl.on('SIGINT', () => { resolve(false); rl.close(); });
+    rl.question('\nPress Enter or type y to apply these changes and continue; any other answer cancels: ', answer => {
+      const normalizedAnswer = answer.trim().toLowerCase();
+      resolve(normalizedAnswer === '' || normalizedAnswer === 'y');
+      rl.close();
+    });
+  });
+  if (!confirmed) throw new Error('❌ Build cancelled. No import filenames were changed.');
 
-// Run scan on all specified paths
-for (let scanPath of SCAN_PATHS) {
-  if (fs.existsSync(scanPath)) {
-    scanDirectory(scanPath);
+  // Check every source again before writing so edits made while awaiting confirmation are preserved.
+  for (const change of pendingChanges) {
+    if (fs.readFileSync(change.filePath, 'utf8') !== change.content) {
+      throw new Error(`❌ Source changed while awaiting confirmation: ${change.filePath}. Build cancelled; run it again.`);
+    }
+  }
+  for (const change of pendingChanges) {
+    fs.writeFileSync(change.filePath, change.nextContent, 'utf8');
+    console.log(`✅ Updated platform imports in: ${change.filePath}`);
   }
 }
 
-
-
-/*   // Check src folder
-  if (!fs.existsSync(ROOT_DIR)) {
-    console.warn(`⚠️ Warning: 'src' directory not found at: ${ROOT_DIR}`);
-    return;
-  } */
-
-  //scanDirectory(ROOT_DIR);
-
-  // iOS Checks
-/*   if (isMac && !iosImportFound) {
-    console.warn(`⚠️ WARNING: You're on macOS but no iOS version (saveToGalleryAndSaveAnyFile-x.x-ios.js) found.`);
-    process.exit(1);
-  } else if (isMac && iosImportFound) {
-    console.log('✅ iOS version detected for macOS build.');
-  } else if (!iosImportFound) {
-    console.log('✅ No iOS-specific imports detected for non-macOS.');
-  } */
-
-// ✅ Only care if iOS import is found in NON-mac systems
-if (iosImportFound && !isMac) {
-  console.error(`\n❌ ERROR: iOS-specific file is imported in non-macOS environment.`);
-  process.exit(1);
-} else if (iosImportFound && isMac) {
-  console.log('✅ iOS import detected (valid for macOS build).');
+// The alias selects exactly one helper for the target platform.
+if (iosImportFound) {
+  console.log('✅ iOS import detected (valid for iOS build).');
+} else if (androidImportFound) {
+  console.log('✅ Android import detected (valid for Android build).');
 } else {
-  console.log('✅ No iOS-specific imports found (this is totally fine).');
+  console.log('✅ No platform-specific saveToGalleryAndSaveAnyFile imports found.');
 }
 
 
   // Android Checks
-  if (androidImportFound) {
+  if (buildPlatform === 'android' && androidImportFound) {
     console.log("📱 Android version of saveToGalleryAndSaveAnyFile detected. Checking AndroidManifest.xml...");
 
     if (!fs.existsSync(ANDROID_MANIFEST_PATH)) {
@@ -980,8 +1063,8 @@ if (iosImportFound && !isMac) {
   }
 };
 
-saveToGalleryAndSaveFileCheck_iOS();
-// saveToGalleryAndSaveAnyFile-x.x-ios.js file check for android and return error if exists  END
+await saveToGalleryAndSaveFileCheck_iOS();
+// Validate saveToGalleryAndSaveAnyFile imports for the build platform END
 
 
 
@@ -1701,7 +1784,6 @@ validateAndroidBuildOptions();
 // Check all the codeplays plugins version START
 
 
-const readline = require('readline');
 
 
 //const srcDir = path.join(__dirname, 'src');
@@ -1720,20 +1802,15 @@ function compareVersions(v1, v2) {
 }
 
 function walkSync(dir, filelist = []) {
-  fs.readdirSync(dir).forEach(file => {
-    const fullPath = path.join(dir, file);
-    const stat = fs.statSync(fullPath);
-    if (stat.isDirectory()) {
-      walkSync(fullPath, filelist);
-    } else {
-      filelist.push(fullPath);
-    }
-  });
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name);
+    const isDirectory = entry.isDirectory() || (entry.isSymbolicLink() && fs.statSync(fullPath).isDirectory());
+    if (isDirectory) walkSync(fullPath, filelist);
+    else filelist.push(fullPath);
+  }
   return filelist;
 }
 
-
-
 function getSearchRoot(plugin) {
   return path.join(srcDir, plugin.baseDir || 'js');
 }
@@ -1788,6 +1865,7 @@ function urlExists(url) {
  * Download file from server
  */
 function downloadFile(url, dest) {
+  if (path.resolve(dest).startsWith(path.join(process.cwd(), 'src') + path.sep)) sourceFileInventory = null;
   return new Promise((resolve, reject) => {
     const file = fs.createWriteStream(dest);
 
@@ -1839,6 +1917,8 @@ const VITE_ALIAS_ONLY = [
 function updateImports(oldName, newName) {
 
   const projectRoot = process.cwd();
+  const oldSaveHelper = oldName.match(/^(saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*)(?:-ios)?\.js$/);
+  const newSaveHelper = newName.match(/^(saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*)(?:-ios)?\.js$/);
 
   const filesToScan = [
     path.join(projectRoot, "vite.config.js"),
@@ -1854,9 +1934,23 @@ function updateImports(oldName, newName) {
 
     let content = fs.readFileSync(file, "utf8");
 
-    if (content.includes(oldName)) {
+    if (content.includes(oldName) || (oldSaveHelper && newSaveHelper && content.includes('@saveGallery'))) {
 
       content = content.split(oldName).join(newName);
+      // Plugin updates can replace an iOS filename with the generic new filename.
+      // Keep the centralized save-gallery alias aligned with the selected build.
+      content = content.replace(/(['"]@saveGallery['"]\s*:\s*path\.resolve\(\s*__dirname\s*,\s*['"])([^'"]+)(['"]\s*\))/g,
+        (match, prefix, target, suffix) => {
+          if (!/saveToGalleryAndSaveAnyFile-\d+(?:\.\d+)*(?:-ios)?\.js$/.test(target)) return match;
+          if (oldSaveHelper && newSaveHelper && target.includes(oldSaveHelper[1])) {
+            target = target.replace(oldSaveHelper[1], newSaveHelper[1]);
+          }
+          const nextTarget = target.replace(/(?:-ios)?\.js$/, buildPlatform === 'ios' ? '-ios.js' : '.js');
+          if (!fs.existsSync(path.resolve(path.dirname(file), nextTarget))) {
+            throw new Error(`❌ Updated @saveGallery target is missing: ${nextTarget}`);
+          }
+          return prefix + nextTarget + suffix;
+        });
 
       fs.writeFileSync(file, content);
 
@@ -1865,47 +1959,16 @@ function updateImports(oldName, newName) {
 
   });
 
-  // scan src files
-  function walk(dir) {
-
-    fs.readdirSync(dir).forEach(file => {
-
-      if (["node_modules","android","ios","dist",".git"].includes(file))
-        return;
-
-      const full = path.join(dir, file);
-      const stat = fs.statSync(full);
-
-      if (stat.isDirectory()) {
-        walk(full);
-      }
-
-      else if (
-        (full.endsWith(".js") ||
-         full.endsWith(".f7") ||
-         full.endsWith(".mjs")) &&
-        !full.endsWith(".min.js")
-      ) {
-
-        let content = fs.readFileSync(full, "utf8");
-
-        if (content.includes(oldName)) {
-
-          content = content.split(oldName).join(newName);
-
-          fs.writeFileSync(full, content);
-
-          console.log(`✏️ Updated import in ${path.relative(projectRoot, full)}`);
-        }
-
-      }
-
-    });
-
-  }
-
-  if (fs.existsSync(srcDir)) {
-    walk(srcDir);
+  // Downloads invalidate the inventory; content-only edits reuse it.
+  for (const full of getSourceFiles()) {
+    const relativePath = path.relative(srcDir, full);
+    if (relativePath.split(path.sep).some(part => ['node_modules', 'android', 'ios', 'dist', '.git'].includes(part))) continue;
+    if (!/\.(js|f7|mjs)$/.test(full) || full.endsWith('.min.js')) continue;
+    let content = fs.readFileSync(full, 'utf8');
+    if (!content.includes(oldName)) continue;
+    content = content.split(oldName).join(newName);
+    fs.writeFileSync(full, content);
+    console.log(`✏️ Updated import in ${path.relative(projectRoot, full)}`);
   }
 
 }
@@ -2299,7 +2362,7 @@ async function loadPluginVersions() {
 let hasMandatoryUpdate = false;
 function checkPlugins() {
   return new Promise(async (resolve, reject) => {
-    const files = walkSync(srcDir);
+    const files = getSourceFiles();
     const outdatedPlugins = [];
     let hasMandatoryUpdate = false;
 
@@ -2635,6 +2698,7 @@ Expected:
     console.log(`🚀 Executing ${runJsPath}...`);
 
     execSync(`node "${runJsPath}"`, { stdio: "inherit" });
+    sourceFileInventory = null;
   }
 
 } else {
@@ -2659,96 +2723,6 @@ Expected:
 
 
 
-//editor-x.x import old style check and stop execution START
-
-
-
-// Match: editor/editor-2.3, editor/editor-2.3.1, etc.
-const FORBIDDEN_REGEX = /editor\/editor-\d+(\.\d+)+/;
-
-let hasError = false;
-
-const ERROR_MESSAGE = `const ERROR_MESSAGE = ❌ Invalid import detected!
-
-You are using a direct version-based path like: editor/editor-x.x/editor.js
-
-🚫 This is NOT allowed.
-
-👉 Please use the proper alias or updated import method.
-	Example: import { ... } from '@editor'
-	
-⚠️ Do not use version-based paths in imports.
-👉 Please add this manually in vite.config.js:
-
-alias: {
-  '@editor': path.resolve(__dirname, './src/js/editor/editor-x.x')
-}`
-
-function scanDir(dir) {
-  const files = fs.readdirSync(dir);
-
-  for (const file of files) {
-    const fullPath = path.join(dir, file);
-    const stat = fs.statSync(fullPath);
-
-    if (stat.isDirectory()) {
-      scanDir(fullPath);
-    } else if (file.endsWith(".js") || file.endsWith(".ts") || file.endsWith(".f7")) {
-      const content = fs.readFileSync(fullPath, "utf-8");
-
-      const lines = content.split("\n");
-
-      lines.forEach((line, index) => {
-        if (FORBIDDEN_REGEX.test(line)) {
-          console.error(
-            `❌ Forbidden import found:\nFile: ${fullPath}\nLine: ${index + 1}\nCode: ${line.trim()}\n`,
-            ERROR_MESSAGE
-          );
-          hasError = true;
-        }
-      });
-    }
-  }
-}
-
-// Run scan
-scanDir(ROOT_DIR);
-
-// Throw error (exit process)
-if (hasError) {
-  console.error("🚫 Build failed due to forbidden editor imports.");
-  process.exit(1);
-} else {
-  console.log("✅ No forbidden imports found.");
-}
-
-
-
-
-
-
-//editor-x.x import old style check and stop execution START
-
-
-
-
-
-
-
-
-
-
-// Check all the codeplays plugins version START
-
-
-
-
-// ====================================================================
-//  AUTO-ADD esbuild.drop: ['console','debugger'] to vite.config.js / mjs
-// ====================================================================
-
-
-
 const checkAndupdateDropInViteConfig = () => {
 
   const possibleFiles = [
@@ -2869,7 +2843,7 @@ const syncAdmobAliasInViteConfig = () => {
 };
 
 
-const getViteConfigPath = () => {
+function getViteConfigPath() {
   const possibleFiles = [
     "vite.config.mjs",
     "vite.config.js"
@@ -2919,7 +2893,7 @@ const getAnalyticsConfig = () => {
   };
 };
 
-const isPackageAvailable = (packageName) => {
+function isPackageAvailable(packageName) {
   if (!fs.existsSync(packageJsonPath)) return false;
 
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
@@ -2927,47 +2901,43 @@ const isPackageAvailable = (packageName) => {
   return Boolean(
     packageJson.dependencies?.[packageName] ||
     packageJson.devDependencies?.[packageName] ||
+    packageJson.optionalDependencies?.[packageName] ||
+    packageJson.peerDependencies?.[packageName] ||
     fs.existsSync(path.join(process.cwd(), "node_modules", packageName, "package.json"))
   );
 };
 
 const sourceImportsPackage = (packageName, ignoredFilePath) => {
-  const sourceDir = path.join(process.cwd(), "src");
-  if (!fs.existsSync(sourceDir)) return false;
-
   const escapedPackage = packageName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const importRegex = new RegExp(`(?:from\\s*['"]${escapedPackage}(?:/[^'"]*)?['"]|import\\s*['"]${escapedPackage}(?:/[^'"]*)?['"]|import\\s*\\(\\s*['"]${escapedPackage}(?:/[^'"]*)?['"]\\s*\\)|require\\s*\\(\\s*['"]${escapedPackage}(?:/[^'"]*)?['"]\\s*\\))`);
 
-  const scan = (dir) => {
-    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-      const fullPath = path.join(dir, entry.name);
-
-      if (ignoredFilePath && path.resolve(fullPath) === path.resolve(ignoredFilePath)) {
-        continue;
-      }
-
-      if (entry.isDirectory()) {
-        if (scan(fullPath)) return true;
-        continue;
-      }
-
-      if (!/\.(js|mjs|cjs|ts|tsx|jsx|f7)$/.test(entry.name)) continue;
-
-      const content = fs.readFileSync(fullPath, "utf8");
-      if (importRegex.test(content)) return true;
-    }
-
-    return false;
-  };
-
-  return scan(sourceDir);
+  return getSourceFiles().some(fullPath => {
+    if (ignoredFilePath && path.resolve(fullPath) === path.resolve(ignoredFilePath)) return false;
+    if (!/\.(js|mjs|cjs|ts|tsx|jsx|f7)$/.test(fullPath)) return false;
+    return importRegex.test(fs.readFileSync(fullPath, 'utf8'));
+  });
 };
 
-const runNpmCommand = (command) => {
+function runNpmCommand(command) {
   console.log(`🚀 ${command}`);
   execSync(command, { stdio: "inherit" });
 };
 
+function removeOneSignalPlugin() {
+  if (!isPackageAvailable(ONESIGNAL_PLUGIN_NAME)) {
+    console.log('ℹ️ OneSignal is not installed. Skipping removal.');
+    return;
+  }
+
+  console.warn(`⚠️ WARNING: ${ONESIGNAL_PLUGIN_NAME} was found. OneSignal is retired and will be uninstalled automatically.`);
+  runNpmCommand(`npm uninstall ${ONESIGNAL_PLUGIN_NAME}`);
+  if (isPackageAvailable(ONESIGNAL_PLUGIN_NAME)) {
+    throw new Error(`❌ ${ONESIGNAL_PLUGIN_NAME} is still declared or installed after npm uninstall. Build stopped; check dependent packages.`);
+  }
+  sourceFileInventory = null;
+  console.log(`✅ Uninstalled ${ONESIGNAL_PLUGIN_NAME}.`);
+}
+
 const CODEPLAY_SYSTEM_BARS_PLUGIN = "capacitor-codeplay-system-bars";
 
 const syncCodeplaySystemBarsPackage = () => {
@@ -3180,27 +3150,17 @@ const syncAdmobConfigImports = () => {
   const adsDir = path.join(process.cwd(), "src", "js", "Ads");
   if (!fs.existsSync(adsDir)) return;
 
-  const scan = (dir) => {
-    fs.readdirSync(dir, { withFileTypes: true }).forEach(entry => {
-      const fullPath = path.join(dir, entry.name);
-
-      if (entry.isDirectory()) {
-        scan(fullPath);
-        return;
-      }
-
-      if (!/\.(js|mjs|ts|f7)$/.test(entry.name) || entry.name.endsWith(".min.js")) return;
-
-      let content = fs.readFileSync(fullPath, "utf8");
-      if (!content.includes(ADMOB_OLD_CONFIG)) return;
-
-      content = content.split(ADMOB_OLD_CONFIG).join(ADMOB_NEXTGEN_CONFIG);
-      fs.writeFileSync(fullPath, content, "utf8");
-      console.log(`✏️ Updated AdMob config import in ${path.relative(process.cwd(), fullPath)}`);
-    });
-  };
+  // Downloads invalidate the inventory; content-only migrations reuse it.
+  for (const fullPath of getSourceFiles()) {
+    if (!fullPath.startsWith(adsDir + path.sep)) continue;
+    if (!/\.(js|mjs|ts|f7)$/.test(fullPath) || fullPath.endsWith('.min.js')) continue;
+    let content = fs.readFileSync(fullPath, 'utf8');
+    if (!content.includes(ADMOB_OLD_CONFIG)) continue;
+    content = content.split(ADMOB_OLD_CONFIG).join(ADMOB_NEXTGEN_CONFIG);
+    fs.writeFileSync(fullPath, content, 'utf8');
+    console.log(`✏️ Updated AdMob config import in ${path.relative(process.cwd(), fullPath)}`);
+  }
 
-  scan(adsDir);
 };
 
 const ensureAdmobNextgenFiles = async () => {
@@ -3273,6 +3233,7 @@ const ensureAdmobNextgenFiles = async () => {
     mergedConfig.iosAppId = iosAppId;
   }
 
+  if (!fs.existsSync(nextgenConfigPath)) sourceFileInventory = null;
   fs.writeFileSync(nextgenConfigPath, JSON.stringify(mergedConfig, null, 2) + "\n", "utf8");
   syncAdmobConfigImports();
   console.log("✅ AdMob nextgen files and configuration are ready.");
@@ -3448,7 +3409,9 @@ export const trackConsumablePurchased = trackEvent;
 `;
 
   const nextContent = analyticsEnabled ? activeWrapper : noopWrapper;
-  const currentContent = fs.existsSync(analyticsFile) ? fs.readFileSync(analyticsFile, "utf8") : "";
+  const analyticsFileExists = fs.existsSync(analyticsFile);
+  const currentContent = analyticsFileExists ? fs.readFileSync(analyticsFile, "utf8") : "";
+  if (!analyticsFileExists) sourceFileInventory = null;
 
   if (currentContent !== nextContent) {
     fs.writeFileSync(analyticsFile, nextContent, "utf8");
@@ -3459,6 +3422,7 @@ export const trackConsumablePurchased = trackEvent;
 
   if (fs.existsSync(legacyAnalyticsFile)) {
     fs.unlinkSync(legacyAnalyticsFile);
+    sourceFileInventory = null;
     console.log("✅ Removed old Firebase analytics wrapper: src/js/analytics/firebase-analytics.js");
   }
 
@@ -3540,7 +3504,7 @@ const syncFirebaseAnalyticsPodfile = () => {
   }
 };
 
-const ensureImportOrRequire = (content, moduleName, esmLine, cjsLine) => {
+function ensureImportOrRequire(content, moduleName, esmLine, cjsLine) {
   const escaped = moduleName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   if (new RegExp(`from\\s*['"]${escaped}['"]|require\\s*\\(\\s*['"]${escaped}['"]\\s*\\)`).test(content)) {
     return content;
@@ -4033,11 +3997,12 @@ if (compareVersion(admobConfigInJson.VERSION, admobConfigMinVersion) < 0) {
 
 
 
-function ensureGitignoreEntry(entry) {
+function ensureGitignoreEntry(entry, shouldIgnore = true) {
   const gitignorePath = path.join(process.cwd(), '.gitignore');
 
   // If .gitignore doesn't exist, create it
   if (!fs.existsSync(gitignorePath)) {
+    if (!shouldIgnore) return;
     fs.writeFileSync(gitignorePath, `${entry}\n`, 'utf8');
     console.log(`✅ .gitignore created and added: ${entry}`);
     return;
@@ -4045,6 +4010,18 @@ function ensureGitignoreEntry(entry) {
 
   const content = fs.readFileSync(gitignorePath, 'utf8');
 
+  if (!shouldIgnore) {
+    const normalizedEntry = entry.replace(/^\/|\/$/g, '');
+    const nextContent = content.split(/(?<=\n)/).filter(line =>
+      line.trim().replace(/^\/|\/$/g, '') !== normalizedEntry
+    ).join('');
+    if (nextContent !== content) {
+      fs.writeFileSync(gitignorePath, nextContent, 'utf8');
+      console.log(`✅ Removed from .gitignore: ${entry}`);
+    }
+    return;
+  }
+
   // Normalize lines (trim + remove trailing slashes for comparison)
   const lines = content
     .split(/\r?\n/)
@@ -4069,7 +4046,8 @@ function ensureGitignoreEntry(entry) {
 }
 
 
-ensureGitignoreEntry('buildCodeplay/');
+ensureGitignoreEntry('buildCodeplay/', false);
+ensureGitignoreEntry('agent-temp/');
 
 
 // ======================================================
@@ -4249,7 +4227,6 @@ function patchFile() {
 async function main() {
   validateThemeFolderLocation();
   validateAndRestoreSignDetails();
-  execSync('node buildCodeplay/fix-onesignal-plugin.js', { stdio: 'inherit' });
 
   await loadPluginVersions();   // 🔥 NEW
   await syncAgentInstructions();
@@ -4265,7 +4242,8 @@ async function main() {
   checkAdmobConfigurationProperty();
 }
 
-main().catch(err => {
+await main();
+})().catch(err => {
   console.error(err?.message || err);
   process.exit(1);
 });