fix: Export Scenes (#3032)

* fix: Import ECS library and thumbnail CORS error

* fix: Await async methods to generate the scene.json file

* feat: Update postinstall script to import the new built decentralad-ecs file

* fix: Await async methods to generate the scene.json file

* feat: Upgrade decentraland-ecs to the fixed version

* fix package version

package.json

@@ -38,7 +38,7 @@
     "decentraland-builder-scripts": "^0.24.0",
     "decentraland-crypto-fetch": "^2.0.1",
     "decentraland-dapps": "^18.1.0",
-    "decentraland-ecs": "6.6.1-20201020183014.commit-bdc29ef-hotfix",
+    "decentraland-ecs": "6.12.4-7784644013.commit-f770b3e",
     "decentraland-experiments": "^1.0.2",
     "decentraland-transactions": "^2.0.3",
     "decentraland-ui": "^5.6.0",
@@ -154,7 +154,7 @@
   },
   "homepage": "",
   "overrides": {
-    "decentraland-ecs": "6.6.1-20201020183014.commit-bdc29ef-hotfix",
+    "decentraland-ecs": "6.12.4-7784644013.commit-f770b3e",
     "decentraland": "3.3.0"
   }
 }

scripts/postinstall.cjs

@@ -7,7 +7,7 @@ const prettier = require('prettier')
 const editorPath = path.resolve(__dirname, process.argv[2] || require.resolve('decentraland-ecs/artifacts/editor'))
 const targetEditorPath = path.resolve(__dirname, '../public/editor.js')
 
-const ecsPath = path.resolve(__dirname, process.argv[3] || require.resolve('decentraland-ecs/dist/src/index.js'))
+const ecsPath = path.resolve(__dirname, process.argv[3] || require.resolve('decentraland-ecs/dist/src/index.min.js'))
 const targetEcsPath = path.resolve(__dirname, '../src/ecsScene/ecs.js.raw')
 
 console.log(`> Copying file ${editorPath} into ${targetEditorPath}`)

src/ecsScene/scene.ts

@@ -1,16 +1,13 @@
 // This file is compiled using the decentraland-compiler, it's not using Vite as the compiler
 
 import { EventEmitter } from 'events'
-import { engine, GLTFShape, Transform, Entity, Component, NFTShape, IEntity } from 'decentraland-ecs'
+import { engine, GLTFShape, Transform, Entity, Component, NFTShape, IEntity, Gizmos, SmartItem } from 'decentraland-ecs'
 import * as ECS from 'decentraland-ecs'
 import { createChannel } from 'decentraland-builder-scripts/channel'
 import { createInventory } from 'decentraland-builder-scripts/inventory'
-import { DecentralandInterface } from 'decentraland-ecs/dist/decentraland/Types'
 import { EntityDefinition, AnyComponent, ComponentData, ComponentType, SceneSDK6 } from 'modules/scene/types'
 import { AssetParameterValues } from 'modules/asset/types'
 
-// @ts-ignore
-const { Gizmos, SmartItem } = require('decentraland-ecs') as any
 declare var dcl: DecentralandInterface
 
 const inventory = createInventory(ECS.UICanvas, ECS.UIContainerStack, ECS.UIImage)

src/modules/project/export.ts

@@ -446,7 +446,11 @@ export async function createDynamicFiles(args: {
       null,
       2
     ),
-    [EXPORT_PATH.SCENE_FILE]: JSON.stringify(getSceneDefinition(project, point, rotation, thumbnail, author, isEmpty, world), null, 2),
+    [EXPORT_PATH.SCENE_FILE]: JSON.stringify(
+      await getSceneDefinition(project, point, rotation, thumbnail, author, isEmpty, world),
+      null,
+      2
+    ),
     [EXPORT_PATH.TSCONFIG_FILE]: JSON.stringify(
       {
         ...tsconfig,
@@ -571,7 +575,8 @@ export function buildAssetPath(namespace: string, path: string) {
 // SDK7
 
 export async function downloadSDK7File(key: string, url: string): Promise<{ path: string; file: Blob }> {
-  return fetch(url)
+  const headers = key === EXPORT_PATH.THUMBNAIL_FILE ? { headers: NO_CACHE_HEADERS } : {}
+  return fetch(url, headers)
     .then(resp => resp.blob())
     .then(blob => ({ path: key, file: blob }))
 }
@@ -610,7 +615,16 @@ export async function createSDK7Files({ project, scene, builderAPI }: { project:
   const sceneJson = new Blob([
     new TextEncoder().encode(
       JSON.stringify(
-        getSceneDefinition(project, { x: 0, y: 0 }, 'east', EXPORT_PATH.THUMBNAIL_FILE, project.ethAddress, undefined, undefined, true)
+        await getSceneDefinition(
+          project,
+          { x: 0, y: 0 },
+          'east',
+          EXPORT_PATH.THUMBNAIL_FILE,
+          project.ethAddress,
+          undefined,
+          undefined,
+          true
+        )
       )
     )
   ])