Skip to content

Commit 3df6994

Browse files
Merge branch 'beta' into feature/types
2 parents 04c9711 + a5ad0c8 commit 3df6994

File tree

110 files changed

+2315
-796
lines changed

Some content is hidden

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

110 files changed

+2315
-796
lines changed

.all-contributorsrc

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,73 @@
370370
"code",
371371
"test"
372372
]
373+
},
374+
{
375+
"login": "mumenthalers",
376+
"name": "S. Mumenthaler",
377+
"avatar_url": "https://avatars.githubusercontent.com/u/3604424?v=4",
378+
"profile": "https://github.com/mumenthalers",
379+
"contributions": [
380+
"code",
381+
"test"
382+
]
383+
},
384+
{
385+
"login": "andreialecu",
386+
"name": "Andrei Alecu",
387+
"avatar_url": "https://avatars.githubusercontent.com/u/697707?v=4",
388+
"profile": "https://lets.poker/",
389+
"contributions": [
390+
"code",
391+
"ideas",
392+
"doc"
393+
]
394+
},
395+
{
396+
"login": "Hyperxq",
397+
"name": "Daniel Ramírez Barrientos",
398+
"avatar_url": "https://avatars.githubusercontent.com/u/22332354?v=4",
399+
"profile": "https://github.com/Hyperxq",
400+
"contributions": [
401+
"code"
402+
]
403+
},
404+
{
405+
"login": "mlz11",
406+
"name": "Mahdi Lazraq",
407+
"avatar_url": "https://avatars.githubusercontent.com/u/94069699?v=4",
408+
"profile": "https://github.com/mlz11",
409+
"contributions": [
410+
"code",
411+
"test"
412+
]
413+
},
414+
{
415+
"login": "Arthie",
416+
"name": "Arthur Petrie",
417+
"avatar_url": "https://avatars.githubusercontent.com/u/16376476?v=4",
418+
"profile": "https://arthurpetrie.com",
419+
"contributions": [
420+
"code"
421+
]
422+
},
423+
{
424+
"login": "FabienDehopre",
425+
"name": "Fabien Dehopré",
426+
"avatar_url": "https://avatars.githubusercontent.com/u/97023?v=4",
427+
"profile": "https://github.com/FabienDehopre",
428+
"contributions": [
429+
"code"
430+
]
431+
},
432+
{
433+
"login": "jvereecken",
434+
"name": "Jamie Vereecken",
435+
"avatar_url": "https://avatars.githubusercontent.com/u/108937550?v=4",
436+
"profile": "https://github.com/jvereecken",
437+
"contributions": [
438+
"code"
439+
]
373440
}
374441
],
375442
"contributorsPerLine": 7,

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// For format details, see https://aka.ms/devcontainer.json.
22
{
33
"name": "angular-testing-library",
4-
"image": "mcr.microsoft.com/devcontainers/typescript-node:0-18-bullseye",
4+
"image": "mcr.microsoft.com/devcontainers/typescript-node:22-bullseye",
55

66
// Features to add to the dev container. More info: https://containers.dev/features.
77
"features": {
@@ -13,7 +13,7 @@
1313
// "forwardPorts": [],
1414

1515
// Use 'postCreateCommand' to run commands after the container is created.
16-
"postCreateCommand": "npm i",
16+
"postCreateCommand": "npm install --force",
1717
"onCreateCommand": "sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt",
1818
"waitFor": "postCreateCommand",
1919

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 121 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,24 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
node-version: ${{ fromJSON((github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta') && '[16]' || '[16, 18]') }}
25+
node-version: ${{ fromJSON((github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta') && '[22]' || '[20, 22, 24]') }}
2626
os: ${{ fromJSON((github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta') && '["ubuntu-latest"]' || '["ubuntu-latest", "windows-latest"]') }}
2727
runs-on: ${{ matrix.os }}
2828

2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- name: use Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
32-
uses: actions/setup-node@v3
32+
uses: actions/setup-node@v4
3333
with:
3434
node-version: ${{ matrix.node-version }}
3535
- name: install
36-
run: npm install
36+
run: npm install --force
3737
- name: build
3838
run: npm run build -- --skip-nx-cache
3939
- name: test
4040
run: npm run test
41+
- name: lint
42+
run: npm run lint
4143
- name: Release
4244
if: github.repository == 'testing-library/angular-testing-library' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta')
4345
run: npx semantic-release

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
# misc
2929
/.angular/cache
3030
.angular
31+
.nx
32+
migrations.json
3133
.cache
3234
/.sass-cache
3335
/connect.lock
@@ -42,3 +44,6 @@ yarn.lock
4244
# System Files
4345
.DS_Store
4446
Thumbs.db
47+
.cursor/rules/nx-rules.mdc
48+
.github/instructions/nx.instructions.md
49+
.history

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
22

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ deployment.yaml
5353
# System Files
5454
.DS_Store
5555
Thumbs.db
56+
57+
/.nx/cache
58+
/.nx/workspace-data

0 commit comments

Comments
 (0)