codeplay-common 4.9.9 → 4.10.1

package/files/take-screen-image.js

@@ -26,12 +26,12 @@ const path = require('node:path');
 const readline = require('node:readline/promises');
 const { spawn, spawnSync } = require('node:child_process');
 const sharp = require('sharp');
-const { frameStyles, createFrameSamples } = require('./scripts/screenshot/frame-samples.js');
+const { frameStyles, createFrameSamples } = require('./scripts-common/screenshot/frame-samples.js');
 const {
   getDecorationSeed,
   createPromotionalDecorations,
   getPromotionalDecorationStyles,
-} = require('./scripts/screenshot/background-decorations.js');
+} = require('./scripts-common/screenshot/background-decorations.js');
 
 const screenshotDirectory = path.join(__dirname, 'Auto-Screenshot', 'Store-image-Screenshot');
 const inFrameDirectory = path.join(__dirname, 'Auto-Screenshot', 'Store-image-Frame');

package/package.json

@@ -1,18 +1,27 @@
 {
   "name": "codeplay-common",
-  "version": "4.9.9",
+  "version": "4.10.1",
   "description": "Common build scripts and files",
   "scripts": {
-	"postinstall": "node scripts/sync-files.js",
-	"preinstall": "node scripts/uninstall.js"
+    "postinstall": "node scripts/sync-files.js",
+    "preinstall": "node scripts/uninstall.js"
   },
   "dependencies": {
-    "adm-zip": "^0.6.1"
+    "adm-zip": "^0.6.1",
+    "plist": "^3.1.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/merbin2012/codeplay-common.git"
   },
   "author": "Codeplay Technologies",
-  "license": "MIT"
+  "license": "MIT",
+  "files": [
+    "files/",
+    "scripts/",
+    "README.md",
+    "CHANGELOG.md",
+    "RELEASE_NOTES.md",
+    "LICENSE"
+  ]
 }

package/scripts/sync-files.js

