From 6b053a1c7dc5e7635f39693bc2bcdd2be12c35f8 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Mon, 1 Nov 2021 12:59:22 -0700 Subject: [PATCH] Fix issue with finalizers being called too early - Update Babylon.js npm packages 5.0.0-alpha.60 - Update Babylon Native submodule to latest --- Apps/PackageTest/0.63.1/package-lock.json | 6 ++--- Apps/PackageTest/0.63.1/package.json | 2 +- Apps/PackageTest/0.64.0/package-lock.json | 6 ++--- Apps/PackageTest/0.64.0/package.json | 2 +- Apps/Playground/package-lock.json | 22 +++++++++---------- Apps/Playground/package.json | 4 ++-- .../react-native-windows/package.json | 2 +- .../@babylonjs/react-native/package-lock.json | 6 ++--- Modules/@babylonjs/react-native/package.json | 4 ++-- .../react-native/submodules/BabylonNative | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Apps/PackageTest/0.63.1/package-lock.json b/Apps/PackageTest/0.63.1/package-lock.json index e20a6656a..438670fe9 100644 --- a/Apps/PackageTest/0.63.1/package-lock.json +++ b/Apps/PackageTest/0.63.1/package-lock.json @@ -913,9 +913,9 @@ } }, "@babylonjs/core": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.57.tgz", - "integrity": "sha512-v2uu7k4uw9JpulVG6q50rdaQ4azlbrwqaePtCygx3et5skHrYrQXZyUNnxJVJSNAxaV9vAWRHTLsgd74ENKLKg==", + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.60.tgz", + "integrity": "sha512-2DM4BFWcRTdgdVZqUzc8IUf9EdcfZN+aeYvWU4bzmutX6l8wowjjlQnqwCFfv+GHouV6XkM3QqoQV2rqc9T1Kw==", "requires": { "tslib": "^2.3.1" } diff --git a/Apps/PackageTest/0.63.1/package.json b/Apps/PackageTest/0.63.1/package.json index c4bff8185..7b0b4fc49 100644 --- a/Apps/PackageTest/0.63.1/package.json +++ b/Apps/PackageTest/0.63.1/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", "@babylonjs/react-native": "^0.4.0-alpha.33", "react": "16.13.1", "react-native": "0.63.1", diff --git a/Apps/PackageTest/0.64.0/package-lock.json b/Apps/PackageTest/0.64.0/package-lock.json index 50cede2bb..677510fe5 100644 --- a/Apps/PackageTest/0.64.0/package-lock.json +++ b/Apps/PackageTest/0.64.0/package-lock.json @@ -934,9 +934,9 @@ } }, "@babylonjs/core": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.57.tgz", - "integrity": "sha512-v2uu7k4uw9JpulVG6q50rdaQ4azlbrwqaePtCygx3et5skHrYrQXZyUNnxJVJSNAxaV9vAWRHTLsgd74ENKLKg==", + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.60.tgz", + "integrity": "sha512-2DM4BFWcRTdgdVZqUzc8IUf9EdcfZN+aeYvWU4bzmutX6l8wowjjlQnqwCFfv+GHouV6XkM3QqoQV2rqc9T1Kw==", "requires": { "tslib": "^2.3.1" }, diff --git a/Apps/PackageTest/0.64.0/package.json b/Apps/PackageTest/0.64.0/package.json index c9acaab60..5ed1450ee 100644 --- a/Apps/PackageTest/0.64.0/package.json +++ b/Apps/PackageTest/0.64.0/package.json @@ -12,7 +12,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", "@babylonjs/react-native": "^0.4.0-alpha.33", "@babylonjs/react-native-windows": "0.4.0-alpha.33", "react": "^17.0.1", diff --git a/Apps/Playground/package-lock.json b/Apps/Playground/package-lock.json index 78049d7d5..fcbf41f59 100644 --- a/Apps/Playground/package-lock.json +++ b/Apps/Playground/package-lock.json @@ -886,9 +886,9 @@ } }, "@babylonjs/core": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.57.tgz", - "integrity": "sha512-v2uu7k4uw9JpulVG6q50rdaQ4azlbrwqaePtCygx3et5skHrYrQXZyUNnxJVJSNAxaV9vAWRHTLsgd74ENKLKg==", + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.60.tgz", + "integrity": "sha512-2DM4BFWcRTdgdVZqUzc8IUf9EdcfZN+aeYvWU4bzmutX6l8wowjjlQnqwCFfv+GHouV6XkM3QqoQV2rqc9T1Kw==", "requires": { "tslib": "^2.3.1" }, @@ -901,12 +901,12 @@ } }, "@babylonjs/loaders": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.0.0-alpha.57.tgz", - "integrity": "sha512-vPPhLZH7mFqwK4plxCgc6SmhggKwj70rsiMMJdp2oIr0oW8/jg8KMuceHt0PO0fyvqaZ4guwk4Zj8uvWPCIVeA==", + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.0.0-alpha.60.tgz", + "integrity": "sha512-uJ+ORjGTIPxrvFWms2blDYNI49xgkg73CebPNztfxXWidPktQ+e9TkpuaFKxBIuk1nLPbxWa3I862tP/1rPimA==", "requires": { - "@babylonjs/core": "5.0.0-alpha.57", - "babylonjs-gltf2interface": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", + "babylonjs-gltf2interface": "5.0.0-alpha.60", "tslib": "^2.3.1" }, "dependencies": { @@ -4611,9 +4611,9 @@ } }, "babylonjs-gltf2interface": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.0.0-alpha.57.tgz", - "integrity": "sha512-uuiyLf5uMy/RPKVCaJDXlYUBKWqf17qgY5+GYiKQ2PH/eNXFh0pmmlgEoju5xik+3A6yTF1KbXbpxcbcm5vkPQ==" + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.0.0-alpha.60.tgz", + "integrity": "sha512-J1+dZarDEi+Gd+k8atJd69HbYZsAfLpmEm28w+SBhFmO6T5h7tCwEjFqDjGomzNXGGtpXACuJzAm23uavsXPgw==" }, "balanced-match": { "version": "1.0.0", diff --git a/Apps/Playground/package.json b/Apps/Playground/package.json index dec697581..15ceae4aa 100644 --- a/Apps/Playground/package.json +++ b/Apps/Playground/package.json @@ -14,8 +14,8 @@ "iosCmake": "node scripts/tools.js iosCMake" }, "dependencies": { - "@babylonjs/core": "5.0.0-alpha.57", - "@babylonjs/loaders": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", + "@babylonjs/loaders": "5.0.0-alpha.60", "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native", "@babylonjs/react-native-windows": "file:../../Modules/@babylonjs/react-native-windows", "@react-native-community/slider": "4.0.0-rc.3", diff --git a/Modules/@babylonjs/react-native-windows/package.json b/Modules/@babylonjs/react-native-windows/package.json index 57cc0e258..abbd7e7a5 100644 --- a/Modules/@babylonjs/react-native-windows/package.json +++ b/Modules/@babylonjs/react-native-windows/package.json @@ -24,7 +24,7 @@ "licenseFilename": "LICENSE", "readmeFilename": "README.md", "peerDependencies": { - "@babylonjs/core": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", "@babylonjs/react-native": "version", "react": "^17.0.1", "react-native": "^0.64.0", diff --git a/Modules/@babylonjs/react-native/package-lock.json b/Modules/@babylonjs/react-native/package-lock.json index 2ab2c021f..ceeda5739 100644 --- a/Modules/@babylonjs/react-native/package-lock.json +++ b/Modules/@babylonjs/react-native/package-lock.json @@ -756,9 +756,9 @@ } }, "@babylonjs/core": { - "version": "5.0.0-alpha.57", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.57.tgz", - "integrity": "sha512-v2uu7k4uw9JpulVG6q50rdaQ4azlbrwqaePtCygx3et5skHrYrQXZyUNnxJVJSNAxaV9vAWRHTLsgd74ENKLKg==", + "version": "5.0.0-alpha.60", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.0.0-alpha.60.tgz", + "integrity": "sha512-2DM4BFWcRTdgdVZqUzc8IUf9EdcfZN+aeYvWU4bzmutX6l8wowjjlQnqwCFfv+GHouV6XkM3QqoQV2rqc9T1Kw==", "dev": true, "requires": { "tslib": "^2.3.1" diff --git a/Modules/@babylonjs/react-native/package.json b/Modules/@babylonjs/react-native/package.json index 022f3bd6d..e9a7dfa89 100644 --- a/Modules/@babylonjs/react-native/package.json +++ b/Modules/@babylonjs/react-native/package.json @@ -28,7 +28,7 @@ "semver": "^7.3.2" }, "peerDependencies": { - "@babylonjs/core": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", "react": ">=16.13.1", "react-native": ">=0.63.1", "react-native-permissions": "^2.1.4" @@ -36,7 +36,7 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@babylonjs/core": "5.0.0-alpha.57", + "@babylonjs/core": "5.0.0-alpha.60", "@rnw-scripts/eslint-config": "0.1.6", "@rnw-scripts/ts-config": "0.1.0", "@types/base-64": "^0.1.3", diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index d7791ffc7..0914aa6f0 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit d7791ffc7b6b85ae6de87bd4d963fd5e312350fd +Subproject commit 0914aa6f0c527121e1ebc5e11663126ad11de9a3