@makefully/adaptfully 3.16.1 → 4.1.0

package/lib/node/packagers/index.js

@@ -1,5 +1,4 @@
 import { CapacitorPackager } from './capacitor.js';
-import { CordovaPackager } from './cordova.js';
 import { ElectronPackager } from './electron.js';
 import { Packager, VALID_PACKAGERS } from './base.js';
 import { WebPackager } from './web.js';
@@ -10,7 +9,6 @@ export {
     resolvePlatformSocialLogin,
     validateSocialLoginConfig,
 } from './capacitor.js';
-export { CordovaPackager } from './cordova.js';
 export {
     ElectronPackager,
     buildElectronMain,
@@ -26,7 +24,6 @@ export { WebPackager } from './web.js';
 const PACKAGER_REGISTRY = {
     web: WebPackager,
     electron: ElectronPackager,
-    cordova: CordovaPackager,
     capacitor: CapacitorPackager,
 };
 

package/lib/node/pipeline.js

@@ -12,6 +12,8 @@ import {
 import { steamPublishFromCli } from './steam-publish.js';
 import { googlePublishFromCli } from './google-publish.js';
 import { applePublishFromCli } from './apple-publish.js';
+import { androidKeystoreFromCli } from './android-keystore.js';
+import { appleSigningFromCli } from './apple-signing.js';
 
 /** @typedef {'prebuild' | 'build' | 'deploy' | 'release'} AdaptfullyStage */
 
@@ -20,6 +22,8 @@ const PUBLISH_COMMANDS = {
     'steam-publish': steamPublishFromCli,
     'google-publish': googlePublishFromCli,
     'apple-publish': applePublishFromCli,
+    'android-keystore': androidKeystoreFromCli,
+    'apple-signing': appleSigningFromCli,
 };
 
 /**
@@ -202,6 +206,8 @@ export async function adaptfullyFromCli(argv = process.argv) {
             + '  adaptfully steam-publish [--username U] [--password P] [--deployment steam] [--output path]\n'
             + '  adaptfully google-publish [--from service-account.json] [--deployment android] [--output path]\n'
             + '  adaptfully apple-publish [--deployment ios] [--category C] [--identity I] [--username U] [--password P]\n'
+            + '  adaptfully android-keystore [--deployment android] [--debug-only] [--yes]\n'
+            + '  adaptfully apple-signing [--deployment ios] [--kind development|distribution] [--csr-only] [--from-cer path] [--provision path]\n'
             + '\n'
             + 'Stages:\n'
             + '  prebuild  Copy deploy/ and apply platform registrations → output/<platform>-prebuild/\n'
@@ -213,9 +219,11 @@ export async function adaptfullyFromCli(argv = process.argv) {
             + '  --artifact <path>   Prior build artifact directory (deploy only; default: ./output/ after build).\n'
             + '\n'
             + 'Publish credential helpers (one-time local setup):\n'
-            + '  steam-publish   Install steamcmd if needed, log in, write steam deployment steam.json\n'
-            + '  google-publish  Import a Play service-account JSON into the android deployment folder\n'
-            + '  apple-publish   Write App Store Connect credentials into the ios deployment folder',
+            + '  steam-publish     Install steamcmd if needed, log in, write steam deployment steam.json\n'
+            + '  google-publish    Import a Play service-account JSON into the android deployment folder\n'
+            + '  apple-publish     Write App Store Connect credentials into the ios deployment folder\n'
+            + '  android-keystore  Generate debug/release keystores and write android build.json\n'
+            + '  apple-signing     Generate CSR, export .p12, place provisioning profiles under ios/apple/',
         );
     }
 

package/lib/node/publish-credentials.js

@@ -211,13 +211,33 @@ export async function promptRequired(prompt, existing) {
     }
 }
 
+/**
+ * @param {string} prompt
+ * @param {boolean} [defaultYes=false]
+ * @returns {Promise<boolean>}
+ */
+export async function promptConfirm(prompt, defaultYes = false) {
+    const rl = readline.createInterface({ input, output });
+    const suffix = defaultYes ? ' [Y/n] ' : ' [y/N] ';
+
+    try {
+        const answer = String(await rl.question(`${prompt}${suffix}`)).trim().toLowerCase();
+        if (!answer) {
+            return defaultYes;
+        }
+        return answer === 'y' || answer === 'yes';
+    } finally {
+        rl.close();
+    }
+}
+
 /**
  * Parse shared CLI flags used by publish credential helpers.
  * @param {string[]} argv
  * @param {number} [startIndex=3]
  */
 export function parsePublishCredentialArgv(argv, startIndex = 3) {
-    /** @type {Record<string, string>} */
+    /** @type {Record<string, string | boolean>} */
     const options = {
         projectRoot: '.',
     };
@@ -243,6 +263,32 @@ export function parsePublishCredentialArgv(argv, startIndex = 3) {
             options.username = argv[++i];
         } else if (arg === '--password' && argv[i + 1]) {
             options.password = argv[++i];
+        } else if (arg === '--debug-only') {
+            options.debugOnly = true;
+        } else if (arg === '--csr-only') {
+            options.csrOnly = true;
+        } else if (arg === '--yes' || arg === '-y') {
+            options.yes = true;
+        } else if (arg === '--from-cer' && argv[i + 1]) {
+            options.fromCer = normalizeUserPath(argv[++i]);
+        } else if (arg === '--kind' && argv[i + 1]) {
+            options.kind = argv[++i];
+        } else if (arg === '--provision' && argv[i + 1]) {
+            options.provision = normalizeUserPath(argv[++i]);
+        } else if (arg === '--workdir' && argv[i + 1]) {
+            options.workdir = normalizeUserPath(argv[++i]);
+        } else if (arg === '--alias' && argv[i + 1]) {
+            options.alias = argv[++i];
+        } else if (arg === '--store-password' && argv[i + 1]) {
+            options.storePassword = argv[++i];
+        } else if (arg === '--key-password' && argv[i + 1]) {
+            options.keyPassword = argv[++i];
+        } else if (arg === '--p12-password' && argv[i + 1]) {
+            options.p12Password = argv[++i];
+        } else if (arg === '--cn' && argv[i + 1]) {
+            options.cn = argv[++i];
+        } else if (arg === '--email' && argv[i + 1]) {
+            options.email = argv[++i];
         }
     }
 

package/lib/node/registrations.js

@@ -345,7 +345,7 @@ export function resolvePublishDir(deploymentKey, metaDir = 'assets/meta') {
     return path.join(metaDir, 'deployments', deploymentKey);
 }
 
-const BUILD_SIGNING_PACKAGERS = new Set(['capacitor', 'cordova']);
+const BUILD_SIGNING_PACKAGERS = new Set(['capacitor']);
 
 /**
  * Credential folders to ship with `adaptfully build` (zip artifact) when the
@@ -412,7 +412,10 @@ export function resolveFamily(targets, packager) {
         return 'electron';
     }
     if (packager === 'cordova') {
-        return 'cordova';
+        throw new Error(
+            'Cordova/PhoneGap is no longer supported. Remove packager: "cordova" '
+            + '(or set packager: "capacitor") and use Capacitor for android/ios builds.',
+        );
     }
     if (packager === 'capacitor') {
         return 'capacitor';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@makefully/adaptfully",
-    "version": "3.16.1",
+    "version": "4.1.0",
     "description": "Platform abstraction and Wrapfully deploy client for Makefully games",
     "type": "module",
     "main": "./lib/node/index.js",
@@ -17,6 +17,7 @@
     "files": [
         "bin",
         "lib",
+        "docs",
         "CHANGELOG.md",
         "LICENSE",
         "README.md"
@@ -40,7 +41,7 @@
         "platform",
         "deploy",
         "build",
-        "cordova",
+        "capacitor",
         "electron"
     ],
     "contributors": [

package/lib/node/packagers/cordova.js

@@ -1,44 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { Packager } from './base.js';
-
-const CORDOVA_CSP = '<meta http-equiv="Content-Security-Policy" content="default-src * \'self\' data: gap: \'unsafe-inline\' \'unsafe-eval\'; style-src * \'self\' \'unsafe-inline\' \'unsafe-eval\' gap:; script-src * \'self\' \'unsafe-inline\' \'unsafe-eval\' gap:; frame-src *;" />';
-
-const CORDOVA_VIEWPORT = '<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />';
-
-const CORDOVA_STUB = `/**
- * Stub for non-Cordova environments. Cordova replaces this at runtime on device builds.
- */
-window.cordova = null;
-`;
-
-export class CordovaPackager extends Packager {
-    /** @type {'cordova'} */
-    static id = 'cordova';
-
-    /** @type {string[]} */
-    static defaultPlatforms = ['ios', 'android'];
-
-    needsGameConfig() {
-        return true;
-    }
-
-    /** @param {string} dest */
-    applyTemplates(dest) {
-        fs.writeFileSync(path.join(dest, 'cordova.js'), CORDOVA_STUB);
-        this.log('adaptfully: write cordova.js');
-
-        super.applyTemplates(dest);
-    }
-
-    buildHtmlInjection() {
-        const headExtras = [CORDOVA_CSP, CORDOVA_VIEWPORT];
-        const bodyScripts = ['<script src="cordova.js"></script>'];
-
-        if (this.needsGameConfig()) {
-            bodyScripts.push('<script src="game-config.js"></script>');
-        }
-
-        return this.formatHtmlInjection(headExtras, bodyScripts);
-    }
-}