Skip to content

Commit

Permalink
Upgrade @angular/cli to v10
Browse files Browse the repository at this point in the history
  • Loading branch information
dreyliky committed Jul 2, 2020
1 parent 6fecb65 commit 56b5afc
Show file tree
Hide file tree
Showing 13 changed files with 2,660 additions and 1,713 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"defaultProject": "ng-os",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
}
}
4 changes: 2 additions & 2 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
4,248 changes: 2,581 additions & 1,667 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@
"@angular/platform-browser-dynamic": "~10.0.2",
"@angular/router": "~10.0.2",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.4",
"@angular-devkit/build-ng-packagr": "~0.901.8",
"@angular/cli": "~9.1.4",
"@angular-devkit/build-angular": "~0.1000.1",
"@angular-devkit/build-ng-packagr": "~0.1000.1",
"@angular/cli": "~10.0.1",
"@angular/compiler-cli": "~10.0.2",
"@angular/language-service": "~10.0.2",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~3.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"ng-packagr": "^9.0.0",
"protractor": "~5.4.3",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.0.0",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~3.9.6"
Expand Down
4 changes: 2 additions & 2 deletions projects/os-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@angular/core": "^9.1.11"
},
"dependencies": {
"tslib": "^1.10.0"
},
"tslib": "^2.0.0"
},
"devDependencies": {
"@linnenschmidt/build-ng-packagr": "^9.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion projects/os-angular/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/os-angular/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": []
Expand Down
30 changes: 30 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "es2020",
"moduleResolution": "node",
"importHelpers": true,
"allowSyntheticDefaultImports": true,
"target": "es2015",
"lib": [
"es2018",
"dom"
],
"paths": {
"os-angular": [
"dist/os-angular/os-angular",
"dist/os-angular"
]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}
45 changes: 19 additions & 26 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"allowSyntheticDefaultImports": true,
"target": "es2015",
"lib": [
"es2018",
"dom"
],
"paths": {
"os-angular": [
"dist/os-angular/os-angular",
"dist/os-angular"
]
}
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
{
"path": "./tsconfig.spec.json"
},
{
"path": "./projects/os-angular/tsconfig.lib.json"
},
{
"path": "./projects/os-angular/tsconfig.spec.json"
}
]
}
2 changes: 1 addition & 1 deletion tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [
Expand Down
12 changes: 11 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
{
"extends": "tslint:recommended",
"rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"indent": {
"options": [
"spaces"
]
},
"max-file-line-count": [
true,
{
Expand Down Expand Up @@ -61,7 +72,6 @@
"no-trailing-whitespace": true,
"no-unnecessary-initializer": true,
"no-unused-expression": true,
"no-use-before-declare": true,
"no-var-keyword": true,
"object-literal-sort-keys": false,
"one-line": [
Expand Down

0 comments on commit 56b5afc

Please sign in to comment.