diff --git a/Apps/PackageTest/package-lock.json b/Apps/PackageTest/package-lock.json index a31210990..5c16196f1 100644 --- a/Apps/PackageTest/package-lock.json +++ b/Apps/PackageTest/package-lock.json @@ -908,16 +908,16 @@ } }, "@babylonjs/core": { - "version": "4.2.0-alpha.33", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0-alpha.33.tgz", - "integrity": "sha512-pxDdwJsuC0shJADLDxEH48ZsoR3NjyxGRV9Y/mTb9vaIxwTjWouWuhShIKtv+qdoTBfhUT3fRn2Ah9Wq7wwNxA==", + "version": "4.2.0-beta.1", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0-beta.1.tgz", + "integrity": "sha512-+obrGFrLriMttGcinqDTSZDyPFU4slZaGxO0zISdAItnhNxS6d+P0k7OvUQySJgvHoThI3e0J3h8BFO6hpKYcg==", "requires": { "tslib": ">=1.10.0" } }, "@babylonjs/react-native": { "version": "file:../../Package/Assembled/babylonjs-react-native-0.0.1.tgz", - "integrity": "sha512-6wYOCDP8Oyx989hEDh8Ow44+8Nd0fGCyL4enbIPTbXJ9vnP4xU2Dx1iumJgF76YljaLxeNzdX7oWhg9F68mnbw==", + "integrity": "sha512-P9tJSJJbC7g0kYgci6VmnmUmJmdbb9Ml0Gy/y5nZz8QS2X1AIymVNFDuArPhLvu8hkbpv/hEA5WgZBc5oRh7vw==", "requires": { "base-64": "^0.1.0" } diff --git a/Apps/PackageTest/package.json b/Apps/PackageTest/package.json index 1d5999243..53d896d00 100644 --- a/Apps/PackageTest/package.json +++ b/Apps/PackageTest/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "4.2.0-alpha.33", + "@babylonjs/core": "^4.2.0-beta.1", "@babylonjs/react-native": "file:../../Package/Assembled/babylonjs-react-native-0.0.1.tgz", "react": "16.13.1", "react-native": "0.63.1", diff --git a/Apps/Playground/metro.config.js b/Apps/Playground/metro.config.js index cf47c2ade..56204bd01 100644 --- a/Apps/Playground/metro.config.js +++ b/Apps/Playground/metro.config.js @@ -26,7 +26,7 @@ function getModuleMappings() { if (!path.isAbsolute(linkPath)) { linkPath = path.resolve(directory, linkPath); } - const linkStat = fs.lstatSync(linkPath); + const linkStat = fs.statSync(linkPath); if (linkStat.isDirectory()) { const packagePath = path.resolve(linkPath, "package.json"); if (fs.existsSync(packagePath)) { diff --git a/Apps/Playground/package-lock.json b/Apps/Playground/package-lock.json index be42c5090..8f0896fad 100644 --- a/Apps/Playground/package-lock.json +++ b/Apps/Playground/package-lock.json @@ -864,21 +864,31 @@ } }, "@babylonjs/core": { - "version": "4.2.0-alpha.33", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0-alpha.33.tgz", - "integrity": "sha512-pxDdwJsuC0shJADLDxEH48ZsoR3NjyxGRV9Y/mTb9vaIxwTjWouWuhShIKtv+qdoTBfhUT3fRn2Ah9Wq7wwNxA==", + "version": "4.2.0-beta.1", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0-beta.1.tgz", + "integrity": "sha512-+obrGFrLriMttGcinqDTSZDyPFU4slZaGxO0zISdAItnhNxS6d+P0k7OvUQySJgvHoThI3e0J3h8BFO6hpKYcg==", "requires": { "tslib": ">=1.10.0" } }, "@babylonjs/loaders": { - "version": "4.2.0-alpha.33", - "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-4.2.0-alpha.33.tgz", - "integrity": "sha512-VOPmKOGN85mksDpgfT3tJMjXOsyVf63ZfA/nA7beTAWdNptJcOMXmSSiidkrl28CE+9qzZ6AwUJ7aN9knxbAlg==", + "version": "4.2.0-beta.1", + "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-4.2.0-beta.1.tgz", + "integrity": "sha512-AKmRpLSewet27eijaZ2W567pPc8qMYIqhcwI4u+XLtDtb3bfWhzLgVDpNZDBWW1VL52ZmINPIg+AtG0cZ/+XVQ==", "requires": { - "@babylonjs/core": "4.2.0-alpha.33", - "babylonjs-gltf2interface": "4.2.0-alpha.33", + "@babylonjs/core": "4.2.0-beta.1", + "babylonjs-gltf2interface": "4.2.0-beta.1", "tslib": ">=1.10.0" + }, + "dependencies": { + "@babylonjs/core": { + "version": "4.2.0-beta.1", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-4.2.0-beta.1.tgz", + "integrity": "sha512-+obrGFrLriMttGcinqDTSZDyPFU4slZaGxO0zISdAItnhNxS6d+P0k7OvUQySJgvHoThI3e0J3h8BFO6hpKYcg==", + "requires": { + "tslib": ">=1.10.0" + } + } } }, "@babylonjs/react-native": { @@ -3053,9 +3063,9 @@ } }, "babylonjs-gltf2interface": { - "version": "4.2.0-alpha.33", - "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-4.2.0-alpha.33.tgz", - "integrity": "sha512-xOT4ORQmkXSzfp26Spwrw0HIMd9DpgPkHowDhLc7fF+fZ/io5oSMa5GM+OQ1KWWaENxgD6wFTjdPZztP5NH8Dw==" + "version": "4.2.0-beta.1", + "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-4.2.0-beta.1.tgz", + "integrity": "sha512-7aN5ToP377lBhbfsIJNsLXI3+l6GvUjjE9/wWIzBrWcXZh68JiwSTsxZWX5cZChugMf2rxIUNXCF3BYH5tOixA==" }, "balanced-match": { "version": "1.0.0", diff --git a/Apps/Playground/package.json b/Apps/Playground/package.json index 676f50dbd..5ee1497c7 100644 --- a/Apps/Playground/package.json +++ b/Apps/Playground/package.json @@ -10,8 +10,8 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@babylonjs/core": "4.2.0-alpha.33", - "@babylonjs/loaders": "4.2.0-alpha.33", + "@babylonjs/core": "^4.2.0-beta.1", + "@babylonjs/loaders": "^4.2.0-beta.1", "@babylonjs/react-native": "file:../../Modules/@babylonjs/react-native", "@react-native-community/slider": "^2.0.9", "logkitty": "^0.7.1", diff --git a/Modules/@babylonjs/react-native/README.md b/Modules/@babylonjs/react-native/README.md index 6586636d0..8f3900fb6 100644 --- a/Modules/@babylonjs/react-native/README.md +++ b/Modules/@babylonjs/react-native/README.md @@ -10,10 +10,6 @@ This package has several **peer dependencies**. If these dependencies are unmet, The `react-native-permissions` dependency is required for XR capabilities of Babylon.js (to request camera permissions automatically). Be sure to follow the `react-native-permissions` [instructions](https://github.com/react-native-community/react-native-permissions#setup) to update your `Podfile` and `Info.plist` (iOS) and/or `AndroidManifest.xml` (Android). -### C++ Build Requirements - -This package includes C++ source, so platform specific tooling to build C++ code must be installed. - ### Android Configuration The minimum Android SDK version is 18. This must be set as `minSdkVersion` in the consuming project's `build.gradle` file. diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 9e57d3719..3a51c6c15 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 9e57d37192875932c3c668673daaf3e036742bc4 +Subproject commit 3a51c6c1509596b1c5ff183730ac0affa326d0c9