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

Commit 8bb8e82

Browse files
author
Bastiaan van den Berg
committed
Merge branch 'rc.1'
2 parents 5a5b2bb + 9319d0f commit 8bb8e82

49 files changed

Lines changed: 2373 additions & 1705 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ yarn-error.log
99
*.orig
1010
*.swp
1111
*.tgz
12+
*.idea

.npmignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
/node_modules
55
/src
66

7-
/dist/ng-select.js
8-
/dist/ng-select.d.ts
9-
/dist/ng-select.metadata.json
7+
/dist/src/ng-select.js
8+
/dist/src/ng-select.d.ts
9+
/dist/src/ng-select.metadata.json
10+
/dist/src/ng-select.ngfactory.js
11+
/dist/src/ng-select.ngfactory.d.ts
12+
/dist/src/ng-select.ngsummary.json
13+
/dist/node_modules
1014

1115
yarn.lock
1216
gulpfile.js

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
<a name="1.0.0-rc.1"></a>
4+
## [1.0.0-rc.1](https://github.com/basvandenberg/ng-select/compare/1.0.0-beta.6...1.0.0-rc.1) (2017-11-02)
5+
6+
Works with Angular 5.
7+
8+
### Breaking changes
9+
- Removed font-family: Sans-Serif from style sheets (#241).
10+
11+
### Bug fixes
12+
- Use original option object in option template of selected option (#92).
13+
- Prevent changed-after-checked error when using a placeholder (#208).
14+
- Remove deprecated ngOutletContext (#242).
15+
- Hide placeholder in multi-select when setting delayed options (#249).
316

417

518
<a name="1.0.0-beta.6"></a>

demo/.angular-cli.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"root": "src",
99
"outDir": "dist",
1010
"assets": [
11-
"assets",
12-
"favicon.ico"
11+
"assets"
1312
],
1413
"index": "index.html",
1514
"main": "main.ts",

demo/package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,50 @@
66
"ng": "ng",
77
"start": "ng serve",
88
"build": "ng build",
9+
"build-prod": "ng build --prod --base-href /ng-select --deploy-url /ng-select",
910
"test": "ng test",
1011
"lint": "ng lint",
1112
"e2e": "ng e2e"
1213
},
1314
"private": true,
1415
"dependencies": {
15-
"@angular/animations": "^4.2.5",
16-
"@angular/common": "^4.2.5",
17-
"@angular/compiler": "^4.2.5",
18-
"@angular/core": "^4.2.5",
19-
"@angular/forms": "^4.2.5",
20-
"@angular/http": "^4.2.5",
21-
"@angular/material": "^2.0.0-beta.7",
22-
"@angular/platform-browser": "^4.2.5",
23-
"@angular/platform-browser-dynamic": "^4.2.5",
24-
"@angular/router": "^4.2.5",
16+
"@angular/animations": "^5.0.0",
17+
"@angular/cdk": "^2.0.0-beta.12",
18+
"@angular/common": "^5.0.0",
19+
"@angular/compiler": "^5.0.0",
20+
"@angular/core": "^5.0.0",
21+
"@angular/forms": "^5.0.0",
22+
"@angular/http": "^5.0.0",
23+
"@angular/material": "^2.0.0-beta.12",
24+
"@angular/platform-browser": "^5.0.0",
25+
"@angular/platform-browser-dynamic": "^5.0.0",
26+
"@angular/router": "^5.0.0",
2527
"core-js": "^2.4.1",
2628
"famfamfam-flags": "^1.0.0",
2729
"hammerjs": "^2.0.8",
28-
"ng-select": "1.0.0-beta.6",
30+
"ng-select": "1.0.0-rc.1",
2931
"normalize.css": "^7.0.0",
3032
"rxjs": "^5.4.1",
3133
"web-animations-js": "^2.2.5",
32-
"zone.js": "^0.8.12"
34+
"zone.js": "^0.8.18"
3335
},
3436
"devDependencies": {
35-
"@angular/cli": "^1.2.0",
36-
"@angular/compiler-cli": "^4.2.5",
37+
"@angular/cli": "^1.4.9",
38+
"@angular/compiler-cli": "^5.0.0",
3739
"@types/jasmine": "^2.5.53",
38-
"@types/node": "^8.0.7",
39-
"codelyzer": "^3.1.1",
40+
"@types/node": "^8.0.46",
41+
"codelyzer": "^3.2.1",
4042
"jasmine-core": "^2.6.4",
4143
"jasmine-spec-reporter": "^4.1.1",
4244
"karma": "^1.7.0",
4345
"karma-chrome-launcher": "^2.2.0",
44-
"karma-cli": "~1.0.1",
46+
"karma-cli": "^1.0.1",
4547
"karma-coverage-istanbul-reporter": "^1.3.0",
46-
"karma-jasmine": "~1.1.0",
48+
"karma-jasmine": "^1.1.0",
4749
"karma-jasmine-html-reporter": "^0.2.2",
4850
"protractor": "^5.1.2",
4951
"ts-node": "^3.1.0",
5052
"tslint": "^5.4.3",
51-
"typescript": "~2.2.0"
53+
"typescript": "~2.4.2"
5254
}
5355
}

0 commit comments

Comments
 (0)