feat: bump deps, support typescript 4.0+ (#51)

alauda · Sep 25, 2020 · 7291f95 · 7291f95
1 parent a4980e9
commit 7291f95
Show file tree

Hide file tree

Showing 35 changed files with 3,630 additions and 4,593 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -2,8 +2,8 @@ const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
 module.exports = {
   stories: [
-    '../stories/**/index.(js|ts)',
-    '../stories/**/*.stories.(js|ts|mdx)',
+    '../stories/**/index.@(js|ts)',
+    '../stories/**/*.stories.@(js|ts|mdx)',
   ],
   addons: [
     '@storybook/addon-docs',

diff --git a/package.json b/package.json
@@ -48,45 +48,45 @@
     "@1stg/app-config": "^0.5.5",
     "@1stg/lib-config": "^0.5.5",
     "@1stg/tslint-config": "^0.8.5",
-    "@angular-devkit/build-angular": "^0.1000.5",
-    "@angular-devkit/core": "^10.0.1",
-    "@angular/animations": "^10.0.8",
+    "@angular-devkit/build-angular": "^0.1001.2",
+    "@angular-devkit/core": "^10.1.2",
+    "@angular/animations": "^10.1.2",
     "@angular/cdk": "^10.2.2",
-    "@angular/cli": "^10.0.5",
-    "@angular/common": "^10.0.8",
-    "@angular/compiler": "^10.0.8",
-    "@angular/compiler-cli": "^10.0.8",
-    "@angular/core": "^10.0.8",
-    "@angular/forms": "^10.0.8",
-    "@angular/platform-browser": "^10.0.8",
-    "@angular/platform-browser-dynamic": "^10.0.8",
-    "@storybook/addon-actions": "^5.3.18",
-    "@storybook/addon-docs": "^5.3.18",
-    "@storybook/addon-knobs": "^5.3.18",
-    "@storybook/addon-storysource": "^5.3.18",
-    "@storybook/addons": "^5.3.18",
-    "@storybook/angular": "^5.3.18",
-    "@storybook/cli": "^5.3.18",
-    "@storybook/source-loader": "^5.3.18",
-    "@types/jest": "^26.0.9",
-    "@types/node": "^14.0.27",
+    "@angular/cli": "^10.1.2",
+    "@angular/common": "^10.1.2",
+    "@angular/compiler": "^10.1.2",
+    "@angular/compiler-cli": "^10.1.2",
+    "@angular/core": "^10.1.2",
+    "@angular/forms": "^10.1.2",
+    "@angular/platform-browser": "^10.1.2",
+    "@angular/platform-browser-dynamic": "^10.1.2",
+    "@storybook/addon-actions": "^6.0.21",
+    "@storybook/addon-docs": "^6.0.21",
+    "@storybook/addon-knobs": "^6.0.21",
+    "@storybook/addon-storysource": "^6.0.21",
+    "@storybook/addons": "^6.0.21",
+    "@storybook/angular": "^6.0.21",
+    "@storybook/cli": "^6.0.21",
+    "@storybook/source-loader": "^6.0.21",
+    "@types/jest": "^26.0.14",
+    "@types/node": "^14.11.2",
     "babel-loader": "^8.1.0",
     "clipboard-polyfill": "^3.0.1",
     "gulp": "^4.0.2",
     "gulp-dart-sass": "^1.0.2",
-    "jest": "^26.2.2",
+    "jest": "^26.4.2",
     "jest-junit": "^11.1.0",
-    "jest-preset-angular": "^8.2.1",
-    "ng-packagr": "^10.0.3",
+    "jest-preset-angular": "^8.3.1",
+    "ng-packagr": "^10.1.0",
     "ng-tslint": "^1.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.4",
+    "prettier": "^2.1.2",
     "rxjs": "^6.6.2",
-    "standard-version": "^8.0.2",
+    "standard-version": "^9.0.0",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
     "tslib": "^2.0.1",
     "tslint": "^6.1.3",
-    "typescript": "^3.9.7",
-    "yarn-deduplicate": "^2.1.1"
+    "typescript": "^4.0.3",
+    "yarn-deduplicate": "^3.0.0"
   }
 }
diff --git a/src/accordion/accordion-item/accordion-item.component.ts b/src/accordion/accordion-item/accordion-item.component.ts
@@ -34,7 +34,8 @@ export class AccordionItemContentDirective {}
   preserveWhitespaces: false,
   viewProviders: [AccordionItemComponent],
 })
