feat: update to bootstrap 5.2.3 angular 15 and ng-bootstrap 14 (#1146)

swisspost · Feb 24, 2023 · d33819e · d33819e
1 parent 5a73a35
commit d33819e
Show file tree

Hide file tree

Showing 101 changed files with 2,121 additions and 3,155 deletions.
diff --git a/.changeset/eighty-hats-do.md b/.changeset/eighty-hats-do.md
@@ -0,0 +1,12 @@
+---
+'@swisspost/design-system-intranet-header': minor
+'@swisspost/design-system-components-angular': minor
+'@swisspost/design-system-components': minor
+'@swisspost/design-system-styles': minor
+'@swisspost/design-system-demo': minor
+---
+
+Major dependency update. The following versions are now supported:
+  - Angular 15
+  - Bootstrap 5.2.3
+  - ng-bootstrap 14
diff --git a/packages/components-angular/angular.json b/packages/components-angular/angular.json
@@ -147,5 +147,13 @@
         }
       }
     }
+  },
+  "schematics": {
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
+    }
   }
 }
diff --git a/packages/components-angular/package.json b/packages/components-angular/package.json
@@ -10,16 +10,16 @@
     "lint": "ng lint"
   },
   "dependencies": {
-    "@angular/animations": "14.2.12",
-    "@angular/common": "14.2.12",
-    "@angular/compiler": "14.2.12",
-    "@angular/core": "14.2.12",
-    "@angular/forms": "14.2.12",
-    "@angular/localize": "14.2.12",
-    "@angular/platform-browser": "14.2.12",
-    "@angular/platform-browser-dynamic": "14.2.12",
-    "@angular/router": "14.2.12",
-    "@ng-bootstrap/ng-bootstrap": "12.1.2",
+    "@angular/animations": "15.1.5",
+    "@angular/common": "15.1.5",
+    "@angular/compiler": "15.1.5",
+    "@angular/core": "15.1.5",
+    "@angular/forms": "15.1.5",
+    "@angular/localize": "15.1.5",
+    "@angular/platform-browser": "15.1.5",
+    "@angular/platform-browser-dynamic": "15.1.5",
+    "@angular/router": "15.1.5",
+    "@ng-bootstrap/ng-bootstrap": "14.0.1",
     "@popperjs/core": "2.11.6",
     "@swisspost/design-system-styles": "workspace:5.3.2",
     "rxjs": "7.8.0",
@@ -28,14 +28,14 @@
     "zone.js": "0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.2.10",
-    "@angular-eslint/builder": "14.4.0",
-    "@angular-eslint/eslint-plugin": "14.4.0",
-    "@angular-eslint/eslint-plugin-template": "14.4.0",
-    "@angular-eslint/schematics": "14.4.0",
-    "@angular-eslint/template-parser": "14.4.0",
-    "@angular/cli": "14.2.10",
-    "@angular/compiler-cli": "14.2.12",
+    "@angular-devkit/build-angular": "15.1.6",
+    "@angular-eslint/builder": "15.2.1",
+    "@angular-eslint/eslint-plugin": "15.2.1",
+    "@angular-eslint/eslint-plugin-template": "15.2.1",
+    "@angular-eslint/schematics": "15.2.1",
+    "@angular-eslint/template-parser": "15.2.1",
+    "@angular/cli": "15.1.6",
+    "@angular/compiler-cli": "15.1.5",
     "@types/jasmine": "4.3.1",
     "@types/node": "18.14.0",
     "@typescript-eslint/eslint-plugin": "5.53.0",
@@ -47,7 +47,7 @@
     "karma-coverage": "2.2.0",
     "karma-jasmine": "5.1.0",
     "karma-jasmine-html-reporter": "2.0.0",
-    "ng-packagr": "14.2.2",
+    "ng-packagr": "15.1.2",
     "rimraf": "4.1.2",
     "typescript": "4.8.4"
   }

diff --git a/packages/components-angular/projects/intranet-header-showcase/src/test.ts b/packages/components-angular/projects/intranet-header-showcase/src/test.ts
@@ -7,20 +7,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    <T>(id: string): T;
-    keys(): string[];
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
 );
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);
diff --git a/packages/components-angular/projects/intranet-header/src/test.ts b/packages/components-angular/projects/intranet-header/src/test.ts
@@ -8,20 +8,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    <T>(id: string): T;
-    keys(): string[];
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
 );
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);
diff --git a/packages/components-angular/tsconfig.json b/packages/components-angular/tsconfig.json
@@ -16,7 +16,7 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
     "module": "es2020",
     "paths": {
       "intranet-header": [
@@ -27,7 +27,8 @@
     "lib": [
       "es2020",
       "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -41,7 +41,7 @@
     "@stencil/react-output-target": "0.4.0",
     "@stencil/sass": "2.0.3",
     "@swisspost/design-system-styles": "workspace:5.3.2",
-    "bootstrap": "5.1.3",
+    "bootstrap": "5.2.3",
     "puppeteer": "19.7.2",
     "sass": "1.58.3"
   },

diff --git a/packages/demo/angular.json b/packages/demo/angular.json
@@ -13,23 +13,16 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies": ["bootstrap/js/dist/collapse", "prettier"],
             "outputPath": "dist/demo",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss",
-              "./node_modules/highlight.js/styles/vs2015.css"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles.scss", "./node_modules/highlight.js/styles/vs2015.css"],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "node_modules"
-              ]
+              "includePaths": ["node_modules"]
             },
             "vendorChunk": true,
             "extractLicenses": false,
@@ -87,23 +80,15 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.scss"
-            ],
+            "styles": ["src/styles.scss"],
             "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ]
