Skip to content

Commit

Permalink
fix build next (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
gonpombo8 authored Sep 19, 2024
1 parent 70993cb commit 28e6588
Show file tree
Hide file tree
Showing 30 changed files with 67 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-with-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
result-encoding: string

- name: install sdk version
run: npm i ${{inputs.dcl-sdk-package}} --workspaces
run: npm i ${{inputs.dcl-sdk-package}} @dcl/js-runtime@${{steps.extract_version.outputs.result}} --workspaces

- name: install dependencies
run: npm i --workspaces
Expand Down
11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@
"author": "Decentraland",
"license": "ISC",
"dependencies": {
"@dcl-sdk/utils": "latest",
"@dcl/sdk": "^7.5.6",
"glob": "^7.1.6",
"@dcl/js-runtime": "^7.5.8-10926653489.commit-aec9f09",
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09",
"glob": "^10.3.10",
"syncpack": "^12.3.0"
},
"workspaces": [
".",
"scenes/*"
],
"devDependencies": {
"glob": "^10.3.10"
}
]
}
5 changes: 2 additions & 3 deletions scenes/0,0-cube-spawner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
},
"devDependencies": {
"@dcl/asset-packs": "latest",
"@dcl/js-runtime": "7.4.5",
"@dcl/sdk": "^7.4.5"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand All @@ -24,4 +23,4 @@
"printWidth": 120,
"trailingComma": "none"
}
}
}
5 changes: 2 additions & 3 deletions scenes/0,2-cube-wave-32x32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
"description": "ECS7 ",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "7.4.5",
"@dcl/sdk": "^7.4.5"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"scripts": {
"build": "sdk-commands build --skip-install",
"deploy": "sdk-commands deploy",
"start": "sdk-commands start"
}
}
}
5 changes: 2 additions & 3 deletions scenes/10,0-move-to-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
},
"devDependencies": {
"@dcl/asset-packs": "latest",
"@dcl/js-runtime": "7.4.21",
"@dcl/sdk": "^7.4.21"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand All @@ -24,4 +23,4 @@
"printWidth": 120,
"trailingComma": "none"
}
}
}
5 changes: 2 additions & 3 deletions scenes/100,100-mannakia-test-scene/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"export-static": "sdk-commands export-static --destination static/ --realmName mannakia-dcl-scene --baseUrl https://leanmendoza.github.io/mannakia-dcl-scene/ --commsAdapter ws-room:ws-room-service.decentraland.org/rooms/mannakia-dcl-scene"
},
"devDependencies": {
"@dcl/js-runtime": "7.4.7",
"@dcl/sdk": "^7.4.7",
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"dcl-crypto-toolkit": "^1.0.0-20231213161359.commit-4e6bbb6",
"eslint": "^8.53.0",
Expand All @@ -39,4 +38,4 @@
"dependencies": {
"@dcl-sdk/utils": "^1.2.6"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -223,19 +223,19 @@ function AnimatorClip(props: { clip: string }): JSX.Element {
</UiBox>
)
}
export function MainSceneUi(): JSX.Element {
export function MainSceneUi(): JSX.Element[] {
return [
<UiBox width={600} height={300} uiTransform={{ padding: 10 }}>
<UiEntity>
<AnimatorClip clip="swim" />
<AnimatorClip clip="bite" />
</UiEntity>
</UiBox>,

<UiBox width={200} height={300} uiTransform={{ padding: 10 }}>
<Button value='Spawn Teleporter' onMouseDown={() => {
respawnTeleporter()
}} />
}} />
<Button value='Remove Teleporter' onMouseDown={() => {
if (teleporterEntity !== null) {
sceneEntities.removeEntity(teleporterEntity)
Expand All @@ -260,7 +260,7 @@ function respawnTeleporter(): void {
Transform.createOrReplace(newEntity, {
position: Vector3.create(2, 0, 8)
})

Animator.create(newEntity, {
states:[
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
export type SceneItem = {
name: string
mainFn?: () => void
ui?: () => JSX.Element
ui?: () => JSX.Element | JSX.Element[]
extended?: boolean
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function nullUi(): JSX.Element {
return <UiEntity></UiEntity>
}

export function setupUi(element?: () => JSX.Element, extended?: boolean): void {
export function setupUi(element?: () => JSX.Element | JSX.Element[], extended?: boolean): void {
if (element !== undefined) {
const uiComponent =
extended === true
Expand Down
7 changes: 3 additions & 4 deletions scenes/100,102-avatar-attach-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
"upgrade-sdk:next": "npm install --save-dev @dcl/sdk@next"
},
"devDependencies": {
"@dcl/js-runtime": "7.4.15",
"@dcl/sdk": "latest",
"@dcl/asset-packs": "latest"
"@dcl/asset-packs": "latest",
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand All @@ -24,4 +23,4 @@
"printWidth": 120,
"trailingComma": "none"
}
}
}
5 changes: 2 additions & 3 deletions scenes/2,22-virtual-cameras/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
},
"devDependencies": {
"@dcl/asset-packs": "^1.20.0",
"@dcl/js-runtime": "7.5.8-10777738407.commit-ecf90a0",
"@dcl/sdk": "^7.5.8-10777738407.commit-ecf90a0"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand All @@ -24,4 +23,4 @@
"printWidth": 120,
"trailingComma": "none"
}
}
}
4 changes: 1 addition & 3 deletions scenes/5,90-scene-bounds-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"description": "Dance Floor",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"scripts": {
"build": "sdk-commands build --skip-install",
"deploy": "sdk-commands deploy",
Expand Down
4 changes: 1 addition & 3 deletions scenes/52,-52-testing-gallery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
"name": "testing-gallery",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"scripts": {
"build": "sdk-commands build --skip-install",
"deploy": "sdk-commands deploy",
Expand Down
5 changes: 3 additions & 2 deletions scenes/52,-52-testing-gallery/src/input/system.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {
IEngine,
InputAction,
PBPointerEventsResult,
PointerEventType
PointerEventType,
PointerEventsResult as _PointerEventsResult
} from '@dcl/sdk/ecs'

const InputCommands: InputAction[] = [
Expand All @@ -31,7 +32,7 @@ const InputStateUpdateSystemPriority = 1 << 20
* @internal
*/
export function createInputSystem(engine: IEngine) {
const PointerEventsResult = components.PointerEventsResult(engine)
const PointerEventsResult = engine.getComponent(_PointerEventsResult.componentId) as typeof _PointerEventsResult
const globalState = {
previousFrameMaxTimestamp: 0,
currentFrameMaxTimestamp: 0,
Expand Down
3 changes: 1 addition & 2 deletions scenes/54,-55-Testing-3d-models/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"description": "3D model tests",
"version": "1.0.0",
"devDependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"scripts": {
"build": "sdk-commands build",
Expand Down
4 changes: 1 addition & 3 deletions scenes/6,66-sdk-observables/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"description": "ECS7 ",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"engines": {
"node": ">=16.0.0",
"npm": ">=6.0.0"
Expand Down
2 changes: 1 addition & 1 deletion scenes/70,-9-sdk7-ui-backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"upgrade-sdk:next": "npm install --save-dev @dcl/sdk@next"
},
"devDependencies": {
"@dcl/sdk": "next"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand Down
3 changes: 1 addition & 2 deletions scenes/73,-2-dbmonster/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"version": "1.0.0",
"author": "",
"dependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"license": "Apache-2.0",
"repository": "menduz/menduzlandia.git",
Expand Down
6 changes: 2 additions & 4 deletions scenes/73,-8-animator-tests-shark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
"description": "ECS7 ",
"version": "1.0.0",
"dependencies": {
"@dcl/sdk": "latest",
"@dcl/js-runtime": "7.4.9"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"scripts": {
"build": "sdk-commands build --skip-install",
"start": "sdk-commands start"
}
}
}
4 changes: 1 addition & 3 deletions scenes/76,-10-UiCanvasInformation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"description": "ECS7 ",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"engines": {
"node": ">=16.0.0",
"npm": ">=6.0.0"
Expand Down
3 changes: 1 addition & 2 deletions scenes/77,-1-raycast-unit-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"description": "SDK7 Template scene",
"version": "1.0.0",
"dependencies": {
"@dcl/js-runtime": "7.4.0",
"@dcl/sdk": "^7.4.9"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand Down
3 changes: 1 addition & 2 deletions scenes/77,-5-tweens-moving-platforms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"version": "1.0.0",
"dependencies": {
"@dcl-sdk/utils": "latest",
"@dcl/js-runtime": "latest",
"@dcl/sdk": "latest"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"scripts": {
"build": "sdk-commands build --skip-install",
Expand Down
2 changes: 1 addition & 1 deletion scenes/8,7-portable-experience-hide-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"trailingComma": "none"
},
"dependencies": {
"@dcl/sdk": "https://sdk-team-cdn.decentraland.org/@dcl/js-sdk-toolchain/branch/update/schemas/dcl-sdk-7.3.2-5589950025.commit-7453f93.tgz"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
}
}
2 changes: 1 addition & 1 deletion scenes/8,8-portable-experience/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"upgrade-sdk:next": "npm install --save-dev @dcl/sdk@next"
},
"devDependencies": {
"@dcl/sdk": "next"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand Down
2 changes: 1 addition & 1 deletion scenes/8,9-portable-experience-disabled/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"upgrade-sdk:next": "npm install --save-dev @dcl/sdk@next"
},
"devDependencies": {
"@dcl/sdk": "next"
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"engines": {
"node": ">=16.0.0",
Expand Down
7 changes: 6 additions & 1 deletion scenes/80,-2-main-crdt/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package-lock.json
*.js
node_modules
bin/
bin/
.DS_Store
**/.DS_Store
npm-debug.log*
yarn-debug.log*
yarn-error.log*
22 changes: 12 additions & 10 deletions scenes/80,-2-main-crdt/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
{
"name": "80_-2-main-crdt",
"description": "SDK7 Template scene",
"name": "main-crdt",
"version": "1.0.0",
"dependencies": {
"@dcl/sdk": "latest"
"description": "SDK7 Template scene",
"scripts": {
"start": "sdk-commands start",
"deploy": "sdk-commands deploy",
"build": "sdk-commands build",
"upgrade-sdk": "npm install --save-dev @dcl/sdk@latest",
"upgrade-sdk:next": "npm install --save-dev @dcl/sdk@next"
},
"devDependencies": {
"@dcl/asset-packs": "latest",
"@dcl/sdk": "^7.5.8-10926653489.commit-aec9f09"
},
"devDependencies": {},
"engines": {
"node": ">=16.0.0",
"npm": ">=6.0.0"
Expand All @@ -15,10 +22,5 @@
"singleQuote": true,
"printWidth": 120,
"trailingComma": "none"
},
"scripts": {
"build": "sdk-commands build --skip-install",
"deploy": "sdk-commands deploy",
"start": "sdk-commands start"
}
}
Loading

0 comments on commit 28e6588

Please sign in to comment.