fix(capacitor): pass in project/package id during start

fixes #3519

Author: imhoffd

packages/@ionic/cli-utils/src/definitions.ts

@@ -266,6 +266,7 @@ export interface IProject {
 }
 
 export interface IIntegrationAddOptions {
+  enableArgs?: string[];
   conflictHandler?(f: string, stats: fs.Stats): Promise<boolean>;
   onFileCreate?(f: string): void;
 }

packages/@ionic/cli-utils/src/lib/integrations/capacitor/config.ts

@@ -4,6 +4,8 @@ import * as lodash from 'lodash';
 export const CAPACITOR_CONFIG_FILE = 'capacitor.config.json';
 
 export interface CapacitorConfigFile {
+  appId?: string;
+  appName?: string;
   webDir?: string;
   server?: {
     url?: string;

packages/@ionic/cli-utils/src/lib/integrations/capacitor/index.ts

@@ -1,17 +1,34 @@
+import * as path from 'path';
+
 import { BaseIntegration } from '../';
-import { IIntegrationAddOptions, InfoItem, IntegrationName } from '../../../definitions';
+import { IIntegrationAddOptions, InfoItem, IntegrationName, ProjectPersonalizationDetails } from '../../../definitions';
 import { pkgManagerArgs } from '../../utils/npm';
 
+import { CAPACITOR_CONFIG_FILE, CapacitorConfig } from './config';
+
 export class Integration extends BaseIntegration {
   readonly name: IntegrationName = 'capacitor';
   readonly summary = `Target native iOS and Android with Capacitor, Ionic's new native layer`;
   readonly archiveUrl = undefined;
 
   async add(options?: IIntegrationAddOptions): Promise<void> {
+    let name = this.e.project.config.get('name');
+    let packageId = 'io.ionic.starter';
+
+    if (options && options.enableArgs) {
+      if (options.enableArgs[0]) {
+        name = options.enableArgs[0];
+      }
+
+      if (options.enableArgs[1]) {
+        packageId = options.enableArgs[1];
+      }
+    }
+
     await this.installCapacitorCore();
     await this.installCapacitorCLI();
 
-    await this.e.shell.run('capacitor', ['init', this.e.project.config.get('name'), 'io.ionic.starter'], { cwd: this.e.project.directory });
+    await this.e.shell.run('capacitor', ['init', name, packageId], { cwd: this.e.project.directory });
 
     await super.add(options);
   }
@@ -26,6 +43,16 @@ export class Integration extends BaseIntegration {
     await this.e.shell.run(manager, managerArgs, { cwd: this.e.project.directory });
   }
 
+  async personalize({ name, packageId }: ProjectPersonalizationDetails) {
+    const conf = new CapacitorConfig(path.resolve(this.e.project.directory, CAPACITOR_CONFIG_FILE));
+
+    conf.set('appName', name);
+
+    if (packageId) {
+      conf.set('appId', packageId);
+    }
+  }
+
   async getInfo(): Promise<InfoItem[]> {
     const [
       [ capacitorCorePkg, capacitorCorePkgPath ],

packages/ionic/src/commands/integrations/enable.ts

@@ -60,6 +60,7 @@ Integrations can be re-added with the ${chalk.green('--add')} option.
     try {
       if (!integrationConfig || add) {
         await integration.add({
+          enableArgs: options['--'] ? options['--'] : undefined,
           conflictHandler: async (f, stats) => {
             const isDirectory = stats.isDirectory();
             const filename = `${path.basename(f)}${isDirectory ? '/' : ''}`;

packages/ionic/src/commands/start.ts

@@ -439,7 +439,7 @@ ${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/cli/starters
       }
 
       if (options['capacitor']) {
-        await runCommand(runinfo, ['integrations', 'enable', 'capacitor', '--quiet']);
+        await runCommand(runinfo, ['integrations', 'enable', 'capacitor', '--quiet', '--', this.schema.name, packageId ? packageId : 'io.ionic.starter']);
       }
 
       await this.project.personalize({ name: this.schema.name, projectId, packageId });