cleanup(angular): migrate downgrade-module and upgrade-module generat…

…ors to nx devkit (#6083)

docs/angular/api-angular/generators/downgrade-module.md

@@ -1,6 +1,6 @@
 # downgrade-module
 
-Setup Downgrade Module
+Setup Downgrade Module.
 
 ## Usage
 
@@ -40,20 +40,20 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

docs/angular/api-angular/generators/upgrade-module.md

@@ -1,6 +1,6 @@
 # upgrade-module
 
-Add an upgrade module
+Add an upgrade module.
 
 ## Usage
 
@@ -28,7 +28,7 @@ nx g upgrade-module ... --dry-run
 
 Type: `string`
 
-The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent)
+The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent).
 
 ### angularJsImport
 
@@ -46,28 +46,28 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### router
 
 Default: `false`
 
 Type: `boolean`
 
-Sets up router synchronization (e.g., --router)
+Sets up router synchronization (e.g., --router).
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

docs/node/api-angular/generators/downgrade-module.md

@@ -1,6 +1,6 @@
 # downgrade-module
 
-Setup Downgrade Module
+Setup Downgrade Module.
 
 ## Usage
 
@@ -40,20 +40,20 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

docs/node/api-angular/generators/upgrade-module.md

@@ -1,6 +1,6 @@
 # upgrade-module
 
-Add an upgrade module
+Add an upgrade module.
 
 ## Usage
 
@@ -28,7 +28,7 @@ nx g upgrade-module ... --dry-run
 
 Type: `string`
 
-The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent)
+The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent).
 
 ### angularJsImport
 
@@ -46,28 +46,28 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### router
 
 Default: `false`
 
 Type: `boolean`
 
-Sets up router synchronization (e.g., --router)
+Sets up router synchronization (e.g., --router).
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

docs/react/api-angular/generators/downgrade-module.md

@@ -1,6 +1,6 @@
 # downgrade-module
 
-Setup Downgrade Module
+Setup Downgrade Module.
 
 ## Usage
 
@@ -40,20 +40,20 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

docs/react/api-angular/generators/upgrade-module.md

@@ -1,6 +1,6 @@
 # upgrade-module
 
-Add an upgrade module
+Add an upgrade module.
 
 ## Usage
 
@@ -28,7 +28,7 @@ nx g upgrade-module ... --dry-run
 
 Type: `string`
 
-The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent)
+The selector of an AngularJS component (e.g., --angularJsCmpSelector=myComponent).
 
 ### angularJsImport
 
@@ -46,28 +46,28 @@ The name of the main AngularJS module.
 
 Type: `string`
 
-The name of the project
+The name of the project.
 
 ### router
 
 Default: `false`
 
 Type: `boolean`
 
-Sets up router synchronization (e.g., --router)
+Sets up router synchronization (e.g., --router).
 
 ### skipFormat
 
 Default: `false`
 
 Type: `boolean`
 
-Skip formatting files
+Skip formatting files.
 
 ### skipPackageJson
 
 Default: `false`
 
 Type: `boolean`
 
-Do not add @angular/upgrade to package.json (e.g., --skipPackageJson)
+Do not add @angular/upgrade to package.json (e.g., --skipPackageJson).

packages/angular/collection.json

@@ -44,15 +44,15 @@
     },
 
     "downgrade-module": {
-      "factory": "./src/schematics/downgrade-module/downgrade-module",
-      "schema": "./src/schematics/downgrade-module/schema.json",
-      "description": "Setup Downgrade Module"
+      "factory": "./src/generators/downgrade-module/compat",
+      "schema": "./src/generators/downgrade-module/schema.json",
+      "description": "Setup Downgrade Module."
     },
 
     "upgrade-module": {
-      "factory": "./src/schematics/upgrade-module/upgrade-module",
-      "schema": "./src/schematics/upgrade-module/schema.json",
-      "description": "Add an upgrade module"
+      "factory": "./src/generators/upgrade-module/compat",
+      "schema": "./src/generators/upgrade-module/schema.json",
+      "description": "Add an upgrade module."
     },
 
     "storybook-configuration": {
@@ -120,6 +120,12 @@
       "description": "Add linting configuration to an Angular project.",
       "hidden": true
     },
+    "application": {
+      "factory": "./src/generators/application/application",
+      "schema": "./src/generators/application/schema.json",
+      "aliases": ["app"],
+      "description": "Create an Angular application"
+    },
     "component-cypress-spec": {
       "factory": "./src/generators/component-cypress-spec/component-cypress-spec",
       "schema": "./src/generators/component-cypress-spec/schema.json",
@@ -137,6 +143,11 @@
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
       "description": "Convert a project from TSLint to ESLint"
     },
+    "downgrade-module": {
+      "factory": "./src/generators/downgrade-module/downgrade-module",
+      "schema": "./src/generators/downgrade-module/schema.json",
+      "description": "Setup Downgrade Module."
+    },
     "init": {
       "factory": "./src/generators/init/init",
       "schema": "./src/generators/init/schema.json",
@@ -191,11 +202,10 @@
       "schema": "./src/generators/storybook-migrate-stories-to-6-2/schema.json",
       "description": "Migrate stories to match the new syntax in v6.2 where the component declaration should be in the default export."
     },
-    "application": {
-      "factory": "./src/generators/application/application",
-      "schema": "./src/generators/application/schema.json",
-      "aliases": ["app"],
-      "description": "Create an Angular application"
+    "upgrade-module": {
+      "factory": "./src/generators/upgrade-module/upgrade-module",
+      "schema": "./src/generators/upgrade-module/schema.json",
+      "description": "Add an upgrade module."
     }
   }
 }

packages/angular/generators.ts

@@ -1,5 +1,6 @@
 export * from './src/generators/application/application';
 export * from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
+export * from './src/generators/downgrade-module/downgrade-module';
 export * from './src/generators/karma/karma';
 export * from './src/generators/karma-project/karma-project';
 export * from './src/generators/library/library';
@@ -9,3 +10,4 @@ export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';
 export * from './src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6';
 export * from './src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2';
+export * from './src/generators/upgrade-module/upgrade-module';

packages/angular/src/generators/downgrade-module/__snapshots__/downgrade-module.spec.ts.snap

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`downgradeModule generator should update main.ts 1`] = `
+"import { enableProdMode, StaticProvider } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import * as angular from 'angular';
+import { downgradeComponent, downgradeModule, setAngularJSGlobal } from '@angular/upgrade/static';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+import 'legacy';
+import { AppComponent } from './app/app.component';
+
+export function bootstrapAngular(extra: StaticProvider[]): any {
+  setAngularJSGlobal(angular);
+  if (environment.production) {
+    enableProdMode();
+  }
+  return platformBrowserDynamic(extra)
+    .bootstrapModule(AppModule)
+    .catch(err => console.log(err));
+}
+
+const downgraded = angular
+  .module('downgraded', [downgradeModule(bootstrapAngular)])
+  .directive('appRoot', downgradeComponent({ component: AppComponent, propagateDigest: false }));
+
+angular.bootstrap(document, ['legacy', downgraded.name]);"
+`;

packages/angular/src/generators/downgrade-module/compat.ts

@@ -0,0 +1,4 @@
+import { convertNxGenerator } from '@nrwl/devkit';
+import { downgradeModuleGenerator } from './downgrade-module';
+
+export default convertNxGenerator(downgradeModuleGenerator);