diff --git a/packages/@dcl/playground-assets/etc/playground-assets.api.md b/packages/@dcl/playground-assets/etc/playground-assets.api.md index 32399ac2d..45a34e5e1 100644 --- a/packages/@dcl/playground-assets/etc/playground-assets.api.md +++ b/packages/@dcl/playground-assets/etc/playground-assets.api.md @@ -598,7 +598,6 @@ export const componentDefinitionByName: { "core::EngineInfo": LwwComponentGetter>; "core::GltfContainer": LwwComponentGetter>; "core::GltfContainerLoadingState": LwwComponentGetter>; - "core::InputModifier": LwwComponentGetter>; "core::Material": LwwComponentGetter>; "core::MeshCollider": LwwComponentGetter>; "core::MeshRenderer": LwwComponentGetter>; @@ -1385,9 +1384,6 @@ export const enum InputAction { IA_WALK = 9 } -// @public (undocumented) -export const InputModifier: LastWriteWinElementSetComponentDefinition; - // @public export const inputSystem: IInputSystem; @@ -2307,47 +2303,6 @@ export namespace PBGltfContainerLoadingState { export function encode(message: PBGltfContainerLoadingState, writer?: _m0.Writer): _m0.Writer; } -// @public (undocumented) -export interface PBInputModifier { - // (undocumented) - mode?: { - $case: "standard"; - standard: PBInputModifier_StandardInput; - } | undefined; -} - -// @public (undocumented) -export namespace PBInputModifier { - // (undocumented) - export function decode(input: _m0.Reader | Uint8Array, length?: number): PBInputModifier; - // (undocumented) - export function encode(message: PBInputModifier, writer?: _m0.Writer): _m0.Writer; -} - -// @public (undocumented) -export interface PBInputModifier_StandardInput { - // (undocumented) - disableAll?: boolean | undefined; - // (undocumented) - disableEmote?: boolean | undefined; - // (undocumented) - disableJog?: boolean | undefined; - // (undocumented) - disableJump?: boolean | undefined; - // (undocumented) - disableRun?: boolean | undefined; - // (undocumented) - disableWalk?: boolean | undefined; -} - -// @public (undocumented) -export namespace PBInputModifier_StandardInput { - // (undocumented) - export function decode(input: _m0.Reader | Uint8Array, length?: number): PBInputModifier_StandardInput; - // (undocumented) - export function encode(message: PBInputModifier_StandardInput, writer?: _m0.Writer): _m0.Writer; -} - // @public (undocumented) export interface PBMaterial { // (undocumented) diff --git a/packages/@dcl/sdk-commands/package-lock.json b/packages/@dcl/sdk-commands/package-lock.json index d86f5b186..c3dbdeffa 100644 --- a/packages/@dcl/sdk-commands/package-lock.json +++ b/packages/@dcl/sdk-commands/package-lock.json @@ -65,7 +65,7 @@ "../inspector": { "version": "0.1.0", "dependencies": { - "@dcl/asset-packs": "1.20.0", + "@dcl/asset-packs": "1.20.1", "ts-deepmerge": "^7.0.0" }, "devDependencies": { @@ -3138,7 +3138,7 @@ "@babylonjs/inspector": "~6.18.0", "@babylonjs/loaders": "~6.18.0", "@babylonjs/materials": "~6.18.0", - "@dcl/asset-packs": "1.20.0", + "@dcl/asset-packs": "1.20.1", "@dcl/ecs": "file:../ecs", "@dcl/ecs-math": "2.0.2", "@dcl/mini-rpc": "^1.0.7", diff --git a/packages/@dcl/sdk-commands/src/commands/build/index.ts b/packages/@dcl/sdk-commands/src/commands/build/index.ts index ec5ed7e47..ea4478b86 100644 --- a/packages/@dcl/sdk-commands/src/commands/build/index.ts +++ b/packages/@dcl/sdk-commands/src/commands/build/index.ts @@ -1,14 +1,7 @@ import path from 'path' import { CliComponents } from '../../components' import { declareArgs } from '../../logic/args' -import { - installAssetPack, - installDependencies, - isEditorScene, - needsDependencies, - SceneProject, - WearableProject -} from '../../logic/project-validations' +import { installDependencies, needsDependencies, SceneProject, WearableProject } from '../../logic/project-validations' import { getBaseCoords } from '../../logic/scene-validations' import { b64HashingFunction } from '../../logic/project-files' import { bundleProject } from '../../logic/bundle' @@ -70,10 +63,6 @@ export async function buildScene(options: Options, project: SceneProject | Weara if (await needsDependencies(options.components, project.workingDirectory)) { await installDependencies(options.components, project.workingDirectory) } - - if (await isEditorScene(options.components, project.workingDirectory)) { - await installAssetPack(options.components, project.workingDirectory) - } } const watch = !!options.args['--watch'] diff --git a/packages/@dcl/sdk-commands/src/logic/project-validations.ts b/packages/@dcl/sdk-commands/src/logic/project-validations.ts index fa256c628..c97f7ef9b 100644 --- a/packages/@dcl/sdk-commands/src/logic/project-validations.ts +++ b/packages/@dcl/sdk-commands/src/logic/project-validations.ts @@ -2,10 +2,10 @@ import { Scene } from '@dcl/schemas' import path from 'path' import { CliComponents } from '../components' import { colors } from '../components/log' -import { printProgressInfo, printSuccess, printWarning } from './beautiful-logs' +import { printProgressInfo } from './beautiful-logs' import { CliError } from './error' import { getSceneFilePath, getValidSceneJson } from './scene-validations' -import { getInstalledPackageVersion, getInstalledPackageVersionInsidePackage } from './config' +import { getInstalledPackageVersion } from './config' import { getSmartWearableFile, getValidWearableJson } from './portable-experience-sw-validations' import { getPackageJson } from './project-files' @@ -74,29 +74,6 @@ export async function installDependencies( printProgressInfo(components.logger, colors.white('✅ Installing dependencies...')) } -/* - * Runs "npm install" for desired project - */ -export async function installAssetPack( - components: Pick, - workingDirectory: string -): Promise { - const assetPack = '@dcl/asset-packs' as const - let assetPackVersion: string = '' - try { - assetPackVersion = await getInstalledPackageVersionInsidePackage( - components, - assetPack, - '@dcl/inspector', - workingDirectory - ) - await components.spawner.exec(workingDirectory, npmBin, ['install', `${assetPack}@${assetPackVersion}`, '-D']) - printSuccess(components.logger, `${assetPack}@${assetPackVersion} installed`, '') - } catch (e: any) { - printWarning(components.logger, `Failed to install ${assetPack}@${assetPackVersion}' \n ${e.message}`) - } -} - /** * Run NPM commands */