Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #155

Merged
merged 10 commits into from
Mar 18, 2024
Merged

Bump dependencies #155

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
77908ca
Bump dependencies
saskliutas Mar 15, 2024
7ba93ae
lint
saskliutas Mar 15, 2024
92459ac
Revive tests
saskliutas Mar 15, 2024
4e52593
Revive app
saskliutas Mar 15, 2024
4553071
Add ignores to restore coverage
saskliutas Mar 15, 2024
e0c102f
Lint
saskliutas Mar 15, 2024
01b2c02
Use type instead of fill
saskliutas Mar 15, 2024
49bdaa4
Merge branch 'master' into bump_deps
saskliutas Mar 15, 2024
6aa3907
Cleanup pipeline
saskliutas Mar 18, 2024
cb55a91
Merge branch 'master' into bump_deps
saskliutas Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions app/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
},
"dependencies": {
"@app/common": "workspace:*",
"@itwin/core-backend": "^4.2.3",
"@itwin/core-bentley": "^4.2.3",
"@itwin/core-common": "^4.2.3",
"@itwin/core-geometry": "^4.2.3",
"@itwin/core-quantity": "^4.2.3",
"@itwin/ecschema-metadata": "^4.2.3",
"@itwin/ecschema-rpcinterface-common": "^4.2.3",
"@itwin/ecschema-rpcinterface-impl": "^4.2.3",
"@itwin/core-backend": "^4.4.6",
"@itwin/core-bentley": "^4.4.6",
"@itwin/core-common": "^4.4.6",
"@itwin/core-geometry": "^4.4.6",
"@itwin/core-quantity": "^4.4.6",
"@itwin/ecschema-metadata": "^4.4.6",
"@itwin/ecschema-rpcinterface-common": "^4.4.6",
"@itwin/ecschema-rpcinterface-impl": "^4.4.6",
"@itwin/eslint-plugin": "4.0.0-dev.48",
"@itwin/express-server": "^4.2.3",
"@itwin/imodels-access-backend": "^4.1.1",
"@itwin/presentation-backend": "^4.2.3",
"@itwin/presentation-common": "^4.2.3",
"@types/node": "^18.17.1",
"@itwin/express-server": "^4.4.6",
"@itwin/imodels-access-backend": "^4.1.5",
"@itwin/presentation-backend": "^4.4.6",
"@itwin/presentation-common": "^4.4.6",
"@types/node": "^18.19.24",
"dotenv": "^10.0.0",
"eslint": "^8.45.0",
"eslint": "^8.57.0",
"pretty-bytes": "^5.6.0",
"ts-node-dev": "^2.0.0",
"typescript": "^4.9.5"
Expand Down
16 changes: 8 additions & 8 deletions app/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"lint": "eslint **/*.{ts,tsx}"
},
"dependencies": {
"@itwin/core-bentley": "^4.2.3",
"@itwin/core-common": "^4.2.3",
"@itwin/core-geometry": "^4.2.3",
"@itwin/core-quantity": "^4.2.3",
"@itwin/ecschema-metadata": "^4.2.3",
"@itwin/ecschema-rpcinterface-common": "^4.2.3",
"@itwin/core-bentley": "^4.4.6",
"@itwin/core-common": "^4.4.6",
"@itwin/core-geometry": "^4.4.6",
"@itwin/core-quantity": "^4.4.6",
"@itwin/ecschema-metadata": "^4.4.6",
"@itwin/ecschema-rpcinterface-common": "^4.4.6",
"@itwin/eslint-plugin": "4.0.0-dev.48",
"@itwin/presentation-common": "^4.2.3",
"eslint": "^8.45.0",
"@itwin/presentation-common": "^4.4.6",
"eslint": "^8.57.0",
"typescript": "^4.9.5"
}
}
22 changes: 11 additions & 11 deletions app/e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"test:web:junit": "npm run test:web -- --reporter mocha-junit-reporter",
"test:debug": "cross-env PWDEBUG=1 mocha -r ts-node/register/transpile-only --timeout 99999999 --exit --grep '#local' '**/*.test.ts'",
"typecheck": "tsc --noEmit",
"typecheck:watch": "tsc --noEmit --watch"
"typecheck:watch": "tsc --noEmit --watch",
"prepare": "playwright install chromium"
},
"dependencies": {
"@itwin/eslint-plugin": "4.0.0-dev.48",
"@types/chai": "^4.3.5",
"@types/jest-dev-server": "^5.0.0",
"@types/mocha": "^10.0.1",
"@types/node": "^16.18.39",
"chai": "^4.3.10",
"@types/chai": "^4.3.12",
"@types/mocha": "^10.0.6",
"@types/node": "^16.18.89",
"chai": "^4.4.1",
"cross-env": "^7.0.3",
"eslint": "^8.45.0",
"jest-dev-server": "^6.2.0",
"mocha": "^10.2.0",
"eslint": "^8.57.0",
"jest-dev-server": "^10.0.0",
"mocha": "^10.3.0",
"mocha-junit-reporter": "^2.2.1",
"playwright": "^1.36.2",
"ts-node": "^10.9.1",
"playwright": "^1.42.1",
"ts-node": "^10.9.2",
"typescript": "^4.9.5"
}
}
16 changes: 12 additions & 4 deletions app/e2e-tests/src/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { exec } from "child_process";
import * as fs from "fs";
import { JestDevServerOptions, setup as setupDevServers, teardown as teardownDevServers } from "jest-dev-server";
import { Config, setup as setupDevServers, teardown as teardownDevServers } from "jest-dev-server";
import { Socket } from "net";
import { chromium, ChromiumBrowser, Page } from "playwright";
import { getServiceUrl } from "./utils";
Expand All @@ -31,7 +31,7 @@ before(async function () {

after(async () => {
await browser.close();
await teardownDevServers();
await teardownServers();
});

beforeEach(async () => {
Expand Down Expand Up @@ -95,8 +95,10 @@ interface SetupServersArgs {
debug: boolean;
}

let spawnedServers: Parameters<typeof teardownDevServers>[0] | undefined;

async function setupServers({ backendPort, frontendPort, debug }: SetupServersArgs): Promise<void> {
const servers: JestDevServerOptions[] = [];
const servers: Config[] = [];

if (await isPortAvailable(backendPort)) {
// eslint-disable-next-line no-console
Expand Down Expand Up @@ -130,7 +132,13 @@ async function setupServers({ backendPort, frontendPort, debug }: SetupServersAr
console.log(`Frontend server port (${frontendPort}) is already taken.`);
}

await setupDevServers(servers);
spawnedServers = await setupDevServers(servers);
}

async function teardownServers() {
if (spawnedServers !== undefined) {
await teardownDevServers(spawnedServers);
}
}

async function isPortAvailable(port: number) {
Expand Down
2 changes: 1 addition & 1 deletion app/e2e-tests/src/share.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe("share button #local #web", () => {
const editor = getEditor(page);
await editor.locator("text={").first().click();
await editor.press("Control+a");
await editor.type("test ruleset text");
await editor.fill("test ruleset text");
await page.click('button:has-text("Share")');
});

Expand Down
2 changes: 1 addition & 1 deletion app/e2e-tests/src/tab-content/editor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe("editor #local", () => {
await editor.press("Backspace");

await editor.press("F1");
await editor.type("Submit ruleset");
await editor.fill("Submit ruleset");
await editor.press("Enter");
await getWidget(page, "Tree")
.locator("text=The data required for this tree layout is not available in this iModel.")
Expand Down
2 changes: 1 addition & 1 deletion app/e2e-tests/src/widgets/properties.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe("properties widget #local", () => {
await editor.press("PageDown");
await editor.getByText(/^"SelectedNodeInstances"$/).click();
await editor.press("End");
await editor.type(`,
await editor.fill(`,
"propertyOverrides": [{ "name": "*", "categoryId": "custom" }],
"propertyCategories": [{ "id": "custom", "label": "custom_category" }]`);
await editor.press("Alt+Enter");
Expand Down
2 changes: 1 addition & 1 deletion app/e2e-tests/src/widgets/table.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe("table widget #local", () => {
await editor.press("PageDown");
await editor.getByText(/^"SelectedNodeInstances"$/).click();
await editor.press("End");
await editor.type(`,
await editor.fill(`,
"propertyOverrides": [{ "name": "Model", "labelOverride": "Custom Property Label" }]`);
await editor.press("Alt+Enter");

Expand Down
2 changes: 1 addition & 1 deletion app/e2e-tests/src/widgets/tree.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("tree widget #local", () => {
const editor = getEditor(page);
await editor.getByText(/^"rules"$/).click();
await editor.press("Control+Enter");
await editor.type('{ "ruleType": "CheckBox" },');
await editor.fill('{ "ruleType": "CheckBox" },');
await editor.press("Alt+Enter");

const treeWidget = getWidget(page, "Tree");
Expand Down
93 changes: 46 additions & 47 deletions app/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,73 +16,72 @@
},
"dependencies": {
"@app/common": "workspace:*",
"@itwin/appui-abstract": "^4.2.3",
"@itwin/appui-layout-react": "^4.6.3",
"@itwin/appui-react": "^4.6.3",
"@itwin/components-react": "^4.6.3",
"@itwin/core-bentley": "^4.2.3",
"@itwin/core-common": "^4.2.3",
"@itwin/core-frontend": "^4.2.3",
"@itwin/core-geometry": "^4.2.3",
"@itwin/core-i18n": "^4.2.3",
"@itwin/core-markup": "^4.2.3",
"@itwin/core-orbitgt": "^4.2.3",
"@itwin/core-quantity": "^4.2.3",
"@itwin/core-react": "^4.6.3",
"@itwin/core-telemetry": "^4.2.3",
"@itwin/ecschema-metadata": "^4.2.3",
"@itwin/ecschema-rpcinterface-common": "^4.2.3",
"@itwin/appui-abstract": "^4.4.6",
"@itwin/appui-layout-react": "^4.8.3",
"@itwin/appui-react": "^4.10.0",
"@itwin/components-react": "^4.10.0",
"@itwin/core-bentley": "^4.4.6",
"@itwin/core-common": "^4.4.6",
"@itwin/core-frontend": "^4.4.6",
"@itwin/core-geometry": "^4.4.6",
"@itwin/core-i18n": "^4.4.6",
"@itwin/core-markup": "^4.4.6",
"@itwin/core-orbitgt": "^4.4.6",
"@itwin/core-quantity": "^4.4.6",
"@itwin/core-react": "^4.10.0",
"@itwin/core-telemetry": "^4.4.6",
"@itwin/ecschema-metadata": "^4.4.6",
"@itwin/ecschema-rpcinterface-common": "^4.4.6",
"@itwin/eslint-plugin": "4.0.0-dev.48",
"@itwin/imodel-browser-react": "^1.1.1",
"@itwin/imodel-components-react": "^4.6.3",
"@itwin/imodels-access-frontend": "^4.1.1",
"@itwin/imodels-client-management": "^4.2.0",
"@itwin/itwinui-icons-react": "^2.7.0",
"@itwin/imodel-browser-react": "^1.2.2",
"@itwin/imodel-components-react": "^4.10.0",
"@itwin/imodels-access-frontend": "^4.1.5",
"@itwin/imodels-client-management": "^4.3.0",
"@itwin/itwinui-icons-react": "^2.8.0",
"@itwin/itwinui-illustrations-react": "^2.1.0",
"@itwin/itwinui-layouts-css": "^0.2.0",
"@itwin/itwinui-layouts-react": "^0.2.0",
"@itwin/itwinui-react": "~2.12.15",
"@itwin/presentation-common": "^4.2.3",
"@itwin/presentation-components": "^4.3.0",
"@itwin/presentation-frontend": "^4.2.3",
"@itwin/itwinui-react": "~2.12.25",
"@itwin/presentation-common": "^4.4.6",
"@itwin/presentation-components": "^4.4.0",
"@itwin/presentation-frontend": "^4.4.6",
"@itwin/presentation-rules-editor-react": "workspace:*",
"@itwin/webgl-compatibility": "^4.2.3",
"@microsoft/applicationinsights-web": "^2.8.14",
"@itwin/webgl-compatibility": "^4.4.6",
"@microsoft/applicationinsights-web": "^2.8.18",
"@types/copy-webpack-plugin": "^8.0.1",
"@types/lz-string": "^1.5.0",
"@types/node": "^16.18.39",
"@types/react": "^17.0.62",
"@types/react-dom": "^17.0.20",
"@types/react-redux": "^7.1.25",
"@types/react-table": "^7.7.14",
"@types/node": "^16.18.89",
"@types/react": "^17.0.78",
"@types/react-dom": "^17.0.25",
"@types/react-redux": "^7.1.33",
"@types/react-table": "^7.7.19",
"copy-webpack-plugin": "^9.1.0",
"css-loader": "^6.8.1",
"css-loader": "^6.10.0",
"dotenv": "^10.0.0",
"esbuild-loader": "^3.0.1",
"eslint": "^8.45.0",
"eslint-plugin-react": "^7.33.0",
"html-webpack-plugin": "^5.5.3",
"esbuild-loader": "^3.2.0",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.0",
"html-webpack-plugin": "^5.6.0",
"lz-string": "^1.5.0",
"monaco-editor": "^0.40.0",
"monaco-editor-webpack-plugin": "^7.1.0",
"npm-run-all": "^4.1.5",
"oidc-client": "^1.11.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-error-boundary": "^4.0.10",
"react-error-boundary": "^4.0.13",
"react-redux": "^7.2.9",
"react-router-dom": "^6.14.2",
"react-router-dom": "^6.22.3",
"redux": "^4.2.1",
"sass": "^1.64.1",
"sass": "^1.72.0",
"sass-loader": "^11.1.1",
"source-map-loader": "^2.0.2",
"source-map-loader": "^5.0.0",
"string-replace-loader": "^3.1.0",
"style-loader": "^3.3.3",
"terser-webpack-plugin": "^5.3.9",
"ts-node": "^10.9.1",
"tslib": "^2.6.1",
"style-loader": "^3.3.4",
"terser-webpack-plugin": "^5.3.10",
"ts-node": "^10.9.2",
"tslib": "^2.6.2",
"typescript": "^4.9.5",
"webpack": "^5.88.2",
"webpack": "^5.90.3",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.15.1"
}
Expand Down
Loading
Loading