From 7d77985faca17a0d18231a767fecc54988f5d568 Mon Sep 17 00:00:00 2001 From: liyokuna Date: Sun, 26 Apr 2020 20:16:10 +0200 Subject: [PATCH] @angular/cli migration - workspace-version-9 Angular Workspace migration. Update an Angular CLI workspace to version 9. --- angular.json | 12 +++- package-lock.json | 71 +++++++++---------- package.json | 17 +++-- projects/cookie-service/tsconfig.lib.json | 1 - .../cookie-service/tsconfig.lib.prod.json | 6 ++ src/tsconfig.app.json | 9 ++- tsconfig.json | 2 +- 7 files changed, 66 insertions(+), 52 deletions(-) create mode 100644 projects/cookie-service/tsconfig.lib.prod.json diff --git a/angular.json b/angular.json index a33ffe7..f5be18a 100644 --- a/angular.json +++ b/angular.json @@ -17,6 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { + "aot": true, "outputPath": "dist/cookie-consent", "index": "src/index.html", "main": "src/main.ts", @@ -54,6 +55,10 @@ "type": "initial", "maximumWarning": "2mb", "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" } ] } @@ -147,7 +152,12 @@ "tsConfig": "projects/cookie-service/tsconfig.lib.json", "project": "projects/cookie-service/ng-package.json" } - }, + , "configurations": { + "production": { + "tsConfig": "projects/cookie-service/tsconfig.lib.prod.json" + } + } +}, "test": { "builder": "@angular-devkit/build-angular:karma", "options": { diff --git a/package-lock.json b/package-lock.json index 9780198..73f3079 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3216,9 +3216,9 @@ "dev": true }, "@types/node": { - "version": "12.7.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz", - "integrity": "sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==", + "version": "12.12.37", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz", + "integrity": "sha512-4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg==", "dev": true }, "@types/normalize-package-data": { @@ -5083,14 +5083,14 @@ "dev": true }, "codelyzer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.1.tgz", - "integrity": "sha512-t8ZLSZBUjVFOJVk4jASLgmTdKWK/0ZsQCnPXy6PXw1LWOOormQOVnyy4OYoiZ6rAWTrz60Obx+zA2t8xY53QzQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.2.tgz", + "integrity": "sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==", "dev": true, "requires": { "app-root-path": "^2.2.1", "aria-query": "^3.0.0", - "axobject-query": "^2.0.2", + "axobject-query": "2.0.2", "css-selector-tokenizer": "^0.7.1", "cssauron": "^1.4.0", "damerau-levenshtein": "^1.0.4", @@ -5947,14 +5947,14 @@ "dev": true }, "css-selector-tokenizer": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", - "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz", + "integrity": "sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==", "dev": true, "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" + "cssesc": "^3.0.0", + "fastparse": "^1.1.2", + "regexpu-core": "^4.6.0" } }, "css-tree": { @@ -5991,9 +5991,9 @@ } }, "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, "cssnano": { @@ -6125,9 +6125,9 @@ "dev": true }, "damerau-levenshtein": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz", - "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz", + "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==", "dev": true }, "dashdash": { @@ -13758,14 +13758,17 @@ } }, "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", + "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" } }, "registry-auth-token": { @@ -13787,15 +13790,15 @@ } }, "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz", + "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==", "dev": true }, "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", + "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -15760,12 +15763,6 @@ "yn": "^3.0.0" } }, - "tsickle": { - "version": "0.38.1", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.38.1.tgz", - "integrity": "sha512-4xZfvC6+etRu6ivKCNqMOd1FqcY/m6JY3Y+yr5+Xw+i751ciwrWINi6x/3l1ekcODH9GZhlf0ny2LpzWxnjWYA==", - "dev": true - }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", diff --git a/package.json b/package.json index e9bb88c..dd88041 100644 --- a/package.json +++ b/package.json @@ -32,11 +32,12 @@ "private": true, "dependencies": { "bootstrap": "^4.3.1", - "cookie-service-banner": "^2.0.1" + "cookie-service-banner": "^2.0.1", + "tslib": "^1.10.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.901.3", - "@angular-devkit/build-ng-packagr": "^0.901.3", + "@angular-devkit/build-angular": "~0.901.3", + "@angular-devkit/build-ng-packagr": "~0.901.3", "@angular/animations": "^9.1.3", "@angular/cli": "^9.1.3", "@angular/common": "^9.1.3", @@ -50,9 +51,9 @@ "@angular/router": "^9.1.3", "@types/jasmine": "^3.4.4", "@types/jasminewd2": "^2.0.8", - "@types/node": "^12.7.12", + "@types/node": "^12.11.1", "bootstrap": "^4.3.1", - "codelyzer": "~5.1.1", + "codelyzer": "^5.1.2", "core-js": "^3.3.2", "cpx": "~1.5.0", "jasmine-core": "^3.5.0", @@ -62,15 +63,13 @@ "karma-coverage-istanbul-reporter": "^2.1.0", "karma-jasmine": "^2.0.1", "karma-jasmine-html-reporter": "^1.4.2", - "ng-packagr": "^9.1.1", + "ng-packagr": "^9.0.0", "protractor": "~5.4.0", "rxjs": "^6.5.3", "ts-node": "^8.4.1", - "tsickle": "^0.38.1", - "tslib": "^1.10.0", "tslint": "^5.20.0", "typescript": "~3.8.3", - "zone.js": "~0.10.3" + "zone.js": "~0.10.2" }, "keywords": [ "angular", diff --git a/projects/cookie-service/tsconfig.lib.json b/projects/cookie-service/tsconfig.lib.json index 3fe337f..a78ed73 100644 --- a/projects/cookie-service/tsconfig.lib.json +++ b/projects/cookie-service/tsconfig.lib.json @@ -18,7 +18,6 @@ ] }, "angularCompilerOptions": { - "annotateForClosureCompiler": true, "skipTemplateCodegen": true, "strictMetadataEmit": true, "fullTemplateTypeCheck": true, diff --git a/projects/cookie-service/tsconfig.lib.prod.json b/projects/cookie-service/tsconfig.lib.prod.json new file mode 100644 index 0000000..b1d501a --- /dev/null +++ b/projects/cookie-service/tsconfig.lib.prod.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.lib.json", + "angularCompilerOptions": { + "enableIvy": false + } +} \ No newline at end of file diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index 190fd30..f3a1b80 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -4,8 +4,11 @@ "outDir": "../out-tsc/app", "types": [] }, - "exclude": [ - "test.ts", - "**/*.spec.ts" + "files": [ + "main.ts", + "polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" ] } diff --git a/tsconfig.json b/tsconfig.json index e8d9c25..e04ee79 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "module": "es2015", + "module": "esnext", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true,