Skip to content

Commit

Permalink
Merge branch 'angular8'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Müller committed Oct 30, 2019
2 parents e8ed853 + f6c3c04 commit 39005fc
Show file tree
Hide file tree
Showing 11 changed files with 2,831 additions and 2,754 deletions.
6 changes: 6 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down
12 changes: 12 additions & 0 deletions browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
76 changes: 39 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-mat-search-bar",
"version": "3.2.1",
"version": "4.0.0-beta.1",
"license": "MIT",
"scripts": {
"build": "ng build",
Expand All @@ -12,49 +12,51 @@
"test": "ng test"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.11.0",
"@angular-devkit/core": "^0.2.0",
"@angular/animations": "^7.1.0",
"@angular/cdk": "^7.1.0",
"@angular/cli": "^7.1.0",
"@angular/common": "^7.1.0",
"@angular/compiler": "^7.1.0",
"@angular/compiler-cli": "^7.1.0",
"@angular/core": "^7.1.0",
"@angular/forms": "^7.1.0",
"@angular/material": "^7.1.0",
"@angular/platform-browser": "^7.1.0",
"@angular/platform-browser-dynamic": "^7.1.0",
"@types/jasmine": "~2.5.53",
"@angular-devkit/build-angular": "~0.803.4",
"@angular-devkit/core": "^8.3.4",
"@angular/animations": "^8.2.6",
"@angular/cdk": "^8.2.0",
"@angular/cli": "^8.3.4",
"@angular/common": "^8.2.6",
"@angular/compiler": "^8.2.6",
"@angular/compiler-cli": "^8.2.6",
"@angular/core": "^8.2.6",
"@angular/forms": "^8.2.6",
"@angular/material": "^8.2.0",
"@angular/platform-browser": "^8.2.6",
"@angular/platform-browser-dynamic": "^8.2.6",
"@types/jasmine": "~3.4.0",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
"codelyzer": "^4.5.0",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.1.0",
"karma": "~1.7.0",
"karma-chrome-launcher": "~2.1.1",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^4.4.0",
"protractor": "~5.1.2",
"@types/node": "~12.7.5",
"codelyzer": "^5.0.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-cli": "~2.0.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"ng-packagr": "^5.4.0",
"protractor": "~5.4.2",
"rxjs": "^6.3.3",
"ts-node": "~3.2.0",
"tsickle": "^0.34.0",
"tslib": "^1.7.1",
"tslint": "~5.7.0",
"typescript": "~3.1.6",
"zone.js": "^0.8.26"
"ts-node": "~8.3.0",
"tsickle": "^0.37.0",
"tslib": "^1.10.0",
"tslint": "~5.20.0",
"typescript": "~3.4.5",
"zone.js": "~0.9.1"
},
"peerDependencies": {
"@angular/animations": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/material": "^7.0.0"
"@angular/animations": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/forms": "^8.0.0",
"@angular/material": "^8.0.0"
},
"ngPackage": {
"lib": {
"entryFile": "public_api.ts"
}
}
},
"dependencies": {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import { AbstractControlValueAccessor } from '../util/abstract-value-accessor';
export class MatSearchBarComponent extends AbstractControlValueAccessor<
string
> {
@ViewChild('input') inputElement: ElementRef;
@ViewChild('input', { static: false }) inputElement: ElementRef;

@Input() formControl: FormControl;

Expand Down
8 changes: 3 additions & 5 deletions src/app/ng-mat-search-bar/ng-mat-search-bar.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
MatIconModule,
MatInputModule,
MatRippleModule
} from '@angular/material';
import { MatRippleModule } from '@angular/material/core';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';

import { MatSearchBarComponent } from './mat-search-bar/mat-search-bar.component';

Expand Down
2 changes: 1 addition & 1 deletion src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

/** 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';
import 'core-js/proposals/reflect-metadata';


/**
Expand Down
1 change: 0 additions & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015",
"types": []
},
"exclude": [
Expand Down
2 changes: 0 additions & 2 deletions src/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"node"
Expand Down
6 changes: 4 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{
"compileOnSave": false,
"compilerOptions": {
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
],
"module": "es2015",
"module": "esnext",
"baseUrl": "./"
}
}
8 changes: 4 additions & 4 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@
"app",
"kebab-case"
],
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": true,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true,
Expand Down
Loading

0 comments on commit 39005fc

Please sign in to comment.