Merge pull request #195 from ZhiliangLiu/zoranliu/5.0.0-alpha

Zoranliu/5.0.0 alpha

Author: shinnqy

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:10-browsers
+      - image: circleci/node:16-browsers
     working_directory: ~/repo
     steps:
       - checkout

.gitignore

@@ -25,6 +25,7 @@ node_modules
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

angular.json

@@ -11,15 +11,20 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/apps/docs",
             "index": "apps/docs/src/index.html",
             "main": "apps/docs/src/main.ts",
             "tsConfig": "apps/docs/tsconfig.app.json",
             "polyfills": "apps/docs/src/polyfills.ts",
             "assets": ["apps/docs/src/assets", "apps/docs/src/favicon.ico", "apps/docs/src/404.html"],
             "styles": ["apps/docs/src/styles.scss"],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -36,15 +41,15 @@
               "aot": false,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": false,
               "fileReplacements": [
                 {
                   "replace": "apps/docs/src/environments/environment.ts",
                   "with": "apps/docs/src/environments/environment.prod.ts"
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -74,13 +79,6 @@
             "styles": ["apps/docs/src/styles.scss"],
             "assets": ["apps/docs/src/assets", "apps/docs/src/favicon.ico", "apps/docs/src/404.html"]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["apps/docs/tsconfig.app.json", "apps/docs/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "app"
@@ -93,15 +91,20 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/apps/demo",
             "index": "apps/demo/src/index.html",
             "main": "apps/demo/src/main.ts",
             "tsConfig": "apps/demo/tsconfig.app.json",
             "polyfills": "apps/demo/src/polyfills.ts",
             "assets": ["apps/demo/src/assets", "apps/demo/src/favicon.ico", "apps/demo/src/404.html"],
             "styles": ["apps/demo/src/styles.css"],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -119,15 +122,15 @@
               "aot": false,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": false,
               "fileReplacements": [
                 {
                   "replace": "apps/demo/src/environments/environment.ts",
                   "with": "apps/demo/src/environments/environment.prod.ts"
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -157,13 +160,6 @@
             "styles": ["apps/demo/src/styles.css"],
             "assets": ["apps/demo/src/assets", "apps/demo/src/favicon.ico", "apps/demo/src/404.html"]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["apps/demo/tsconfig.app.json", "apps/demo/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "app"
@@ -177,7 +173,7 @@
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "libs/core/tsconfig.lib.json",
-            "project": "libs/core/package.json"
+            "project": "libs/core/ng-package.json"
           },
           "configurations": {
             "production": {
@@ -195,13 +191,6 @@
             "assets": [],
             "tsConfig": "libs/core/tsconfig.spec.json"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["libs/core/tsconfig.lib.json", "libs/core/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "lib"
@@ -215,7 +204,7 @@
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "libs/fabric/tsconfig.lib.json",
-            "project": "libs/fabric/package.json"
+            "project": "libs/fabric/ng-package.json"
           },
           "configurations": {
             "production": {
@@ -233,13 +222,6 @@
             "assets": [],
             "tsConfig": "libs/fabric/tsconfig.spec.json"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["libs/fabric/tsconfig.lib.json", "libs/fabric/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "lib"
@@ -253,7 +235,7 @@
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "libs/semantic-ui/tsconfig.lib.json",
-            "project": "libs/semantic-ui/package.json"
+            "project": "libs/semantic-ui/ng-package.json"
           },
           "configurations": {
             "production": {
@@ -271,13 +253,6 @@
             "assets": [],
             "tsConfig": "libs/semantic-ui/tsconfig.spec.json"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["libs/semantic-ui/tsconfig.lib.json", "libs/semantic-ui/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "lib"
@@ -291,7 +266,7 @@
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "libs/toolkit/tsconfig.lib.json",
-            "project": "libs/toolkit/package.json"
+            "project": "libs/toolkit/ng-package.json"
           },
           "configurations": {
             "production": {
@@ -309,21 +284,13 @@
             "assets": [],
             "tsConfig": "libs/toolkit/tsconfig.spec.json"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["libs/toolkit/tsconfig.lib.json", "libs/toolkit/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
         }
       },
       "prefix": "lib"
     }
   },
   "defaultProject": "docs",
   "cli": {
-    "warnings": {},
-    "defaultCollection": "@nrwl/schematics"
+    "warnings": {}
   }
 }

apps/demo/src/app/app.component.html

@@ -70,3 +70,11 @@ <h2>Getting up and running...</h2>
   combo-box:
   <fab-combo-box></fab-combo-box>
 </div>
+
+<div>
+  callout:
+  <button #calloutTarget (click)="handCalloutClicked()">{{ showCallout ? 'hide callout' : 'show callout' }}</button>
+  <fab-callout *ngIf="showCallout" [target]="calloutTarget" (onDismiss)="showCallout = false">
+    <div>I am a callout</div>
+  </fab-callout>
+</div>

apps/demo/src/app/app.component.ts

@@ -623,4 +623,10 @@ export class AppComponent {
   onRatingChanged({ rating }) {
     console.log(rating)
   }
+
+  handCalloutClicked() {
+    if (!this.showCallout) {
+      this.showCallout = true;
+    }
+  }
 }

apps/demo/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { AngularReactBrowserModule } from '@angular-react/core';
 import { NgModule } from '@angular/core';
-import { NxModule } from '@nrwl/nx';
+import { NxModule } from '@nrwl/angular';
 import { initializeIcons } from '@fluentui/react/lib/Icons';
 import { AppComponent } from './app.component';
 import { CounterComponent } from './counter/counter.component';

apps/demo/src/polyfills.ts

@@ -34,26 +34,17 @@
 // import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
 /** IE10 and IE11 requires the following for the Reflect API. */
 // import 'core-js/es6/reflect';
 
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
 // import 'core-js/es7/reflect';
 
-/**
- * Required to support Web Animations `@angular/platform-browser/animations`.
- * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
- **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /***************************************************************************************************
  * Zone JS is required by Angular itself.
  */
-import 'zone.js/dist/zone'; // Included with Angular CLI.
+import 'zone.js'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

apps/demo/src/test.ts

@@ -1,13 +1,15 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: any;
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+});
 // Then we find all the tests.
 const context = require.context('./', true, /.spec.ts$/);
 // And load the modules.

apps/docs/src/app/app.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NxModule } from '@nrwl/nx';
+import { NxModule } from '@nrwl/angular';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { AngularReactBrowserModule } from '@angular-react/core';

apps/docs/src/app/react-components/react-dot/react-dot.component.ts

@@ -14,7 +14,9 @@ import {
 } from '@angular/core';
 import * as React from 'react';
 import { ReactWrapperComponent } from '@angular-react/core';
+import { AngularReact } from '@angular-react/core';
 
+@AngularReact()
 @Component({
   selector: 'app-react-dot',
   template: `
@@ -38,7 +40,6 @@ import { ReactWrapperComponent } from '@angular-react/core';
     </ReactDot>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  styles: ['react-renderer'],
 })
 export class ReactDotComponent extends ReactWrapperComponent<ReactDotProps> {
   @ViewChild('reactNode', { static: true }) protected reactNodeRef: ElementRef;