-export class AccordionItemComponent extends CdkAccordionItem
+export class AccordionItemComponent
+  extends CdkAccordionItem
   implements AfterContentInit {
   @Input()
   hideToggle: false;

diff --git a/src/autocomplete/autocomplete.directive.ts b/src/autocomplete/autocomplete.directive.ts
@@ -34,11 +34,13 @@ import { SuggestionComponent } from './suggestion/suggestion.component';
 @Directive({
   selector: 'input[auiAutocomplete],textarea[auiAutocomplete]',
   exportAs: 'auiAutocomplete',
+  inputs: ['class:auiAutocompleteClass'],
   host: {
     autocomplete: 'off',
   },
 })
-export class AutoCompleteDirective extends BaseTooltip
+export class AutoCompleteDirective
+  extends BaseTooltip<AutoCompleteContext>
   implements OnInit, OnDestroy {
   @Input('auiAutocomplete')
   get autocomplete() {
@@ -54,9 +56,6 @@ export class AutoCompleteDirective extends BaseTooltip
     this.content = val.template;
   }
 
-  @Input('auiAutocompleteClass')
-  class: string;
-
   @Input('auiAutocompleteFilterFn')
   @Input()
   get filterFn() {
@@ -82,12 +81,6 @@ export class AutoCompleteDirective extends BaseTooltip
   @Output('auiAutocompleteHide')
   hide: EventEmitter<void>;
 
-  readonly type: TooltipType = TooltipType.Plain;
-  readonly trigger: TooltipTrigger = TooltipTrigger.Focus;
-  readonly position = 'bottom start';
-  readonly hideOnClick = true;
-  context: AutoCompleteContext;
-
   private _autocomplete: AutocompleteComponent;
   private focusedSuggestion: SuggestionComponent;
 
@@ -113,6 +106,10 @@ export class AutoCompleteDirective extends BaseTooltip
     private readonly ngControl: NgControl,
   ) {
     super(overlay, viewContainerRef, elRef, renderer, cdr, ngZone);
+    this.type = TooltipType.Plain;
+    this.trigger = TooltipTrigger.Focus;
+    this.position = 'bottom start';
+    this.hideOnClick = true;
   }
 
   ngOnInit() {

diff --git a/src/checkbox/checkbox.component.ts b/src/checkbox/checkbox.component.ts
@@ -37,7 +37,8 @@ let uniqueId = 0;
     },
   ],
 })
