develop #49

Manually merged
samuel-p merged 23 commits from develop into master 2020-11-27 22:09:29 +00:00
7 changed files with 30 additions and 51 deletions
Showing only changes of commit 19c91082f7 - Show all commits

View file

@ -46,7 +46,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"extractLicenses": true, "extractLicenses": true,
"vendorChunk": false, "vendorChunk": false,

View file

@ -1,5 +1,5 @@
{ {
"extends": "../tsconfig.base.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/e2e", "outDir": "../out-tsc/e2e",
"module": "commonjs", "module": "commonjs",

View file

@ -37,22 +37,22 @@
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.1000.3", "@angular-devkit/build-angular": "~0.1100.2",
"@angular/cli": "~10.0.3", "@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2", "@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2", "@angular/language-service": "~11.0.2",
"@nguniversal/builders": "^10.1.0", "@nguniversal/builders": "^10.1.0",
"@types/express": "^4.17.8", "@types/express": "^4.17.8",
"@types/node": "^14.0.23", "@types/node": "^14.0.23",
"@types/jasmine": "~3.5.11", "@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"codelyzer": "^6.0.0", "codelyzer": "^6.0.0",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~5.0.0",
"karma": "~5.1.0", "karma": "~5.1.0",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0", "karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "~8.10.2", "ts-node": "~8.10.2",

View file

@ -1,5 +1,5 @@
{ {
"extends": "./tsconfig.base.json", "extends": "./tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "./out-tsc/app", "outDir": "./out-tsc/app",
"types": [] "types": []

View file

@ -1,23 +0,0 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "es2020",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"lib": [
"es2018",
"dom"
]
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

View file

@ -1,20 +1,23 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScripts 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": [], "compileOnSave": false,
"references": [ "compilerOptions": {
{ "baseUrl": "./",
"path": "./tsconfig.app.json" "outDir": "./dist/out-tsc",
}, "sourceMap": true,
{ "declaration": false,
"path": "./tsconfig.spec.json" "downlevelIteration": true,
}, "experimentalDecorators": true,
{ "module": "es2020",
"path": "./tsconfig.server.json" "moduleResolution": "node",
} "importHelpers": true,
] "target": "es2015",
"lib": [
"es2018",
"dom"
]
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
} }

View file

@ -1,5 +1,5 @@
{ {
"extends": "./tsconfig.base.json", "extends": "./tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "./out-tsc/spec", "outDir": "./out-tsc/spec",
"types": [ "types": [