Skip to content

Commit

Permalink
chore: angular 7+ update (#929)
Browse files Browse the repository at this point in the history 
BREAKING CHANGES:
Angular 7+ now required.
  • Loading branch information
@tibing-old-email
tibing-old-email committed Nov 14, 2018
1 parent 33a0990 commit c301718
Show file tree
Hide file tree
Showing 9 changed files with 5,522 additions and 4,548 deletions.
9,930 changes: 5,451 additions & 4,479 deletions package-lock.json
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"docs:prepare": "npm-run-all docs:parse",
"docs:start": "npm start -- docs --port 4100",
"docs:serve": "npm-run-all docs:prepare docs:start",
"docs:build": "npm run docs:prepare && npm run build:prod -- docs --base-href '/nebular/' && npm run docs:dirs",
"docs:build": "npm-run-all docs:prepare docs:prod docs:dirs",
"docs:prod": "npm run build -- docs --prod --aot --base-href '/nebular/'",
"docs:dirs": "gulp create-docs-dirs",
"docs:gh-pages": "npm run docs:build && npm run ngh -- --dir ./docs/dist",
"build": "ng build",
"build:prod": "npm run build -- --prod --aot",
"build:wp": "npm run build:prod -- playground-wp",
"build:wp": "npm run build -- playground-wp --prod --aot",
"build:package": "npm-run-all -s clean:tmp:lib gulp build:ts build:inline-resources build:bundle clean:tmp",
"build:ts": "tsc -p tsconfig.publish.json && ngc -p tsconfig.publish.json",
"build:inline-resources": "gulp inline-resources",
Expand All @@ -54,7 +54,7 @@
"ci:lint": "npm run lint && npm run lint:styles",
"ci:docs": "npm-run-all docs:prepare docs:build ",
"ci:dev-deploy": "npm run firebase use dev && npm run firebase deploy",
"ci:build": "npm-run-all build:prod build:package build:wp",
"ci:build": "npm-run-all build -- --prod --aot build:package build:wp",
"ci:test": "rimraf coverage && npm run build:package && npm run test:wp -- --code-coverage --watch=false",
"ci:e2e": "npm-run-all build:package e2e:wp",
"version:bump": "gulp version",
Expand All @@ -77,18 +77,18 @@
"nebular"
],
"dependencies": {
"@angular/animations": "6.0.0",
"@angular/common": "6.0.0",
"@angular/compiler": "6.0.0",
"@angular/core": "6.0.0",
"@angular/forms": "6.0.0",
"@angular/http": "6.0.0",
"@angular/platform-browser": "6.0.0",
"@angular/platform-browser-dynamic": "6.0.0",
"@angular/router": "6.0.0",
"@angular/animations": "7.0.0",
"@angular/common": "7.0.0",
"@angular/compiler": "7.0.0",
"@angular/core": "7.0.0",
"@angular/forms": "7.0.0",
"@angular/http": "7.0.0",
"@angular/platform-browser": "7.0.0",
"@angular/platform-browser-dynamic": "7.0.0",
"@angular/router": "7.0.0",
"bootstrap": "4.0.0",
"colors.js": "1.2.4",
"core-js": "2.5.1",
"core-js": "2.5.7",
"date-fns": "^2.0.0-alpha.16",
"docsearch.js": "^2.5.2",
"gulp-bump": "2.7.0",
Expand All @@ -101,18 +101,18 @@
"moment": "^2.22.2",
"nebular-icons": "1.1.0",
"normalize.css": "8.0.0",
"rxjs": "^6.1.0",
"rxjs": "6.3.0",
"socicon": "3.0.5",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.6.0",
"@angular-devkit/core": "^0.6.5",
"@angular-devkit/schematics": "^0.6.5",
"@angular/cdk": "6.0.0",
"@angular/cli": "^6.0.0",
"@angular/compiler-cli": "6.0.0",
"@angular/language-service": "6.0.0",
"@angular-devkit/build-angular": "0.10.2",
"@angular-devkit/core": "7.0.2",
"@angular-devkit/schematics": "7.0.2",
"@angular/cdk": "7.0.0",
"@angular/cli": "7.0.2",
"@angular/compiler-cli": "7.0.0",
"@angular/language-service": "7.0.0",
"@types/gulp": "3.8.36",
"@types/highlight.js": "9.12.2",
"@types/jasmine": "2.8.3",
Expand All @@ -121,7 +121,7 @@
"@types/node": "6.0.90",
"angular-cli-ghpages": "0.5.0",
"browserstack-local": "^1.3.3",
"codelyzer": "4.0.2",
"codelyzer": "4.5.0",
"conventional-changelog-cli": "1.3.4",
"del": "3.0.0",
"doc-prsr": "2.1.1",
Expand Down Expand Up @@ -155,10 +155,10 @@
"stylelint": "7.13.0",
"through2": "^2.0.3",
"ts-node": "3.2.2",
"tslint": "5.7.0",
"tslint-language-service": "0.9.6",
"tslint": "5.8.0",
"tslint-language-service": "0.9.9",
"typedoc": "^0.12.0",
"typescript": "2.7.2",
"typescript": "3.1.3",
"uglify-es": "3.2.2",
"uglifyjs-webpack-plugin": "1.1.5"
},
Expand Down
42 changes: 21 additions & 21 deletions packages-smoke/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^6.1.0",
"@angular/cdk": "^6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"@nebular/auth": "^2.0.0-rc.10",
"@nebular/security": "^2.0.0-rc.10",
"@nebular/theme": "^2.0.0-rc.10",
"@angular/animations": "7.0.0",
"@angular/cdk": "7.0.0",
"@angular/common": "7.0.0",
"@angular/compiler": "7.0.0",
"@angular/core": "7.0.0",
"@angular/forms": "7.0.0",
"@angular/http": "7.0.0",
"@angular/platform-browser": "7.0.0",
"@angular/platform-browser-dynamic": "7.0.0",
"@angular/router": "7.0.0",
"@nebular/auth": "2.0.1",
"@nebular/security": "2.0.1",
"@nebular/theme": "2.0.1",
"core-js": "^2.5.4",
"date-fns": "^1.29.0",
"moment": "^2.22.2",
"rxjs": "~6.2.0",
"rxjs": "6.3.0",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.8.0",
"@angular/cli": "~6.2.3",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@angular-devkit/build-angular": "0.10.2",
"@angular/cli": "7.0.2",
"@angular/compiler-cli": "7.0.0",
"@angular/language-service": "7.0.0",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.3.0",
"codelyzer": "4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-fail-fast": "2.0.0",
"browserstack-local": "^1.3.3",
Expand All @@ -50,7 +50,7 @@
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "~2.9.2"
"tslint": "5.8.0",
"typescript": "3.1.3"
}
}
12 changes: 6 additions & 6 deletions src/framework/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"nebular"
],
"peerDependencies": {
"@angular/common": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/router": "^6.0.0",
"@angular/forms": "^6.0.0",
"@angular/http": "^6.0.0",
"@angular/common": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/router": "^7.0.0",
"@angular/forms": "^7.0.0",
"@angular/http": "^7.0.0",
"@nebular/theme": "2.0.2",
"rxjs": "^6.1.0"
"rxjs": "^6.3.0"
}
}
10 changes: 6 additions & 4 deletions src/framework/auth/strategies/oauth2/oauth2-strategy.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ describe('oauth2-auth-strategy', () => {
error_uri: 'some',
};

const successToken = nbAuthCreateToken(NbAuthOAuth2Token, tokenSuccessResponse, 'strategy') as NbAuthOAuth2Token;
// tslint:disable-next-line
const refreshedToken = nbAuthCreateToken(NbAuthOAuth2Token, refreshedTokenPayload, 'strategy') as NbAuthOAuth2Token;
const refreshedTokenWithRefreshToken = nbAuthCreateToken(NbAuthOAuth2Token, refreshedTokenResponse, 'strategy') as NbAuthOAuth2Token;
const successToken = nbAuthCreateToken(NbAuthOAuth2Token, tokenSuccessResponse,
'strategy') as NbAuthOAuth2Token;
const refreshedToken = nbAuthCreateToken(NbAuthOAuth2Token, refreshedTokenPayload,
'strategy') as NbAuthOAuth2Token;
const refreshedTokenWithRefreshToken = nbAuthCreateToken(NbAuthOAuth2Token, refreshedTokenResponse,
'strategy') as NbAuthOAuth2Token;

beforeEach(() => {
windowMock = { location: { href: '' } };
Expand Down
8 changes: 4 additions & 4 deletions src/framework/security/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"nebular"
],
"peerDependencies": {
"@angular/common": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/router": "^6.0.0",
"rxjs": "^6.1.0"
"@angular/common": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/router": "^7.0.0",
"rxjs": "^6.3.0"
}
}
2 changes: 1 addition & 1 deletion src/framework/theme/components/radio/radio-group.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class NbRadioGroupComponent implements AfterContentInit, OnDestroy, Contr
}

@Input('name')
set setName(name: string){
set setName(name: string) {
this.name = name;
this.updateNames();
}
Expand Down
12 changes: 6 additions & 6 deletions src/framework/theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"nebular"
],
"peerDependencies": {
"@angular/animations": "^6.0.0",
"@angular/common": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/router": "^6.0.0",
"@angular/cdk": "^6.0.0",
"rxjs": "^6.1.0",
"@angular/animations": "^7.0.0",
"@angular/common": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/router": "^7.0.0",
"@angular/cdk": "^7.0.0",
"rxjs": "^6.3.0",
"nebular-icons": "^1.1.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/playground/progress-bar/progress-bar-interactive.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class NbProgressBarInteractiveComponent {
this.value = Math.min(Math.max(newValue, 0), 100)
}

get status(){
get status() {
if (this.value <= 25) {
return 'danger';
} else if (this.value <= 50) {
Expand Down

0 comments on commit c301718

Please sign in to comment.