Skip to content

Commit

Permalink
Update and cleanup dependencies (#14793)
Browse files Browse the repository at this point in the history
* Update and cleanup dependencies

* fix project references

* update API
  • Loading branch information
RaananW authored Feb 20, 2024
1 parent 1146e16 commit 1233f13
Show file tree
Hide file tree
Showing 8 changed files with 16,173 additions and 21,499 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ packages/tools/playground/public/temp
test-results
playwright-report
playwright/.cache/
.nx
.DS_Store
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"npmScope": "babylonjs",
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
Expand Down
37,637 changes: 16,156 additions & 21,481 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
"devDependencies": {
"@alex_neo/jest-expect-message": "~1.0.5",
"@dev/build-tools": "^1.0.0",
"@nrwl/cli": "^15.9.3",
"@nrwl/tao": "^15.9.3",
"@nrwl/workspace": "^15.9.3",
"@nrwl/tao": "^18.0.4",
"@nrwl/workspace": "^18.0.4",
"@playwright/test": "^1.37.1",
"@types/expect-puppeteer": "~5.0.3",
"@types/fs-extra": "^9.0.13",
Expand All @@ -36,10 +35,11 @@
"eslint-plugin-prettier": "~5.0.0",
"eslint-plugin-tsdoc": "~0.2.14",
"fs-extra": "^10.0.1",
"jest": "~29.5.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.5.0",
"jest-junit": "~13.2.0",
"mini-css-extract-plugin": "~2.6.0",
"nx": "^18.0.4",
"prettier": "^3.0.3",
"rimraf": "~3.0.2",
"selenium-webdriver": "^4.3.1",
Expand All @@ -64,7 +64,7 @@
"build:source": "tsc -b ./tsconfig.devpackages.json",
"build:source:lts": "npx nx run-many --target=compile --projects=@lts/core,@lts/gui,@lts/loaders,@lts/materials,@lts/post-processes,@lts/procedural-textures,@lts/serializers --parallel=1",
"build:umd": "nx run-many --target=build --parallel --maxParallel=6 --projects=babylonjs,babylonjs-gui,babylonjs-inspector,babylonjs-loaders,babylonjs-materials,babylonjs-serializers,babylonjs-post-process,babylonjs-procedural-textures,babylonjs-node-editor,babylonjs-node-geometry-editor,babylonjs-gui-editor,babylonjs-ktx2decoder,babylonjs-viewer-assets,babylonjs-viewer,babylonjs-accessibility",
"build:es6": "nx run-many --target=build --parallel --maxParallel=6 --projects=core,gui,loaders,materials,serializers,post-processes,procedural-textures,node-editor,node-geometry-editor,inspector,gui-editor,viewer,shared-ui-components,accessibility",
"build:es6": "nx run-many --target=build --parallel --maxParallel=6 --projects=@babylonjs/core,@babylonjs/gui,@babylonjs/loaders,@babylonjs/materials,@babylonjs/serializers,@babylonjs/post-processes,@babylonjs/procedural-textures,@babylonjs/node-editor,@babylonjs/node-geometry-editor,@babylonjs/inspector,@babylonjs/gui-editor,@babylonjs/viewer,@babylonjs/shared-ui-components,@babylonjs/accessibility",
"watch:shaders": "build-tools -c build-shaders --global --watch",
"watch:assets": "build-tools -c pa --global --watch",
"watch:source:dev": "tsc -b ./tsconfig.devpackages.json -w",
Expand Down Expand Up @@ -107,8 +107,5 @@
"nextVersion": "Unreleased",
"ignoreCommitters": [],
"feature": "New Feature"
},
"dependencies": {
"lerna": "^7.0.2"
}
}
6 changes: 3 additions & 3 deletions packages/public/@babylonjs/test-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"compile": "tsc -b tsconfig.build.json --verbose"
},
"devDependencies": {
"puppeteer": "^20.5.0",
"puppeteer": "^22.1.0",
"@alex_neo/jest-expect-message": "~1.0.5"
},
"dependencies": {
"jest": "^27.0.0",
"jest-puppeteer": "^6.0.3"
"jest": "^29.7.0",
"jest-puppeteer": "^10.0.1"
},
"peerDependencies": {
"puppeteer": ">20.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/testTools/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ export const logPageErrors = async (page: Page, debug?: boolean) => {
// serialize my args the way I want
const args: any[] = await Promise.all(
msg.args().map((arg: any) =>
arg.executionContext().evaluate((argument: string | Error) => {
arg.evaluate((argument: string | Error) => {
// I'm in a page context now. If my arg is an error - get me its message.
if (argument instanceof Error) return `[ERR] ${argument.message}`;
//Return the argument if it is just a message
Expand Down
6 changes: 3 additions & 3 deletions packages/tools/tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"@types/jest-image-snapshot": "^4.3.1",
"@types/react": "^17.0.30",
"@types/react-dom": "^17.0.10",
"jest": "^27.4.7",
"jest-puppeteer": "^6.0.3",
"jest": "^29.7.0",
"jest-puppeteer": "^10.0.1",
"sass": "^1.62.1",
"puppeteer": "^20.5.0"
"puppeteer": "^22.1.0"
},
"optionalDependencies": {
"jest-image-snapshot": "^6.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const evaluateTests = async (engineType = "webgl2", testFileName = "confi
// serialize my args the way I want
const args = await Promise.all(
msg.args().map((arg) =>
arg.executionContext().evaluate((argument: string | Error) => {
arg.evaluate((argument) => {
// I'm in a page context now. If my arg is an error - get me its message.
if (argument instanceof Error) return argument.message;
//Return null if the arg is not a error
Expand All @@ -90,7 +90,7 @@ export const evaluateTests = async (engineType = "webgl2", testFileName = "confi
log(`${msg.type().substring(0, 3).toUpperCase()} ${msg.text()}`);
}
});
page.on("pageerror", ({ message }) => log(message)).on("requestfailed", (request) => log(`${request.failure().errorText} ${request.url()}`));
page.on("pageerror", ({ message }) => log(message)).on("requestfailed", (request) => log(`${request?.failure()?.errorText} ${request.url()}`));
log("preparing page");
await page.setViewport({ width: 600, height: 400 });
page.setDefaultTimeout(0);
Expand Down

0 comments on commit 1233f13

Please sign in to comment.