Skip to content

Commit

Permalink
fix: support the latest Angular CLI scaffolding
Browse files Browse the repository at this point in the history
BREAKING CHANGE: requires libraries scaffolded by Angular 10.2
  • Loading branch information
ersimont committed Nov 9, 2020
1 parent c197fcb commit 900876d
Show file tree
Hide file tree
Showing 22 changed files with 959 additions and 875 deletions.
26 changes: 13 additions & 13 deletions package.json
Expand Up @@ -20,14 +20,14 @@
"calc-micro-dash-sizes": "cd projects/micro-dash-sizes && ts-node calc-sizes"
},
"dependencies": {
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
"@angular/core": "~10.0.0",
"@angular/forms": "~10.0.0",
"@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@angular/animations": "~10.2.2",
"@angular/common": "~10.2.2",
"@angular/compiler": "~10.2.2",
"@angular/core": "~10.2.2",
"@angular/forms": "~10.2.2",
"@angular/platform-browser": "~10.2.2",
"@angular/platform-browser-dynamic": "~10.2.2",
"@angular/router": "~10.2.2",
"@typescript-eslint/eslint-plugin": "~3.4.0",
"@typescript-eslint/parser": "~3.4.0",
"eslint": "~7.3.1",
Expand All @@ -38,10 +38,10 @@
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.8",
"@angular-devkit/build-ng-packagr": "~0.1000.8",
"@angular/cli": "~10.0.0",
"@angular/compiler-cli": "~10.0.0",
"@angular-devkit/build-angular": "~0.1002.0",
"@angular-devkit/build-ng-packagr": "~0.1002.0",
"@angular/cli": "~10.2.0",
"@angular/compiler-cli": "~10.2.2",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/lodash-es": "^4.17.3",
Expand Down Expand Up @@ -114,4 +114,4 @@
"postchangelog": "prettier --write CHANGELOG.md"
}
}
}
}
2 changes: 1 addition & 1 deletion projects/app-state/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/app-state/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/integration/e2e/tsconfig.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../../tsconfig.base.json",
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "../../../out-tsc/e2e",
"module": "commonjs",
Expand Down
2 changes: 1 addition & 1 deletion projects/integration/tsconfig.app.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion projects/integration/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/js-core/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/js-core/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/micro-dash-sizes/tsconfig.app.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion projects/micro-dash/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/micro-dash/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"],
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-app-state/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-app-state/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-core/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-core/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-dev/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/ng-dev/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
2 changes: 1 addition & 1 deletion projects/rxjs-core/tsconfig.lib.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/rxjs-core/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine"]
Expand Down
34 changes: 0 additions & 34 deletions tsconfig.base.json

This file was deleted.

58 changes: 32 additions & 26 deletions tsconfig.json
@@ -1,28 +1,34 @@
/*
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.
*/
{
"files": [],
"references": [
{ "path": "./projects/app-state/tsconfig.lib.json" },
{ "path": "./projects/app-state/tsconfig.spec.json" },
{ "path": "./projects/integration/tsconfig.app.json" },
{ "path": "./projects/integration/tsconfig.spec.json" },
{ "path": "./projects/js-core/tsconfig.lib.json" },
{ "path": "./projects/js-core/tsconfig.spec.json" },
{ "path": "./projects/micro-dash/tsconfig.lib.json" },
{ "path": "./projects/micro-dash/tsconfig.spec.json" },
{ "path": "./projects/micro-dash-sizes/tsconfig.app.json" },
{ "path": "./projects/ng-app-state/tsconfig.lib.json" },
{ "path": "./projects/ng-app-state/tsconfig.spec.json" },
{ "path": "./projects/ng-core/tsconfig.lib.json" },
{ "path": "./projects/ng-core/tsconfig.spec.json" },
{ "path": "./projects/ng-dev/tsconfig.lib.json" },
{ "path": "./projects/ng-dev/tsconfig.spec.json" },
{ "path": "./projects/rxjs-core/tsconfig.lib.json" },
{ "path": "./projects/rxjs-core/tsconfig.spec.json" }
]
"compileOnSave": false,
"compilerOptions": {
//
// from the Angular CLI
//
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"module": "es2020",
"lib": ["es2018", "dom"],
"paths": { "@s-libs/*": ["dist/*"] },

//
// Simonton Software additions
//
"noUnusedLocals": true,
"noUnusedParameters": true
},
"angularCompilerOptions": {
"strictInjectionParameters": true,
"strictTemplates": true
}
}

0 comments on commit 900876d

Please sign in to comment.