chore: upgrade angular to v13 (#84)

* chore: upgrade to angular v13 * fix: update jest config * fix: add --legacy-peer-deps
manekinekko · Feb 22, 2023 · 5eb3dbd · 5eb3dbd
1 parent dbedf48
commit 5eb3dbd
Show file tree

Hide file tree

Showing 18 changed files with 18,589 additions and 18,627 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 15.x]
+        node-version: [14.x, 15.x, 16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -25,6 +25,6 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
+    - run: npm ci --legacy-peer-deps
     - run: npm run build --if-present
     - run: npm test
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -87,22 +87,8 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
-            "jestConfig": "jest.config.js",
             "setupFilesAfterEnv": "<rootDir>/test-setup.ts",
-            "detect-open-handles": true
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "detectOpenHandles": true
           }
         },
         "e2e": {
@@ -140,20 +126,8 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
-            "jestConfig": "projects/manekinekko/angular-web-bluetooth/jest.config.js",
-            "setupFilesAfterEnv": "./test-setup.ts"
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/manekinekko/angular-web-bluetooth/tsconfig.lib.json",
-              "projects/manekinekko/angular-web-bluetooth/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "setupFilesAfterEnv": "./test-setup.ts",
+            "detectOpenHandles": true
           }
         }
       }

diff --git a/docs/dependencies.html b/docs/dependencies.html
@@ -49,25 +49,25 @@
     </ol>
     <ul class="dependencies-list">
         <li>
-            <b>@angular/animations</b> : ~12.2.17</li>
+            <b>@angular/animations</b> : ~13.3.10</li>
         <li>
-            <b>@angular/cdk</b> : ^11.2.0</li>
+            <b>@angular/cdk</b> : ^13.3.9</li>
         <li>
-            <b>@angular/common</b> : ~12.2.17</li>
+            <b>@angular/common</b> : ~13.3.10</li>
         <li>
-            <b>@angular/compiler</b> : ~12.2.17</li>
+            <b>@angular/compiler</b> : ~13.3.10</li>
         <li>
-            <b>@angular/core</b> : ~12.2.17</li>
+            <b>@angular/core</b> : ~13.3.12</li>
         <li>
-            <b>@angular/forms</b> : ~12.2.17</li>
+            <b>@angular/forms</b> : ~13.3.10</li>
         <li>
-            <b>@angular/material</b> : ^11.2.0</li>
+            <b>@angular/material</b> : ^13.3.9</li>
         <li>
-            <b>@angular/platform-browser</b> : ~12.2.17</li>
+            <b>@angular/platform-browser</b> : ~13.3.10</li>
         <li>
-            <b>@angular/platform-browser-dynamic</b> : ~12.2.17</li>
+            <b>@angular/platform-browser-dynamic</b> : ~13.3.10</li>
         <li>
-            <b>@angular/router</b> : ~12.2.17</li>
+            <b>@angular/router</b> : ~13.3.10</li>
         <li>
             <b>@release-it/conventional-changelog</b> : ^1.1.4</li>
         <li>

diff --git a/docs/injectables/BluetoothCore.html b/docs/injectables/BluetoothCore.html
@@ -626,7 +626,7 @@ <h3 id="methods">
                     <div>
                     </div>
                     <div class="io-description">
-                        <b>Returns : </b>    <code>{}</code>
+                        <b>Returns : </b>    <code>Promise&lt;BluetoothDevice&gt;</code>
 
                     </div>
                     <div class="io-description">
@@ -2462,7 +2462,7 @@ <h3 id="inputs">
    * @param Options such as filters and optional services
    * @return  The GATT server for the chosen device
    */
