Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Commit

Permalink
Merge branch '1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bastiaan van den Berg committed May 30, 2019
2 parents fcd4b43 + 4b668c9 commit 2653801
Show file tree
Hide file tree
Showing 13 changed files with 2,425 additions and 2,915 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "8"
- "10"
cache: yarn
before_script:
- yarn global add angular-cli
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog

<a name="1.0.2"></a>
## [1.0.2](https://github.com/basvandenberg/ng-select/compare/1.0.1...1.0.2) (2019-..-..)
## [1.0.2](https://github.com/basvandenberg/ng-select/compare/1.0.1...1.0.2) (2019-05-30)

### Features
- Changed peer dependencies to include Angular 8.
- Upgrade dependencies.



Expand Down
File renamed without changes.
89 changes: 44 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,62 @@
{
"name": "ng-select-demo",
"version": "1.0.1",
"version": "1.0.2",
"license": "MIT",
"scripts": {
"test-lib": "ng test ng-select",
"lint-lib": "ng lint ng-select",
"build-lib": "ng build ng-select",

"serve-demo": "ng serve",
"build-demo": "ng build ng-select-demo",
"build-demo-prod": "ng build ng-select-demo --prod --base-href /ng-select/ --deploy-url /ng-select/",

"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular/animations": "^7.0.3",
"@angular/cdk": "^7.0.3",
"@angular/common": "^7.0.3",
"@angular/compiler": "^7.0.3",
"@angular/core": "^7.0.3",
"@angular/forms": "^7.0.3",
"@angular/http": "^7.0.3",
"@angular/material": "^7.0.3",
"@angular/platform-browser": "^7.0.3",
"@angular/platform-browser-dynamic": "^7.0.3",
"@angular/router": "^7.0.3",
"core-js": "^2.5.4",
"famfamfam-flags": "^1.0.0",
"hammerjs": "^2.0.8",
"ng-select": "1.0.0",
"normalize.css": "^8.0.1",
"rxjs": "^6.3.3",
"web-animations-js": "^2.2.5",
"zone.js": "^0.8.26"
"@angular/animations": "8.0.0",
"@angular/cdk": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/material": "8.0.0",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"famfamfam-flags": "1.0.0",
"hammerjs": "2.0.8",
"ng-select": "1.0.1",
"normalize.css": "8.0.1",
"rxjs": "6.5.2",
"tslib": "1.9.3",
"web-animations-js": "2.3.1",
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.10.0",
"@angular-devkit/build-ng-packagr": "~0.10.0",
"@angular/cli": "~7.0.5",
"@angular/compiler-cli": "~7.0.0",
"@angular/language-service": "~7.0.0",
"@types/node": "~8.9.4",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^4.2.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tsickle": ">=0.29.0",
"tslib": "^1.9.0",
"tslint": "~5.11.0",
"typescript": "~3.1.6"
"@angular-devkit/build-angular": "0.800.0",
"@angular-devkit/build-ng-packagr": "0.800.0",
"@angular/cli": "8.0.0",
"@angular/compiler-cli": "8.0.0",
"@angular/language-service": "8.0.0",
"@types/jasmine": "3.3.13",
"@types/jasminewd2": "2.0.3",
"@types/node": "8.9.4",
"codelyzer": "5.0.1",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.1.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage-istanbul-reporter": "2.0.1",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.2",
"ng-packagr": "5.2.0",
"protractor": "5.4.0",
"ts-node": "7.0.0",
"tsickle": "0.35.0",
"tslint": "5.16.0",
"typescript": "3.4.5"
},
"resolutions": {
"caniuse-lite": "1.0.30000971"
}
}
6 changes: 3 additions & 3 deletions projects/ng-select/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-select",
"version": "1.0.1",
"version": "1.0.2",
"description": "Select component for angular.",
"repository": "[email protected]:basvandenberg/ng-select.git",
"keywords": [
Expand All @@ -17,7 +17,7 @@
},
"homepage": "https://basvandenberg.github.io/ng-select",
"peerDependencies": {
"@angular/core": ">=5.0.0 <8.0.0",
"@angular/common": ">=5.0.0 <8.0.0"
"@angular/core": ">=5.0.0 <9.0.0",
"@angular/common": ">=5.0.0 <9.0.0"
}
}
4 changes: 2 additions & 2 deletions projects/ng-select/src/lib/select-dropdown.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export class SelectDropdownComponent
@Output() singleFilterInput = new EventEmitter<string>();
@Output() singleFilterKeydown = new EventEmitter<any>();

@ViewChild('filterInput') filterInput: any;
@ViewChild('optionsList') optionsList: any;
@ViewChild('filterInput', { static: false }) filterInput: any;
@ViewChild('optionsList', { static: true }) optionsList: any;

disabledColor: string = '#fff';
disabledTextColor: string = '9e9e9e';
Expand Down
8 changes: 4 additions & 4 deletions projects/ng-select/src/lib/select.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ export class SelectComponent implements ControlValueAccessor, OnChanges, OnInit
@Output() noOptionsFound = new EventEmitter<string>();
@Output() filterInputChanged = new EventEmitter<string>();

@ViewChild('selection') selectionSpan: ElementRef;
@ViewChild('dropdown') dropdown: SelectDropdownComponent;
@ViewChild('filterInput') filterInput: ElementRef;
@ViewChild('selection', { static: true }) selectionSpan: ElementRef;
@ViewChild('dropdown', { static: false }) dropdown: SelectDropdownComponent;
@ViewChild('filterInput', { static: false }) filterInput: ElementRef;

@ContentChild('optionTemplate') optionTemplate: TemplateRef<any>;
@ContentChild('optionTemplate', { static: false }) optionTemplate: TemplateRef<any>;

private _value: Array<any> = [];
optionList: OptionList = new OptionList([]);
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare var hljs: any;
})
export class AppComponent {

@ViewChild('mainContainer') mainContainer: ElementRef;
@ViewChild('mainContainer', { static: true }) mainContainer: ElementRef;

static readonly SCREEN_BREAKPOINT: number = 600;
smallScreen: boolean = false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {OptionService} from '../services/option.service';
})
export class Home {

version: string = '1.0.1';
version: string = '1.0.2';

countries: Array<IOption> = this.optionService.getCountries();
singleSelectValue: string = 'NL';
Expand Down
26 changes: 2 additions & 24 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,9 @@
*/

/***************************************************************************************************
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
import 'core-js/es6/symbol';
import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
import 'core-js/es6/parse-float';
import 'core-js/es6/number';
import 'core-js/es6/math';
import 'core-js/es6/string';
import 'core-js/es6/date';
import 'core-js/es6/array';
import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/weak-map';
import 'core-js/es6/set';
* BROWSER POLYFILLS
*/

/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
**/
import 'core-js/es6/array';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
Expand Down
8 changes: 4 additions & 4 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@
"check-type"
],
"no-output-on-prefix": true,
"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 2653801

Please sign in to comment.