Skip to content

Commit 5eb3dbd

Browse files
manekinekkomanekinekko
authored
chore: upgrade angular to v13 (#84)
* chore: upgrade to angular v13 * fix: update jest config * fix: add --legacy-peer-deps
1 parent dbedf48 commit 5eb3dbd

18 files changed

+18589
-18627
lines changed

‎.github/workflows/angular.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [14.x, 15.x]
19+
node-version: [14.x, 15.x, 16.x]
2020
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2121

2222
steps:
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/setup-node@v1
2626
with:
2727
node-version: ${{ matrix.node-version }}
28-
- run: npm ci
28+
- run: npm ci --legacy-peer-deps
2929
- run: npm run build --if-present
3030
- run: npm test

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
!.vscode/extensions.json
2626

2727
# misc
28+
/.angular/cache
2829
/.sass-cache
2930
/connect.lock
3031
/coverage

‎angular.json

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,8 @@
8787
"test": {
8888
"builder": "@angular-builders/jest:run",
8989
"options": {
90-
"jestConfig": "jest.config.js",
9190
"setupFilesAfterEnv": "<rootDir>/test-setup.ts",
92-
"detect-open-handles": true
93-
}
94-
},
95-
"lint": {
96-
"builder": "@angular-devkit/build-angular:tslint",
97-
"options": {
98-
"tsConfig": [
99-
"tsconfig.app.json",
100-
"tsconfig.spec.json",
101-
"e2e/tsconfig.json"
102-
],
103-
"exclude": [
104-
"**/node_modules/**"
105-
]
91+
"detectOpenHandles": true
10692
}
10793
},
10894
"e2e": {
@@ -140,20 +126,8 @@
140126
"test": {
141127
"builder": "@angular-builders/jest:run",
142128
"options": {
143-
"jestConfig": "projects/manekinekko/angular-web-bluetooth/jest.config.js",
144-
"setupFilesAfterEnv": "./test-setup.ts"
145-
}
146-
},
147-
"lint": {
148-
"builder": "@angular-devkit/build-angular:tslint",
149-
"options": {
150-
"tsConfig": [
151-
"projects/manekinekko/angular-web-bluetooth/tsconfig.lib.json",
152-
"projects/manekinekko/angular-web-bluetooth/tsconfig.spec.json"
153-
],
154-
"exclude": [
155-
"**/node_modules/**"
156-
]
129+
"setupFilesAfterEnv": "./test-setup.ts",
130+
"detectOpenHandles": true
157131
}
158132
}
159133
}

‎docs/dependencies.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@
4949
</ol>
5050
<ul class="dependencies-list">
5151
<li>
52-
<b>@angular/animations</b> : ~12.2.17</li>
52+
<b>@angular/animations</b> : ~13.3.10</li>
5353
<li>
54-
<b>@angular/cdk</b> : ^11.2.0</li>
54+
<b>@angular/cdk</b> : ^13.3.9</li>
5555
<li>
56-
<b>@angular/common</b> : ~12.2.17</li>
56+
<b>@angular/common</b> : ~13.3.10</li>
5757
<li>
58-
<b>@angular/compiler</b> : ~12.2.17</li>
58+
<b>@angular/compiler</b> : ~13.3.10</li>
5959
<li>
60-
<b>@angular/core</b> : ~12.2.17</li>
60+
<b>@angular/core</b> : ~13.3.12</li>
6161
<li>
62-
<b>@angular/forms</b> : ~12.2.17</li>
62+
<b>@angular/forms</b> : ~13.3.10</li>
6363
<li>
64-
<b>@angular/material</b> : ^11.2.0</li>
64+
<b>@angular/material</b> : ^13.3.9</li>
6565
<li>
66-
<b>@angular/platform-browser</b> : ~12.2.17</li>
66+
<b>@angular/platform-browser</b> : ~13.3.10</li>
6767
<li>
68-
<b>@angular/platform-browser-dynamic</b> : ~12.2.17</li>
68+
<b>@angular/platform-browser-dynamic</b> : ~13.3.10</li>
6969
<li>
70-
<b>@angular/router</b> : ~12.2.17</li>
70+
<b>@angular/router</b> : ~13.3.10</li>
7171
<li>
7272
<b>@release-it/conventional-changelog</b> : ^1.1.4</li>
7373
<li>

‎docs/injectables/BluetoothCore.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ <h3 id="methods">
626626
<div>
627627
</div>
628628
<div class="io-description">
629-
<b>Returns : </b> <code>{}</code>
629+
<b>Returns : </b> <code>Promise&lt;BluetoothDevice&gt;</code>
630630

631631
</div>
632632
<div class="io-description">
@@ -2462,7 +2462,7 @@ <h3 id="inputs">
24622462
* @param Options such as filters and optional services
24632463
* @return The GATT server for the chosen device
24642464
*/
2465-
async discover(options: RequestDeviceOptions &#x3D; {} as RequestDeviceOptions) {
2465+
async discover(options: RequestDeviceOptions &#x3D; {} as RequestDeviceOptions): Promise&lt;BluetoothDevice&gt; {
24662466
options.optionalServices &#x3D; options.optionalServices || [&#x27;generic_access&#x27;];
24672467

24682468
this.console.log(&#x27;[BLE::Info] Requesting devices with options %o&#x27;, options);

‎docs/js/search/search_index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/miscellaneous/variables.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,27 @@ <h3 id="index">Index</h3>
5858
<tr>
5959
<td class="col-md-4">
6060
<ul class="index-list">
61-
<li>
62-
<a href="#bleCore" title="src/app/thingy52/battery-level.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
63-
</li>
6461
<li>
6562
<a href="#bleCore" title="src/app/thingy52/humidity.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
6663
</li>
6764
<li>
6865
<a href="#bleCore" title="src/app/thingy52/stepcounter.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
6966
</li>
7067
<li>
71-
<a href="#bleCore" title="src/app/thingy52/temperature.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
68+
<a href="#bleCore" title="src/app/thingy52/battery-level.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
7269
</li>
7370
<li>
74-
<a href="#bleService" title="src/app/thingy52/battery-level.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
71+
<a href="#bleCore" title="src/app/thingy52/temperature.component.ts"><b>bleCore</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
7572
</li>
7673
<li>
7774
<a href="#bleService" title="src/app/thingy52/humidity.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
7875
</li>
7976
<li>
8077
<a href="#bleService" title="src/app/thingy52/stepcounter.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
8178
</li>
79+
<li>
80+
<a href="#bleService" title="src/app/thingy52/battery-level.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
81+
</li>
8282
<li>
8383
<a href="#bleService" title="src/app/thingy52/temperature.component.ts"><b>bleService</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
8484
</li>
@@ -88,15 +88,15 @@ <h3 id="index">Index</h3>
8888
<li>
8989
<a href="#environment" title="src/environments/environment.ts"><b>environment</b>&nbsp;&nbsp;&nbsp;(src/.../environment.ts)</a>
9090
</li>
91-
<li>
92-
<a href="#PROVIDERS" title="src/app/thingy52/battery-level.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
93-
</li>
9491
<li>
9592
<a href="#PROVIDERS" title="src/app/thingy52/humidity.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../humidity.component.ts)</a>
9693
</li>
9794
<li>
9895
<a href="#PROVIDERS" title="src/app/thingy52/stepcounter.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../stepcounter.component.ts)</a>
9996
</li>
97+
<li>
98+
<a href="#PROVIDERS" title="src/app/thingy52/battery-level.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../battery-level.component.ts)</a>
99+
</li>
100100
<li>
101101
<a href="#PROVIDERS" title="src/app/thingy52/temperature.component.ts"><b>PROVIDERS</b>&nbsp;&nbsp;&nbsp;(src/.../temperature.component.ts)</a>
102102
</li>
@@ -113,7 +113,7 @@ <h3 id="index">Index</h3>
113113
</table>
114114
</section>
115115

116-
<h3>src/app/thingy52/battery-level.component.ts</h3>
116+
<h3>src/app/thingy52/humidity.component.ts</h3>
117117
<section>
118118
<h3></h3> <table class="table table-sm table-bordered">
119119
<tbody>
@@ -193,7 +193,7 @@ <h3></h3> <table class="table table-sm table-bordered">
193193
</tbody>
194194
</table>
195195
</section>
196-
<h3>src/app/thingy52/humidity.component.ts</h3>
196+
<h3>src/app/thingy52/stepcounter.component.ts</h3>
197197
<section>
198198
<h3></h3> <table class="table table-sm table-bordered">
199199
<tbody>
@@ -273,7 +273,7 @@ <h3></h3> <table class="table table-sm table-bordered">
273273
</tbody>
274274
</table>
275275
</section>
276-
<h3>src/app/thingy52/stepcounter.component.ts</h3>
276+
<h3>src/app/thingy52/battery-level.component.ts</h3>
277277
<section>
278278
<h3></h3> <table class="table table-sm table-bordered">
279279
<tbody>

‎jest.config.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module.exports = {
2-
displayName: 'angular-web-bluetooth-starter',
32
preset: 'jest-preset-angular',
4-
setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
5-
testPathIgnorePatterns: ['<rootDir>/projects/'],
6-
modulePathIgnorePatterns: [
7-
"dist/*"
8-
],
3+
displayName: "angular-web-bluetooth-starter",
4+
setupFilesAfterEnv: ["<rootDir>/test-setup.ts"],
5+
modulePathIgnorePatterns: ["dist/*"],
6+
globalSetup: 'jest-preset-angular/global-setup',
97
moduleNameMapper: {
10-
"@manekinekko/(.+)": '<rootDir>/projects/manekinekko/$1/src/public_api.ts'
11-
}
12-
}
8+
"@manekinekko/(.+)": "<rootDir>/projects/manekinekko/$1/src/public_api.ts",
9+
},
10+
};

0 commit comments

Comments
 (0)