codeplay-common 4.10.4 → 4.10.6

package/package.json

@@ -1,27 +1,27 @@
-{
-  "name": "codeplay-common",
-  "version": "4.10.4",
-  "description": "Common build scripts and files",
-  "scripts": {
-    "postinstall": "node scripts/sync-files.js",
-    "preinstall": "node scripts/uninstall.js"
-  },
-  "dependencies": {
-    "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",
-  "files": [
-    "files/",
-    "scripts/",
-    "README.md",
-    "CHANGELOG.md",
-    "RELEASE_NOTES.md",
-    "LICENSE"
-  ]
-}
+{
+  "name": "codeplay-common",
+  "version": "4.10.6",
+  "description": "Common build scripts and files",
+  "scripts": {
+    "postinstall": "node scripts/sync-files.js",
+    "preinstall": "node scripts/uninstall.js"
+  },
+  "dependencies": {
+    "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",
+  "files": [
+    "files/",
+    "scripts/",
+    "README.md",
+    "CHANGELOG.md",
+    "RELEASE_NOTES.md",
+    "LICENSE"
+  ]
+}

package/scripts/sync-files.js

@@ -1,86 +1,111 @@
-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);
-}
-
-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;
-}
-
-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;
-}
-module.exports = { install, findProjectRoot, migrateAppScripts };
-if (require.main === module) {
-  try { install(); } catch (error) { console.error(error.message); process.exitCode = 1; }
+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);
+}
+
+function migrateAppConfigurator(projectRoot) {
+  const filePath = path.join(projectRoot, 'scripts-common', 'configure-codeplay-common.js');
+  if (!fs.existsSync(filePath)) return;
+  const original = fs.readFileSync(filePath, 'utf8');
+  let updated = original;
+  // Preserve app-specific configuration; extend only the known legacy lookups.
+  for (const [variable, script] of [
+    ['buildFile', 'codeplayBeforeBuild.js'],
+    ['packageIdFile', 'packageidBaseModification.js'],
+  ]) {
+    updated = updated.replace(
+      `const ${variable} = fs.readdirSync(buildDir)`,
+      `const ${variable} = fs.existsSync(path.join(buildDir, '${script}'))\n` +
+      `  ? '${script}'\n` +
+      `  : fs.readdirSync(buildDir)`
+    );
+  }
+  updated = updated.replace(
+    "packageJson.scripts['capacitor:sync:after'] = 'node scripts/run-codeplay-sync-after.js';",
+    "packageJson.scripts['capacitor:sync:after'] = 'node scripts-common/run-codeplay-sync-after.js';"
+  );
+  if (updated !== original) fs.writeFileSync(filePath, updated, 'utf8');
+}
+
+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;
+}
+
+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 });
+    }
+  }
+  migrateAppConfigurator(projectRoot);
+  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;
+}
+module.exports = { install, findProjectRoot, migrateAppScripts, migrateAppConfigurator };
+if (require.main === module) {
+  try { install(); } catch (error) { console.error(error.message); process.exitCode = 1; }
 }

package/scripts/uninstall.js

@@ -1,3 +1,3 @@
-// Preserve working app files during preinstall. Postinstall migrates commands
-// first, then removes only recognized copied build scripts.
+// 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.');