chore(): clean up lingering ionic v1 and v3 refs (#5001)

liamdebeasi · web-flow · commit 971ded891c6b · 2023-05-01T17:01:25.000-04:00
diff --git a/packages/@ionic/cli/src/commands/monitoring/index.ts b/packages/@ionic/cli/src/commands/monitoring/index.ts
@@ -6,9 +6,7 @@ export class MonitoringNamespace extends Namespace {
   async getMetadata() {
     const groups: MetadataGroup[] = [];
 
-    if (!this.project || this.project.type !== 'ionic-angular') {
-      groups.push(MetadataGroup.HIDDEN);
-    }
+    groups.push(MetadataGroup.HIDDEN);
 
     return {
       name: 'monitoring',
diff --git a/packages/@ionic/cli/src/commands/start.ts b/packages/@ionic/cli/src/commands/start.ts
@@ -94,16 +94,17 @@ The second argument is the ${input(
 
 Use the ${input(
         '--type'
-      )} option to start projects using older versions of Ionic. For example, you can start an Ionic 3 project with ${input(
-        '--type=ionic-angular'
-      )}. Use ${input('--list')} to see all project types and templates.
+      )} option to start projects using a different JavaScript Framework. Use ${input(
+        '--list'
+      )} to see all project types and templates.
       `,
       exampleCommands: [
         '',
         '--list',
         'myApp',
         'myApp blank',
         'myApp tabs --capacitor',
+        'myApp list --type=vue',
         '"My App" blank',
         '"Conference App" https://github.com/ionic-team/ionic-conference-app',
       ],
diff --git a/packages/@ionic/cli/src/constants.ts b/packages/@ionic/cli/src/constants.ts
@@ -8,8 +8,8 @@ export const ASSETS_DIRECTORY = path.resolve(__dirname, 'assets');
 export const ANGULAR_STANDALONE = 'angular-standalone';
 
 export const PROJECT_FILE = process.env['IONIC_CONFIG_FILE'] ?? 'ionic.config.json';
-export const PROJECT_TYPES: ProjectType[] = ['angular', ANGULAR_STANDALONE, 'react', 'vue', 'ionic-angular', 'ionic1', 'custom', 'vue-vite', 'react-vite'];
-export const LEGACY_PROJECT_TYPES: ProjectType[] = ['ionic-angular', 'ionic1'];
+export const PROJECT_TYPES: ProjectType[] = ['angular', ANGULAR_STANDALONE, 'react', 'vue', 'custom', 'vue-vite', 'react-vite'];
+export const LEGACY_PROJECT_TYPES: ProjectType[] = [];
 export const MODERN_PROJECT_TYPES: ProjectType[] = lodash.difference(PROJECT_TYPES, LEGACY_PROJECT_TYPES);
 
 export const COLUMNAR_OPTIONS = { hsep: chalk.dim('-'), vsep: chalk.dim('|') };
diff --git a/packages/@ionic/cli/src/definitions.ts b/packages/@ionic/cli/src/definitions.ts
@@ -78,7 +78,7 @@ export interface Runner<T extends object, U> {
   run(options: T): Promise<U>;
 }
 
-export type ProjectType = 'angular' | 'angular-standalone' | 'ionic-angular' | 'ionic1' | 'custom' | 'bare' | 'react' | 'vue' | 'react-vite' | 'vue-vite';
+export type ProjectType = 'angular' | 'angular-standalone' | 'custom' | 'bare' | 'react' | 'vue' | 'react-vite' | 'vue-vite';
 export type HookName = 'build:before' | 'build:after' | 'serve:before' | 'serve:after' | 'capacitor:run:before' | 'capacitor:build:before' | 'capacitor:sync:after';
 
 export type CapacitorRunHookName = 'capacitor:run:before';
@@ -95,8 +95,8 @@ export interface BaseHookContext {
   env: NodeJS.ProcessEnv;
 }
 
-export type AnyServeOptions = ReactServeOptions | AngularServeOptions | IonicAngularServeOptions | Ionic1ServeOptions;
-export type AnyBuildOptions = ReactBuildOptions | AngularBuildOptions | IonicAngularBuildOptions | Ionic1BuildOptions;
+export type AnyServeOptions = ReactServeOptions | AngularServeOptions;
+export type AnyBuildOptions = ReactBuildOptions | AngularBuildOptions;
 
 export interface CapacitorSyncHookInput {
   readonly name: CapacitorSyncHookName;
@@ -118,17 +118,17 @@ export interface CapacitorBuildHookInput {
 
 export interface BuildHookInput {
   readonly name: 'build:before' | 'build:after';
-  readonly build: AngularBuildOptions | IonicAngularBuildOptions | Ionic1BuildOptions;
+  readonly build: AngularBuildOptions;
 }
 
 export interface ServeBeforeHookInput {
   readonly name: 'serve:before';
-  readonly serve: AngularServeOptions | IonicAngularServeOptions | Ionic1ServeOptions;
+  readonly serve: AngularServeOptions;
 }
 
 export interface ServeAfterHookInput {
   readonly name: 'serve:after';
-  readonly serve: (AngularServeOptions | IonicAngularServeOptions | Ionic1ServeOptions) & ServeDetails;
+  readonly serve: (AngularServeOptions) & ServeDetails;
 }
 
 export type HookInput = BuildHookInput | ServeBeforeHookInput | ServeAfterHookInput | CapacitorRunHookInput | CapacitorBuildHookInput | CapacitorSyncHookInput;
@@ -674,18 +674,6 @@ export interface IonicCapacitorOptions extends CapacitorConfig {
   verbose?: boolean;
 }
 
-export interface IonicAngularBuildOptions extends BuildOptions<'ionic-angular'> {
-  prod: boolean;
-  sourcemaps?: boolean;
-  aot: boolean;
-  minifyjs: boolean;
-  minifycss: boolean;
-  optimizejs: boolean;
-  env?: string;
-}
-
-export interface Ionic1BuildOptions extends BuildOptions<'ionic1'> {}
-
 export interface CustomBuildOptions extends BuildOptions<'custom'> {}
 
 export interface GenerateOptions {
@@ -744,22 +732,6 @@ export interface VueServeOptions extends ServeOptions {
   sourcemaps?: boolean;
 }
 
-export interface IonicAngularServeOptions extends ServeOptions {
-  sourcemaps?: boolean;
-  consolelogs: boolean;
-  serverlogs: boolean;
-  env?: string;
-  livereloadPort: number;
-  notificationPort: number;
-}
-
-export interface Ionic1ServeOptions extends ServeOptions {
-  consolelogs: boolean;
-  serverlogs: boolean;
-  livereloadPort: number;
-  notificationPort: number;
-}
-
 export interface CustomServeOptions extends ServeOptions {}
 
 export interface LabServeDetails {
diff --git a/packages/@ionic/cli/src/lib/integrations/cordova/utils.ts b/packages/@ionic/cli/src/lib/integrations/cordova/utils.ts
@@ -7,7 +7,7 @@ import { FatalException } from '../../errors';
 import { prettyProjectName } from '../../project';
 import { emoji } from '../../utils/emoji';
 
-export const SUPPORTED_PROJECT_TYPES: readonly ProjectType[] = ['custom', 'ionic1', 'ionic-angular', 'angular'];
+export const SUPPORTED_PROJECT_TYPES: readonly ProjectType[] = ['custom', 'angular'];
 
 /**
  * Filter and gather arguments from command line to be passed to Cordova
diff --git a/packages/@ionic/cli/src/lib/project/common.ts b/packages/@ionic/cli/src/lib/project/common.ts
diff --git a/packages/@ionic/cli/src/lib/project/index.ts b/packages/@ionic/cli/src/lib/project/index.ts
@@ -225,8 +225,6 @@ export class ProjectDetails {
       log.warn(
         `Could not determine project type (project config: ${strong(prettyPath(result.configPath))}).\n` +
         `- ${wordWrap(`For ${strong(prettyProjectName('angular'))} projects, make sure ${input('@ionic/angular')} is listed as a dependency in ${strong('package.json')}.`, listWrapOptions)}\n` +
-        `- ${wordWrap(`For ${strong(prettyProjectName('ionic-angular'))} projects, make sure ${input('ionic-angular')} is listed as a dependency in ${strong('package.json')}.`, listWrapOptions)}\n` +
-        `- ${wordWrap(`For ${strong(prettyProjectName('ionic1'))} projects, make sure ${input('ionic')} is listed as a dependency in ${strong('bower.json')}.`, listWrapOptions)}\n\n` +
         `Alternatively, set ${strong('type')} attribute in ${strong(prettyPath(result.configPath))} to one of: ${PROJECT_TYPES.map(v => input(v)).join(', ')}.\n\n` +
         `If the Ionic CLI does not know what type of project this is, ${input('ionic build')}, ${input('ionic serve')}, and other commands may not work. You can use the ${input('custom')} project type if that's okay.`
       );
@@ -781,10 +779,6 @@ export function prettyProjectName(type?: string): string {
     return '@ionic/react';
   } else if (type === 'vue') {
     return '@ionic/vue';
-  } else if (type === 'ionic-angular') {
-    return 'Ionic 2/3';
-  } else if (type === 'ionic1') {
-    return 'Ionic 1';
   } else if (type === 'custom') {
     return 'Custom';
   }
diff --git a/packages/@ionic/cli/src/lib/start.ts b/packages/@ionic/cli/src/lib/start.ts
@@ -343,76 +343,4 @@ export const STARTER_TEMPLATES: StarterTemplate[] = [
     description: 'A starting project with a simple tabbed interface',
     id: 'react-vite-official-tabs',
   },
-  // Old Ionic V3
-  {
-    name: 'tabs',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'A starting project with a simple tabbed interface',
-    id: 'ionic-angular-official-tabs',
-  },
-  {
-    name: 'sidemenu',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'A starting project with a side menu with navigation in the content area',
-    id: 'ionic-angular-official-sidemenu',
-  },
-  {
-    name: 'blank',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'A blank starter project',
-    id: 'ionic-angular-official-blank',
-  },
-  {
-    name: 'super',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'A starting project complete with pre-built pages, providers and best practices for Ionic development.',
-    id: 'ionic-angular-official-super',
-  },
-  {
-    name: 'tutorial',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'A tutorial based project that goes along with the Ionic documentation',
-    id: 'ionic-angular-official-tutorial',
-  },
-  {
-    name: 'aws',
-    projectType: 'ionic-angular',
-    type: 'managed',
-    description: 'AWS Mobile Hub Starter',
-    id: 'ionic-angular-official-aws',
-  },
-  // Older Ionic V1
-  {
-    name: 'tabs',
-    projectType: 'ionic1',
-    type: 'managed',
-    description: 'A starting project for Ionic using a simple tabbed interface',
-    id: 'ionic1-official-tabs',
-  },
-  {
-    name: 'sidemenu',
-    projectType: 'ionic1',
-    type: 'managed',
-    description: 'A starting project for Ionic using a side menu with navigation in the content area',
-    id: 'ionic1-official-sidemenu',
-  },
-  {
-    name: 'blank',
-    projectType: 'ionic1',
-    type: 'managed',
-    description: 'A blank starter project for Ionic',
-    id: 'ionic1-official-blank',
-  },
-  {
-    name: 'maps',
-    projectType: 'ionic1',
-    type: 'managed',
-    description: 'An Ionic starter project using Google Maps and a side menu',
-    id: 'ionic1-official-maps',
-  },
 ];
diff --git a/packages/cli-scripts/projects/ionic-angular/ionic.config.json b/packages/cli-scripts/projects/ionic-angular/ionic.config.json
diff --git a/packages/cli-scripts/projects/ionic1/ionic.config.json b/packages/cli-scripts/projects/ionic1/ionic.config.json
diff --git a/packages/cli-scripts/src/docs/index.ts b/packages/cli-scripts/src/docs/index.ts
@@ -25,7 +25,7 @@ export class DocsCommand extends Command {
     await remove(STAGING_DIRECTORY);
     await mkdirp(STAGING_DIRECTORY);
 
-    const projectTypes: ProjectType[] = ['angular', 'ionic-angular', 'ionic1'];
+    const projectTypes: ProjectType[] = ['angular'];
     const baseCtx = await generateContext();
 
     for (const projectType of projectTypes) {
