feat(core): new nx starter (nrwl#7912)

.verdaccio/htpasswd

@@ -1,2 +1 @@
 test:$6FrCaT/v0dwE:autocreated 2020-03-25T19:10:50.254Z
-dddd:ZpRSQxtFPtZog:autocreated 2021-08-21T07:57:21.687Z

e2e/angular-core/src/angular-core.test.ts

@@ -44,10 +44,11 @@ describe('Angular Package', () => {
           names(mylib).className
         }Module } from '@${proj}/my-dir/${mylib}';
         import { AppComponent } from './app.component';
+        import { NxWelcomeComponent } from './nx-welcome.component';
 
         @NgModule({
           imports: [BrowserModule, MyDir${names(mylib).className}Module],
-          declarations: [AppComponent],
+          declarations: [AppComponent, NxWelcomeComponent],
           bootstrap: [AppComponent]
         })
         export class AppModule {}

e2e/angular-extensions/src/angular-app.test.ts

@@ -53,9 +53,10 @@ describe('Angular Package', () => {
         }Module} from '@${proj}/${buildableLib}';
 
         import { AppComponent } from './app.component';
+        import { NxWelcomeComponent } from './nx-welcome.component';
 
         @NgModule({
-          declarations: [AppComponent],
+          declarations: [AppComponent, NxWelcomeComponent],
           imports: [BrowserModule, ${names(buildableLib).className}Module],
           providers: [],
           bootstrap: [AppComponent],

e2e/next/src/next.test.ts

@@ -613,7 +613,6 @@ async function checkApp(
   const buildResult = runCLI(`build ${appName} --withDeps`);
   expect(buildResult).toContain(`Compiled successfully`);
   checkFilesExist(`dist/apps/${appName}/.next/build-manifest.json`);
-  checkFilesExist(`dist/apps/${appName}/public/star.svg`);
 
   const packageJson = readJson(`dist/apps/${appName}/package.json`);
   expect(packageJson.dependencies.react).toBeDefined();

packages/angular/src/generators/application/application.spec.ts

@@ -133,7 +133,7 @@ describe('app', () => {
       const myAppPrefix = workspaceJson.projects['my-app'].prefix;
 
       expect(myAppPrefix).toEqual('proj');
-      expect(appE2eSpec).toContain('Welcome to my-app!');
+      expect(appE2eSpec).toContain('Welcome my-app');
     });
 
     it('should set a new prefix and use it', async () => {
@@ -151,7 +151,7 @@ describe('app', () => {
       const myAppPrefix = workspaceJson.projects['my-app-with-prefix'].prefix;
 
       expect(myAppPrefix).toEqual('custom');
-      expect(appE2eSpec).toContain('Welcome to my-app-with-prefix!');
+      expect(appE2eSpec).toContain('Welcome my-app-with-prefix');
     });
 
     // TODO: this should work
@@ -289,7 +289,7 @@ describe('app', () => {
       await generateApp(appTree, 'myApp', { directory: 'myDir' });
       expect(
         appTree.read('apps/my-dir/my-app/src/app/app.component.html', 'utf-8')
-      ).toContain('Thank you for using and showing some ♥ for Nx.');
+      ).toContain('<proj-nx-welcome></proj-nx-welcome>');
     });
 
     it("should update `template`'s property of AppComponent with Nx content", async () => {
@@ -299,7 +299,17 @@ describe('app', () => {
       });
       expect(
         appTree.read('apps/my-dir/my-app/src/app/app.component.ts', 'utf-8')
-      ).toContain('Thank you for using and showing some ♥ for Nx.');
+      ).toContain('<proj-nx-welcome></proj-nx-welcome>');
+    });
+
+    it('should create Nx specific `nx-welcome.component.ts` file', async () => {
+      await generateApp(appTree, 'myApp', { directory: 'myDir' });
+      expect(
+        appTree.read(
+          'apps/my-dir/my-app/src/app/nx-welcome.component.ts',
+          'utf-8'
+        )
+      ).toContain('Hello there');
     });
 
     it('should update the AppComponent spec to target Nx content', async () => {
@@ -313,7 +323,7 @@ describe('app', () => {
       );
 
       expect(testFileContent).toContain(`querySelector('h1')`);
-      expect(testFileContent).toContain('Welcome to my-dir-my-app!');
+      expect(testFileContent).toContain('Welcome my-dir-my-app');
     });
   });
 
@@ -633,7 +643,7 @@ describe('app', () => {
 
         expect(
           appTree.read('apps/my-app-e2e/src/app.e2e-spec.ts', 'utf-8')
-        ).toContain(`'Welcome to my-app!'`);
+        ).toContain(`'Welcome my-app'`);
         expect(
           appTree.read('apps/my-app-e2e/src/app.po.ts', 'utf-8')
         ).toContain(`'proj-root header h1'`);
@@ -650,7 +660,7 @@ describe('app', () => {
             'apps/my-directory/my-app-e2e/src/app.e2e-spec.ts',
             'utf-8'
           )
-        ).toContain(`'Welcome to my-directory-my-app!'`);
+        ).toContain(`'Welcome my-directory-my-app'`);
         expect(
           appTree.read('apps/my-directory/my-app-e2e/src/app.po.ts', 'utf-8')
         ).toContain(`'proj-root header h1'`);

packages/angular/src/generators/application/application.ts

@@ -17,8 +17,8 @@ import init from '../init/init';
 import {
   createFiles,
   normalizeOptions,
-  updateComponentStyles,
-  updateComponentTemplate,
+  updateAppComponentTemplate,
+  updateNxComponentTemplate,
   updateConfigFiles,
   addE2e,
   updateComponentSpec,
@@ -78,8 +78,24 @@ export async function applicationGenerator(
 
   moveFilesToNewDirectory(host, appProjectRoot, options.appProjectRoot);
   updateConfigFiles(host, options);
-  updateComponentTemplate(host, options);
-  updateComponentStyles(host, options);
+  updateAppComponentTemplate(host, options);
+
+  // Create the NxWelcomeComponent
+  const angularComponentSchematic = wrapAngularDevkitSchematic(
+    '@schematics/angular',
+    'component'
+  );
+  await angularComponentSchematic(host, {
+    name: 'NxWelcome',
+    inlineTemplate: true,
+    prefix: options.prefix,
+    skipTests: true,
+    style: 'none',
+    flat: true,
+    viewEncapsulation: 'None',
+    project: options.name,
+  });
+  updateNxComponentTemplate(host, options);
 
   if (options.unitTestRunner !== UnitTestRunner.None) {
     updateComponentSpec(host, options);

packages/angular/src/generators/application/lib/index.ts

@@ -12,8 +12,8 @@ export * from './remove-scaffolded-e2e';
 export * from './root-router-config';
 export * from './set-app-strict-default';
 export * from './update-component-spec';
-export * from './update-component-styles';
-export * from './update-component-template';
+export * from './update-app-component-template';
+export * from './update-nx-component-template';
 export * from './update-config-files';
 export * from './update-e2e-project';
 export * from './update-editor-tsconfig';