From abca246e23ab990f40fa436139f6cf544f80e2b1 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Fri, 4 Jun 2021 18:35:52 +0200 Subject: [PATCH 1/5] chore: update @testing-library/DOM --- .eslintrc.json | 2 +- lint-staged.config.js | 5 ++++- package.json | 2 +- projects/testing-library/package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 5125274f..7b537000 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -115,7 +115,7 @@ "rules": {} }, { - "files": ["*.ts", "*.js", "*.json", "*.md"], + "files": ["*.ts", "*.js"], "extends": ["prettier"] } ] diff --git a/lint-staged.config.js b/lint-staged.config.js index 68b831db..a10d3ccf 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -1 +1,4 @@ -module.exports = { '*.{ts,js}': ['eslint --fix', 'git add'], '*.{json,md}': ['prettier --write', 'git add'] }; +module.exports = { + '*.{ts,js}': ['eslint --fix', 'git add'], + '*.{json,md}': ['prettier --write', 'git add'], +}; diff --git a/package.json b/package.json index fd008e45..fe58348d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ngrx/store": "12.0.0", "@nrwl/angular": "12.0.3", "@nrwl/nx-cloud": "11.2.0", - "@testing-library/dom": "7.29.4", + "@testing-library/dom": "^8.0.0-alpha.2", "@testing-library/user-event": "^13.1.9", "core-js": "^3.6.5", "rxjs": "^6.5.5", diff --git a/projects/testing-library/package.json b/projects/testing-library/package.json index b50e7b1a..f1e5603e 100644 --- a/projects/testing-library/package.json +++ b/projects/testing-library/package.json @@ -36,7 +36,7 @@ "@angular/core": ">= 10.0.0" }, "dependencies": { - "@testing-library/dom": "7.29.4", + "@testing-library/dom": "^8.0.0-alpha.2", "tslib": "^2.0.0" }, "publishConfig": { From b0f03485702da6c4f2b395f551a06825621d3038 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Mon, 14 Jun 2021 18:42:27 +0200 Subject: [PATCH 2/5] update alpha 6 --- package.json | 2 +- projects/testing-library/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fe58348d..1e77830e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ngrx/store": "12.0.0", "@nrwl/angular": "12.0.3", "@nrwl/nx-cloud": "11.2.0", - "@testing-library/dom": "^8.0.0-alpha.2", + "@testing-library/dom": "^8.0.0-alpha.6", "@testing-library/user-event": "^13.1.9", "core-js": "^3.6.5", "rxjs": "^6.5.5", diff --git a/projects/testing-library/package.json b/projects/testing-library/package.json index f1e5603e..2a0369cc 100644 --- a/projects/testing-library/package.json +++ b/projects/testing-library/package.json @@ -36,7 +36,7 @@ "@angular/core": ">= 10.0.0" }, "dependencies": { - "@testing-library/dom": "^8.0.0-alpha.2", + "@testing-library/dom": "^8.0.0-alpha.6", "tslib": "^2.0.0" }, "publishConfig": { From a4a5e92bca231348b260858b2508112c81b10ee5 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Wed, 16 Jun 2021 18:43:52 +0200 Subject: [PATCH 3/5] chore: use PrettyFormatOptions --- projects/testing-library/src/lib/models.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/testing-library/src/lib/models.ts b/projects/testing-library/src/lib/models.ts index b1984477..912003d9 100644 --- a/projects/testing-library/src/lib/models.ts +++ b/projects/testing-library/src/lib/models.ts @@ -1,8 +1,7 @@ import { Type, DebugElement } from '@angular/core'; import { ComponentFixture } from '@angular/core/testing'; import { Routes } from '@angular/router'; -import { BoundFunction, Queries, queries, Config as dtlConfig } from '@testing-library/dom'; -import { OptionsReceived } from 'pretty-format'; +import { BoundFunction, Queries, queries, Config as dtlConfig, PrettyFormatOptions } from '@testing-library/dom'; export type RenderResultQueries = { [P in keyof Q]: BoundFunction }; export interface RenderResult extends RenderResultQueries { @@ -23,7 +22,7 @@ export interface RenderResult extend debug: ( element?: Element | HTMLDocument | (Element | HTMLDocument)[], maxLength?: number, - options?: OptionsReceived, + options?: PrettyFormatOptions, ) => void; /** * @description From da7f734572a591864ab43c97eff08d66dd9e5184 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Mon, 21 Jun 2021 20:30:54 +0200 Subject: [PATCH 4/5] alpha 7 --- package.json | 2 +- projects/testing-library/package.json | 2 +- projects/testing-library/src/lib/models.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1e77830e..c67852a3 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ngrx/store": "12.0.0", "@nrwl/angular": "12.0.3", "@nrwl/nx-cloud": "11.2.0", - "@testing-library/dom": "^8.0.0-alpha.6", + "@testing-library/dom": "^8.0.0-alpha.7", "@testing-library/user-event": "^13.1.9", "core-js": "^3.6.5", "rxjs": "^6.5.5", diff --git a/projects/testing-library/package.json b/projects/testing-library/package.json index 2a0369cc..57142861 100644 --- a/projects/testing-library/package.json +++ b/projects/testing-library/package.json @@ -36,7 +36,7 @@ "@angular/core": ">= 10.0.0" }, "dependencies": { - "@testing-library/dom": "^8.0.0-alpha.6", + "@testing-library/dom": "^8.0.0-alpha.7", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/projects/testing-library/src/lib/models.ts b/projects/testing-library/src/lib/models.ts index 912003d9..54b5f2ee 100644 --- a/projects/testing-library/src/lib/models.ts +++ b/projects/testing-library/src/lib/models.ts @@ -1,7 +1,7 @@ import { Type, DebugElement } from '@angular/core'; import { ComponentFixture } from '@angular/core/testing'; import { Routes } from '@angular/router'; -import { BoundFunction, Queries, queries, Config as dtlConfig, PrettyFormatOptions } from '@testing-library/dom'; +import { BoundFunction, Queries, queries, Config as dtlConfig, PrettyDOMOptions } from '@testing-library/dom'; export type RenderResultQueries = { [P in keyof Q]: BoundFunction }; export interface RenderResult extends RenderResultQueries { @@ -22,7 +22,7 @@ export interface RenderResult extend debug: ( element?: Element | HTMLDocument | (Element | HTMLDocument)[], maxLength?: number, - options?: PrettyFormatOptions, + options?: PrettyDOMOptions, ) => void; /** * @description From b88273278fdf63e6dffe492c7119737764045600 Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Fri, 25 Jun 2021 08:34:51 +0200 Subject: [PATCH 5/5] update dom --- package.json | 2 +- projects/testing-library/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c67852a3..aa4e8a86 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ngrx/store": "12.0.0", "@nrwl/angular": "12.0.3", "@nrwl/nx-cloud": "11.2.0", - "@testing-library/dom": "^8.0.0-alpha.7", + "@testing-library/dom": "^8.0.0", "@testing-library/user-event": "^13.1.9", "core-js": "^3.6.5", "rxjs": "^6.5.5", diff --git a/projects/testing-library/package.json b/projects/testing-library/package.json index 57142861..f1922ae6 100644 --- a/projects/testing-library/package.json +++ b/projects/testing-library/package.json @@ -36,7 +36,7 @@ "@angular/core": ">= 10.0.0" }, "dependencies": { - "@testing-library/dom": "^8.0.0-alpha.7", + "@testing-library/dom": "^8.0.0", "tslib": "^2.0.0" }, "publishConfig": {