From 76546a7b00c18db3f8f2e04fbf87269b0d4ceb18 Mon Sep 17 00:00:00 2001 From: Jonas <100586436+JonasDov@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:16:58 +0200 Subject: [PATCH 1/4] Update changelog --- presentation-rules-editor-react/CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/presentation-rules-editor-react/CHANGELOG.md b/presentation-rules-editor-react/CHANGELOG.md index 18726ef..09ef723 100644 --- a/presentation-rules-editor-react/CHANGELOG.md +++ b/presentation-rules-editor-react/CHANGELOG.md @@ -9,8 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- `@itwin` peer dependencies have been upgraded to `^3.6.2 || ^4.0.0`. -- `monaco-editor` peer dependency has been upgraded to `^0.40.0`. +- `@itwin/itwinui-react` peer dependency has been upgraded to `^3.0.0`. +- `@itwin/presentation-components` peer dependency has been upgraded to `^5.0.0`. +- All other `@itwin` peer dependencies have been upgraded to `^4.0.0`. +- `react` and `react-dom` peer dependencies have been upgraded to `^18.0.0`. +- `monaco-editor` peer dependency has been upgraded to `^0.52.0`. - Update package dependencies. ### Added From 5e35f058dc7ab85b73a2ab2d7be6adf92333978a Mon Sep 17 00:00:00 2001 From: Jonas <100586436+JonasDov@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:17:18 +0200 Subject: [PATCH 2/4] Update build script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e421a92..a970964 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "start:qa": "cross-env IMJS_URL_PREFIX=qa- run-p --silent start:backend start:frontend", "start:web": "cross-env DEPLOYMENT_TYPE=web npm run start:frontend", "start:backend": "npm run start --prefix ./app/backend", - "build": "npm run build:common && npm run build:components && run-p build:backend build:frontend", + "build": "npm run build:common && npm run build:components && npm run build:frontend", "build:backend": "npm run build --prefix ./app/backend", "build:components": "npm run build --prefix ./presentation-rules-editor-react", "build:frontend": "npm run build --prefix ./app/frontend", From 4aaebe19592e4daa830f692cec4199fcc435deea Mon Sep 17 00:00:00 2001 From: Jonas <100586436+JonasDov@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:22:01 +0200 Subject: [PATCH 3/4] Add tests junit script --- .gitignore | 1 + app/e2e-tests/package.json | 1 + app/e2e-tests/playwright.config.ts | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f165f73..90dd978 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ lib node_modules /**/playwright-report /**/test-results +junit-results.xml diff --git a/app/e2e-tests/package.json b/app/e2e-tests/package.json index 01a615f..6cee546 100644 --- a/app/e2e-tests/package.json +++ b/app/e2e-tests/package.json @@ -13,6 +13,7 @@ "lint": "eslint ./src/**/*.{ts,tsx}", "test:local": "npx playwright test --grep=#local", "test:web": "cross-env WEB_TEST=1 npx playwright test --grep=#web", + "test:web:junit": "cross-env J_UNIT=1 WEB_TEST=1 npx playwright test --grep=#web", "test:local:debug": "npx playwright test --grep=#local --ui", "test:web:debug": "cross-env WEB_TEST=1 npx playwright test --grep=#web --ui", "typecheck": "tsc --noEmit", diff --git a/app/e2e-tests/playwright.config.ts b/app/e2e-tests/playwright.config.ts index 2808277..d0fe0b1 100644 --- a/app/e2e-tests/playwright.config.ts +++ b/app/e2e-tests/playwright.config.ts @@ -23,7 +23,11 @@ export default defineConfig({ /* Retry on CI only */ retries: process.env.CI ? 2 : 0, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: [["list"], ["html", { open: "never" }]], + reporter: [ + ["list"], + ["html", { open: "never" }], + ...(process.env.J_UNIT ? [["junit", { outputFile: "junit-results.xml" }] as ["junit", { outputFile?: string }]] : []), + ], /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { /* Base URL to use in actions like `await page.goto('/')`. */ From e8b04da3d35fb54731d67b5dda997ef1c46fd895 Mon Sep 17 00:00:00 2001 From: Jonas <100586436+JonasDov@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:42:40 +0200 Subject: [PATCH 4/4] Make every e2e script use junit --- app/e2e-tests/package.json | 1 - app/e2e-tests/playwright.config.ts | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/e2e-tests/package.json b/app/e2e-tests/package.json index 6cee546..01a615f 100644 --- a/app/e2e-tests/package.json +++ b/app/e2e-tests/package.json @@ -13,7 +13,6 @@ "lint": "eslint ./src/**/*.{ts,tsx}", "test:local": "npx playwright test --grep=#local", "test:web": "cross-env WEB_TEST=1 npx playwright test --grep=#web", - "test:web:junit": "cross-env J_UNIT=1 WEB_TEST=1 npx playwright test --grep=#web", "test:local:debug": "npx playwright test --grep=#local --ui", "test:web:debug": "cross-env WEB_TEST=1 npx playwright test --grep=#web --ui", "typecheck": "tsc --noEmit", diff --git a/app/e2e-tests/playwright.config.ts b/app/e2e-tests/playwright.config.ts index d0fe0b1..515fe88 100644 --- a/app/e2e-tests/playwright.config.ts +++ b/app/e2e-tests/playwright.config.ts @@ -23,11 +23,7 @@ export default defineConfig({ /* Retry on CI only */ retries: process.env.CI ? 2 : 0, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: [ - ["list"], - ["html", { open: "never" }], - ...(process.env.J_UNIT ? [["junit", { outputFile: "junit-results.xml" }] as ["junit", { outputFile?: string }]] : []), - ], + reporter: [["list"], ["html", { open: "never" }], ["junit", { outputFile: "junit-results.xml" }]], /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { /* Base URL to use in actions like `await page.goto('/')`. */