Merge branch 'feature/angular_11' into develop

mzuccaroli · Feb 7, 2021 · 3b3bc03 · 3b3bc03
2 parents f575b6d + 6129aeb
commit 3b3bc03
Show file tree

Hide file tree

Showing 12 changed files with 4,288 additions and 5,757 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [1.3.0] - UNRELEASED
+
+### Added
+### Changed
+- Angular 11 support
+### Removed
 ## [1.2.4] - 2020‑12‑08
 
 ### Added

diff --git a/demo-application/angular.json b/demo-application/angular.json
@@ -43,7 +43,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

diff --git a/demo-application/package-lock.json b/demo-application/package-lock.json
diff --git a/demo-application/package.json b/demo-application/package.json
@@ -1,6 +1,6 @@
 {
   "name": "demo-application",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -9,32 +9,32 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.1.2",
-    "@angular/common": "~10.1.2",
-    "@angular/compiler": "~10.1.2",
-    "@angular/core": "~10.1.2",
-    "@angular/forms": "~10.1.2",
-    "@angular/platform-browser": "~10.1.2",
-    "@angular/platform-browser-dynamic": "~10.1.2",
-    "@angular/router": "~10.1.2",
+    "@angular/animations": "~11.0.7",
+    "@angular/common": "~11.0.7",
+    "@angular/compiler": "~11.0.7",
+    "@angular/core": "~11.0.7",
+    "@angular/forms": "~11.0.7",
+    "@angular/platform-browser": "~11.0.7",
+    "@angular/platform-browser-dynamic": "~11.0.7",
+    "@angular/router": "~11.0.7",
     "angular-google-tag-manager": "^1.2.4",
     "core-js": "^2.5.4",
     "rxjs": "~6.5.4",
     "tslib": "^2.0.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1001.2",
-    "@angular/cli": "~10.1.2",
-    "@angular/compiler-cli": "~10.1.2",
-    "@angular/language-service": "~10.1.2",
+    "@angular-devkit/build-angular": "~0.1100.6",
+    "@angular/cli": "~11.0.6",
+    "@angular/compiler-cli": "~11.0.7",
+    "@angular/language-service": "~11.0.7",
     "@types/node": "^12.11.1",
-    "@types/jasmine": "~2.8.8",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.5.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~5.1.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",

diff --git a/demo-application/src/app/app.module.ts b/demo-application/src/app/app.module.ts
@@ -26,7 +26,7 @@ const routes: Routes = [
   ],
   imports: [
     BrowserModule,
-    RouterModule.forRoot(routes),
+    RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' }),
     GoogleTagManagerModule.forRoot({
       id: 'GTM-PV8586C',
       // gtm_auth: YOUR_GTM_AUTH,