+            "assets": ["src/favicon.ico", "src/assets"]
           }
         },
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }
@@ -121,5 +106,13 @@
         }
       }
     }
+  },
+  "schematics": {
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
+    }
   }
 }
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -12,22 +12,22 @@
     "lint": "ng lint"
   },
   "dependencies": {
-    "@angular/animations": "14.2.12",
+    "@angular/animations": "15.1.5",
     "@angular/cdk": "14.2.7",
-    "@angular/common": "14.2.12",
-    "@angular/compiler": "14.2.12",
-    "@angular/core": "14.2.12",
-    "@angular/forms": "14.2.12",
-    "@angular/localize": "14.2.12",
-    "@angular/platform-browser": "14.2.12",
-    "@angular/platform-browser-dynamic": "14.2.12",
-    "@angular/router": "14.2.12",
-    "@ng-bootstrap/ng-bootstrap": "12.1.2",
+    "@angular/common": "15.1.5",
+    "@angular/compiler": "15.1.5",
+    "@angular/core": "15.1.5",
+    "@angular/forms": "15.1.5",
+    "@angular/localize": "15.1.5",
+    "@angular/platform-browser": "15.1.5",
+    "@angular/platform-browser-dynamic": "15.1.5",
+    "@angular/router": "15.1.5",
+    "@ng-bootstrap/ng-bootstrap": "14.0.1",
     "@popperjs/core": "2.11.6",
     "@swimlane/ngx-datatable": "20.1.0",
     "@swisspost/design-system-intranet-header": "workspace:3.0.8",
     "@swisspost/design-system-styles": "workspace:5.3.2",
-    "bootstrap": "5.1.3",
+    "bootstrap": "5.2.3",
     "core-js": "3.28.0",
     "highlight.js": "11.7.0",
     "ngx-highlightjs": "7.0.1",
@@ -37,17 +37,17 @@
     "zone.js": "0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.2.10",
+    "@angular-devkit/build-angular": "15.1.6",
     "@angular-devkit/build-optimizer": "0.1202.18",
-    "@angular-eslint/builder": "14.4.0",
-    "@angular-eslint/eslint-plugin": "14.4.0",
-    "@angular-eslint/eslint-plugin-template": "14.4.0",
-    "@angular-eslint/schematics": "14.4.0",
-    "@angular-eslint/template-parser": "14.4.0",
-    "@angular/cli": "14.2.10",
-    "@angular/compiler-cli": "14.2.12",
-    "@angular/elements": "14.2.12",
-    "@angular/language-service": "14.2.12",
+    "@angular-eslint/builder": "15.2.1",
+    "@angular-eslint/eslint-plugin": "15.2.1",
+    "@angular-eslint/eslint-plugin-template": "15.2.1",
+    "@angular-eslint/schematics": "15.2.1",
+    "@angular-eslint/template-parser": "15.2.1",
+    "@angular/cli": "15.1.6",
+    "@angular/compiler-cli": "15.1.5",
+    "@angular/elements": "15.1.5",
+    "@angular/language-service": "15.1.5",
     "@types/highlight.js": "9.12.4",
     "@types/jasmine": "4.3.1",
     "@types/jasminewd2": "2.0.10",

diff --git a/packages/demo/src/app/app-routing.module.ts b/packages/demo/src/app/app-routing.module.ts
@@ -150,7 +150,6 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       useHash: true,
-      relativeLinkResolution: "legacy",
     }),
   ],
   exports: [RouterModule],

diff --git a/packages/demo/src/test.ts b/packages/demo/src/test.ts
@@ -7,19 +7,8 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().forEach(context);
diff --git a/packages/demo/tsconfig.json b/packages/demo/tsconfig.json
@@ -10,7 +10,7 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
     "allowJs": true,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
@@ -20,6 +20,7 @@
     "lib": [
       "es2018",
       "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
   }
 }
diff --git a/packages/internet-header/package.json b/packages/internet-header/package.json
@@ -59,14 +59,14 @@
     "@percy/cypress": "3.1.2",
     "@stencil/eslint-plugin": "0.4.0",
     "@stencil/sass": "2.0.3",
-    "@swisspost/design-system-styles": "5.3.2",
+    "@swisspost/design-system-styles": "workspace:5.3.2",
     "@types/iframe-resizer": "3.5.9",
     "@types/jest": "26.0.24",
     "@types/jquery": "3.5.16",
     "@types/node": "18.14.0",
     "@types/throttle-debounce": "5.0.0",
     "babel-loader": "9.1.2",
-    "bootstrap": "5.1",
+    "bootstrap": "5.2.3",
     "cypress": "12.6.0",
     "cypress-each": "1.13.1",
     "cypress-storybook": "0.5.1",

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -33,17 +33,17 @@
     "schematics:build": "copyfiles schematics/migrations.json dist && tsc -p tsconfig.schematics.json"
   },
   "dependencies": {
-    "@angular-devkit/core": "14.2.10",
-    "@angular-devkit/schematics": "14.2.10",
-    "@angular/core": "14.2.12",
+    "@angular-devkit/core": "<=15.0.4",
+    "@angular-devkit/schematics": "<=15.0.4",
+    "@angular/core": "<=15.0.4",
     "@popperjs/core": "2.11.6",
-    "bootstrap": "5.1.3",
+    "bootstrap": "5.2.3",
     "cheerio": "1.0.0-rc.12",
     "prettier": "2.8.4",
     "typescript": "4.8.4"
   },
   "devDependencies": {
-    "@angular/compiler": "14.2.12",
+    "@angular/compiler": "<=15.0.4",
     "@percy/cli": "1.20.0",
     "@percy/cypress": "3.1.2",
     "@types/node": "18.14.0",