-export class CheckboxComponent extends CommonFormControl<boolean>
+export class CheckboxComponent
+  extends CommonFormControl<boolean>
   implements AfterViewInit, OnDestroy {
   id = `aui-checkbox-${uniqueId++}`;
 

diff --git a/src/dialog/dialog.service.ts b/src/dialog/dialog.service.ts
@@ -7,7 +7,6 @@ import {
 import {
   ComponentPortal,
   ComponentType,
-  PortalInjector,
   TemplatePortal,
 } from '@angular/cdk/portal';
 import {
@@ -173,12 +172,21 @@ export class DialogService {
     config: DialogConfig,
     dialogRef: DialogRef<T>,
     dialogIns: DialogComponent,
-  ): PortalInjector {
+  ): Injector {
     const userInjector = config?.viewContainerRef?.injector;
-    const injectionTokens = new WeakMap();
-    injectionTokens.set(DialogRef, dialogRef);
-    injectionTokens.set(DIALOG_DATA, config.data || dialogIns);
-    return new PortalInjector(userInjector || this.injector, injectionTokens);
+    return Injector.create({
+      providers: [
+        {
+          provide: DialogRef,
+          useValue: dialogRef,
+        },
+        {
+          provide: DIALOG_DATA,
+          useValue: config.data || dialogIns,
+        },
+      ],
+      parent: userInjector || this.injector,
+    });
   }
 
   private removeDialog(dialogRef: DialogRef<any>) {

diff --git a/src/dropdown/dropdown.directive.ts b/src/dropdown/dropdown.directive.ts
@@ -25,13 +25,19 @@ import { MenuComponent } from './menu/menu.component';
 
 @Directive({
   selector: '[auiDropdown]',
+  exportAs: 'auiDropdown',
+  inputs: [
+    'class:auiDropdownClass',
+    'disabled:auiDropdownDisabled',
+    'position:auiDropdownPosition',
+    'trigger:auiDropdownTrigger',
+  ],
   providers: [
     {
       provide: BaseTooltip,
       useExisting: DropdownDirective,
     },
   ],
-  exportAs: 'auiDropdown',
 })
 export class DropdownDirective extends BaseTooltip implements OnInit {
   @Input('auiDropdown')
@@ -50,18 +56,6 @@ export class DropdownDirective extends BaseTooltip implements OnInit {
   @Input('auiDropdownContext')
   lazyContentContext: any;
 
-  @Input('auiDropdownPosition')
-  position = 'bottom end';
-
-  @Input('auiDropdownClass')
-  class: string;
-
-  @Input('auiDropdownTrigger')
-  trigger = TooltipTrigger.Click;
-
-  @Input('auiDropdownDisabled')
-  disabled: boolean;
-
   @Input('auiDropdownHideOnClick')
   hideOnClick = true;
 
@@ -71,7 +65,6 @@ export class DropdownDirective extends BaseTooltip implements OnInit {
   @Output('auiDropdownHide')
   hide: EventEmitter<void>;
 
-  readonly type: TooltipType = TooltipType.Plain;
   private _menu: MenuComponent;
 
   constructor(
@@ -84,6 +77,9 @@ export class DropdownDirective extends BaseTooltip implements OnInit {
   ) {
     super(overlay, viewContainerRef, elRef, renderer, cdr, ngZone);
     new DropdownActiveDirective(this, elRef, renderer).customClass = 'isActive';
+    this.type = TooltipType.Plain;
+    this.position = 'bottom end';
+    this.trigger = TooltipTrigger.Click;
   }
 
   ngOnInit() {

diff --git a/src/dropdown/menu-item/menu-item.component.ts b/src/dropdown/menu-item/menu-item.component.ts
@@ -19,8 +19,16 @@ import { MenuItemType } from '../dropdown.types';
 export class MenuItemComponent {
   bem: Bem = buildBem('aui-menu-item');
 
+  protected _disabled = false;
+
   @Input()
-  disabled = false;
+  get disabled() {
+    return this._disabled;
+  }
+
+  set disabled(value) {
+    this._disabled = value;
+  }
 
   @Input()
   divide = false;

diff --git a/src/dropdown/submenu/submenu.component.ts b/src/dropdown/submenu/submenu.component.ts
@@ -34,16 +34,10 @@ export class SubmenuComponent extends MenuItemComponent {
     return this._disabled || !this.hasEnabledItem;
   }
 
-  set disabled(val) {
-    this._disabled = val;
-  }
-
   @ContentChildren(MenuItemComponent, { descendants: true })
   menuItems: QueryList<MenuItemComponent>;
 
   get hasEnabledItem() {
     return this.menuItems?.length > 0;
   }
-
-  private _disabled = false;
 }
diff --git a/src/form/__snapshots__/form.component.spec.ts.snap b/src/form/__snapshots__/form.component.spec.ts.snap
@@ -48,7 +48,7 @@ exports[`FormComponent should match snapshot 1`] = `
                 auiformitemaddon=""
                 class="aui-form-item__addon"
               >
-                 addon 
+                addon
               </div>
             </div>
           </div>
@@ -119,7 +119,7 @@ exports[`FormComponent should match snapshot 2`] = `
                 auiformitemaddon=""
                 class="aui-form-item__addon"
               >
-                 addon 
+                addon
               </div>
             </div>
           </div>

diff --git a/src/form/form.component.spec.ts b/src/form/form.component.spec.ts
@@ -51,9 +51,7 @@ describe('FormComponent', () => {
         <div auiFormItemError *ngIf="name.errors?.required">required</div>
         <div auiFormItemError *ngIf="name.errors?.minlength">minlength: 3</div>
         <div auiFormItemHint>input your name</div>
-        <div auiFormItemAddon>
-          addon
-        </div>
+        <div auiFormItemAddon>addon</div>
       </aui-form-item>
     </form>
   `,

diff --git a/src/icon/icon.component.html b/src/icon/icon.component.html
@@ -15,8 +15,8 @@
       x2="150"
       y2="180"
     >
-      <stop offset="0" style="stop-color:#000000" />
-      <stop offset="1" style="stop-color:#808080" />
+      <stop offset="0" style="stop-color: #000000" />
+      <stop offset="1" style="stop-color: #808080" />
     </linearGradient>
     <linearGradient
       [attr.id]="'left-' + id"
@@ -26,8 +26,8 @@
       x2="50"
       y2="180"
     >
-      <stop offset="0" style="stop-color:#FFFFFF" />
-      <stop offset="1" style="stop-color:#808080" />
+      <stop offset="0" style="stop-color: #ffffff" />
+      <stop offset="1" style="stop-color: #808080" />
     </linearGradient>
     <mask [attr.id]="'mask-' + id">
       <g>

diff --git a/src/input/input-group/__snapshots__/input-group.component.spec.ts.snap b/src/input/input-group/__snapshots__/input-group.component.spec.ts.snap
@@ -70,11 +70,11 @@ exports[`InputGroupComponent should match snapshot 1`] = `
                   >
                     <stop
                       offset="0"
-                      style="stop-color:#000000"
+                      style="stop-color: #000000"
                     />
                     <stop
                       offset="1"
-                      style="stop-color:#808080"
+                      style="stop-color: #808080"
                     />
                   </lineargradient>
                   <lineargradient
@@ -87,11 +87,11 @@ exports[`InputGroupComponent should match snapshot 1`] = `
                   >
                     <stop
                       offset="0"
-                      style="stop-color:#FFFFFF"
+                      style="stop-color: #ffffff"
                     />
                     <stop
                       offset="1"
-                      style="stop-color:#808080"
+                      style="stop-color: #808080"
                     />
                   </lineargradient>
                   <mask

diff --git a/src/input/number-input/number-input.component.ts b/src/input/number-input/number-input.component.ts
@@ -19,6 +19,7 @@ import { Bem, buildBem } from '../../utils/bem';
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false,
+  inputs: ['disabled'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
@@ -45,9 +46,6 @@ export class NumberInputComponent extends CommonFormControl<number> {
   @Input()
   precision: number;
 
-  @Input()
-  disabled = false;
-
   @Input()
   controls = true;
 

diff --git a/src/notification/notification.component.ts b/src/notification/notification.component.ts
@@ -31,7 +31,8 @@ let uniqueId = 0;
   changeDetection: ChangeDetectionStrategy.OnPush,
   preserveWhitespaces: false,
 })
-export class NotificationComponent extends MessageComponent
+export class NotificationComponent
+  extends MessageComponent
   implements AfterViewInit {
   protected readonly animateStartState = 'flyLeft';
   protected readonly animateStartEnd = 'flyUp';

diff --git a/src/select/base-select.ts b/src/select/base-select.ts
@@ -30,7 +30,8 @@ import { scrollIntoView } from '../utils/scroll-into-view';
 import { OptionComponent } from './option/option.component';
 import { OptionFilterFn, TrackFn } from './select.types';
 
-export abstract class BaseSelect<T> extends CommonFormControl<T>
+export abstract class BaseSelect<T>
+  extends CommonFormControl<T>
   implements AfterContentInit, AfterViewInit, OnDestroy {
   @Input()
   get size() {