-  async discover(options: RequestDeviceOptions &#x3D; {} as RequestDeviceOptions) {
+  async discover(options: RequestDeviceOptions &#x3D; {} as RequestDeviceOptions): Promise&lt;BluetoothDevice&gt; {
     options.optionalServices &#x3D; options.optionalServices || [&#x27;generic_access&#x27;];
 
     this.console.log(&#x27;[BLE::Info] Requesting devices with options %o&#x27;, options);

diff --git a/docs/js/search/search_index.js b/docs/js/search/search_index.js
diff --git a/docs/miscellaneous/variables.html b/docs/miscellaneous/variables.html
@@ -58,27 +58,27 @@ <h3 id="index">Index</h3>
             <tr>
                 <td class="col-md-4">
                     <ul class="index-list">
-                        <li>
-                            <a href="#bleCore" title="src/app/thingy52/battery-level.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
-                        </li>
                         <li>
                             <a href="#bleCore" title="src/app/thingy52/humidity.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
                         </li>
                         <li>
                             <a href="#bleCore" title="src/app/thingy52/stepcounter.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
                         </li>
                         <li>
-                            <a href="#bleCore" title="src/app/thingy52/temperature.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
+                            <a href="#bleCore" title="src/app/thingy52/battery-level.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
                         </li>
                         <li>
-                            <a href="#bleService" title="src/app/thingy52/battery-level.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
+                            <a href="#bleCore" title="src/app/thingy52/temperature.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
                         </li>
                         <li>
                             <a href="#bleService" title="src/app/thingy52/humidity.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
                         </li>
                         <li>
                             <a href="#bleService" title="src/app/thingy52/stepcounter.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
                         </li>
+                        <li>
+                            <a href="#bleService" title="src/app/thingy52/battery-level.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
+                        </li>
                         <li>
                             <a href="#bleService" title="src/app/thingy52/temperature.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
                         </li>
@@ -88,15 +88,15 @@ <h3 id="index">Index</h3>
                         <li>
                             <a href="#environment" title="src/environments/environment.ts"><b>environment</b>&nbsp;&nbsp;&nbsp;(src/.../environment.ts)</a>
                         </li>
-                        <li>
-                            <a href="#PROVIDERS" title="src/app/thingy52/battery-level.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
-                        </li>
                         <li>
                             <a href="#PROVIDERS" title="src/app/thingy52/humidity.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
                         </li>
                         <li>
                             <a href="#PROVIDERS" title="src/app/thingy52/stepcounter.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
                         </li>
+                        <li>
+                            <a href="#PROVIDERS" title="src/app/thingy52/battery-level.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
+                        </li>
                         <li>
                             <a href="#PROVIDERS" title="src/app/thingy52/temperature.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
                         </li>
@@ -113,7 +113,7 @@ <h3 id="index">Index</h3>
     </table>
 </section>
 
-    <h3>src/app/thingy52/battery-level.component.ts</h3>
+    <h3>src/app/thingy52/humidity.component.ts</h3>
     <section>
     <h3></h3>        <table class="table table-sm table-bordered">
             <tbody>
@@ -193,7 +193,7 @@ <h3></h3>        <table class="table table-sm table-bordered">
             </tbody>
         </table>
 </section>
-    <h3>src/app/thingy52/humidity.component.ts</h3>
+    <h3>src/app/thingy52/stepcounter.component.ts</h3>
     <section>
     <h3></h3>        <table class="table table-sm table-bordered">
             <tbody>
@@ -273,7 +273,7 @@ <h3></h3>        <table class="table table-sm table-bordered">
             </tbody>
         </table>
 </section>
-    <h3>src/app/thingy52/stepcounter.component.ts</h3>
+    <h3>src/app/thingy52/battery-level.component.ts</h3>
     <section>
     <h3></h3>        <table class="table table-sm table-bordered">
             <tbody>

diff --git a/jest.config.js b/jest.config.js
@@ -1,12 +1,10 @@
 module.exports = {
-  displayName: 'angular-web-bluetooth-starter',
   preset: 'jest-preset-angular',
-  setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
-  testPathIgnorePatterns: ['<rootDir>/projects/'],
-  modulePathIgnorePatterns: [
-    "dist/*"
-  ],
+  displayName: "angular-web-bluetooth-starter",
+  setupFilesAfterEnv: ["<rootDir>/test-setup.ts"],
+  modulePathIgnorePatterns: ["dist/*"],
+  globalSetup: 'jest-preset-angular/global-setup',
   moduleNameMapper: {
-    "@manekinekko/(.+)": '<rootDir>/projects/manekinekko/$1/src/public_api.ts'
-  }
-}
+    "@manekinekko/(.+)": "<rootDir>/projects/manekinekko/$1/src/public_api.ts",
+  },
+};