Merge pull request #1166 from decentraland/sync/main-into-experimental

sync: main into experimental (manual rebase)

Author: pravusjif

.github/workflows/sync-main-to-experimental.yml

@@ -0,0 +1,70 @@
+name: Sync main to experimental
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Sync main into experimental branch
+        run: |
+          # Always use the same rolling branch
+          BRANCH_NAME="chore/sync"
+          git checkout -B $BRANCH_NAME origin/experimental
+
+          # Pull main changes into experimental branch
+          git pull origin main
+
+          git checkout --theirs .
+          git add -A .
+
+          # Run required update steps
+          make update-protocol 'experimental'
+          make install
+          make build
+          make update-snapshots
+
+          # Add updated files
+          git add -A .
+
+          # Commit if there are changes
+          git commit --no-edit || echo "No changes to commit"
+
+          # Push (force to keep PR updated)
+          git push --force --set-upstream origin $BRANCH_NAME
+
+      - name: Create or update PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=$(gh pr list --base experimental --head chore/sync --state open --json number --jq '.[0].number')
+
+          if [ -n "$PR_NUMBER" ]; then
+            echo "PR #$PR_NUMBER already exists, adding comment..."
+            gh pr comment $PR_NUMBER --body "🔄 Updated with latest changes from **main** on $(date -u '+%Y-%m-%d %H:%M UTC')"
+          else
+            echo "Creating new PR..."
+            gh pr create \
+              --base experimental \
+              --head chore/sync \
+              --title "chore: sync main to experimental" \
+              --body ":crown: *Automated PR to keep experimental in sync with main (with protocol updates, build & snapshots)*" \
+              --label "auto-pr"

package-lock.json

@@ -6,7 +6,7 @@
   "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues",
   "dependencies": {
     "@actions/core": "^1.10.0",
-    "@dcl/protocol": "1.0.0-16079712278.commit-7b0267f",
+    "@dcl/protocol": "1.0.0-16429465125.commit-bac58dd",
     "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1",
     "@dcl/ts-proto": "1.153.0",
     "@types/fs-extra": "^9.0.12",

package.json

@@ -32,14 +32,12 @@ module.exports = isE2E ? {
     }
   },
   collectCoverageFrom: ["src/**/*.ts"],
-  coveragePathIgnorePatterns: ["node_modules/", "src/lib/babylon/decentraland/gizmo-patch.ts"],
   verbose: true,
-    testPathIgnorePatterns: ["e2e"],
+  testPathIgnorePatterns: ["e2e"],
   testMatch: ["**/*.spec.(ts)"],
   testEnvironment: "jsdom",
   transformIgnorePatterns: [
     `/node_modules/(?!(@babylonjs)|(@dcl/ecs-math)|(@dcl/asset-packs)|(@dcl/sdk)|(@dcl/ecs)|(@dcl-sdk/utils))`,
     ],
     setupFiles: ['./test/setup.ts']
 }
-

packages/@dcl/inspector/jest.config.js

@@ -2,15 +2,15 @@
   "name": "@dcl/inspector",
   "version": "0.1.0",
   "dependencies": {
-    "@dcl/asset-packs": "2.5.1",
+    "@dcl/asset-packs": "2.5.2",
     "ts-deepmerge": "^7.0.0"
   },
   "devDependencies": {
-    "@babylonjs/core": "~6.18.0",
-    "@babylonjs/gui": "~6.18.0",
-    "@babylonjs/inspector": "~6.18.0",
-    "@babylonjs/loaders": "~6.18.0",
-    "@babylonjs/materials": "~6.18.0",
+    "@babylonjs/core": "8.7.0",
+    "@babylonjs/gui": "8.7.0",
+    "@babylonjs/inspector": "8.7.0",
+    "@babylonjs/loaders": "8.7.0",
+    "@babylonjs/materials": "8.7.0",
     "@dcl/ecs": "file:../ecs",
     "@dcl/ecs-math": "2.1.0",
     "@dcl/mini-rpc": "^1.0.7",

packages/@dcl/inspector/package-lock.json

@@ -22,6 +22,7 @@ import { useArrayState } from '../../../hooks/useArrayState'
 import { analytics, Event } from '../../../lib/logic/analytics'
 import { EditorComponentsTypes } from '../../../lib/sdk/components'
 import { getAssetByModel } from '../../../lib/logic/catalog'
+import { updateGltfForEntity } from '../../../lib/babylon/decentraland/sdkComponents/gltf-container'
 
 import { Block } from '../../Block'
 import { Container } from '../../Container'
@@ -127,6 +128,7 @@ export default withSdk<Props>(({ sdk, entity: entityId }) => {
   const hasStates = useHasComponent(entityId, States)
   const hasCounter = useHasComponent(entityId, Counter)
   const hasRewards = useHasComponent(entityId, Rewards)
+  const [gltfValue] = useComponentValue(entityId, sdk.components.GltfContainer)
 
   useChange(
     (event, sdk) => {
@@ -143,15 +145,27 @@ export default withSdk<Props>(({ sdk, entity: entityId }) => {
   )
 
   useEffect(() => {
-    if (entity) {
+    if (entity && gltfValue) {
+      const currentGltfSrc = entity.ecsComponentValues.gltfContainer?.src
+      const isChangingGltf = currentGltfSrc !== gltfValue.src
+
+      if (isChangingGltf) {
+        entity.resetGltfAssetContainerLoading()
+      }
+
+      updateGltfForEntity(entity, gltfValue)
       entity
         .onGltfContainerLoaded()
         .then((gltfAssetContainer) => {
           setAnimations([...gltfAssetContainer.animationGroups])
         })
-        .catch(() => {})
+        .catch(() => {
+          setAnimations([])
+        })
+    } else {
+      setAnimations([])
     }
-  }, [entity])
+  }, [entity, gltfValue])
 
   const isValidAction = useCallback(
     (action: Action) => {
@@ -295,7 +309,7 @@ export default withSdk<Props>(({ sdk, entity: entityId }) => {
   const handleRemove = useCallback(async () => {
     sdk.operations.removeComponent(entityId, Actions)
     await sdk.operations.dispatch()
-    const gltfContainer = getComponentValue(entityId, GltfContainer)
+    const gltfContainer = getComponentValue(entityId, sdk.components.GltfContainer)
     const asset = getAssetByModel(gltfContainer.src)
     analytics.track(Event.REMOVE_COMPONENT, {
       componentName: ComponentName.ACTIONS,