feat: Ionic Appflow rebranding

Author: imhoffd

CONTRIBUTING.md

@@ -48,7 +48,7 @@ The Ionic CLI is organized into a monorepo. Here are the packages:
 
 * [`packages/ionic`](https://github.com/ionic-team/ionic-cli/tree/develop/packages/ionic): Ionic CLI executable and library.
 * [`packages/@ionic/cli-framework`](https://github.com/ionic-team/ionic-cli/tree/develop/packages/%40ionic/cli-framework): Framework for command-line programs.
-* [`packages/@ionic/discover`](https://github.com/ionic-team/ionic-cli/tree/develop/packages/%40ionic/discover): Service discovery library used for `ionic serve` with the [Ionic DevApp](https://ionicframework.com/docs/pro/devapp/).
+* [`packages/@ionic/discover`](https://github.com/ionic-team/ionic-cli/tree/develop/packages/%40ionic/discover): Service discovery library used for `ionic serve` with the [Ionic DevApp](https://ionicframework.com/docs/appflow/devapp/).
 * [`packages/@ionic/lab`](https://github.com/ionic-team/ionic-cli/tree/develop/packages/%40ionic/lab): Utility CLI for Ionic Lab, used by `ionic serve`.
 
 ##### Ionic 1

packages/ionic/CHANGELOG.md

@@ -239,7 +239,7 @@ Aside from a few edge cases listed below, upgrading to CLI 4 should be seamless.
 
 #### :boom: Breaking Changes
 
-* Support for legacy Ionic Cloud ended on January 31st, 2018. The `ionic upload` and `ionic package` commands have been removed from the CLI. Support for [Ionic Pro](https://ionicframework.com/pro/) will be a major focus for the CLI going forward. :ok_hand:
+* Support for legacy Ionic Cloud ended on January 31st, 2018. The `ionic upload` and `ionic package` commands have been removed from the CLI. Support for [Ionic Appflow](https://ionicframework.com/appflow/) will be a major focus for the CLI going forward. :ok_hand:
 * The `app_id` property in `ionic.config.json` has been renamed to `pro_id` and is now optional (see [#3038](https://github.com/ionic-team/ionic-cli/issues/3038)). The CLI automatically detects this and changes it, but this notice is here if your build scripts rely on the setting.
 * `ionic build` will no longer run `cordova prepare`. Instead, run `ionic cordova prepare <platform>`, which performs an Ionic build beforehand.
 * `ionic cordova prepare` will no longer run an Ionic build without a platform, e.g. `ionic cordova prepare ios` (see [#3653](https://github.com/ionic-team/ionic-cli/issues/3653))

packages/ionic/src/commands/config/base.ts

@@ -75,8 +75,8 @@ export abstract class BaseConfigCommand extends Command {
     }
 
     try {
-      // '12345e6' (a possible Pro ID) is interpreted as a number in scientific
-      // notation during JSON.parse, so don't try
+      // '12345e6' (a possible Appflow App ID) is interpreted as a number in
+      // scientific notation during JSON.parse, so don't try
       if (!v.match(/^\d+e\d+$/)) {
         v = JSON.parse(v);
       }

packages/ionic/src/commands/config/get.ts

@@ -58,7 +58,7 @@ This command will sanitize config output for known sensitive fields (disabled wh
           groups: [OptionGroup.Advanced],
         },
       ],
-      exampleCommands: ['', 'pro_id', '--global user.email', '-g npmClient'],
+      exampleCommands: ['', 'id', '--global user.email', '-g npmClient'],
     };
   }
 

packages/ionic/src/commands/cordova/resources.ts

@@ -75,7 +75,7 @@ This command uses Ionic servers, so we require you to be logged into your free I
     const isLoggedIn = this.env.session.isLoggedIn();
 
     if (!isLoggedIn) {
-      this.env.log.warn(`You need to be logged into your Ionic Pro account in order to run ${chalk.green(`ionic cordova resources`)}.\n`);
+      this.env.log.warn(`You need to be logged into your Ionic account in order to run ${chalk.green(`ionic cordova resources`)}.\n`);
       await promptToLogin(this.env);
     }
   }

packages/ionic/src/commands/git/clone.ts

@@ -13,8 +13,8 @@ export class GitCloneCommand extends Command {
       summary: 'Clones an Ionic app git repository to your computer',
       inputs: [
         {
-          name: 'pro-id',
-          summary: 'The Pro ID of the Ionic app to clone',
+          name: 'id',
+          summary: 'The ID of the Ionic Appflow app to clone',
           validators: [validators.required],
         },
         {
@@ -27,10 +27,10 @@ export class GitCloneCommand extends Command {
   }
 
   async run(inputs: CommandLineInputs, options: CommandLineOptions): Promise<void> {
-    // let [ proId, destination ] = inputs;
+    // let [ id, destination ] = inputs;
 
     // const appLoader = new App(this.env.session.getUserToken(), this.env.client);
-    // const app = await appLoader.load(proId);
+    // const app = await appLoader.load(id);
     // const remote = await formatGitRepoUrl(this.env.config, app.id);
 
     // if (!destination) {

packages/ionic/src/commands/git/remote.ts

@@ -9,9 +9,9 @@ export class GitRemoteCommand extends Command {
     return {
       name: 'remote',
       type: 'project',
-      summary: 'Adds/updates the Ionic Pro git remote to your local Ionic app',
+      summary: 'Adds/updates the Ionic Appflow git remote to your local Ionic app',
       description: `
-This command is used by ${chalk.green('ionic link')} when Ionic Pro is used as the git host.
+This command is used by ${chalk.green('ionic link')} when Ionic Appflow is used as the git host.
 
 ${chalk.green('ionic git remote')} will check the local repository for whether or not the git remote is properly set up. This command operates on the ${chalk.bold('ionic')} remote. For advanced configuration, see ${chalk.bold('Settings')} => ${chalk.bold('Git')} in the app settings of the Dashboard${chalk.cyan('[1]')}.
 
@@ -29,9 +29,9 @@ ${chalk.cyan('[1]')}: ${chalk.bold('https://dashboard.ionicframework.com')}
     }
 
     const token = this.env.session.getUserToken();
-    const proId = await this.project.requireProId();
+    const id = await this.project.requireAppflowId();
     const appClient = new AppClient(token, this.env);
-    const app = await appClient.load(proId);
+    const app = await appClient.load(id);
 
     if (!app.repo_url) {
       throw new FatalException(`Missing ${chalk.bold('repo_url')} property in app.`);

packages/ionic/src/commands/help.ts

@@ -45,15 +45,13 @@ export class HelpCommand extends Command {
         );
       }
 
-      const isLoggedIn = this.env.session.isLoggedIn();
       const now = new Date();
-      const prefix = isLoggedIn ? chalk.blue('PRO') + ' ' : '';
       const version = this.env.ctx.version;
       const suffix = now.getMonth() === 9 && now.getDate() === 31 ? ' 🎃' : '';
 
       const formatterOptions = {
         inProject: this.project ? true : false,
-        version: prefix + version + suffix,
+        version: version + suffix,
         location,
         namespace: location.obj,
       };

packages/ionic/src/commands/link.ts

@@ -31,26 +31,26 @@ export class LinkCommand extends Command implements CommandPreRun {
     return {
       name: 'link',
       type: 'project',
-      summary: 'Connect local apps to Ionic Pro',
+      summary: 'Connect local apps to Ionic Appflow',
       description: `
-Link apps on Ionic Pro to local Ionic projects with this command.
+Link apps on Ionic Appflow to local Ionic projects with this command.
 
-If the ${chalk.green('pro-id')} argument is excluded, this command will prompt you to select an app from Ionic Pro.
+If the ${chalk.green('id')} argument is excluded, this command will prompt you to select an app from Ionic Appflow.
 
-Ionic Pro uses a git-based workflow to manage app updates. During the linking process, select ${chalk.bold('GitHub')} (recommended) or ${chalk.bold('Ionic Pro')} as a git host. See our documentation${chalk.cyan('[1]')} for more information.
+Ionic Appflow uses a git-based workflow to manage app updates. During the linking process, select ${chalk.bold('GitHub')} (recommended) or ${chalk.bold('Ionic Appflow')} as a git host. See our documentation${chalk.cyan('[1]')} for more information.
 
-Ultimately, this command sets the ${chalk.bold('pro_id')} property in ${chalk.bold(prettyPath(projectFile))}, which marks this app as linked.
+Ultimately, this command sets the ${chalk.bold('id')} property in ${chalk.bold(prettyPath(projectFile))}, which marks this app as linked.
 
 If you are having issues linking, please get in touch with our Support${chalk.cyan('[2]')}.
 
-${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/pro/basics/git')}
+${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/appflow/basics/git')}
 ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')}
       `,
       exampleCommands: ['', 'a1b2c3d4'],
       inputs: [
         {
-          name: 'pro-id',
-          summary: `The Ionic Pro ID of the app to link (e.g. ${chalk.green('a1b2c3d4')})`,
+          name: 'id',
+          summary: `The Ionic Appflow ID of the app to link (e.g. ${chalk.green('a1b2c3d4')})`,
         },
       ],
       options: [
@@ -61,14 +61,14 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
         },
         {
           name: 'create',
-          summary: 'Create a new app on Ionic Pro and link it with this local Ionic project',
+          summary: 'Create a new app on Ionic Appflow and link it with this local Ionic project',
           type: Boolean,
           groups: [OptionGroup.Hidden],
         },
         {
           name: 'pro-id',
-          summary: 'Specify an app ID from the Ionic Pro to link',
-          groups: [OptionGroup.Hidden],
+          summary: 'Specify an app ID from the Ionic Appflow to link',
+          groups: [OptionGroup.Deprecated, OptionGroup.Hidden],
           spec: { value: 'id' },
         },
       ],
@@ -79,13 +79,13 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
     const { create } = options;
 
     if (inputs[0] && create) {
-      throw new FatalException(`Sorry--cannot use both ${chalk.green('pro-id')} and ${chalk.green('--create')}. You must either link an existing app or create a new one.`);
+      throw new FatalException(`Sorry--cannot use both ${chalk.green('id')} and ${chalk.green('--create')}. You must either link an existing app or create a new one.`);
     }
 
-    const proAppId = options['pro-id'] ? String(options['pro-id']) : undefined;
+    const id = options['pro-id'] ? String(options['pro-id']) : undefined;
 
-    if (proAppId) {
-      inputs[0] = proAppId;
+    if (id) {
+      inputs[0] = id;
     }
   }
 
@@ -96,25 +96,25 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
       throw new FatalException(`Cannot run ${chalk.green('ionic link')} outside a project directory.`);
     }
 
-    let proId: string | undefined = inputs[0];
+    let id: string | undefined = inputs[0];
     let { create } = options;
 
-    const proIdFromConfig = this.project.config.get('pro_id');
+    const idFromConfig = this.project.config.get('id');
 
-    if (proIdFromConfig) {
-      if (proId && proIdFromConfig === proId) {
-        this.env.log.msg(`Already linked with app ${chalk.green(proId)}.`);
+    if (idFromConfig) {
+      if (id && idFromConfig === id) {
+        this.env.log.msg(`Already linked with app ${chalk.green(id)}.`);
         return;
       }
 
-      const msg = proId ?
-        `Are you sure you want to link it to ${chalk.green(proId)} instead?` :
+      const msg = id ?
+        `Are you sure you want to link it to ${chalk.green(id)} instead?` :
         `Would you like to run link again?`;
 
       const confirm = await this.env.prompt({
         type: 'confirm',
         name: 'confirm',
-        message: `Pro ID ${chalk.green(proIdFromConfig)} is already set up with this app. ${msg}`,
+        message: `Appflow ID ${chalk.green(idFromConfig)} is already set up with this app. ${msg}`,
       });
 
       if (!confirm) {
@@ -127,21 +127,21 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
       await promptToLogin(this.env);
     }
 
-    if (!proId && !create) {
+    if (!id && !create) {
       const choices = [
         {
-          name: `Link ${proIdFromConfig ? 'a different' : 'an existing'} app on Ionic Pro`,
+          name: `Link ${idFromConfig ? 'a different' : 'an existing'} app on Ionic Appflow`,
           value: CHOICE_LINK_EXISTING_APP,
         },
         {
-          name: 'Create a new app on Ionic Pro',
+          name: 'Create a new app on Ionic Appflow',
           value: CHOICE_CREATE_NEW_APP,
         },
       ];
 
-      if (proIdFromConfig) {
+      if (idFromConfig) {
         choices.unshift({
-          name: `Relink ${chalk.green(proIdFromConfig)}`,
+          name: `Relink ${chalk.green(idFromConfig)}`,
           value: CHOICE_RELINK,
         });
       }
@@ -155,7 +155,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
 
       if (result === CHOICE_CREATE_NEW_APP) {
         create = true;
-        proId = undefined;
+        id = undefined;
       } else if (result === CHOICE_LINK_EXISTING_APP) {
         const tasks = this.createTaskChain();
         tasks.next(`Looking up your apps`);
@@ -175,27 +175,27 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
           const confirm = await this.env.prompt({
             type: 'confirm',
             name: 'confirm',
-            message: `No apps found. Would you like to create a new app on Ionic Pro?`,
+            message: `No apps found. Would you like to create a new app on Ionic Appflow?`,
           });
 
           if (!confirm) {
             throw new FatalException(`Cannot link without an app selected.`);
           }
 
           create = true;
-          proId = undefined;
+          id = undefined;
         } else {
           const choice = await this.chooseApp(apps);
 
           if (choice === CHOICE_NEVERMIND) {
             this.env.log.info('Not linking app.');
-            proId = undefined;
+            id = undefined;
           } else {
-            proId = choice;
+            id = choice;
           }
         }
       } else if (result === CHOICE_RELINK) {
-        proId = proIdFromConfig;
+        id = idFromConfig;
       }
     }
 
@@ -211,9 +211,9 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
         });
       }
 
-      proId = await this.createApp({ name }, runinfo);
-    } else if (proId) {
-      const app = await this.lookUpApp(proId);
+      id = await this.createApp({ name }, runinfo);
+    } else if (id) {
+      const app = await this.lookUpApp(id);
       await this.linkApp(app, runinfo);
     }
   }
@@ -230,12 +230,12 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
     return new UserClient(token, this.env);
   }
 
-  async lookUpApp(proId: string): Promise<App> {
+  async lookUpApp(id: string): Promise<App> {
     const tasks = this.createTaskChain();
-    tasks.next(`Looking up app ${chalk.green(proId)}`);
+    tasks.next(`Looking up app ${chalk.green(id)}`);
 
     const appClient = await this.getAppClient();
-    const app = await appClient.load(proId); // Make sure the user has access to the app
+    const app = await appClient.load(id); // Make sure the user has access to the app
 
     tasks.end();
 
@@ -260,9 +260,9 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
     this.env.log.nl();
 
     this.env.log.info(
-      `Ionic Pro uses a git-based workflow to manage app updates.\n` +
+      `Ionic Appflow uses a git-based workflow to manage app updates.\n` +
       `You will be prompted to set up the git host and repository for this new app. See the docs${chalk.cyan('[1]')} for more information.\n\n` +
-      `${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/pro/basics/git/')}`
+      `${chalk.cyan('[1]')}: ${chalk.bold('https://ionicframework.com/docs/appflow/basics/git/')}`
     );
 
     this.env.log.nl();
@@ -277,7 +277,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
           value: CHOICE_GITHUB,
         },
         {
-          name: 'Ionic Pro',
+          name: 'Ionic Appflow',
           value: CHOICE_IONIC,
         },
         // TODO: option to skip git setup for now
@@ -290,14 +290,14 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
         await runCommand(runinfo, ['ssh', 'setup']);
       }
 
-      await runCommand(runinfo, ['config', 'set', 'pro_id', `"${app.id}"`, '--json']);
+      await runCommand(runinfo, ['config', 'set', 'id', `"${app.id}"`, '--json']);
       await runCommand(runinfo, ['git', 'remote']);
     } else {
       if (service === CHOICE_GITHUB) {
         githubUrl = await this.linkGithub(app);
       }
 
-      await runCommand(runinfo, ['config', 'set', 'pro_id', `"${app.id}"`, '--json']);
+      await runCommand(runinfo, ['config', 'set', 'id', `"${app.id}"`, '--json']);
     }
 
     this.env.log.ok(`Project linked with app ${chalk.green(app.id)}!`);
@@ -312,7 +312,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
 
       if (githubUrl) {
         this.env.log.info(
-          `You can now push to one of your branches on GitHub to trigger a build in Ionic Pro!\n` +
+          `You can now push to one of your branches on GitHub to trigger a build in Ionic Appflow!\n` +
           `If you haven't added GitHub as your origin you can do so by running:\n\n` +
           `${chalk.green('git remote add origin ' + githubUrl)}\n\n` +
           `You can find additional links above to help if you're having issues.`
@@ -373,7 +373,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
     this.env.log.nl();
     this.env.log.info(
       `GitHub OAuth setup required.\n` +
-      `To continue, we need you to authorize Ionic Pro with your GitHub account. ` +
+      `To continue, we need you to authorize Ionic Appflow with your GitHub account. ` +
       `A browser will open and prompt you to complete the authorization request. ` +
       `When finished, please return to the CLI to continue linking your app.`
     );
@@ -533,7 +533,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://ionicframework.com/support/request')
 
   async selectGithubBranches(repoId: number): Promise<string[]> {
     this.env.log.nl();
-    this.env.log.info(chalk.bold(`By default Ionic Pro links only to the ${chalk.green('master')} branch.`));
+    this.env.log.info(chalk.bold(`By default Ionic Appflow links only to the ${chalk.green('master')} branch.`));
     this.env.log.info(
       `${chalk.bold('If you\'d like to link to another branch or multiple branches you\'ll need to select each branch to connect to.')}\n` +
       `If you're not familiar with on working with branches in GitHub you can read about them here:\n\n` +