Skip to content

Commit 8b60673

Browse files
authored
Merge branch 'master' into issues/4486
2 parents 1a80e08 + 0088eb1 commit 8b60673

66 files changed

Lines changed: 31659 additions & 30420 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ orbs:
1111
executors:
1212
core:
1313
docker:
14-
- image: satantime/puppeteer-node:20.15.1
14+
- image: satantime/puppeteer-node:20.17.0
1515
resource_class: medium
1616
a5:
1717
docker:
@@ -59,15 +59,15 @@ executors:
5959
resource_class: medium
6060
a16:
6161
docker:
62-
- image: satantime/puppeteer-node:18.20.3
62+
- image: satantime/puppeteer-node:18.20.4
6363
resource_class: medium
6464
a17:
6565
docker:
66-
- image: satantime/puppeteer-node:20.15.1
66+
- image: satantime/puppeteer-node:20.17.0
6767
resource_class: medium
6868
a18:
6969
docker:
70-
- image: satantime/puppeteer-node:20.15.1
70+
- image: satantime/puppeteer-node:20.17.0
7171
resource_class: medium
7272

7373
commands:

.eslintrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ overrides:
102102
'@typescript-eslint/no-empty-interface': off
103103
'@typescript-eslint/no-explicit-any': off
104104
'@typescript-eslint/no-namespace': off
105+
'@typescript-eslint/no-require-imports': off
106+
'@typescript-eslint/no-restricted-types': error
105107
'@typescript-eslint/no-this-alias': off
106108
'@typescript-eslint/no-unsafe-declaration-merging': off
107109
'@typescript-eslint/no-unused-vars': error

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.15.1
1+
20.17.0

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [14.13.1](https://github.com/help-me-mom/ng-mocks/compare/v14.13.0...v14.13.1) (2024-08-25)
2+
3+
4+
### Bug Fixes
5+
6+
* unable to bind ngIf in angular 17+ ([7c816e6](https://github.com/help-me-mom/ng-mocks/commit/7c816e67ced783e943653d10aef2cdc393ffe8e0)), closes [#8884](https://github.com/help-me-mom/ng-mocks/issues/8884)
7+
18
# [14.13.0](https://github.com/help-me-mom/ng-mocks/compare/v14.12.2...v14.13.0) (2024-06-01)
29

310

CODEOWNERS

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
# This is a comment.
22
# Each line is a file pattern followed by one or more owners.
3-
* @satanTime
3+
* @satanTime
4+
5+
**/.nvmrc
6+
**/compose.yml
7+
**/package.json
8+
**/package-lock.json
9+
10+
/.circleci/config.yml
11+
/.github/workflows/codeql.yml
12+
13+
/libs/ng-mocks/package.json @satanTime

compose.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
ng-mocks:
3-
image: satantime/puppeteer-node:20.15.1
3+
image: satantime/puppeteer-node:20.17.0
44
working_dir: /app
55
volumes:
66
- .:/app
@@ -12,7 +12,7 @@ services:
1212
- --no-audit
1313

1414
docs:
15-
image: satantime/puppeteer-node:20.15.1
15+
image: satantime/puppeteer-node:20.17.0
1616
working_dir: /app
1717
volumes:
1818
- ./docs:/app
@@ -24,7 +24,7 @@ services:
2424
- --no-audit
2525

2626
e2e:
27-
image: satantime/puppeteer-node:20.15.1
27+
image: satantime/puppeteer-node:20.17.0
2828
working_dir: /app
2929
volumes:
3030
- ./tests-e2e:/app
@@ -190,7 +190,7 @@ services:
190190
- --no-audit
191191

192192
a16:
193-
image: satantime/puppeteer-node:18.20.3
193+
image: satantime/puppeteer-node:18.20.4
194194
working_dir: /app
195195
volumes:
196196
- ./e2e/a16:/app
@@ -202,7 +202,7 @@ services:
202202
- --no-audit
203203

204204
a17:
205-
image: satantime/puppeteer-node:20.15.1
205+
image: satantime/puppeteer-node:20.17.0
206206
working_dir: /app
207207
volumes:
208208
- ./e2e/a17:/app
@@ -214,7 +214,7 @@ services:
214214
- --no-audit
215215

216216
a18:
217-
image: satantime/puppeteer-node:20.15.1
217+
image: satantime/puppeteer-node:20.17.0
218218
working_dir: /app
219219
volumes:
220220
- ./e2e/a18:/app
@@ -226,7 +226,7 @@ services:
226226
- --no-audit
227227

228228
jasmine:
229-
image: satantime/puppeteer-node:20.15.1
229+
image: satantime/puppeteer-node:20.17.0
230230
working_dir: /app
231231
volumes:
232232
- ./e2e/jasmine:/app
@@ -238,7 +238,7 @@ services:
238238
- --no-audit
239239

240240
jest:
241-
image: satantime/puppeteer-node:20.15.1
241+
image: satantime/puppeteer-node:20.17.0
242242
working_dir: /app
243243
volumes:
244244
- ./e2e/jest:/app
@@ -250,7 +250,7 @@ services:
250250
- --no-audit
251251

252252
min:
253-
image: satantime/puppeteer-node:20.15.1
253+
image: satantime/puppeteer-node:20.17.0
254254
working_dir: /app
255255
volumes:
256256
- ./e2e/min:/app
@@ -262,7 +262,7 @@ services:
262262
- --no-audit
263263

264264
nx:
265-
image: satantime/puppeteer-node:20.15.1
265+
image: satantime/puppeteer-node:20.17.0
266266
working_dir: /app
267267
volumes:
268268
- ./e2e/nx:/app

docs/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.15.1
1+
20.17.0

docs/articles/guides/routing-guard.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ The example below is applicable for all types of guards:
2626
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch),
2727
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch)
2828
- `canLoad` -
29-
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch),
30-
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-match.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanMatch)
29+
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/can-load.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanLoad),
30+
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/can-load.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3AcanLoad)
3131
- class guards (legacy) -
3232
[CodeSandbox](https://codesandbox.io/p/sandbox/github/help-me-mom/ng-mocks-sandbox/tree/tests/?file=/src/examples/TestRoutingGuard/test.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3Atest),
3333
[StackBlitz](https://stackblitz.com/github/help-me-mom/ng-mocks-sandbox/tree/tests?file=src/examples/TestRoutingGuard/test.spec.ts&initialpath=%3Fspec%3DTestRoutingGuard%3Atest)

docs/articles/migrations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ Previously, it had been accepting a `meta` parameter, now it has been removed.
166166

167167
#### Tokens
168168

169-
- `NG_GUARDS` has been renamed to [`NG_MOCKS_GUARDS`](api/MockBuilder.md#ngmocksguards-token)
170-
- `NG_INTERCEPTORS` has been renamed to [`NG_MOCKS_INTERCEPTORS`](api/MockBuilder.md#ngmocksinterceptors-token)
169+
- `NG_GUARDS` has been renamed to [`NG_MOCKS_GUARDS`](api/MockBuilder.md#ng_mocks_guards-token)
170+
- `NG_INTERCEPTORS` has been renamed to [`NG_MOCKS_INTERCEPTORS`](api/MockBuilder.md#ng_mocks_interceptors-token)
171171

172172
## From 9 to 10
173173

docs/articles/troubleshooting/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ beforeEach(() =>
4141
);
4242
```
4343

44-
Or, you can keep all root providers with help of [`NG_MOCKS_ROOT_PROVIDERS`](../api/MockBuilder.md#ngmocksrootproviders-token).
44+
Or, you can keep all root providers with help of [`NG_MOCKS_ROOT_PROVIDERS`](../api/MockBuilder.md#ng_mocks_root_providers-token).
4545

4646
```ts
4747
beforeEach(() =>

0 commit comments

Comments
 (0)