@@ -1,118 +1,86 @@
-const fs = require("fs");
-const path = require("path");
-
-const projectRoot = path.resolve(__dirname, "../../../"); // Your project's root
-const commonBuildPath = path.join(__dirname, "../files"); // Path to common files
-const buildCodeplayPath = path.join(commonBuildPath, "buildCodeplay"); // Correct path
-const packageJsonPath = path.join(projectRoot, "package.json");
-
-// Ensure package.json exists
-if (!fs.existsSync(packageJsonPath)) {
-    process.stderr.write("❌ package.json not found!\n");
-    process.exit(1);
-}
-
-const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-
-function copyFolderSync(source, destination) {
-    try {
-        fs.cpSync(source, destination, { recursive: true });
-        process.stdout.write(`✅ Copied folder: ${source} -> ${destination}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to copy folder: ${source} - ${error.message}\n`);
+const fs = require('fs');
+const path = require('path');
+const { updateBuildScripts, removeVersionedBuildScripts } = require('../files/buildCodeplay/project-scripts.cjs');
+
+function migrateAppScripts(projectRoot) {
+  const root = path.resolve(projectRoot);
+  const source = path.resolve(root, 'scripts');
+  const destination = path.resolve(root, 'scripts-common');
+  if (path.dirname(source) !== root || path.dirname(destination) !== root) throw new Error('Invalid app scripts path.');
+  if (!fs.existsSync(source)) return;
+  // Preflight the entire tree before moving anything. Never overwrite a
+  // different existing file or follow a linked directory.
+  function check(from, to) {
+    if (fs.lstatSync(from).isSymbolicLink() || (fs.existsSync(to) && fs.lstatSync(to).isSymbolicLink())) throw new Error('Cannot migrate linked script paths.');
+    if (!fs.existsSync(to)) return;
+    if (fs.statSync(from).isDirectory() && fs.statSync(to).isDirectory()) {
+      for (const name of fs.readdirSync(from)) check(path.join(from, name), path.join(to, name));
+    } else if (!fs.statSync(from).isFile() || !fs.statSync(to).isFile() || !fs.readFileSync(from).equals(fs.readFileSync(to))) {
+      throw new Error(`Scripts folder conflict; both files preserved: ${to}`);
     }
+  }
+  function move(from, to) {
+    if (!fs.existsSync(to)) { fs.renameSync(from, to); return; }
+    if (fs.statSync(from).isDirectory()) {
+      for (const name of fs.readdirSync(from)) move(path.join(from, name), path.join(to, name));
+      fs.rmdirSync(from);
+    } else fs.unlinkSync(from); // Identical existing file, verified above.
+  }
+  check(source, destination);
+  move(source, destination);
 }
 
-// Copy all files from `common-build-files/files/` to the project root
-fs.readdirSync(commonBuildPath).forEach(file => {
-    // Never distribute or overwrite app-owned screenshot data.
-    if (file === "scripts-screenshot") return;
-    const sourcePath = path.join(commonBuildPath, file);
-    const destPath = path.join(projectRoot, file);
-
-    if (fs.statSync(sourcePath).isDirectory()) {
-        copyFolderSync(sourcePath, destPath);
-    } else {
-        try {
-            fs.copyFileSync(sourcePath, destPath);
-            process.stdout.write(`✅ Copied file: ${file}\n`);
-        } catch (error) {
-            process.stderr.write(`⚠️ Failed to copy file: ${file} - ${error.message}\n`);
-        }
-    }
-});
-
-// Function to get the latest versioned file from files/buildCodeplay
-function getLatestFile(prefix) {
-    if (!fs.existsSync(buildCodeplayPath)) return null; // Ensure directory exists
-
-    const files = fs.readdirSync(buildCodeplayPath).filter(file => file.startsWith(prefix));
-    if (files.length === 0) return null;
-    files.sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
-    return files[0];
+function findProjectRoot() {
+  // npm may execute a file: dependency's lifecycle in its source directory.
+  // INIT_CWD identifies the app that invoked npm in that case.
+  for (const candidate of [process.env.INIT_CWD, path.join(__dirname, '../../..')]) {
+    if (!candidate) continue;
+    const root = path.resolve(candidate);
+    const file = path.join(root, 'package.json');
+    if (!fs.existsSync(file)) continue;
+    if (JSON.parse(fs.readFileSync(file, 'utf8')).name !== 'codeplay-common' && fs.existsSync(path.join(root, 'capacitor.config.json'))) return root;
+  }
+  return null;
 }
 
-// Detect latest script versions
-const latestSplashScreen = getLatestFile("add-splash-screen-");
-const latestSplashAnimation = getLatestFile("setSplashAnimation-");
-const latestCodeplayBuild = getLatestFile("codeplayBeforeBuild-");
-
-const latestPackageIdModification = getLatestFile("packageidBaseModification-");
-const baselineProfileSetupScript = "node scripts/setup-baseline-profile.js";
-const baselineProfileGenerateScript = "cd android && gradlew.bat :app:generateBaselineProfile --console=plain";
-
-function appendIfMissing(base, suffix) {
-  if (!suffix) return base;
-  if (!base || typeof base !== "string") return suffix;
-  if (base.includes(suffix)) return base;
-  return `${base} && ${suffix}`;
-}
-
-
-// Ensure scripts object exists
-packageJson.scripts = packageJson.scripts || {};
-
-// Update or add necessary scripts
-if (latestCodeplayBuild) {
-    packageJson.scripts["build"] = `node buildCodeplay/${latestCodeplayBuild} && node buildCodeplay/${latestPackageIdModification} && cross-env NODE_ENV=production vite build --logLevel warn`;
-}
-if (latestSplashScreen && latestSplashAnimation) {
-    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
-        `node buildCodeplay/${latestSplashScreen} && node buildCodeplay/${latestSplashAnimation} && node buildCodeplay/manifestModification.js`,
-        baselineProfileSetupScript
-    );
-    //node buildCodeplay/ios-emi-admob-modification.js && 
-} else if (packageJson.scripts["capacitor:sync:after"]) {
-    packageJson.scripts["capacitor:sync:after"] = appendIfMissing(
-        packageJson.scripts["capacitor:sync:after"],
-        baselineProfileSetupScript
-    );
+function install(options = {}) {
+  const resolved = options.projectRoot || findProjectRoot();
+  if (!resolved) {
+    console.log('codeplay-common: no consuming Capacitor app found; skipping source-package setup.');
+    return null;
+  }
+  const projectRoot = path.resolve(resolved);
+  const commonFiles = path.resolve(__dirname, '../files');
+  const packagePath = path.join(projectRoot, 'package.json');
+  if (!fs.existsSync(packagePath)) throw new Error('Consuming application package.json was not found.');
+  const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+  const scripts = updateBuildScripts(pkg.scripts || {});
+  migrateAppScripts(projectRoot);
+  // Copy the common templates into each application for local testing.
+  const buildSource = path.join(commonFiles, 'buildCodeplay');
+  const buildTarget = path.join(projectRoot, 'buildCodeplay');
+  fs.mkdirSync(buildTarget, { recursive: true });
+  for (const name of fs.readdirSync(buildSource)) {
+    const target = path.join(buildTarget, name);
+    if ((name === 'release-sync.config.json' || name === 'splashxml') && fs.existsSync(target)) continue;
+    fs.cpSync(path.join(buildSource, name), target, { recursive: true });
+  }
+  fs.copyFileSync(path.join(commonFiles, 'finalrelease'), path.join(projectRoot, 'finalrelease'));
+  if (options.copyAssets !== false) {
+    for (const name of fs.readdirSync(commonFiles)) {
+      if (name === 'buildCodeplay' || name === 'scripts-screenshot') continue;
+      fs.cpSync(path.join(commonFiles, name), path.join(projectRoot, name), { recursive: true });
+    }
+  }
+  pkg.scripts = scripts;
+  fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2) + '\n');
+  // Cleanup happens only after replacement assets and package commands exist.
+  removeVersionedBuildScripts(projectRoot);
+  console.log('codeplay-common: unversioned build scripts copied to app buildCodeplay; app-owned settings preserved.');
+  // Coupled IAP/AdMob/Home migrations run together during before-build.
+  return pkg;
 }
-packageJson.scripts["baseline-profile:setup"] = baselineProfileSetupScript;
-packageJson.scripts["baseline-profile:generate"] = baselineProfileGenerateScript;
-
-// Keep Android as the default; iOS explicitly selects its save-gallery helper.
-packageJson.scripts["build:ios"] = "cross-env CODEPLAY_BUILD_PLATFORM=ios npm run build";
-packageJson.scripts["build-capacitor-android"] = "npm run build && npx cap copy android";
-
-packageJson.scripts["ionic:build"] = "npm run build";
-packageJson.scripts["ionic:serve"] = "cross-env NODE_ENV=development vite";
-packageJson.scripts["build:storeid1"] = "vite build --mode storeid1";
-packageJson.scripts["build:storeid2"] = "vite build --mode storeid2";
-packageJson.scripts["build:storeid3"] = "vite build --mode storeid3";
-packageJson.scripts["build:storeid4"] = "vite build --mode storeid4";
-packageJson.scripts["build:storeid5"] = "vite build --mode storeid5";
-//packageJson.scripts["build:storeid6"] = "vite build --mode storeid6";
-packageJson.scripts["build:storeid7"] = "vite build --mode storeid7";
-packageJson.scripts["build:storeid8"] = "vite build --mode storeid8";
-// Save changes
-fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf8");
-process.stdout.write("✅ package.json updated!\n");
-
-// Migrate AdMob packages and imports during installation, without running native builds.
-require(path.join(projectRoot, 'buildCodeplay', 'sync-admob-nextgen.js'))
-  .syncAdmobNextgen({ projectRoot, AdmZip: require('adm-zip') })
-  .catch(error => {
-    process.stderr.write('AdMob migration failed: ' + error.message + '\n');
-    process.exitCode = 1;
-  });
+module.exports = { install, findProjectRoot, migrateAppScripts };
+if (require.main === module) {
+  try { install(); } catch (error) { console.error(error.message); process.exitCode = 1; }
+}

package/scripts/uninstall.js

@@ -1,123 +1,3 @@
-// Define file prefixes to delete
-const filePrefixes = [
-    "add-splash-screen",
-    "setSplashAnimation",
-    "codeplayBeforeBuild",
-    "finalrelease"
-];
-
-const fs = require("fs");
-const path = require("path");
-
-const projectRoot = path.resolve(__dirname, "../../../"); // Project root
-const commonBuildPath = path.join(__dirname, "../files"); // Path where files were copied from
-const splashXmlPath = path.join(projectRoot, "buildCodeplay"); // Path to splashxml folder
-const baselineProfileSetupScript = path.join(projectRoot, "scripts", "setup-baseline-profile.js");
-const baselineProfileBackup = path.join(projectRoot, "baselineProfiles", "baseline-prof.txt");
-
-const isAgentInstructionAsset = (file) => {
-    const normalizedName = file.toLowerCase();
-    return normalizedName === "agents" || normalizedName === "agents.md";
-};
-
-process.stdout.write("🚀 Uninstalling: Removing old and copied files...\n");
-
-const removeDirectory = (dirPath) => {
-    if (fs.existsSync(dirPath)) {
-        fs.readdirSync(dirPath).forEach(file => {
-            const currentPath = path.join(dirPath, file);
-            if (fs.lstatSync(currentPath).isDirectory()) {
-                removeDirectory(currentPath);
-            } else {
-                fs.unlinkSync(currentPath);
-            }
-        });
-        fs.rmdirSync(dirPath);
-        process.stdout.write(`🗑️ Removed folder: ${dirPath}\n`);
-    }
-};
-
-removeDirectory(splashXmlPath);
-removeDirectory(path.join(projectRoot, "splashxml")); // Remove old splashxml folder
-
-// Step 1: Find all matching files in the project directory
-const filePatternsToRemove = [
-    /^add-splash-screen-.*$/, 
-    /^setSplashAnimation-.*$/, 
-    /^codeplayBeforeBuild-.*$/, 
-    /^modify-plugin-xml\.xml$/, 
-    /^finalrelease.*$/, 
-    /^iap-install-\d+(\.\d+)?\.js$/,
-    /^\.env\.storeid[1-7]$/, 
-    /^modify-plugin-xml\.js$/
-];
-
-const filesInProject = fs.readdirSync(projectRoot);
-
-filesInProject.forEach(file => {
-    if (filePatternsToRemove.some(pattern => pattern.test(file))) {
-        const filePath = path.join(projectRoot, file);
-        try {
-            fs.unlinkSync(filePath);
-            process.stdout.write(`🗑️ Removed file: ${filePath}\n`);
-        } catch (error) {
-            process.stderr.write(`⚠️ Failed to remove ${filePath}: ${error.message}\n`);
-        }
-    }
-});
-
-// Remove files and folders listed in commonBuildPath
-if (fs.existsSync(commonBuildPath)) {
-    fs.readdirSync(commonBuildPath).forEach(file => {
-        const destPath = path.join(projectRoot, file);
-        // Screenshot data belongs to the app, including folders from older releases.
-        if (file === "scripts" || file === "scripts-screenshot" || isAgentInstructionAsset(file)) {
-            return;
-        }
-        if (fs.existsSync(destPath)) {
-            try {
-                if (fs.lstatSync(destPath).isDirectory()) {
-                    removeDirectory(destPath);
-                } else {
-                    fs.unlinkSync(destPath);
-                    process.stdout.write(`🗑️ Removed file: ${destPath}\n`);
-                }
-            } catch (error) {
-                process.stderr.write(`⚠️ Failed to remove ${destPath}: ${error.message}\n`);
-            }
-        }
-    });
-}
-
-for (const helperDirectory of [
-    path.join(projectRoot, "scripts", "screenshot"),
-    path.join(projectRoot, "scripts-screenshot", "screenshot")
-]) {
-    for (const helperName of ["frame-samples.js", "background-decorations.js"]) {
-        const helperPath = path.join(helperDirectory, helperName);
-        if (fs.existsSync(helperPath)) {
-            fs.unlinkSync(helperPath);
-            process.stdout.write(`🗑️ Removed file: ${helperPath}\n`);
-        }
-    }
-}
-
-if (fs.existsSync(baselineProfileSetupScript)) {
-    try {
-        fs.unlinkSync(baselineProfileSetupScript);
-        process.stdout.write(`🗑️ Removed file: ${baselineProfileSetupScript}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to remove ${baselineProfileSetupScript}: ${error.message}\n`);
-    }
-}
-
-if (fs.existsSync(baselineProfileBackup)) {
-    try {
-        fs.unlinkSync(baselineProfileBackup);
-        process.stdout.write(`🗑️ Removed file: ${baselineProfileBackup}\n`);
-    } catch (error) {
-        process.stderr.write(`⚠️ Failed to remove ${baselineProfileBackup}: ${error.message}\n`);
-    }
-}
-
-process.stdout.write("✅ Uninstall cleanup complete!\n");
+// Preserve working app files during preinstall. Postinstall migrates commands
+// first, then removes only recognized copied build scripts.
+console.log('codeplay-common: preserving app files until installation completes.');

package/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto