Merge pull request #152 from rpaschoal/feature/upgrade-angular

Upgrade Angular to version 9
rpaschoal · Apr 17, 2020 · 64bfb08 · 64bfb08
2 parents 145fcb0 + c08002a
commit 64bfb08
Show file tree

Hide file tree

Showing 19 changed files with 336 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,6 @@ yarn-error.log
 # System Files
 .DS_Store
 Thumbs.db
+
+# NPM lock
+package-lock.json
diff --git a/angular.json b/angular.json
@@ -3,39 +3,61 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "ng-chat": {
-      "root": "demo/offline_bot",
-      "sourceRoot": "demo/offline_bot/src",
+    "my-app-angular-test": {
       "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "demo/offline_bot/dist",
-            "index": "demo/offline_bot/src/index.html",
-            "main": "demo/offline_bot/src/main.ts",
-            "tsConfig": "demo/offline_bot/src/../../../tsconfig.json",
+            "outputPath": "dist/my-app-angular-test",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
             "assets": [
-              "demo/offline_bot/src/assets"
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
             ],
-            "styles": [],
             "scripts": []
           },
           "configurations": {
             "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
-              "fileReplacements": [
+              "budgets": [
                 {
-                  "replace": "demo/offline_bot/src/environments/environment.ts",
-                  "with": "demo/offline_bot/src/environments/environment.prod.ts"
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
                 }
               ]
             }
@@ -44,72 +66,61 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "ng-chat:build"
+            "browserTarget": "my-app-angular-test:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ng-chat:build:production"
+              "browserTarget": "my-app-angular-test:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ng-chat:build"
+            "browserTarget": "my-app-angular-test:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "demo/offline_bot/src/../../../test.ts",
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "scripts": [],
-            "styles": [],
             "assets": [
-              "demo/offline_bot/src/assets"
+              "src/favicon.ico",
+              "src/assets"
             ],
-            "tsConfig": "demo/offline_bot/src/../../../tsconfig.json"
+            "styles": [],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [],
-            "exclude": []
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
-        }
-      }
-    },
-    "ng-chat-e2e": {
-      "root": "demo/offline_bot/e2e",
-      "sourceRoot": "demo/offline_bot/e2e",
-      "projectType": "application",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "protractor.conf.js",
-            "devServerTarget": "ng-chat:serve"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [],
-            "exclude": []
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app-angular-test:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app-angular-test:serve:production"
+            }
           }
         }
       }
-    }
-  },
-  "defaultProject": "ng-chat",
-  "schematics": {
-    "@schematics/angular:component": {
-      "prefix": "",
-      "styleext": "css"
-    },
-    "@schematics/angular:directive": {
-      "prefix": ""
-    }
-  }
+    }},
+  "defaultProject": "my-app-angular-test"
 }
diff --git a/demo/offline_bot/angular.json b/demo/offline_bot/angular.json
@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/index.html",
@@ -28,6 +29,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -124,7 +131,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "css"
+      "style": "css"
     },
     "@schematics/angular:directive": {
       "prefix": "app"

diff --git a/demo/offline_bot/browserslist b/demo/offline_bot/browserslist
@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/demo/offline_bot/package.json b/demo/offline_bot/package.json
@@ -12,40 +12,40 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.3",
-    "@angular/common": "^7.0.3",
-    "@angular/compiler": "^7.0.3",
-    "@angular/core": "^7.0.3",
-    "@angular/forms": "^7.0.3",
-    "@angular/http": "^7.0.3",
-    "@angular/platform-browser": "^7.0.3",
-    "@angular/platform-browser-dynamic": "^7.0.3",
-    "@angular/router": "^7.0.3",
+    "@angular/animations": "^9.1.2",
+    "@angular/common": "^9.1.2",
+    "@angular/compiler": "^9.1.2",
+    "@angular/core": "^9.1.2",
+    "@angular/forms": "^9.1.2",
+    "@angular/platform-browser": "^9.1.2",
+    "@angular/platform-browser-dynamic": "^9.1.2",
+    "@angular/router": "^9.1.2",
     "core-js": "^2.5.7",
-    "ng-chat": "^2.0.5",
-    "rxjs": "^6.5.2",
-    "zone.js": "^0.8.26"
+    "ng-chat": "^3.0.0",
+    "rxjs": "^6.5.5",
+    "tslib": "^1.11.1",
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.13.4",
-    "@angular/cli": "^7.0.4",
-    "@angular/compiler-cli": "^7.0.3",
-    "@angular/language-service": "^7.0.3",
-    "@types/jasmine": "~2.8.11",
-    "@types/jasminewd2": "~2.0.6",
-    "@types/node": "~10.12.3",
-    "codelyzer": "~4.5.0",
-    "jasmine-core": "~3.3.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.1.1",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^2.0.4",
-    "karma-jasmine": "~1.1.2",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "protractor": "~5.4.1",
-    "ts-node": "~7.0.1",
-    "tslint": "~5.11.0",
-    "typescript": "~3.2.4"
+    "@angular-devkit/build-angular": "~0.901.1",
+    "@angular/cli": "^9.1.1",
+    "@angular/compiler-cli": "9.1.2",
+    "@angular/language-service": "^9.1.2",
+    "@types/jasmine": "~3.5.10",
+    "@types/jasminewd2": "~2.0.8",
+    "@types/node": "^13.11.1",
+    "codelyzer": "^5.2.2",
+    "jasmine-core": "~3.5.0",
+    "jasmine-spec-reporter": "~5.0.1",
+    "karma": "~5.0.1",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-cli": "~2.0.0",
+    "karma-coverage-istanbul-reporter": "^2.1.1",
+    "karma-jasmine": "~3.1.1",
+    "karma-jasmine-html-reporter": "^1.5.3",
+    "protractor": "~5.4.3",
+    "ts-node": "~8.8.2",
+    "tslint": "~6.1.1",
+    "typescript": "~3.8.3"
   }
 }
diff --git a/demo/offline_bot/src/tsconfig.app.json b/demo/offline_bot/src/tsconfig.app.json
@@ -3,11 +3,15 @@
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "./",
-    "module": "es2015",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts",
+    "../node_modules/ng-chat/*.ts",
+    "../node_modules/ng-chat/ng-chat/**/*.ts"
   ]
 }
diff --git a/demo/offline_bot/src/tsconfig.spec.json b/demo/offline_bot/src/tsconfig.spec.json
@@ -3,8 +3,6 @@
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "baseUrl": "./",
-    "module": "commonjs",
-    "target": "es5",
     "types": [
       "jasmine",
       "node"

diff --git a/demo/offline_bot/tsconfig.json b/demo/offline_bot/tsconfig.json
@@ -1,21 +1,22 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "downlevelIteration": true,
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
       "es2017",
       "dom"
     ],
-    "module": "es2015",
+    "module": "esnext",
     "baseUrl": "./"
   },
   "include": [

diff --git a/demo/offline_bot/tslint.json b/demo/offline_bot/tslint.json
@@ -125,12 +125,12 @@
       "app",
       "kebab-case"
     ],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
+    "no-inputs-metadata-property": true,
+    "no-outputs-metadata-property": true,
+    "no-host-metadata-property": true,
     "no-input-rename": true,
     "no-output-rename": true,
-    "use-life-cycle-interface": true,
+    "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
     "directive-class-suffix": true,