diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 61babc9a0e9..df438194553 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -121,7 +121,7 @@ rules: # NOTE: We don't want to rely on TS automatic type inference '@typescript-eslint/no-inferrable-types': off - # TODO: sadly we still rely heavily on legacyCC + # TODO: sadly we still rely heavily on cclegacy '@typescript-eslint/no-unsafe-assignment': off '@typescript-eslint/no-unsafe-call': off '@typescript-eslint/no-unsafe-member-access': off diff --git a/cocos/2d/assembler/label/font-utils.ts b/cocos/2d/assembler/label/font-utils.ts index e2e4b9288d5..8581a093666 100644 --- a/cocos/2d/assembler/label/font-utils.ts +++ b/cocos/2d/assembler/label/font-utils.ts @@ -29,7 +29,7 @@ import { PixelFormat } from '../../../asset/assets/asset-enum'; import { BufferTextureCopy } from '../../../gfx'; import { safeMeasureText, BASELINE_RATIO, MIDDLE_RATIO, getBaselineOffset } from '../../utils/text-utils'; import { director, Director } from '../../../game/director'; -import { ccwindow } from '../../../core/global-exports'; +import { ccwindow } from '@base/global'; export interface ISharedLabelData { canvas: HTMLCanvasElement; diff --git a/cocos/2d/assembler/label/text-processing.ts b/cocos/2d/assembler/label/text-processing.ts index fa0d61c90ed..06db2bf6e88 100644 --- a/cocos/2d/assembler/label/text-processing.ts +++ b/cocos/2d/assembler/label/text-processing.ts @@ -24,7 +24,8 @@ import { ANDROID, JSB } from 'internal:constants'; import { Texture2D } from '../../../asset/assets'; import { WrapMode } from '../../../asset/assets/asset-enum'; -import { cclegacy, Color, Pool, Rect, Vec2 } from '../../../core'; +import { cclegacy } from '@base/global'; +import { Color, Pool, Rect, Vec2 } from '../../../core'; import { log, logID, warn } from '../../../core/platform'; import { SpriteFrame } from '../../assets'; import { FontLetterDefinition } from '../../assets/bitmap-font'; diff --git a/cocos/2d/assets/bitmap-font.ts b/cocos/2d/assets/bitmap-font.ts index 04ab0ee7982..e13876a7b8c 100644 --- a/cocos/2d/assets/bitmap-font.ts +++ b/cocos/2d/assets/bitmap-font.ts @@ -26,7 +26,8 @@ import { ccclass, type, serializable, editable } from 'cc.decorator'; import { Font } from './font'; import { SpriteFrame } from './sprite-frame'; -import { cclegacy, js, warn } from '../../core'; +import { cclegacy } from '@base/global'; +import { js, warn } from '../../core'; export interface IConfig { [key: string]: any; diff --git a/cocos/2d/assets/font.ts b/cocos/2d/assets/font.ts index 2f7ac8a7bf0..fb1074cbc24 100644 --- a/cocos/2d/assets/font.ts +++ b/cocos/2d/assets/font.ts @@ -25,7 +25,7 @@ import { ccclass } from 'cc.decorator'; import { Asset } from '../../asset/assets'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en Class for Font handling. diff --git a/cocos/2d/assets/label-atlas.ts b/cocos/2d/assets/label-atlas.ts index dfe886a86f6..a6b1ea53c3e 100644 --- a/cocos/2d/assets/label-atlas.ts +++ b/cocos/2d/assets/label-atlas.ts @@ -25,7 +25,7 @@ import { ccclass } from 'cc.decorator'; import { BitmapFont } from './bitmap-font'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en Class for LabelAtlas handling. * @zh 艺术数字字体资源类。 diff --git a/cocos/2d/assets/sprite-atlas.ts b/cocos/2d/assets/sprite-atlas.ts index 1e3b05d87fe..741829c9848 100644 --- a/cocos/2d/assets/sprite-atlas.ts +++ b/cocos/2d/assets/sprite-atlas.ts @@ -27,7 +27,8 @@ import { EDITOR, TEST } from 'internal:constants'; import { ccclass, serializable, editable } from 'cc.decorator'; import { Asset } from '../../asset/assets'; import { SpriteFrame } from './sprite-frame'; -import { cclegacy, js } from '../../core'; +import { cclegacy } from '@base/global'; +import { js } from '../../core'; import type { TextureBase } from '../../asset/assets/texture-base'; interface ISpriteAtlasSerializeData{ diff --git a/cocos/2d/assets/sprite-frame.ts b/cocos/2d/assets/sprite-frame.ts index cea6556413d..f707d088530 100644 --- a/cocos/2d/assets/sprite-frame.ts +++ b/cocos/2d/assets/sprite-frame.ts @@ -28,7 +28,8 @@ import { ccclass } from 'cc.decorator'; import { EDITOR, TEST, BUILD } from 'internal:constants'; import { IMemoryImageSource } from '../../../pal/image/types'; -import { Mat4, Rect, Size, Vec2, Vec3, Vec4, cclegacy, errorID, warnID, js } from '../../core'; +import { Mat4, Rect, Size, Vec2, Vec3, Vec4, errorID, warnID, js } from '../../core'; +import { cclegacy, ccwindow } from '@base/global'; import { Asset } from '../../asset/assets/asset'; import { TextureBase } from '../../asset/assets/texture-base'; import { ImageAsset } from '../../asset/assets/image-asset'; @@ -37,7 +38,6 @@ import { dynamicAtlasManager } from '../utils/dynamic-atlas/atlas-manager'; import { Mesh } from '../../3d/assets/mesh'; import { createMesh } from '../../3d/misc'; import { Attribute, AttributeName, Format, PrimitiveMode, Sampler, SamplerInfo, Texture } from '../../gfx'; -import { ccwindow } from '../../core/global-exports'; const INSET_LEFT = 0; const INSET_TOP = 1; diff --git a/cocos/2d/assets/ttf-font.ts b/cocos/2d/assets/ttf-font.ts index fe0ef179365..3ef233e6915 100644 --- a/cocos/2d/assets/ttf-font.ts +++ b/cocos/2d/assets/ttf-font.ts @@ -24,7 +24,8 @@ */ import { ccclass, string, override, serializable } from 'cc.decorator'; -import { path, cclegacy } from '../../core'; +import { path } from '../../core'; +import { cclegacy } from '@base/global'; import { Font } from './font'; /** diff --git a/cocos/2d/components/deprecated.ts b/cocos/2d/components/deprecated.ts index 0e8eb00bceb..2ff14b8bff1 100644 --- a/cocos/2d/components/deprecated.ts +++ b/cocos/2d/components/deprecated.ts @@ -31,7 +31,8 @@ import { UIMeshRenderer } from './ui-mesh-renderer'; import { Graphics } from './graphics'; import { UIStaticBatch } from './ui-static-batch'; import { UIOpacity } from './ui-opacity'; -import { js, cclegacy, replaceProperty } from '../../core'; +import { js, replaceProperty } from '../../core'; +import { cclegacy } from '@base/global'; /** * Alias of [[Mask]] diff --git a/cocos/2d/components/graphics.ts b/cocos/2d/components/graphics.ts index 08248a4b935..150f1f8aab1 100644 --- a/cocos/2d/components/graphics.ts +++ b/cocos/2d/components/graphics.ts @@ -28,7 +28,8 @@ import { JSB } from 'internal:constants'; import { builtinResMgr } from '../../asset/asset-manager'; import { InstanceMaterialType, UIRenderer } from '../framework/ui-renderer'; import { director } from '../../game/director'; -import { Color, warnID, cclegacy } from '../../core'; +import { Color, warnID } from '../../core'; +import { cclegacy } from '@base/global'; import { scene } from '../../render-scene'; import { IAssembler } from '../renderer/base'; import { IBatcher } from '../renderer/i-batcher'; diff --git a/cocos/2d/components/label-outline.ts b/cocos/2d/components/label-outline.ts index ba50ae80fa8..46172ea0251 100644 --- a/cocos/2d/components/label-outline.ts +++ b/cocos/2d/components/label-outline.ts @@ -25,7 +25,8 @@ import { ccclass, help, executionOrder, menu, tooltip, requireComponent, executeInEditMode, serializable } from 'cc.decorator'; import { Component } from '../../scene-graph/component'; -import { Color, cclegacy } from '../../core'; +import { Color } from '../../core'; +import { cclegacy } from '@base/global'; import { Label } from './label'; /** diff --git a/cocos/2d/components/label.ts b/cocos/2d/components/label.ts index b22846c7875..267f0a6df77 100644 --- a/cocos/2d/components/label.ts +++ b/cocos/2d/components/label.ts @@ -28,7 +28,8 @@ import { BYTEDANCE, EDITOR, JSB } from 'internal:constants'; import { minigame } from 'pal/minigame'; import { BitmapFont, Font, SpriteFrame } from '../assets'; import { ImageAsset, Texture2D } from '../../asset/assets'; -import { ccenum, cclegacy, Color } from '../../core'; +import { ccenum, Color } from '../../core'; +import { cclegacy } from '@base/global'; import { IBatcher } from '../renderer/i-batcher'; import { FontAtlas } from '../assets/bitmap-font'; import { CanvasPool, ISharedLabelData, LetterRenderTexture } from '../assembler/label/font-utils'; diff --git a/cocos/2d/components/mask.ts b/cocos/2d/components/mask.ts index a01247055d4..d03e7ac0c23 100644 --- a/cocos/2d/components/mask.ts +++ b/cocos/2d/components/mask.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ -import { ccclass, help, executionOrder, menu, tooltip, displayOrder, - type, visible, serializable, range, slide, executeInEditMode } from 'cc.decorator'; +import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, visible, serializable, range, slide, executeInEditMode } from 'cc.decorator'; import { JSB } from 'internal:constants'; -import { clamp, Color, Mat4, Vec2, Vec3, warnID, cclegacy, ccenum, error } from '../../core'; +import { clamp, Color, Mat4, Vec2, Vec3, warnID, ccenum, error } from '../../core'; +import { cclegacy } from '@base/global'; import { Graphics } from './graphics'; import { TransformBit } from '../../scene-graph/node-enum'; import { Stage } from '../renderer/stencil-manager'; diff --git a/cocos/2d/components/rich-text.ts b/cocos/2d/components/rich-text.ts index a81d5ea8743..b97da8aad82 100644 --- a/cocos/2d/components/rich-text.ts +++ b/cocos/2d/components/rich-text.ts @@ -27,7 +27,8 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, multil import { DEBUG, DEV, EDITOR } from 'internal:constants'; import { Font, SpriteAtlas, TTFFont, SpriteFrame } from '../assets'; import { EventTouch } from '../../input/types'; -import { assert, warnID, Color, Vec2, CCObject, cclegacy, js, Size } from '../../core'; +import { assert, warnID, Color, Vec2, CCObject, js, Size } from '../../core'; +import { cclegacy } from '@base/global'; import { BASELINE_RATIO, fragmentText, isUnicodeCJK, isUnicodeSpace, getEnglishWordPartAtFirst, getEnglishWordPartAtLast } from '../utils/text-utils'; import { HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack } from '../utils/html-text-parser'; import { Node } from '../../scene-graph'; diff --git a/cocos/2d/components/sprite.ts b/cocos/2d/components/sprite.ts index e6d958d3814..286eedd5a3b 100644 --- a/cocos/2d/components/sprite.ts +++ b/cocos/2d/components/sprite.ts @@ -27,7 +27,8 @@ import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range import { BUILD, EDITOR } from 'internal:constants'; import { SpriteAtlas } from '../assets/sprite-atlas'; import { SpriteFrame } from '../assets/sprite-frame'; -import { Vec2, cclegacy, ccenum, clamp, warn } from '../../core'; +import { Vec2, ccenum, clamp, warn } from '../../core'; +import { cclegacy } from '@base/global'; import { IBatcher } from '../renderer/i-batcher'; import { UIRenderer, InstanceMaterialType } from '../framework/ui-renderer'; import { PixelFormat } from '../../asset/assets/asset-enum'; diff --git a/cocos/2d/components/ui-mesh-renderer.ts b/cocos/2d/components/ui-mesh-renderer.ts index 62bc1de4628..64f7a818b2a 100644 --- a/cocos/2d/components/ui-mesh-renderer.ts +++ b/cocos/2d/components/ui-mesh-renderer.ts @@ -34,7 +34,8 @@ import { NativeUIModelProxy } from '../renderer/native-2d'; import { uiRendererManager } from '../framework/ui-renderer-manager'; import { RenderEntity, RenderEntityType } from '../renderer/render-entity'; import { MeshRenderData, RenderData } from '../renderer/render-data'; -import { assert, cclegacy, warn } from '../../core'; +import { assert, warn } from '../../core'; +import { cclegacy } from '@base/global'; import { RenderDrawInfoType } from '../renderer/render-draw-info'; import type { UIRenderer } from '../framework/ui-renderer'; diff --git a/cocos/2d/framework/canvas.ts b/cocos/2d/framework/canvas.ts index 87e4eb5e422..4b51f792d37 100644 --- a/cocos/2d/framework/canvas.ts +++ b/cocos/2d/framework/canvas.ts @@ -23,12 +23,12 @@ THE SOFTWARE. */ -import { ccclass, help, disallowMultiple, executeInEditMode, - executionOrder, menu, tooltip, type, serializable } from 'cc.decorator'; +import { ccclass, help, disallowMultiple, executeInEditMode, executionOrder, menu, tooltip, type, serializable } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; import { Camera } from '../../misc/camera-component'; import { Widget } from '../../ui/widget'; -import { Vec3, screen, Enum, cclegacy, visibleRect } from '../../core'; +import { Vec3, screen, Enum, visibleRect } from '../../core'; +import { cclegacy } from '@base/global'; import { view } from '../../ui/view'; import { RenderRoot2D } from './render-root-2d'; import { NodeEventType } from '../../scene-graph/node-event'; diff --git a/cocos/2d/framework/deprecated.ts b/cocos/2d/framework/deprecated.ts index cc39a163fbd..0d2656c416d 100644 --- a/cocos/2d/framework/deprecated.ts +++ b/cocos/2d/framework/deprecated.ts @@ -23,7 +23,8 @@ */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import { markAsWarning, removeProperty, replaceProperty, js, Color, cclegacy } from '../../core'; +import { markAsWarning, removeProperty, replaceProperty, js, Color } from '../../core'; +import { cclegacy } from '@base/global'; import { UIComponent } from './ui-component'; import { UITransform } from './ui-transform'; import { UIRenderer } from './ui-renderer'; diff --git a/cocos/2d/framework/render-root-2d.ts b/cocos/2d/framework/render-root-2d.ts index 2c8c2196b47..bbeb403e66f 100644 --- a/cocos/2d/framework/render-root-2d.ts +++ b/cocos/2d/framework/render-root-2d.ts @@ -22,10 +22,9 @@ THE SOFTWARE. */ -import { ccclass, disallowMultiple, executeInEditMode, - executionOrder, help, menu, requireComponent } from 'cc.decorator'; +import { ccclass, disallowMultiple, executeInEditMode, executionOrder, help, menu, requireComponent } from 'cc.decorator'; import { Component } from '../../scene-graph/component'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { UITransform } from './ui-transform'; /** diff --git a/cocos/2d/framework/sprite-renderer.ts b/cocos/2d/framework/sprite-renderer.ts index 9e7b7b4125c..cc1890ccb19 100644 --- a/cocos/2d/framework/sprite-renderer.ts +++ b/cocos/2d/framework/sprite-renderer.ts @@ -25,7 +25,8 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, serializable, type, visible } from 'cc.decorator'; import { builtinResMgr } from '../../asset/asset-manager'; import { Material } from '../../asset/assets'; -import { Color, Vec2, cclegacy } from '../../core'; +import { Color, Vec2 } from '../../core'; +import { cclegacy } from '@base/global'; import { ModelLocalBindings } from '../../rendering/define'; import { Model } from '../../render-scene/scene'; import { Root } from '../../root'; diff --git a/cocos/2d/framework/ui-renderer.ts b/cocos/2d/framework/ui-renderer.ts index d79a81d315f..71b4122279c 100644 --- a/cocos/2d/framework/ui-renderer.ts +++ b/cocos/2d/framework/ui-renderer.ts @@ -23,11 +23,9 @@ */ import { DEBUG, EDITOR, JSB } from 'internal:constants'; -import { - ccclass, executeInEditMode, requireComponent, tooltip, - type, displayOrder, serializable, override, visible, displayName, disallowAnimation, -} from 'cc.decorator'; -import { Color, assert, ccenum, cclegacy } from '../../core'; +import { ccclass, executeInEditMode, requireComponent, tooltip, type, displayOrder, serializable, override, visible, displayName, disallowAnimation } from 'cc.decorator'; +import { Color, assert, ccenum } from '../../core'; +import { cclegacy } from '@base/global'; import { builtinResMgr } from '../../asset/asset-manager'; import { Material } from '../../asset/assets'; import { BlendFactor, BlendOp, ColorMask } from '../../gfx'; diff --git a/cocos/2d/index.ts b/cocos/2d/index.ts index 296768138a7..a136830a011 100644 --- a/cocos/2d/index.ts +++ b/cocos/2d/index.ts @@ -22,15 +22,11 @@ THE SOFTWARE. */ -import { - graphicsAssembler, - labelAssembler, - spriteAssembler, -} from './assembler'; +import { graphicsAssembler, labelAssembler, spriteAssembler } from './assembler'; import { RenderData, MeshRenderData } from './renderer/render-data'; import { MeshBuffer } from './renderer/mesh-buffer'; import { StencilManager } from './renderer/stencil-manager'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import './event'; import './renderer/batcher-2d'; diff --git a/cocos/2d/renderer/batcher-2d.ts b/cocos/2d/renderer/batcher-2d.ts index 13e7126ec76..a31f5f806b0 100644 --- a/cocos/2d/renderer/batcher-2d.ts +++ b/cocos/2d/renderer/batcher-2d.ts @@ -27,9 +27,9 @@ import { Camera, Model } from '../../render-scene/scene'; import type { UIStaticBatch } from '../components/ui-static-batch'; import { Material } from '../../asset/assets/material'; import { RenderRoot2D, UIRenderer } from '../framework'; -import { Texture, Device, Attribute, Sampler, DescriptorSetInfo, Buffer, - BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager, PrimitiveMode } from '../../gfx'; -import { CachedArray, Pool, Mat4, cclegacy, assertIsTrue, assert, approx, EPSILON } from '../../core'; +import { Texture, Device, Attribute, Sampler, DescriptorSetInfo, Buffer, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet, InputAssembler, deviceManager, PrimitiveMode } from '../../gfx'; +import { CachedArray, Pool, Mat4, assertIsTrue, assert, approx, EPSILON } from '../../core'; +import { cclegacy } from '@base/global'; import { Root } from '../../root'; import { Node } from '../../scene-graph'; import { Stage, StencilManager } from './stencil-manager'; diff --git a/cocos/2d/renderer/draw-batch.ts b/cocos/2d/renderer/draw-batch.ts index 2cadbd5c412..3b759d70dd1 100644 --- a/cocos/2d/renderer/draw-batch.ts +++ b/cocos/2d/renderer/draw-batch.ts @@ -27,7 +27,7 @@ import { Texture, Sampler, InputAssembler, DescriptorSet, Shader } from '../../g import { Node } from '../../scene-graph'; import { Model } from '../../render-scene/scene/model'; import { Layers } from '../../scene-graph/layers'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Pass } from '../../render-scene/core/pass'; import { IBatcher } from './i-batcher'; diff --git a/cocos/2d/renderer/vertex-format.ts b/cocos/2d/renderer/vertex-format.ts index 3d8cdefa08c..1853062ca60 100644 --- a/cocos/2d/renderer/vertex-format.ts +++ b/cocos/2d/renderer/vertex-format.ts @@ -23,7 +23,7 @@ */ import { AttributeName, Format, FormatInfos, Attribute } from '../../gfx'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en Vertex format with vector 3 position attribute diff --git a/cocos/2d/utils/dynamic-atlas/atlas-manager.ts b/cocos/2d/utils/dynamic-atlas/atlas-manager.ts index 3fc28ec8533..fddb22a0030 100644 --- a/cocos/2d/utils/dynamic-atlas/atlas-manager.ts +++ b/cocos/2d/utils/dynamic-atlas/atlas-manager.ts @@ -23,7 +23,8 @@ */ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { System, macro, js, cclegacy } from '../../../core'; +import { System, macro, js } from '../../../core'; +import { cclegacy } from '@base/global'; import { Filter } from '../../../asset/assets/asset-enum'; import { Atlas, DynamicAtlasTexture } from './atlas'; import { director } from '../../../game'; diff --git a/cocos/2d/utils/dynamic-atlas/atlas.ts b/cocos/2d/utils/dynamic-atlas/atlas.ts index 176fda8b0ec..e3dde76d033 100644 --- a/cocos/2d/utils/dynamic-atlas/atlas.ts +++ b/cocos/2d/utils/dynamic-atlas/atlas.ts @@ -26,7 +26,8 @@ import { PixelFormat } from '../../../asset/assets/asset-enum'; import { ImageAsset } from '../../../asset/assets/image-asset'; import { Texture2D } from '../../../asset/assets/texture-2d'; import { BufferTextureCopy } from '../../../gfx'; -import { cclegacy, warn } from '../../../core'; +import { cclegacy } from '@base/global'; +import { warn } from '../../../core'; import { SpriteFrame } from '../../assets/sprite-frame'; const space = 2; diff --git a/cocos/2d/utils/font-loader.ts b/cocos/2d/utils/font-loader.ts index a4940d8a903..6ff7b6506fb 100644 --- a/cocos/2d/utils/font-loader.ts +++ b/cocos/2d/utils/font-loader.ts @@ -27,7 +27,7 @@ import { safeMeasureText } from './text-utils'; import downloader from '../../asset/asset-manager/downloader'; import factory from '../../asset/asset-manager/factory'; import { TTFFont } from '../assets/ttf-font'; -import { ccwindow } from '../../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/2d/utils/html-text-parser.ts b/cocos/2d/utils/html-text-parser.ts index 2062c28f1c1..d676451f586 100644 --- a/cocos/2d/utils/html-text-parser.ts +++ b/cocos/2d/utils/html-text-parser.ts @@ -24,7 +24,7 @@ */ import { TEST } from 'internal:constants'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @deprecated since v3.5.0, this is an engine private interface that will be removed in the future. diff --git a/cocos/3d/assets/mesh.jsb.ts b/cocos/3d/assets/mesh.jsb.ts index 99e4d36f3c5..546614d7f6a 100644 --- a/cocos/3d/assets/mesh.jsb.ts +++ b/cocos/3d/assets/mesh.jsb.ts @@ -21,7 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy, Vec3 } from '../../core'; +import { cclegacy } from '@base/global'; +import { Vec3 } from '../../core'; import { patch_cc_Mesh } from '../../native-binding/decorators'; import type { Mesh as JsbMesh } from './mesh'; diff --git a/cocos/3d/assets/mesh.ts b/cocos/3d/assets/mesh.ts index b691dbfcf40..4354a0413c3 100644 --- a/cocos/3d/assets/mesh.ts +++ b/cocos/3d/assets/mesh.ts @@ -28,16 +28,14 @@ import { Asset } from '../../asset/assets/asset'; import { IDynamicGeometry } from '../../primitive/define'; import { BufferBlob } from '../misc/buffer-blob'; import { Skeleton } from './skeleton'; -import { geometry, cclegacy, sys, warnID, Mat4, Quat, Vec3, assertIsTrue, murmurhash2_32_gc, errorID } from '../../core'; +import { geometry, sys, warnID, Mat4, Quat, Vec3, assertIsTrue, murmurhash2_32_gc, errorID } from '../../core'; +import { cclegacy } from '@base/global'; import { RenderingSubMesh } from '../../asset/assets'; -import { - Attribute, Device, Buffer, BufferInfo, AttributeName, BufferUsageBit, Feature, Format, - FormatInfos, FormatType, MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, DrawInfo, FormatInfo, deviceManager, -} from '../../gfx'; +import { Attribute, Device, Buffer, BufferInfo, AttributeName, BufferUsageBit, Feature, Format, FormatInfos, FormatType, MemoryUsageBit, PrimitiveMode, getTypedArrayConstructor, DrawInfo, FormatInfo, deviceManager } from '../../gfx'; import { Morph } from './morph'; import { MorphRendering, createMorphRendering } from './morph-rendering'; import { MeshoptDecoder } from '../misc/mesh-codec'; -import zlib from '../../../external/compression/zlib.min'; +import zlib from '../../../external/compression/zlib.min'; function getIndexStrideCtor (stride: number): Uint8ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor { switch (stride) { diff --git a/cocos/3d/assets/morph-rendering.ts b/cocos/3d/assets/morph-rendering.ts index 22dde772058..ba8f0a71f77 100644 --- a/cocos/3d/assets/morph-rendering.ts +++ b/cocos/3d/assets/morph-rendering.ts @@ -22,16 +22,14 @@ THE SOFTWARE. */ -import { - AttributeName, Buffer, BufferUsageBit, Device, MemoryUsageBit, DescriptorSet, BufferInfo, FormatFeatureBit, Format, Texture, Sampler, -} from '../../gfx'; +import { AttributeName, Buffer, BufferUsageBit, Device, MemoryUsageBit, DescriptorSet, BufferInfo, FormatFeatureBit, Format, Texture, Sampler } from '../../gfx'; import { Mesh } from './mesh'; import { Texture2D } from '../../asset/assets/texture-2d'; import { ImageAsset } from '../../asset/assets/image-asset'; -import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, - UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../rendering/define'; +import { UBOMorph, UNIFORM_NORMAL_MORPH_TEXTURE_BINDING, UNIFORM_POSITION_MORPH_TEXTURE_BINDING, UNIFORM_TANGENT_MORPH_TEXTURE_BINDING } from '../../rendering/define'; import { Morph, SubMeshMorph } from './morph'; -import { assertIsNonNullable, assertIsTrue, warn, bits, nextPow2, cclegacy } from '../../core'; +import { assertIsNonNullable, assertIsTrue, warn, bits, nextPow2 } from '../../core'; +import { cclegacy } from '@base/global'; import { IMacroPatch } from '../../render-scene'; import { PixelFormat } from '../../asset/assets/asset-enum'; diff --git a/cocos/3d/assets/skeleton.jsb.ts b/cocos/3d/assets/skeleton.jsb.ts index 865ee557cbd..bfdf1f68054 100644 --- a/cocos/3d/assets/skeleton.jsb.ts +++ b/cocos/3d/assets/skeleton.jsb.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { CCString, cclegacy, Mat4 } from '../../core'; +import { CCString, Mat4 } from '../../core'; +import { cclegacy } from '@base/global'; import { DataPoolManager } from '../skeletal-animation/data-pool-manager'; import { Asset } from '../../asset/assets/asset'; import { patch_cc_Skeleton } from '../../native-binding/decorators'; diff --git a/cocos/3d/assets/skeleton.ts b/cocos/3d/assets/skeleton.ts index 1a610f9d723..ff2f43e5950 100644 --- a/cocos/3d/assets/skeleton.ts +++ b/cocos/3d/assets/skeleton.ts @@ -23,7 +23,8 @@ */ import { ccclass, type, serializable } from 'cc.decorator'; -import { CCString, Mat4, cclegacy, murmurhash2_32_gc } from '../../core'; +import { CCString, Mat4, murmurhash2_32_gc } from '../../core'; +import { cclegacy } from '@base/global'; import type { DataPoolManager } from '../skeletal-animation/data-pool-manager'; import { Asset } from '../../asset/assets/asset'; diff --git a/cocos/3d/framework/deprecated.ts b/cocos/3d/framework/deprecated.ts index aafe27f546b..f2d66394d88 100644 --- a/cocos/3d/framework/deprecated.ts +++ b/cocos/3d/framework/deprecated.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { removeProperty, js, cclegacy } from '../../core'; +import { removeProperty, js } from '../../core'; +import { cclegacy } from '@base/global'; import { MeshRenderer } from './mesh-renderer'; removeProperty(MeshRenderer.prototype, 'MeshRenderer.prototype', [ diff --git a/cocos/3d/framework/mesh-renderer.ts b/cocos/3d/framework/mesh-renderer.ts index e86959cae57..9491aec8c96 100644 --- a/cocos/3d/framework/mesh-renderer.ts +++ b/cocos/3d/framework/mesh-renderer.ts @@ -27,7 +27,8 @@ import { displayOrder, group, range } from 'cc.decorator'; import { Texture2D, TextureCube } from '../../asset/assets'; import { Material } from '../../asset/assets/material'; import { Mesh } from '../assets/mesh'; -import { Vec4, Enum, cclegacy, CCBoolean, CCFloat, assertIsTrue, _decorator, CCInteger, EventTarget, warnID } from '../../core'; +import { Vec4, Enum, CCBoolean, CCFloat, assertIsTrue, _decorator, CCInteger, EventTarget, warnID } from '../../core'; +import { cclegacy } from '@base/global'; import { scene } from '../../render-scene'; import { MorphModel } from '../models/morph-model'; import { Root } from '../../root'; diff --git a/cocos/3d/index.ts b/cocos/3d/index.ts index 4dc501ba8ce..ef7e4447308 100644 --- a/cocos/3d/index.ts +++ b/cocos/3d/index.ts @@ -23,7 +23,7 @@ */ import * as utils from './misc'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; export * from './misc/batch-utils'; export * from './assets'; @@ -37,4 +37,4 @@ export * from './reflection-probe'; export { utils, }; -legacyCC.utils = utils; +cclegacy.utils = utils; diff --git a/cocos/3d/lights/deprecated.ts b/cocos/3d/lights/deprecated.ts index 70fcfb9af29..879f1fae5eb 100644 --- a/cocos/3d/lights/deprecated.ts +++ b/cocos/3d/lights/deprecated.ts @@ -26,7 +26,8 @@ import { Light } from './light-component'; import { SpotLight } from './spot-light-component'; import { SphereLight } from './sphere-light-component'; import { DirectionalLight } from './directional-light-component'; -import { cclegacy, js, replaceProperty } from '../../core'; +import { cclegacy } from '@base/global'; +import { js, replaceProperty } from '../../core'; /** * Alias of [[Light]] diff --git a/cocos/3d/lights/directional-light-component.ts b/cocos/3d/lights/directional-light-component.ts index 5e46460f578..69c87b80e00 100644 --- a/cocos/3d/lights/directional-light-component.ts +++ b/cocos/3d/lights/directional-light-component.ts @@ -25,7 +25,8 @@ import { Light } from './light-component'; import { scene } from '../../render-scene'; -import { cclegacy, clamp, warnID, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core'; +import { cclegacy } from '@base/global'; +import { clamp, warnID, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core'; import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene'; import { Root } from '../../root'; import { MeshRenderer } from '../framework/mesh-renderer'; diff --git a/cocos/3d/lights/light-component.ts b/cocos/3d/lights/light-component.ts index 48db01d9214..694f13e4169 100644 --- a/cocos/3d/lights/light-component.ts +++ b/cocos/3d/lights/light-component.ts @@ -25,7 +25,8 @@ import { ccclass, tooltip, range, slide, type, displayOrder, serializable, editable } from 'cc.decorator'; import { Component } from '../../scene-graph/component'; -import { Color, Vec3, Enum, cclegacy } from '../../core'; +import { Color, Vec3, Enum } from '../../core'; +import { cclegacy } from '@base/global'; import { scene } from '../../render-scene'; import { Root } from '../../root'; import { CAMERA_DEFAULT_MASK } from '../../rendering/define'; diff --git a/cocos/3d/lights/point-light-component.ts b/cocos/3d/lights/point-light-component.ts index 6c24cb870be..f9877b36c23 100644 --- a/cocos/3d/lights/point-light-component.ts +++ b/cocos/3d/lights/point-light-component.ts @@ -22,12 +22,12 @@ THE SOFTWARE. */ -import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, - serializable, formerlySerializedAs, editable, rangeMin, range } from 'cc.decorator'; +import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs, editable, rangeMin, range } from 'cc.decorator'; import { scene } from '../../render-scene'; import { Camera, LightType } from '../../render-scene/scene'; import { Light, PhotometricTerm } from './light-component'; -import { CCFloat, CCInteger, cclegacy } from '../../core'; +import { CCFloat, CCInteger } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en The point light component, multiple point lights can be added to one scene. diff --git a/cocos/3d/lights/ranged-directional-light-component.ts b/cocos/3d/lights/ranged-directional-light-component.ts index 2ee1736a9dc..06899a3bd56 100644 --- a/cocos/3d/lights/ranged-directional-light-component.ts +++ b/cocos/3d/lights/ranged-directional-light-component.ts @@ -19,11 +19,11 @@ */ import { Light } from './light-component'; -import { ccclass, help, property, menu, executeInEditMode, formerlySerializedAs, serializable, - tooltip, editable, type } from '../../core/data/class-decorator'; +import { ccclass, help, property, menu, executeInEditMode, formerlySerializedAs, serializable, tooltip, editable, type } from '../../core/data/class-decorator'; import { Camera, LightType } from '../../render-scene/scene'; import { scene } from '../../render-scene'; -import { CCInteger, cclegacy } from '../../core'; +import { CCInteger } from '../../core'; +import { cclegacy } from '@base/global'; import { range } from '../../core/data/decorators'; /** diff --git a/cocos/3d/lights/sphere-light-component.ts b/cocos/3d/lights/sphere-light-component.ts index 4fadb107218..4ae90f1b87a 100644 --- a/cocos/3d/lights/sphere-light-component.ts +++ b/cocos/3d/lights/sphere-light-component.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ -import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs, - editable, slide, rangeMin, range } from 'cc.decorator'; +import { ccclass, help, executeInEditMode, menu, tooltip, type, displayOrder, serializable, formerlySerializedAs, editable, slide, rangeMin, range } from 'cc.decorator'; import { scene } from '../../render-scene'; import { Light, PhotometricTerm } from './light-component'; -import { CCFloat, CCInteger, cclegacy } from '../../core'; +import { CCFloat, CCInteger } from '../../core'; +import { cclegacy } from '@base/global'; import { Camera } from '../../render-scene/scene'; import { Root } from '../../root'; diff --git a/cocos/3d/lights/spot-light-component.ts b/cocos/3d/lights/spot-light-component.ts index ba520f6c847..2a02ee4394a 100644 --- a/cocos/3d/lights/spot-light-component.ts +++ b/cocos/3d/lights/spot-light-component.ts @@ -22,7 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { toRadian, cclegacy, CCBoolean, CCFloat, _decorator } from '../../core'; +import { toRadian, CCBoolean, CCFloat, _decorator } from '../../core'; +import { cclegacy } from '@base/global'; import { scene } from '../../render-scene'; import { Light, PhotometricTerm } from './light-component'; import { Root } from '../../root'; diff --git a/cocos/3d/misc/create-mesh.jsb.ts b/cocos/3d/misc/create-mesh.jsb.ts index 411f7c7390e..8185ff94ebb 100644 --- a/cocos/3d/misc/create-mesh.jsb.ts +++ b/cocos/3d/misc/create-mesh.jsb.ts @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy } from "../../core"; +import { cclegacy } from '@base/global'; import type { MeshUtils as JsbMeshUtils } from './create-mesh'; declare const jsb: any; diff --git a/cocos/3d/misc/mesh-codec.ts b/cocos/3d/misc/mesh-codec.ts index 6ae03a4dd71..dccb982bc0d 100644 --- a/cocos/3d/misc/mesh-codec.ts +++ b/cocos/3d/misc/mesh-codec.ts @@ -24,7 +24,8 @@ import { WASM_SUPPORT_MODE } from 'internal:constants'; import { ensureWasmModuleReady, instantiateWasm } from 'pal/wasm'; -import { sys, logID, cclegacy } from '../../core'; +import { sys, logID } from '../../core'; +import { cclegacy } from '@base/global'; import { WebAssemblySupportMode } from '../../misc/webassembly-support'; diff --git a/cocos/3d/models/baked-skinning-model.jsb.ts b/cocos/3d/models/baked-skinning-model.jsb.ts index ac18716c6d5..fd931907fbb 100644 --- a/cocos/3d/models/baked-skinning-model.jsb.ts +++ b/cocos/3d/models/baked-skinning-model.jsb.ts @@ -22,11 +22,12 @@ THE SOFTWARE. */ -import { cclegacy, geometry } from '../../core'; +import { cclegacy } from '@base/global'; +import { geometry } from '../../core'; import { Skeleton } from '../assets/skeleton'; import { Mesh } from '../assets/mesh'; -import { Node } from '../../scene-graph/node' -import { AnimationClip } from "../../animation"; +import { Node } from '../../scene-graph/node'; +import { AnimationClip } from '../../animation'; import { IJointTextureHandle } from '../skeletal-animation/skeletal-animation-utils'; import type { BakedSkinningModel as JsbBakedSkinningModel } from './baked-skinning-model'; diff --git a/cocos/3d/models/baked-skinning-model.ts b/cocos/3d/models/baked-skinning-model.ts index d0cd13740da..8346a13a5cb 100644 --- a/cocos/3d/models/baked-skinning-model.ts +++ b/cocos/3d/models/baked-skinning-model.ts @@ -25,7 +25,8 @@ import type { AnimationClip } from '../../animation/animation-clip'; import { Mesh } from '../assets/mesh'; import { Skeleton } from '../assets/skeleton'; -import { geometry, cclegacy } from '../../core'; +import { geometry } from '../../core'; +import { cclegacy } from '@base/global'; import { BufferUsageBit, MemoryUsageBit, Attribute, DescriptorSet, Buffer, BufferInfo } from '../../gfx'; import { INST_JOINT_ANIM_INFO, UBOSkinningAnimation, UBOSkinningTexture, UNIFORM_JOINT_TEXTURE_BINDING } from '../../rendering/define'; import { Node } from '../../scene-graph'; diff --git a/cocos/3d/models/morph-model.jsb.ts b/cocos/3d/models/morph-model.jsb.ts index be42906a5e6..7e6a101fa33 100644 --- a/cocos/3d/models/morph-model.jsb.ts +++ b/cocos/3d/models/morph-model.jsb.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from "../../core"; +import { cclegacy } from '@base/global'; import type { MorphModel as JsbMorphModel } from './morph-model'; declare const jsb: any; diff --git a/cocos/3d/models/skinning-model.jsb.ts b/cocos/3d/models/skinning-model.jsb.ts index a5207e5c5fd..b332ff8e914 100644 --- a/cocos/3d/models/skinning-model.jsb.ts +++ b/cocos/3d/models/skinning-model.jsb.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from "../../core"; +import { cclegacy } from '@base/global'; import type { SkinningModel as JsbSkinningModel } from './skinning-model'; declare const jsb: any; diff --git a/cocos/3d/reflection-probe/reflection-probe-manager.ts b/cocos/3d/reflection-probe/reflection-probe-manager.ts index c4ac433ee71..c2891d4b8ab 100644 --- a/cocos/3d/reflection-probe/reflection-probe-manager.ts +++ b/cocos/3d/reflection-probe/reflection-probe-manager.ts @@ -28,7 +28,8 @@ import { MeshRenderer } from '../framework/mesh-renderer'; import { ReflectionProbeType } from './reflection-probe-enum'; import { ImageAsset, Texture2D } from '../../asset/assets'; import { PixelFormat } from '../../asset/assets/asset-enum'; -import { Vec3, geometry, cclegacy } from '../../core'; +import { Vec3, geometry } from '../../core'; +import { cclegacy } from '@base/global'; import { AABB } from '../../core/geometry'; import { Texture } from '../../gfx'; import { Camera, Model } from '../../render-scene/scene'; diff --git a/cocos/3d/skeletal-animation/data-pool-manager.ts b/cocos/3d/skeletal-animation/data-pool-manager.ts index 8ed1381a22d..f042f71e178 100644 --- a/cocos/3d/skeletal-animation/data-pool-manager.ts +++ b/cocos/3d/skeletal-animation/data-pool-manager.ts @@ -26,7 +26,7 @@ import type { AnimationClip } from '../../animation/animation-clip'; import type { Skeleton } from '../assets'; import { Device } from '../../gfx'; import { JointAnimationInfo, JointTexturePool } from './skeletal-animation-utils'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; export class DataPoolManager { public jointTexturePool: JointTexturePool; diff --git a/cocos/3d/skeletal-animation/deprecated.ts b/cocos/3d/skeletal-animation/deprecated.ts index 1e394027d12..1ebada404a3 100644 --- a/cocos/3d/skeletal-animation/deprecated.ts +++ b/cocos/3d/skeletal-animation/deprecated.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; import { SkeletalAnimation } from './skeletal-animation'; /** * Alias of [[SkeletalAnimation]] diff --git a/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts index 142097a926e..e61c9bb8495 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-data-hub.ts @@ -24,7 +24,7 @@ import { DataPoolManager } from './data-pool-manager'; import type { AnimationClip } from '../../animation/animation-clip'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { BAKE_SKELETON_CURVE_SYMBOL } from '../../animation/internal-symbols'; type BakeData = ReturnType; diff --git a/cocos/3d/skeletal-animation/skeletal-animation-state.ts b/cocos/3d/skeletal-animation/skeletal-animation-state.ts index ae2c7778406..4eec66f68e4 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation-state.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation-state.ts @@ -23,7 +23,8 @@ */ import { JSB } from 'internal:constants'; -import { Mat4, Quat, Vec3, cclegacy } from '../../core'; +import { Mat4, Quat, Vec3 } from '../../core'; +import { cclegacy } from '@base/global'; import { IAnimInfo, JointAnimationInfo } from './skeletal-animation-utils'; import { Node } from '../../scene-graph/node'; import type { AnimationClip } from '../../animation/animation-clip'; diff --git a/cocos/3d/skeletal-animation/skeletal-animation.ts b/cocos/3d/skeletal-animation/skeletal-animation.ts index 9bba33a2c59..ba490e68200 100644 --- a/cocos/3d/skeletal-animation/skeletal-animation.ts +++ b/cocos/3d/skeletal-animation/skeletal-animation.ts @@ -22,12 +22,11 @@ THE SOFTWARE. */ -import { - ccclass, executeInEditMode, executionOrder, help, menu, type, serializable, editable, -} from 'cc.decorator'; +import { ccclass, executeInEditMode, executionOrder, help, menu, type, serializable, editable } from 'cc.decorator'; import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { SkinnedMeshRenderer } from '../skinned-mesh-renderer'; -import { Mat4, cclegacy, js, assertIsTrue, warn } from '../../core'; +import { Mat4, js, assertIsTrue, warn } from '../../core'; +import { cclegacy } from '@base/global'; import { DataPoolManager } from './data-pool-manager'; import { Node } from '../../scene-graph/node'; import { AnimationClip } from '../../animation/animation-clip'; diff --git a/cocos/3d/skinned-mesh-renderer/deprecated.ts b/cocos/3d/skinned-mesh-renderer/deprecated.ts index 9d703ce26a5..e57f8da00c4 100644 --- a/cocos/3d/skinned-mesh-renderer/deprecated.ts +++ b/cocos/3d/skinned-mesh-renderer/deprecated.ts @@ -24,7 +24,8 @@ import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; import { SkinnedMeshBatchRenderer, SkinnedMeshUnit } from './skinned-mesh-batch-renderer'; -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; /** * Alias of [[SkinnedMeshRenderer]] * @deprecated Since v1.2 diff --git a/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts index c5b916501a1..9c009f966cb 100644 --- a/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-batch-renderer.ts @@ -23,9 +23,7 @@ */ import { EDITOR } from 'internal:constants'; -import { - ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, visible, override, serializable, editable, -} from 'cc.decorator'; +import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, visible, override, serializable, editable } from 'cc.decorator'; import { ImageData } from 'pal/image'; import { getWorldTransformUntilRoot } from '../../animation/transform-utils'; import { Filter, PixelFormat } from '../../asset/assets/asset-enum'; @@ -33,7 +31,8 @@ import { Material } from '../../asset/assets/material'; import { Mesh } from '../assets/mesh'; import { Skeleton } from '../assets/skeleton'; import { Texture2D } from '../../asset/assets/texture-2d'; -import { CCString, Mat4, Vec2, Vec3, cclegacy, warn } from '../../core'; +import { CCString, Mat4, Vec2, Vec3, warn } from '../../core'; +import { cclegacy } from '@base/global'; import { AttributeName, FormatInfos, Format, Type, Attribute, BufferTextureCopy } from '../../gfx'; import { mapBuffer, readBuffer, writeBuffer } from '../misc/buffer'; import { SkinnedMeshRenderer } from './skinned-mesh-renderer'; diff --git a/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts index c59dfa62b93..a5a2730acde 100644 --- a/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts +++ b/cocos/3d/skinned-mesh-renderer/skinned-mesh-renderer.ts @@ -23,16 +23,15 @@ THE SOFTWARE. */ -import { - ccclass, executeInEditMode, executionOrder, help, menu, type, -} from 'cc.decorator'; +import { ccclass, executeInEditMode, executionOrder, help, menu, type } from 'cc.decorator'; import type { AnimationClip } from '../../animation/animation-clip'; import { Material } from '../../asset/assets'; import { Skeleton } from '../assets/skeleton'; import { Node } from '../../scene-graph/node'; import { MeshRenderer } from '../framework/mesh-renderer'; import type { SkeletalAnimation } from '../skeletal-animation'; -import { cclegacy, assertIsTrue } from '../../core'; +import { cclegacy } from '@base/global'; +import { assertIsTrue } from '../../core'; import { SkinningModel } from '../models/skinning-model'; import { BakedSkinningModel } from '../models/baked-skinning-model'; diff --git a/cocos/animation/animation-clip.ts b/cocos/animation/animation-clip.ts index eca1c287722..d8b36e6f669 100644 --- a/cocos/animation/animation-clip.ts +++ b/cocos/animation/animation-clip.ts @@ -26,9 +26,8 @@ import { ccclass, serializable } from 'cc.decorator'; import { DEBUG } from 'internal:constants'; import { Asset } from '../asset/assets/asset'; import { SpriteFrame } from '../2d/assets/sprite-frame'; -import { errorID, warnID, cclegacy, js, geometry, approx, clamp, Mat4, Quat, - Vec3, murmurhash2_32_gc, binarySearchEpsilon, assertIsTrue, RealCurve, -} from '../core'; +import { errorID, warnID, js, geometry, approx, clamp, Mat4, Quat, Vec3, murmurhash2_32_gc, binarySearchEpsilon, assertIsTrue, RealCurve } from '../core'; +import { cclegacy } from '@base/global'; import { SkelAnimDataHub } from '../3d/skeletal-animation/skeletal-animation-data-hub'; import { WrapMode as AnimationWrapMode, WrapMode } from './types'; import { Node } from '../scene-graph/node'; diff --git a/cocos/animation/animation-component.ts b/cocos/animation/animation-component.ts index ced9b78886e..a527be4a40b 100644 --- a/cocos/animation/animation-component.ts +++ b/cocos/animation/animation-component.ts @@ -25,7 +25,8 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, type, serializable, editable } from 'cc.decorator'; import { EDITOR_NOT_IN_PREVIEW, TEST } from 'internal:constants'; import { Component } from '../scene-graph/component'; -import { Eventify, warnID, js, cclegacy } from '../core'; +import { Eventify, warnID, js } from '../core'; +import { cclegacy } from '@base/global'; import { AnimationClip } from './animation-clip'; import { AnimationState, EventType } from './animation-state'; import { CrossFade } from './cross-fade'; diff --git a/cocos/animation/animation-curve.ts b/cocos/animation/animation-curve.ts index b1c4aaa2edd..3d94fc504e2 100644 --- a/cocos/animation/animation-curve.ts +++ b/cocos/animation/animation-curve.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { lerp, Quat, errorID, cclegacy, binarySearchEpsilon, ValueType, bezierByTime, BezierControlPoints, easing } from '../core'; +import { lerp, Quat, errorID, binarySearchEpsilon, ValueType, bezierByTime, BezierControlPoints, easing } from '../core'; +import { cclegacy } from '@base/global'; import { ILerpable, isLerpable } from './types'; import type * as legacy from './legacy-clip-data'; diff --git a/cocos/animation/animation-manager.ts b/cocos/animation/animation-manager.ts index eb1f32e28e5..c11154a1694 100644 --- a/cocos/animation/animation-manager.ts +++ b/cocos/animation/animation-manager.ts @@ -23,7 +23,8 @@ */ import { ccclass } from 'cc.decorator'; -import { System, errorID, cclegacy, js } from '../core'; +import { System, errorID, js } from '../core'; +import { cclegacy } from '@base/global'; import { director, Director } from '../game/director'; import { Node } from '../scene-graph'; import { LegacyBlendStateBuffer } from '../3d/skeletal-animation/skeletal-animation-blending'; diff --git a/cocos/animation/animation-state.ts b/cocos/animation/animation-state.ts index 31ca4d8ac7f..e2fb94e234c 100644 --- a/cocos/animation/animation-state.ts +++ b/cocos/animation/animation-state.ts @@ -27,7 +27,8 @@ import { Node } from '../scene-graph/node'; import { AnimationClip } from './animation-clip'; import { Playable } from './playable'; import { WrapMode, WrappedInfo } from './types'; -import { cclegacy, debug, geometry, ccenum, assertIsTrue } from '../core'; +import { cclegacy } from '@base/global'; +import { debug, geometry, ccenum, assertIsTrue } from '../core'; import { AnimationMask } from './marionette/animation-mask'; import { PoseOutput } from './pose-output'; import { BlendStateBuffer } from '../3d/skeletal-animation/skeletal-animation-blending'; diff --git a/cocos/animation/global-animation-manager.ts b/cocos/animation/global-animation-manager.ts index 14f80fa981e..6653ac5d9f4 100644 --- a/cocos/animation/global-animation-manager.ts +++ b/cocos/animation/global-animation-manager.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import type { AnimationManager } from './animation-manager'; export function getGlobalAnimationManager (): AnimationManager { diff --git a/cocos/animation/marionette/pose-graph/pose-nodes/ik/two-bone-ik-debugger.ts b/cocos/animation/marionette/pose-graph/pose-nodes/ik/two-bone-ik-debugger.ts index 96c6d07c713..509e9c1e46a 100644 --- a/cocos/animation/marionette/pose-graph/pose-nodes/ik/two-bone-ik-debugger.ts +++ b/cocos/animation/marionette/pose-graph/pose-nodes/ik/two-bone-ik-debugger.ts @@ -2,14 +2,14 @@ import { MeshRenderer } from '../../../../../3d'; import { createMesh } from '../../../../../3d/misc'; import { Material } from '../../../../../asset/assets'; import { Color, Vec3 } from '../../../../../core'; -import { legacyCC } from '../../../../../core/global-exports'; +import { cclegacy } from '@base/global'; import { PrimitiveMode } from '../../../../../gfx'; import { Node } from '../../../../../scene-graph'; export class TwoBoneIKDebugger { constructor () { const node = new Node(); - legacyCC.director.getScene().addChild(node); + cclegacy.director.getScene().addChild(node); const meshRenderer = node.addComponent(MeshRenderer); meshRenderer.material = ((): Material => { diff --git a/cocos/asset/asset-manager/asset-manager.ts b/cocos/asset/asset-manager/asset-manager.ts index 9ce8e540e2b..b87c72263d1 100644 --- a/cocos/asset/asset-manager/asset-manager.ts +++ b/cocos/asset/asset-manager/asset-manager.ts @@ -25,26 +25,28 @@ import { BUILD, EDITOR, PREVIEW } from 'internal:constants'; import { Asset } from '../assets/asset'; -import { error, sys, Settings, settings, path, cclegacy, EventTarget } from '../../core'; +import { error, sys, Settings, settings, path, EventTarget } from '../../core'; +import { cclegacy } from '@base/global'; import Bundle from './bundle'; -import Cache, { ICache } from './cache'; +import Cache from './cache'; +import { ICache } from './cache'; import CacheManager from './cache-manager'; -import dependUtil, { DependUtil } from './depend-util'; -import downloader, { Downloader } from './downloader'; +import dependUtil from './depend-util'; +import { DependUtil } from './depend-util'; +import downloader from './downloader'; +import { Downloader } from './downloader'; import factory from './factory'; import fetch from './fetch'; import * as helper from './helper'; import load from './load'; import packManager from './pack-manager'; -import parser, { Parser } from './parser'; +import parser from './parser'; +import { Parser } from './parser'; import { Pipeline } from './pipeline'; import preprocess from './preprocess'; import { releaseManager } from './release-manager'; import RequestItem from './request-item'; -import { - presets, - references, - assets, BuiltinBundleName, bundles, fetchPipeline, files, parsed, pipeline, transformPipeline, assetsOverrideMap, IRequest } from './shared'; +import { presets, references, assets, BuiltinBundleName, bundles, fetchPipeline, files, parsed, pipeline, transformPipeline, assetsOverrideMap, IRequest } from './shared'; import Task from './task'; import { combine, parse, replaceOverrideAsset } from './url-transformer'; diff --git a/cocos/asset/asset-manager/builtin-res-mgr.jsb.ts b/cocos/asset/asset-manager/builtin-res-mgr.jsb.ts index a05df5cc4d6..ea85da4a688 100644 --- a/cocos/asset/asset-manager/builtin-res-mgr.jsb.ts +++ b/cocos/asset/asset-manager/builtin-res-mgr.jsb.ts @@ -28,7 +28,8 @@ import type { IMemoryImageSource } from '../../../pal/image/types'; import assetManager from '../asset-manager/asset-manager'; import { BuiltinBundleName } from '../asset-manager/shared'; import Bundle from '../asset-manager/bundle'; -import { Settings, settings, cclegacy } from '../../core'; +import { Settings, settings } from '../../core'; +import { cclegacy } from '@base/global'; import { releaseManager } from '../asset-manager/release-manager'; import type { BuiltinResMgr as JsbBuiltinResMgr } from './builtin-res-mgr'; diff --git a/cocos/asset/asset-manager/builtin-res-mgr.ts b/cocos/asset/asset-manager/builtin-res-mgr.ts index 571f128165a..31d9fb4102d 100644 --- a/cocos/asset/asset-manager/builtin-res-mgr.ts +++ b/cocos/asset/asset-manager/builtin-res-mgr.ts @@ -32,7 +32,8 @@ import { TextureCube } from '../assets/texture-cube'; import assetManager from './asset-manager'; import { BuiltinBundleName } from './shared'; import Bundle from './bundle'; -import { Settings, settings, cclegacy } from '../../core'; +import { Settings, settings } from '../../core'; +import { cclegacy } from '@base/global'; import { releaseManager } from './release-manager'; import { Material } from '../assets'; diff --git a/cocos/asset/asset-manager/bundle.ts b/cocos/asset/asset-manager/bundle.ts index 46fc4c4bab8..6e63a44eefa 100644 --- a/cocos/asset/asset-manager/bundle.ts +++ b/cocos/asset/asset-manager/bundle.ts @@ -25,8 +25,10 @@ import { Asset } from '../assets/asset'; import { SceneAsset } from '../assets/scene-asset'; -import { error, errorID, cclegacy } from '../../core'; -import Config, { IAddressableInfo, IAssetInfo, IConfigOption, ISceneInfo } from './config'; +import { error, errorID } from '../../core'; +import { cclegacy } from '@base/global'; +import Config from './config'; +import { IAddressableInfo, IAssetInfo, IConfigOption, ISceneInfo } from './config'; import { releaseManager } from './release-manager'; import RequestItem from './request-item'; import { assets, bundles, RequestType } from './shared'; diff --git a/cocos/asset/asset-manager/config.ts b/cocos/asset/asset-manager/config.ts index 88d32f0a44c..0c439fa9e55 100644 --- a/cocos/asset/asset-manager/config.ts +++ b/cocos/asset/asset-manager/config.ts @@ -23,7 +23,8 @@ */ import { EDITOR_NOT_IN_PREVIEW, TEST } from 'internal:constants'; import { Asset } from '../assets'; -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; import Cache from './cache'; import { decodeUuid, normalize } from './helper'; diff --git a/cocos/asset/asset-manager/deprecated.ts b/cocos/asset/asset-manager/deprecated.ts index ed29f8cee5a..0600725d42f 100644 --- a/cocos/asset/asset-manager/deprecated.ts +++ b/cocos/asset/asset-manager/deprecated.ts @@ -24,14 +24,18 @@ import { BUILD } from 'internal:constants'; import { Asset } from '../assets/asset'; -import { getError, macro, path, removeProperty, replaceProperty, cclegacy } from '../../core'; +import { getError, macro, path, removeProperty, replaceProperty } from '../../core'; +import { cclegacy } from '@base/global'; import Cache from './cache'; -import assetManager, { AssetManager } from './asset-manager'; +import assetManager from './asset-manager'; +import { AssetManager } from './asset-manager'; import { resources } from './bundle'; import dependUtil from './depend-util'; -import downloader, { Downloader } from './downloader'; +import downloader from './downloader'; +import { Downloader } from './downloader'; import { getUuidFromURL, transform } from './helper'; -import parser, { Parser } from './parser'; +import parser from './parser'; +import { Parser } from './parser'; import { releaseManager } from './release-manager'; import { assets, BuiltinBundleName, bundles } from './shared'; import { parseLoadResArgs, setDefaultProgressCallback } from './utilities'; diff --git a/cocos/asset/asset-manager/download-script.ts b/cocos/asset/asset-manager/download-script.ts index e3027cc79f5..96ded9e984d 100644 --- a/cocos/asset/asset-manager/download-script.ts +++ b/cocos/asset/asset-manager/download-script.ts @@ -23,7 +23,7 @@ */ import { getError } from '../../core'; -import { ccwindow } from '../../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/asset/asset-manager/downloader.ts b/cocos/asset/asset-manager/downloader.ts index 367d24191a2..b7b841f98fa 100644 --- a/cocos/asset/asset-manager/downloader.ts +++ b/cocos/asset/asset-manager/downloader.ts @@ -23,9 +23,11 @@ */ import { BUILD, EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { sys, js, misc, path, cclegacy } from '../../core'; +import { sys, js, misc, path } from '../../core'; +import { cclegacy } from '@base/global'; import Cache from './cache'; -import downloadFile, { FileProgressCallback } from './download-file'; +import downloadFile from './download-file'; +import { FileProgressCallback } from './download-file'; import downloadScript from './download-script'; import { files } from './shared'; import { retry, RetryFunction, urlAppendTimestamp } from './utilities'; diff --git a/cocos/asset/asset-manager/fetch.ts b/cocos/asset/asset-manager/fetch.ts index 57e41fed200..61d9115705b 100644 --- a/cocos/asset/asset-manager/fetch.ts +++ b/cocos/asset/asset-manager/fetch.ts @@ -23,7 +23,8 @@ */ import { Asset } from '../assets'; -import { error, cclegacy } from '../../core'; +import { error } from '../../core'; +import { cclegacy } from '@base/global'; import packManager from './pack-manager'; import RequestItem from './request-item'; import { assets, fetchPipeline } from './shared'; diff --git a/cocos/asset/asset-manager/helper.ts b/cocos/asset/asset-manager/helper.ts index 4f5ec26c6cd..ff48d0d324f 100644 --- a/cocos/asset/asset-manager/helper.ts +++ b/cocos/asset/asset-manager/helper.ts @@ -21,7 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy, error } from '../../core'; +import { cclegacy } from '@base/global'; +import { error } from '../../core'; import RequestItem from './request-item'; import { bundles, transformPipeline } from './shared'; import Task from './task'; diff --git a/cocos/asset/asset-manager/load.ts b/cocos/asset/asset-manager/load.ts index 8e7c27b655d..fc7b49f123d 100644 --- a/cocos/asset/asset-manager/load.ts +++ b/cocos/asset/asset-manager/load.ts @@ -23,7 +23,8 @@ */ import { BUILD, EDITOR, PREVIEW } from 'internal:constants'; import { Asset } from '../assets/asset'; -import { error, cclegacy } from '../../core'; +import { error } from '../../core'; +import { cclegacy } from '@base/global'; import packManager from './pack-manager'; import parser from './parser'; import { Pipeline } from './pipeline'; diff --git a/cocos/asset/asset-manager/url-transformer.ts b/cocos/asset/asset-manager/url-transformer.ts index a37beee47ec..a5bd757054a 100644 --- a/cocos/asset/asset-manager/url-transformer.ts +++ b/cocos/asset/asset-manager/url-transformer.ts @@ -23,8 +23,10 @@ */ import { EDITOR, PREVIEW } from 'internal:constants'; -import { warnID, js, path, cclegacy } from '../../core'; -import Config, { IAddressableInfo, IAssetInfo } from './config'; +import { warnID, js, path } from '../../core'; +import { cclegacy } from '@base/global'; +import Config from './config'; +import { IAddressableInfo, IAssetInfo } from './config'; import { decodeUuid } from './helper'; import RequestItem from './request-item'; import { assetsOverrideMap, bundles, presets, RequestType } from './shared'; diff --git a/cocos/asset/asset-manager/utilities.ts b/cocos/asset/asset-manager/utilities.ts index 4db5fe5d185..0bb94059fdc 100644 --- a/cocos/asset/asset-manager/utilities.ts +++ b/cocos/asset/asset-manager/utilities.ts @@ -24,7 +24,8 @@ import { EDITOR } from 'internal:constants'; import { Asset } from '../assets/asset'; -import { cclegacy, error, js, misc } from '../../core'; +import { cclegacy } from '@base/global'; +import { error, js, misc } from '../../core'; import Config from './config'; import { dependMap, nativeDependMap } from './depend-maps'; import dependUtil from './depend-util'; diff --git a/cocos/asset/assets/asset.jsb.ts b/cocos/asset/assets/asset.jsb.ts index ac676310184..b0795e6b4bd 100644 --- a/cocos/asset/assets/asset.jsb.ts +++ b/cocos/asset/assets/asset.jsb.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { cclegacy, js, _decorator, path, jsbUtils, CallbacksInvoker, applyMixins } from '../../core'; +import { cclegacy } from '@base/global'; +import { js, _decorator, path, jsbUtils, CallbacksInvoker, applyMixins } from '../../core'; import { getUrlWithUuid } from '../asset-manager/helper'; import { patch_cc_Asset } from '../../native-binding/decorators'; import type { Asset as JsbAsset } from './asset'; diff --git a/cocos/asset/assets/asset.ts b/cocos/asset/assets/asset.ts index 364d736be30..8346cf73e44 100644 --- a/cocos/asset/assets/asset.ts +++ b/cocos/asset/assets/asset.ts @@ -24,7 +24,8 @@ */ import { EDITOR, PREVIEW } from 'internal:constants'; -import { _decorator, Eventify, path, debug, getError, CCObject, cclegacy } from '../../core'; +import { _decorator, Eventify, path, debug, getError, CCObject } from '../../core'; +import { cclegacy } from '@base/global'; import { getUrlWithUuid } from '../asset-manager/helper'; import { Node } from '../../scene-graph'; diff --git a/cocos/asset/assets/buffer-asset.jsb.ts b/cocos/asset/assets/buffer-asset.jsb.ts index 45d72f98045..23bf781816e 100644 --- a/cocos/asset/assets/buffer-asset.jsb.ts +++ b/cocos/asset/assets/buffer-asset.jsb.ts @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import './asset'; import { patch_cc_BufferAsset } from '../../native-binding/decorators'; import type { BufferAsset as JsbBufferAsset } from './buffer-asset'; diff --git a/cocos/asset/assets/buffer-asset.ts b/cocos/asset/assets/buffer-asset.ts index f091bfa8391..11b1d5976c3 100644 --- a/cocos/asset/assets/buffer-asset.ts +++ b/cocos/asset/assets/buffer-asset.ts @@ -23,7 +23,8 @@ */ import { ccclass, override } from 'cc.decorator'; -import { assertIsNonNullable, cclegacy } from '../../core'; +import { assertIsNonNullable } from '../../core'; +import { cclegacy } from '@base/global'; import { Asset } from './asset'; /** diff --git a/cocos/asset/assets/effect-asset.jsb.ts b/cocos/asset/assets/effect-asset.jsb.ts index 3cc9133abe0..846f20489cd 100644 --- a/cocos/asset/assets/effect-asset.jsb.ts +++ b/cocos/asset/assets/effect-asset.jsb.ts @@ -22,11 +22,11 @@ THE SOFTWARE. */ -import{ cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import './asset'; import { patch_cc_EffectAsset } from '../../native-binding/decorators'; import type { EffectAsset as JsbEffectAsset } from './effect-asset'; -import type { BlendState, DepthStencilState, RasterizerState, DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format} from "../../gfx/index.jsb"; +import type { BlendState, DepthStencilState, RasterizerState, DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format } from '../../gfx/index.jsb'; import type { RenderPassStage } from '../../rendering/define'; import type { MacroRecord } from '../../render-scene/core/pass-utils'; diff --git a/cocos/asset/assets/effect-asset.ts b/cocos/asset/assets/effect-asset.ts index 06d4fac7039..6d729b226bf 100644 --- a/cocos/asset/assets/effect-asset.ts +++ b/cocos/asset/assets/effect-asset.ts @@ -25,13 +25,13 @@ import { ccclass, serializable, editable, editorOnly } from 'cc.decorator'; import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Root } from '../../root'; -import { BlendState, DepthStencilState, RasterizerState, - DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager, ShaderInfo, Shader } from '../../gfx'; +import { BlendState, DepthStencilState, RasterizerState, DynamicStateFlags, PrimitiveMode, ShaderStageFlags, Type, Uniform, MemoryAccess, Format, deviceManager, ShaderInfo, Shader } from '../../gfx'; import { RenderPassStage } from '../../rendering/define'; import { MacroRecord } from '../../render-scene/core/pass-utils'; import { programLib } from '../../render-scene/core/program-lib'; import { Asset } from './asset'; -import { cclegacy, warnID } from '../../core'; +import { cclegacy } from '@base/global'; +import { warnID } from '../../core'; import { ProgramLibrary } from '../../rendering/custom/private'; import { addEffectDefaultProperties, getCombinationDefines } from '../../render-scene/core/program-utils'; diff --git a/cocos/asset/assets/image-asset.jsb.ts b/cocos/asset/assets/image-asset.jsb.ts index e9f3a3c33f6..13f4a1def9f 100644 --- a/cocos/asset/assets/image-asset.jsb.ts +++ b/cocos/asset/assets/image-asset.jsb.ts @@ -27,7 +27,8 @@ import { Format, FormatFeatureBit, deviceManager } from '../../gfx'; import { ImageData } from 'pal/image'; import { IMemoryImageSource, ImageSource } from '../../../pal/image/types'; import { PixelFormat } from './asset-enum'; -import { sys, macro, warnID, cclegacy, error } from '../../core'; +import { sys, macro, warnID, error } from '../../core'; +import { cclegacy } from '@base/global'; import { patch_cc_ImageAsset } from '../../native-binding/decorators'; import './asset'; import type { ImageAsset as JsbImageAsset } from './image-asset'; diff --git a/cocos/asset/assets/image-asset.ts b/cocos/asset/assets/image-asset.ts index 4df3d4a3922..00d0802f1c0 100644 --- a/cocos/asset/assets/image-asset.ts +++ b/cocos/asset/assets/image-asset.ts @@ -30,8 +30,8 @@ import { ImageSource, IMemoryImageSource, RawDataType } from '../../../pal/image import { Device, Format, FormatFeatureBit, deviceManager, API } from '../../gfx'; import { Asset } from './asset'; import { PixelFormat } from './asset-enum'; -import { warnID, macro, sys, cclegacy, warn } from '../../core'; -import { ccwindow } from '../../core/global-exports'; +import { warnID, macro, sys, warn } from '../../core'; +import { cclegacy, ccwindow } from '@base/global'; import { Enum } from '../../core/value-types/enum'; // Compress mipmap constants diff --git a/cocos/asset/assets/json-asset.ts b/cocos/asset/assets/json-asset.ts index 2afb8edc08a..bd87a9cd92a 100644 --- a/cocos/asset/assets/json-asset.ts +++ b/cocos/asset/assets/json-asset.ts @@ -24,7 +24,7 @@ import { ccclass, serializable, editable } from 'cc.decorator'; import { Asset } from './asset'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en Json asset, it will automatically parse the json to a JS object. diff --git a/cocos/asset/assets/material.jsb.ts b/cocos/asset/assets/material.jsb.ts index 5a4c9e89d78..bbe525b4258 100644 --- a/cocos/asset/assets/material.jsb.ts +++ b/cocos/asset/assets/material.jsb.ts @@ -26,7 +26,8 @@ import { EffectAsset } from './effect-asset'; import { Texture } from '../../gfx'; import { TextureBase } from './texture-base'; import { PassOverrides, MacroRecord, MaterialProperty } from '../../render-scene'; -import { Color, Mat3, Mat4, Quat, Vec2, Vec3, Vec4, cclegacy } from '../../core'; +import { Color, Mat3, Mat4, Quat, Vec2, Vec3, Vec4 } from '../../core'; +import { cclegacy } from '@base/global'; import './asset'; import { patch_cc_Material } from '../../native-binding/decorators'; import type { Material as JsbMaterial } from './material'; diff --git a/cocos/asset/assets/material.ts b/cocos/asset/assets/material.ts index b44ff536a63..c712cf24d06 100644 --- a/cocos/asset/assets/material.ts +++ b/cocos/asset/assets/material.ts @@ -29,7 +29,8 @@ import { Texture, Type } from '../../gfx'; import { TextureBase } from './texture-base'; import { IPassInfoFull, Pass, PassOverrides } from '../../render-scene/core/pass'; import { MacroRecord, MaterialProperty } from '../../render-scene/core/pass-utils'; -import { Color, warnID, Vec4, cclegacy, warn } from '../../core'; +import { Color, warnID, Vec4, warn } from '../../core'; +import { cclegacy } from '@base/global'; import { SRGBToLinear } from '../../rendering/pipeline-funcs'; import { Renderer } from '../../misc/renderer'; import { getPhaseID } from '../../rendering/pass-phase'; diff --git a/cocos/asset/assets/render-texture.jsb.ts b/cocos/asset/assets/render-texture.jsb.ts index 517887fafe7..f5bbb316c37 100644 --- a/cocos/asset/assets/render-texture.jsb.ts +++ b/cocos/asset/assets/render-texture.jsb.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ import { EDITOR, TEST } from 'internal:constants'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Filter, PixelFormat, WrapMode } from './asset-enum'; import './asset'; import { patch_cc_RenderTexture } from '../../native-binding/decorators'; diff --git a/cocos/asset/assets/render-texture.ts b/cocos/asset/assets/render-texture.ts index 96fa07d314f..902b8ba0285 100644 --- a/cocos/asset/assets/render-texture.ts +++ b/cocos/asset/assets/render-texture.ts @@ -24,9 +24,9 @@ import { ccclass } from 'cc.decorator'; import { EDITOR, TEST } from 'internal:constants'; -import { clamp, cclegacy, errorID } from '../../core'; -import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager, - BufferTextureCopy, TextureFlags, TextureFlagBit } from '../../gfx'; +import { clamp, errorID } from '../../core'; +import { cclegacy } from '@base/global'; +import { Texture, ColorAttachment, DepthStencilAttachment, GeneralBarrierInfo, AccessFlagBit, RenderPassInfo, Format, deviceManager, BufferTextureCopy, TextureFlags, TextureFlagBit } from '../../gfx'; import { RenderWindow, IRenderWindowInfo } from '../../render-scene/core/render-window'; import { Root } from '../../root'; import { TextureBase } from './texture-base'; diff --git a/cocos/asset/assets/rendering-sub-mesh.ts b/cocos/asset/assets/rendering-sub-mesh.ts index 8d4c32348c0..93018244c4a 100644 --- a/cocos/asset/assets/rendering-sub-mesh.ts +++ b/cocos/asset/assets/rendering-sub-mesh.ts @@ -23,11 +23,9 @@ */ import { mapBuffer } from '../../3d/misc/buffer'; -import { - Attribute, Device, InputAssemblerInfo, Buffer, BufferInfo, AttributeName, BufferUsageBit, - Format, FormatInfos, MemoryUsageBit, PrimitiveMode, DrawInfo, -} from '../../gfx'; -import { Vec3, approx, cclegacy, floatToHalf, halfToFloat, pseudoRandomRange } from '../../core'; +import { Attribute, Device, InputAssemblerInfo, Buffer, BufferInfo, AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode, DrawInfo } from '../../gfx'; +import { Vec3, approx, floatToHalf, halfToFloat, pseudoRandomRange } from '../../core'; +import { cclegacy } from '@base/global'; import { Mesh } from '../../3d/assets/mesh'; import { Root } from '../../root'; diff --git a/cocos/asset/assets/scene-asset.jsb.ts b/cocos/asset/assets/scene-asset.jsb.ts index 1b06938d1a3..3b8f9c9013d 100644 --- a/cocos/asset/assets/scene-asset.jsb.ts +++ b/cocos/asset/assets/scene-asset.jsb.ts @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { patch_cc_SceneAsset } from '../../native-binding/decorators'; import './asset'; import type { SceneAsset as JsbSceneAsset } from './scene-asset'; diff --git a/cocos/asset/assets/scene-asset.ts b/cocos/asset/assets/scene-asset.ts index 183d1723e3f..1047be90c48 100644 --- a/cocos/asset/assets/scene-asset.ts +++ b/cocos/asset/assets/scene-asset.ts @@ -26,7 +26,7 @@ import { ccclass, editable, serializable } from 'cc.decorator'; import { Scene } from '../../scene-graph/scene'; import { Asset } from './asset'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en Class for scene loading. diff --git a/cocos/asset/assets/scripts.ts b/cocos/asset/assets/scripts.ts index 6c99c16dd05..cbe67ca8d4c 100644 --- a/cocos/asset/assets/scripts.ts +++ b/cocos/asset/assets/scripts.ts @@ -25,7 +25,7 @@ import { ccclass } from 'cc.decorator'; import { Asset } from './asset'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en The script asset base class diff --git a/cocos/asset/assets/simple-texture.jsb.ts b/cocos/asset/assets/simple-texture.jsb.ts index 34510757211..b264d41b8ea 100644 --- a/cocos/asset/assets/simple-texture.jsb.ts +++ b/cocos/asset/assets/simple-texture.jsb.ts @@ -23,7 +23,8 @@ */ import { Filter, PixelFormat, WrapMode } from './asset-enum'; import dependUtil from '../asset-manager/depend-util'; -import { js, macro, cclegacy } from '../../core'; +import { js, macro } from '../../core'; +import { cclegacy } from '@base/global'; import './texture-base'; import { patch_cc_SimpleTexture } from '../../native-binding/decorators'; import type { SimpleTexture as JsbSimpleTexture } from './simple-texture'; diff --git a/cocos/asset/assets/simple-texture.ts b/cocos/asset/assets/simple-texture.ts index 18c5e0794d4..945f8eea937 100644 --- a/cocos/asset/assets/simple-texture.ts +++ b/cocos/asset/assets/simple-texture.ts @@ -28,7 +28,8 @@ import { ImageData } from 'pal/image'; import { IMemoryImageSource } from '../../../pal/image/types'; import { TextureFlagBit, TextureUsageBit, API, Texture, TextureInfo, TextureViewInfo, Device, BufferTextureCopy } from '../../gfx'; -import { assertID, error, js, macro, cclegacy } from '../../core'; +import { assertID, error, js, macro } from '../../core'; +import { cclegacy } from '@base/global'; import { Filter } from './asset-enum'; import { ImageAsset } from './image-asset'; import { TextureBase } from './texture-base'; diff --git a/cocos/asset/assets/text-asset.jsb.ts b/cocos/asset/assets/text-asset.jsb.ts index 4fa8185cca6..66ed07eec01 100644 --- a/cocos/asset/assets/text-asset.jsb.ts +++ b/cocos/asset/assets/text-asset.jsb.ts @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { patch_cc_TextAsset } from '../../native-binding/decorators'; import './asset'; diff --git a/cocos/asset/assets/text-asset.ts b/cocos/asset/assets/text-asset.ts index 93b5b60af3e..b2263d94c47 100644 --- a/cocos/asset/assets/text-asset.ts +++ b/cocos/asset/assets/text-asset.ts @@ -25,7 +25,7 @@ import { ccclass, serializable, editable } from 'cc.decorator'; import { Asset } from './asset'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en The asset for text file. diff --git a/cocos/asset/assets/texture-2d.jsb.ts b/cocos/asset/assets/texture-2d.jsb.ts index 0eca9279aca..446f2636605 100644 --- a/cocos/asset/assets/texture-2d.jsb.ts +++ b/cocos/asset/assets/texture-2d.jsb.ts @@ -22,11 +22,12 @@ THE SOFTWARE. */ -import { EDITOR, TEST } from 'internal:constants' +import { EDITOR, TEST } from 'internal:constants'; import { ImageAsset } from './image-asset'; import { SimpleTexture } from './simple-texture'; import { TextureBase } from './texture-base.jsb'; -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; import { Filter, PixelFormat, WrapMode } from './asset-enum'; import './simple-texture'; import { patch_cc_Texture2D } from '../../native-binding/decorators'; diff --git a/cocos/asset/assets/texture-2d.ts b/cocos/asset/assets/texture-2d.ts index 3e0035a831e..19271bc27e7 100644 --- a/cocos/asset/assets/texture-2d.ts +++ b/cocos/asset/assets/texture-2d.ts @@ -29,7 +29,8 @@ import { TextureType, TextureInfo, TextureViewInfo } from '../../gfx'; import { Filter, PixelFormat } from './asset-enum'; import { ImageAsset } from './image-asset'; import { PresumedGFXTextureInfo, PresumedGFXTextureViewInfo, SimpleTexture } from './simple-texture'; -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en The create information for [[Texture2D]]. diff --git a/cocos/asset/assets/texture-base.jsb.ts b/cocos/asset/assets/texture-base.jsb.ts index 41d7c9a8a41..bc88071b720 100644 --- a/cocos/asset/assets/texture-base.jsb.ts +++ b/cocos/asset/assets/texture-base.jsb.ts @@ -24,7 +24,7 @@ import { TEST, EDITOR } from 'internal:constants'; import { deviceManager } from '../../gfx'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Filter, PixelFormat, WrapMode } from './asset-enum'; import './asset'; import { patch_cc_TextureBase } from '../../native-binding/decorators'; @@ -125,7 +125,7 @@ textureBaseProto.getSamplerInfo = function () { const oldDestroy = textureBaseProto.destroy; textureBaseProto.destroy = function () { if (cclegacy.director.root?.batcher2D) { - // legacyCC.director.root.batcher2D._releaseDescriptorSetCache(this.getHash()); + // cclegacy.director.root.batcher2D._releaseDescriptorSetCache(this.getHash()); cclegacy.director.root.batcher2D._releaseDescriptorSetCache(this.getGFXTexture(), this.getGFXSampler()); } // dispatch into C++ virtual function CCObject::destroy diff --git a/cocos/asset/assets/texture-base.ts b/cocos/asset/assets/texture-base.ts index d45d4be8b2c..630cf30c52e 100644 --- a/cocos/asset/assets/texture-base.ts +++ b/cocos/asset/assets/texture-base.ts @@ -28,7 +28,8 @@ import { ccclass, serializable } from 'cc.decorator'; import { Asset } from './asset'; import { Filter, PixelFormat, WrapMode } from './asset-enum'; import { Sampler, Texture, Device, Format, SamplerInfo, Address, Filter as GFXFilter, deviceManager } from '../../gfx'; -import { errorID, murmurhash2_32_gc, ccenum, cclegacy, js } from '../../core'; +import { errorID, murmurhash2_32_gc, ccenum, js } from '../../core'; +import { cclegacy } from '@base/global'; ccenum(Format); diff --git a/cocos/asset/assets/texture-cube.jsb.ts b/cocos/asset/assets/texture-cube.jsb.ts index 731681e6198..c004b030d5b 100644 --- a/cocos/asset/assets/texture-cube.jsb.ts +++ b/cocos/asset/assets/texture-cube.jsb.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ import { Filter, PixelFormat, WrapMode } from './asset-enum'; -import { js, cclegacy } from '../../core'; +import { js } from '../../core'; +import { cclegacy } from '@base/global'; import './simple-texture'; import { EDITOR, TEST } from 'internal:constants'; import { patch_cc_TextureCube } from '../../native-binding/decorators'; diff --git a/cocos/asset/assets/texture-cube.ts b/cocos/asset/assets/texture-cube.ts index a0645e2a047..1d166f72475 100644 --- a/cocos/asset/assets/texture-cube.ts +++ b/cocos/asset/assets/texture-cube.ts @@ -28,7 +28,7 @@ import { TextureType, TextureInfo, TextureViewInfo, BufferTextureCopy } from '.. import { ImageAsset } from './image-asset'; import { PresumedGFXTextureInfo, PresumedGFXTextureViewInfo, SimpleTexture } from './simple-texture'; import { ITexture2DCreateInfo, Texture2D } from './texture-2d'; -import { legacyCC, ccwindow } from '../../core/global-exports'; +import { ccwindow, cclegacy } from '@base/global'; import { error, js, sys } from '../../core'; import { OS } from '../../../pal/system-info/enum-type'; @@ -632,7 +632,7 @@ export class TextureCube extends SimpleTexture { } } -legacyCC.TextureCube = TextureCube; +cclegacy.TextureCube = TextureCube; interface ITextureCubeSerializeData { base: string; diff --git a/cocos/audio/audio-clip.ts b/cocos/audio/audio-clip.ts index 25431eb3972..f3b1c377c16 100644 --- a/cocos/audio/audio-clip.ts +++ b/cocos/audio/audio-clip.ts @@ -25,7 +25,7 @@ import { ccclass, serializable, override } from 'cc.decorator'; import { AudioPlayer } from 'pal/audio'; import { Asset } from '../asset/assets/asset'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { AudioState, AudioType } from '../../pal/audio/type'; export interface AudioMeta { diff --git a/cocos/audio/index.ts b/cocos/audio/index.ts index c73c3c34f7d..60588ff4502 100644 --- a/cocos/audio/index.ts +++ b/cocos/audio/index.ts @@ -25,7 +25,8 @@ Permission is hereby granted, free of charge, to any person obtaining a copy import './audio-downloader'; import { AudioSource } from './audio-source'; -import { cclegacy, js } from '../core'; +import { cclegacy } from '@base/global'; +import { js } from '../core'; import './deprecated'; export { AudioClip } from './audio-clip'; diff --git a/cocos/base/global/package.json b/cocos/base/global/package.json new file mode 100644 index 00000000000..e62f4aba975 --- /dev/null +++ b/cocos/base/global/package.json @@ -0,0 +1,15 @@ +{ + "$schema": "../../../schemas/module-config.schema.json", + "name": "@base/global", + "version": "1.0.0", + "description": "", + "scripts": { + }, + "license": "MIT", + "exports": { + ".": { + "node": "./package.json", + "types": "./src/index.ts" + } + } +} diff --git a/cocos/core/global-exports.ts b/cocos/base/global/src/index.ts similarity index 91% rename from cocos/core/global-exports.ts rename to cocos/base/global/src/index.ts index 68b9f612d48..01ae64e0cdf 100644 --- a/cocos/core/global-exports.ts +++ b/cocos/base/global/src/index.ts @@ -33,17 +33,17 @@ const _global = typeof window === 'undefined' ? global : window; * Cocos引擎的主要命名空间，引擎代码中所有的类，函数，属性和常量都在这个命名空间中定义。 * @deprecated */ -export const legacyCC: Record & { +export const cclegacy: Record & { _global: typeof globalThis; } = { _global, }; // For internal usage -legacyCC.internal = {}; +cclegacy.internal = {}; if (DEV) { - legacyCC._Test = {}; + cclegacy._Test = {}; } const engineVersion = '3.8.2'; @@ -58,16 +58,16 @@ const engineVersion = '3.8.2'; * 请不要删除此字符串，它是错误跟踪的重要标志。 * 如果您将错误发布到论坛，请附上此标志。 */ -_global.CocosEngine = legacyCC.ENGINE_VERSION = engineVersion; +_global.CocosEngine = cclegacy.ENGINE_VERSION = engineVersion; -_global.cc = legacyCC; +_global.cc = cclegacy; export { engineVersion as VERSION }; if (EDITOR_NOT_IN_PREVIEW === undefined) { // Used to indicate whether it is currently in preview mode. // 'isPreviewProcess' is defined only in the editor's process. - legacyCC.GAME_VIEW = typeof globalThis.isPreviewProcess !== 'undefined' ? globalThis.isPreviewProcess : false; + cclegacy.GAME_VIEW = typeof globalThis.isPreviewProcess !== 'undefined' ? globalThis.isPreviewProcess : false; } const ccwindow: typeof window = typeof globalThis.jsb !== 'undefined' ? (typeof jsb.window !== 'undefined' ? jsb.window : globalThis) : globalThis; diff --git a/cocos/base/global/tsconfig.json b/cocos/base/global/tsconfig.json new file mode 100644 index 00000000000..67f2e830c07 --- /dev/null +++ b/cocos/base/global/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "outDir": "./lib/", + "rootDir": "./src/", + "baseUrl": "./" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/cocos/core/algorithm/index.ts b/cocos/core/algorithm/index.ts index 59f939e41fc..843aeb82eaf 100644 --- a/cocos/core/algorithm/index.ts +++ b/cocos/core/algorithm/index.ts @@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import * as easing from './easing'; export * from './murmurhash2_gc'; export { easing }; -legacyCC.easing = easing; +cclegacy.easing = easing; diff --git a/cocos/core/curves/bezier.ts b/cocos/core/curves/bezier.ts index 5c2144503ba..88fbc66472e 100644 --- a/cocos/core/curves/bezier.ts +++ b/cocos/core/curves/bezier.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; export type BezierControlPoints = [ number, number, number, number ]; @@ -30,7 +30,7 @@ export function bezier (C1: number, C2: number, C3: number, C4: number, t: numbe const t1 = 1 - t; return t1 * (t1 * (C1 + (C2 * 3 - C1) * t) + C3 * 3 * t * t) + C4 * t * t * t; } -legacyCC.bezier = bezier; +cclegacy.bezier = bezier; // var sin = Math.sin; const cos = Math.cos; @@ -160,4 +160,4 @@ export function bezierByTime (controlPoints: BezierControlPoints, x: number): nu // return bezier(0, p1y, p2y, 1, percent); return ((1 - percent) * (p1y + (p2y - p1y) * percent) * 3 + percent * percent) * percent; } -legacyCC.bezierByTime = bezierByTime; +cclegacy.bezierByTime = bezierByTime; diff --git a/cocos/core/data/class.ts b/cocos/core/data/class.ts index bc66b0149fb..d043768a127 100644 --- a/cocos/core/data/class.ts +++ b/cocos/core/data/class.ts @@ -24,6 +24,7 @@ */ import { DEV, EDITOR, SUPPORT_JIT, TEST } from 'internal:constants'; +import { cclegacy } from '@base/global'; import { errorID, warnID, error } from '../platform/debug'; import * as js from '../utils/js'; import { getSuper } from '../utils/js'; @@ -34,7 +35,6 @@ import { IAcceptableAttributes } from './utils/attribute-defines'; import { preprocessAttrs } from './utils/preprocess-class'; import * as RF from './utils/requiring-frame'; -import { legacyCC } from '../global-exports'; import { PropertyStash, PropertyStashInternalFlag } from './class-stash'; import { setPropertyEnumTypeOnAttrs } from './utils/attribute-internal'; @@ -130,7 +130,7 @@ function getDefault (defaultVal): any { try { return defaultVal(); } catch (e) { - legacyCC._throw(e); + cclegacy._throw(e); return undefined; } } else { @@ -162,7 +162,7 @@ function doDefine (className, baseClass, options): any { } function define (className, baseClass, options): any { - const Component = legacyCC.Component; + const Component = cclegacy.Component; const frame = RF.peek(); if (frame && js.isChildClassOf(baseClass, Component)) { @@ -181,9 +181,9 @@ function define (className, baseClass, options): any { if (EDITOR) { // for RenderPipeline, RenderFlow, RenderStage - const isRenderPipeline = js.isChildClassOf(baseClass, legacyCC.RenderPipeline); - const isRenderFlow = js.isChildClassOf(baseClass, legacyCC.RenderFlow); - const isRenderStage = js.isChildClassOf(baseClass, legacyCC.RenderStage); + const isRenderPipeline = js.isChildClassOf(baseClass, cclegacy.RenderPipeline); + const isRenderFlow = js.isChildClassOf(baseClass, cclegacy.RenderFlow); + const isRenderStage = js.isChildClassOf(baseClass, cclegacy.RenderStage); const isRender = isRenderPipeline || isRenderFlow || isRenderStage; if (isRender) { let renderName = ''; @@ -295,7 +295,7 @@ export function CCClass (options: { // create constructor const cls = define(name, base, options); if (!name) { - name = legacyCC.js.getClassName(cls); + name = cclegacy.js.getClassName(cls); } cls._sealed = true; @@ -309,8 +309,8 @@ export function CCClass (options: { const editor = options.editor; if (editor) { - if (js.isChildClassOf(base, legacyCC.Component)) { - legacyCC.Component._registerEditorProps(cls, editor); + if (js.isChildClassOf(base, cclegacy.Component)) { + cclegacy.Component._registerEditorProps(cls, editor); } else if (DEV) { warnID(3623, name!); } @@ -607,4 +607,4 @@ CCClass.IDENTIFIER_RE = IDENTIFIER_RE; // NOTE: the type of getNewValueTypeCode can be ((value: any) => string) or boolean. CCClass.getNewValueTypeCode = (SUPPORT_JIT && getNewValueTypeCodeJit) as any; -legacyCC.Class = CCClass; +cclegacy.Class = CCClass; diff --git a/cocos/core/data/index.ts b/cocos/core/data/index.ts index 800783cf829..b39e0a9491d 100644 --- a/cocos/core/data/index.ts +++ b/cocos/core/data/index.ts @@ -22,10 +22,10 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import * as _decorator from './class-decorator'; -import { legacyCC } from '../global-exports'; -legacyCC._decorator = _decorator; +cclegacy._decorator = _decorator; export { _decorator }; export { CCClass, isCCClassOrFastDefined } from './class'; export { CCObject } from './object'; diff --git a/cocos/core/data/object.ts b/cocos/core/data/object.ts index 7d0bb9c22c2..2a3fe9f4876 100644 --- a/cocos/core/data/object.ts +++ b/cocos/core/data/object.ts @@ -23,10 +23,10 @@ */ import { SUPPORT_JIT, EDITOR, TEST, JSB, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; +import { cclegacy } from '@base/global'; import * as js from '../utils/js'; import { CCClass } from './class'; import { errorID, warnID } from '../platform/debug'; -import { legacyCC } from '../global-exports'; import { EditorExtendableObject, editorExtrasTag } from './editor-extras-tag'; import { copyAllProperties } from '../utils/js'; @@ -72,7 +72,7 @@ const objectsToDestroy: CCObject[] = []; let deferredDestroyTimer: number | null = null; function compileDestruct (obj, ctor): Function { - const shouldSkipId = obj instanceof legacyCC.Node || obj instanceof legacyCC.Component; + const shouldSkipId = obj instanceof cclegacy.Node || obj instanceof cclegacy.Component; const idToSkip = shouldSkipId ? '_id' : null; let key; @@ -98,7 +98,7 @@ function compileDestruct (obj, ctor): Function { } // Overwrite propsToReset according to Class if (CCClass._isCCClass(ctor)) { - const attrs = legacyCC.Class.Attr.getClassAttrs(ctor); + const attrs = cclegacy.Class.Attr.getClassAttrs(ctor); const propList = ctor.__props__; for (let i = 0; i < propList.length; i++) { @@ -302,7 +302,7 @@ class CCObject implements EditorExtendableObject { this._objFlags |= ToDestroy; objectsToDestroy.push(this); - if (EDITOR && deferredDestroyTimer === null && legacyCC.engine && !legacyCC.engine._isUpdating) { + if (EDITOR && deferredDestroyTimer === null && cclegacy.engine && !cclegacy.engine._isUpdating) { // auto destroy immediate in edit mode deferredDestroyTimer = setTimeout(CCObject._deferredDestroy); } @@ -660,7 +660,7 @@ export function isValid (value: any, strictMode?: boolean): boolean { return typeof value !== 'undefined'; } } -legacyCC.isValid = isValid; +cclegacy.isValid = isValid; if (EDITOR || TEST) { js.value(CCObject, '_willDestroy', (obj) => !(obj._objFlags & Destroyed) && (obj._objFlags & ToDestroy) > 0); @@ -680,5 +680,5 @@ if (JSB) { (CCObject as unknown as any) = jsb.CCObject; } -legacyCC.Object = CCObject; +cclegacy.Object = CCObject; export { CCObject }; diff --git a/cocos/core/data/utils/attribute.ts b/cocos/core/data/utils/attribute.ts index de9c7f55219..6296d662b2e 100644 --- a/cocos/core/data/utils/attribute.ts +++ b/cocos/core/data/utils/attribute.ts @@ -27,7 +27,7 @@ import { EDITOR } from 'internal:constants'; import { log, warnID } from '../../platform/debug'; import { formatStr, get, getClassName, isChildClassOf, value } from '../../utils/js'; import { isPlainEmptyObj_DEV } from '../../utils/misc'; -import { legacyCC } from '../../global-exports'; +import { cclegacy } from '@base/global'; export const DELIMETER = '$_$'; @@ -47,7 +47,7 @@ export function createAttrs (subclass: any): any { return createAttrsSingle(instance, getClassAttrs(instance.constructor)); } let superClass: any; - const chains: any[] = legacyCC.Class.getInheritanceChain(subclass); + const chains: any[] = cclegacy.Class.getInheritanceChain(subclass); for (let i = chains.length - 1; i >= 0; i--) { const cls = chains[i]; const attrs = cls.hasOwnProperty('__attrs__') && cls.__attrs__; @@ -128,8 +128,8 @@ export class PrimitiveType { * ``` */ export const CCInteger = new PrimitiveType('Integer', 0); -legacyCC.Integer = CCInteger; -legacyCC.CCInteger = CCInteger; +cclegacy.Integer = CCInteger; +cclegacy.CCInteger = CCInteger; /** * @en @@ -150,11 +150,11 @@ legacyCC.CCInteger = CCInteger; * ``` */ export const CCFloat = new PrimitiveType('Float', 0.0); -legacyCC.Float = CCFloat; -legacyCC.CCFloat = CCFloat; +cclegacy.Float = CCFloat; +cclegacy.CCFloat = CCFloat; if (EDITOR) { - get(legacyCC, 'Number', () => { + get(cclegacy, 'Number', () => { warnID(3603); return CCFloat; }); @@ -178,8 +178,8 @@ if (EDITOR) { * ``` */ export const CCBoolean = new PrimitiveType('Boolean', false); -legacyCC.Boolean = CCBoolean; -legacyCC.CCBoolean = CCBoolean; +cclegacy.Boolean = CCBoolean; +cclegacy.CCBoolean = CCBoolean; /** * @en @@ -200,8 +200,8 @@ legacyCC.CCBoolean = CCBoolean; * ``` */ export const CCString = new PrimitiveType('String', ''); -legacyCC.String = CCString; -legacyCC.CCString = CCString; +cclegacy.String = CCString; +cclegacy.CCString = CCString; // Ensures the type matches its default value export function getTypeChecker_ET (type: string, attributeName: string) { @@ -261,8 +261,8 @@ export function getObjTypeChecker_ET (typeCtor) { getTypeChecker_ET('Object', 'type')(classCtor, mainPropName); // check ValueType const defaultDef = getClassAttrs(classCtor)[`${mainPropName + DELIMETER}default`]; - const defaultVal = legacyCC.Class.getDefault(defaultDef); - if (!Array.isArray(defaultVal) && isChildClassOf(typeCtor, legacyCC.ValueType)) { + const defaultVal = cclegacy.Class.getDefault(defaultDef); + if (!Array.isArray(defaultVal) && isChildClassOf(typeCtor, cclegacy.ValueType)) { const typename = getClassName(typeCtor); const info = formatStr('No need to specify the "type" of "%s.%s" because %s is a child class of ValueType.', getClassName(classCtor), mainPropName, typename); diff --git a/cocos/core/data/utils/preprocess-class.ts b/cocos/core/data/utils/preprocess-class.ts index 2ad836fab45..d9cc527aa6a 100644 --- a/cocos/core/data/utils/preprocess-class.ts +++ b/cocos/core/data/utils/preprocess-class.ts @@ -27,7 +27,7 @@ import { DEV, EDITOR, TEST } from 'internal:constants'; import { error, errorID, warn, warnID } from '../../platform/debug'; import * as js from '../../utils/js'; import { PrimitiveType } from './attribute'; -import { legacyCC } from '../../global-exports'; +import { cclegacy } from '@base/global'; // 增加预处理属性这个步骤的目的是降低 CCClass 的实现难度，将比较稳定的通用逻辑和一些需求比较灵活的属性需求分隔开。 @@ -85,7 +85,7 @@ function parseType (val, type, className, propName): void { if (Array.isArray(type)) { if (STATIC_CHECK && 'default' in val) { - if (!legacyCC.Class.isArray(val.default)) { + if (!cclegacy.Class.isArray(val.default)) { warnID(5507, className, propName); } } @@ -98,17 +98,17 @@ function parseType (val, type, className, propName): void { } if (typeof type === 'function') { if (type === String) { - val.type = legacyCC.String; + val.type = cclegacy.String; if (STATIC_CHECK) { warnID(3608, `"${className}.${propName}"`); } } else if (type === Boolean) { - val.type = legacyCC.Boolean; + val.type = cclegacy.Boolean; if (STATIC_CHECK) { warnID(3609, `"${className}.${propName}"`); } } else if (type === Number) { - val.type = legacyCC.Float; + val.type = cclegacy.Float; if (STATIC_CHECK) { warnID(3610, `"${className}.${propName}"`); } @@ -139,7 +139,7 @@ function parseType (val, type, className, propName): void { } if (EDITOR && typeof type === 'function') { - if (legacyCC.Class._isCCClass(type) && val.serializable !== false && !js.getClassId(type, false)) { + if (cclegacy.Class._isCCClass(type) && val.serializable !== false && !js.getClassId(type, false)) { warnID(5512, className, propName, className, propName); } } @@ -186,7 +186,7 @@ export function getFullFormOfProperty (options, isGetset): { return _wrapOptions(isGetset, [], options); } else if (typeof options === 'function') { const type = options; - return _wrapOptions(isGetset, js.isChildClassOf(type, legacyCC.ValueType) ? new type() : null, type); + return _wrapOptions(isGetset, js.isChildClassOf(type, cclegacy.ValueType) ? new type() : null, type); } else if (options instanceof PrimitiveType) { return _wrapOptions(isGetset, undefined, options); } else { @@ -210,7 +210,7 @@ export function preprocessAttrs (properties, className, cls): void { errorID(5513, className, propName); } else if (val.set) { errorID(5514, className, propName); - } else if (legacyCC.Class._isCCClass(val.default)) { + } else if (cclegacy.Class._isCCClass(val.default)) { val.default = null; errorID(5515, className, propName); } @@ -246,7 +246,7 @@ export function doValidateMethodWithProps_DEV (func, funcName, className, cls, b return false; } if (funcName === 'destroy' - && js.isChildClassOf(base, legacyCC.Component) + && js.isChildClassOf(base, cclegacy.Component) && !CALL_SUPER_DESTROY_REG_DEV.test(func) ) { error(`Overwriting '${funcName}' function in '${className}' class without calling super is not allowed. Call the super function in '${funcName}' please.`); diff --git a/cocos/core/data/utils/requiring-frame.ts b/cocos/core/data/utils/requiring-frame.ts index 826486db54e..17eb8511fd2 100644 --- a/cocos/core/data/utils/requiring-frame.ts +++ b/cocos/core/data/utils/requiring-frame.ts @@ -24,7 +24,7 @@ */ import { EDITOR } from 'internal:constants'; -import { legacyCC } from '../../global-exports'; +import { cclegacy } from '@base/global'; /** * @@ -65,14 +65,14 @@ export function peek (): any { return requiringFrames[requiringFrames.length - 1]; } -legacyCC._RF = { +cclegacy._RF = { push, pop, peek, }; if (EDITOR) { - legacyCC._RF.reset = (): void => { + cclegacy._RF.reset = (): void => { requiringFrames = []; }; } diff --git a/cocos/core/deprecated.ts b/cocos/core/deprecated.ts index c6c6c4f5798..68fdfa31005 100644 --- a/cocos/core/deprecated.ts +++ b/cocos/core/deprecated.ts @@ -25,7 +25,7 @@ import { replaceProperty, removeProperty } from './utils/x-deprecated'; import * as math from './math'; import { Scheduler } from './scheduler'; -import { legacyCC } from './global-exports'; +import { cclegacy } from '@base/global'; import { System } from './system'; @@ -184,7 +184,7 @@ replaceProperty(vmath, 'vmath', [ }, ]); -legacyCC.vmath = vmath; +cclegacy.vmath = vmath; export { vmath }; diff --git a/cocos/core/effect-settings.ts b/cocos/core/effect-settings.ts index 580fb5b0074..6c92d25159f 100644 --- a/cocos/core/effect-settings.ts +++ b/cocos/core/effect-settings.ts @@ -22,13 +22,13 @@ THE SOFTWARE. */ import { HTML5 } from 'internal:constants'; -import { legacyCC } from './global-exports'; +import { cclegacy } from '@base/global'; declare const fsUtils: any; export class EffectSettings { init (path = ''): Promise { - if (!legacyCC.rendering || !legacyCC.rendering.enableEffectImport || !path) { + if (!cclegacy.rendering || !cclegacy.rendering.enableEffectImport || !path) { return Promise.resolve(); } return new Promise((resolve, reject) => { @@ -63,4 +63,4 @@ export class EffectSettings { } export const effectSettings = new EffectSettings(); -legacyCC.effectSettings = effectSettings; +cclegacy.effectSettings = effectSettings; diff --git a/cocos/core/event/callbacks-invoker.ts b/cocos/core/event/callbacks-invoker.ts index 34a0e1876ad..a85188ddb17 100644 --- a/cocos/core/event/callbacks-invoker.ts +++ b/cocos/core/event/callbacks-invoker.ts @@ -27,7 +27,7 @@ import { TEST } from 'internal:constants'; import { Pool } from '../memop'; import { array, createMap } from '../utils/js'; import { isCCObject, isValid } from '../data/object'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; const fastRemoveAt = array.fastRemoveAt; @@ -380,5 +380,5 @@ export class CallbacksInvoker { } if (TEST) { - legacyCC._Test.CallbacksInvoker = CallbacksInvoker; + cclegacy._Test.CallbacksInvoker = CallbacksInvoker; } diff --git a/cocos/core/event/event-target.ts b/cocos/core/event/event-target.ts index 010825940cd..a6959c4babe 100644 --- a/cocos/core/event/event-target.ts +++ b/cocos/core/event/event-target.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { Eventify } from './eventify'; class Empty {} @@ -43,4 +43,4 @@ export const EventTarget = Eventify(Empty); export type EventTarget = InstanceType; -legacyCC.EventTarget = EventTarget; +cclegacy.EventTarget = EventTarget; diff --git a/cocos/core/geometry/plane.ts b/cocos/core/geometry/plane.ts index 32bc73cdc7d..4e89a185134 100644 --- a/cocos/core/geometry/plane.ts +++ b/cocos/core/geometry/plane.ts @@ -24,12 +24,12 @@ import { Mat4, Vec3, Vec4 } from '../math'; import enums from './enums'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; const v1 = new Vec3(0, 0, 0); const v2 = new Vec3(0, 0, 0); -const temp_mat = legacyCC.mat4(); -const temp_vec4 = legacyCC.v4(); +const temp_mat = cclegacy.mat4(); +const temp_vec4 = cclegacy.v4(); /** * @en diff --git a/cocos/core/index.ts b/cocos/core/index.ts index 941056a4839..51394cc89f7 100644 --- a/cocos/core/index.ts +++ b/cocos/core/index.ts @@ -23,17 +23,17 @@ THE SOFTWARE. */ -import { legacyCC, VERSION } from './global-exports'; +import { cclegacy, VERSION } from '@base/global'; import * as geometry from './geometry'; import * as math from './math'; import * as memop from './memop'; import './deprecated'; import './deprecated-3.7.0'; -legacyCC.math = math; -legacyCC.geometry = geometry; +cclegacy.math = math; +cclegacy.geometry = geometry; -export { math, memop, geometry, VERSION }; +export { math, memop, geometry, VERSION, cclegacy }; export * from './math'; export * from './memop'; @@ -47,7 +47,6 @@ export * from './curves'; export * from './settings'; export * from './system'; export * from './algorithm'; -export { legacyCC as cclegacy } from './global-exports'; export * from './curves/bezier'; // TODO: should not include engine internal exports when module mechanism is implemented. diff --git a/cocos/core/legacy.ts b/cocos/core/legacy.ts index 5572f0beb39..3bf803067e4 100644 --- a/cocos/core/legacy.ts +++ b/cocos/core/legacy.ts @@ -24,22 +24,22 @@ import * as debug from './platform/debug'; import { _normalize, basename, changeBasename, changeExtname, dirname, extname, getSeperator, join, mainFileName, stripSep } from './utils/path'; -import { legacyCC } from './global-exports'; +import { cclegacy } from '@base/global'; // CCDebug.js -legacyCC.log = debug.log; -legacyCC.warn = debug.warn; -legacyCC.error = debug.error; -legacyCC.assert = debug.assert; -legacyCC._throw = debug._throw; -legacyCC.logID = debug.logID; -legacyCC.warnID = debug.warnID; -legacyCC.errorID = debug.errorID; -legacyCC.assertID = debug.assertID; -legacyCC.debug = debug; +cclegacy.log = debug.log; +cclegacy.warn = debug.warn; +cclegacy.error = debug.error; +cclegacy.assert = debug.assert; +cclegacy._throw = debug._throw; +cclegacy.logID = debug.logID; +cclegacy.warnID = debug.warnID; +cclegacy.errorID = debug.errorID; +cclegacy.assertID = debug.assertID; +cclegacy.debug = debug; // path.js -legacyCC.path = { +cclegacy.path = { join, extname, mainFileName, diff --git a/cocos/core/math/affine-transform.ts b/cocos/core/math/affine-transform.ts index 00b86bf96fa..55d7fe189ef 100644 --- a/cocos/core/math/affine-transform.ts +++ b/cocos/core/math/affine-transform.ts @@ -25,11 +25,11 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { Mat4 } from './mat4'; import { Rect } from './rect'; import { Size } from './size'; import { Vec2 } from './vec2'; -import { legacyCC } from '../global-exports'; /** * @en `AffineTransform` class represent an affine transform matrix. It's composed basically by translation, rotation, scale transformations. @@ -262,4 +262,4 @@ export class AffineTransform { } } -legacyCC.AffineTransform = AffineTransform; +cclegacy.AffineTransform = AffineTransform; diff --git a/cocos/core/math/color.ts b/cocos/core/math/color.ts index d5393128af5..17d38e5b6c1 100644 --- a/cocos/core/math/color.ts +++ b/cocos/core/math/color.ts @@ -23,11 +23,11 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { IColorLike } from './type-define'; import { clamp, EPSILON } from './utils'; -import { legacyCC } from '../global-exports'; import { assertIsTrue } from '../data/utils/asserts'; import { Vec4 } from './vec4'; import { Vec3 } from './vec3'; @@ -735,7 +735,7 @@ export class Color extends ValueType { } CCClass.fastDefine('cc.Color', Color, { r: 0, g: 0, b: 0, a: 255 }); -legacyCC.Color = Color; +cclegacy.Color = Color; export function color (other: Color | string): Color; export function color (r?: number, g?: number, b?: number, a?: number): Color; @@ -744,7 +744,7 @@ export function color (r?: number | Color | string, g?: number, b?: number, a?: return new Color(r as any, g, b, a); } -legacyCC.color = color; +cclegacy.color = color; export function srgbToLinear (x: number): number { if (x <= 0) return 0; diff --git a/cocos/core/math/deprecated.ts b/cocos/core/math/deprecated.ts index 2363088469b..2a490db6aba 100644 --- a/cocos/core/math/deprecated.ts +++ b/cocos/core/math/deprecated.ts @@ -22,6 +22,7 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { replaceProperty } from '../utils/x-deprecated'; import { Color } from './color'; import { Mat3 } from './mat3'; @@ -30,7 +31,6 @@ import { Quat } from './quat'; import { Vec2 } from './vec2'; import { Vec3 } from './vec3'; import { Vec4 } from './vec4'; -import { legacyCC } from '../global-exports'; replaceProperty(Vec2, 'Vec2', [ { @@ -362,7 +362,7 @@ replaceProperty(Color, 'Color', [ newName: 'fromHEX', customFunction (...args: any): any { const arg1 = args[1].toString(16); - return legacyCC.Color.fromHEX(args[0], arg1); + return cclegacy.Color.fromHEX(args[0], arg1); }, }, ]); diff --git a/cocos/core/math/mat3.ts b/cocos/core/math/mat3.ts index 1f9a3b7e0d3..4cd56b9bd70 100644 --- a/cocos/core/math/mat3.ts +++ b/cocos/core/math/mat3.ts @@ -22,13 +22,13 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Quat } from './quat'; import { IMat3Like, IMat4Like, IQuatLike, IVec2Like, IVec3Like } from './type-define'; import { EPSILON, HALF_PI } from './utils'; import { Vec3 } from './vec3'; -import { legacyCC } from '../global-exports'; /** * @en Mathematical 3x3 matrix. @@ -1111,4 +1111,4 @@ CCClass.fastDefine('cc.Mat3', Mat3, { m07: 0, m08: 1, }); -legacyCC.Mat3 = Mat3; +cclegacy.Mat3 = Mat3; diff --git a/cocos/core/math/mat4.ts b/cocos/core/math/mat4.ts index 067a3219bf3..a787139b36e 100644 --- a/cocos/core/math/mat4.ts +++ b/cocos/core/math/mat4.ts @@ -22,6 +22,7 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Mat3 } from './mat3'; @@ -29,7 +30,6 @@ import { Quat } from './quat'; import { IMat4Like, IVec3Like } from './type-define'; import { EPSILON } from './utils'; import { Vec3 } from './vec3'; -import { legacyCC } from '../global-exports'; /** * @engineInternal @@ -2508,7 +2508,7 @@ CCClass.fastDefine('cc.Mat4', Mat4, { m14: 0, m15: 1, }); -legacyCC.Mat4 = Mat4; +cclegacy.Mat4 = Mat4; export function mat4(other: Mat4): Mat4; export function mat4( @@ -2526,4 +2526,4 @@ export function mat4 ( return new Mat4(m00 as any, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33); } -legacyCC.mat4 = mat4; +cclegacy.mat4 = mat4; diff --git a/cocos/core/math/quat.ts b/cocos/core/math/quat.ts index 7e01d595135..58bbbf332cd 100644 --- a/cocos/core/math/quat.ts +++ b/cocos/core/math/quat.ts @@ -22,13 +22,13 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Mat3 } from './mat3'; import { IQuatLike, IVec3Like } from './type-define'; import { EPSILON, toDegree } from './utils'; import { Vec3 } from './vec3'; -import { legacyCC } from '../global-exports'; /** * @en quaternion @@ -902,7 +902,7 @@ const m3_1 = new Mat3(); const halfToRad = 0.5 * Math.PI / 180.0; CCClass.fastDefine('cc.Quat', Quat, { x: 0, y: 0, z: 0, w: 1 }); -legacyCC.Quat = Quat; +cclegacy.Quat = Quat; export function quat (other: Quat): Quat; export function quat (x?: number, y?: number, z?: number, w?: number): Quat; @@ -911,4 +911,4 @@ export function quat (x: number | Quat = 0, y = 0, z = 0, w = 1): Quat { return new Quat(x as any, y, z, w); } -legacyCC.quat = quat; +cclegacy.quat = quat; diff --git a/cocos/core/math/rect.ts b/cocos/core/math/rect.ts index 03061e18a20..1ea5fc9e78e 100644 --- a/cocos/core/math/rect.ts +++ b/cocos/core/math/rect.ts @@ -23,13 +23,13 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Mat4 } from './mat4'; import { Size } from './size'; import { IRectLike, IVec2Like } from './type-define'; import { Vec2 } from './vec2'; -import { legacyCC } from '../global-exports'; /** * @en @@ -486,7 +486,7 @@ export class Rect extends ValueType { CCClass.fastDefine('cc.Rect', Rect, { x: 0, y: 0, width: 0, height: 0 }); -legacyCC.Rect = Rect; +cclegacy.Rect = Rect; /** * @en The convenient method to create a new Rect. @@ -511,4 +511,4 @@ export function rect (x: Rect | number = 0, y = 0, width = 0, height = 0): Rect return new Rect(x as any, y, width, height); } -legacyCC.rect = rect; +cclegacy.rect = rect; diff --git a/cocos/core/math/size.ts b/cocos/core/math/size.ts index 07332665816..0ba6c22207e 100644 --- a/cocos/core/math/size.ts +++ b/cocos/core/math/size.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { ISizeLike } from './type-define'; -import { legacyCC } from '../global-exports'; /** * @en Two dimensional size type representing the width and height. @@ -191,6 +191,6 @@ export function size (width: Size | number = 0, height = 0): Size { return new Size(width as any, height); } -legacyCC.size = size; +cclegacy.size = size; -legacyCC.Size = Size; +cclegacy.Size = Size; diff --git a/cocos/core/math/vec2.ts b/cocos/core/math/vec2.ts index a250b73d06c..2b8b58514da 100644 --- a/cocos/core/math/vec2.ts +++ b/cocos/core/math/vec2.ts @@ -23,6 +23,7 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Mat4 } from './mat4'; @@ -30,7 +31,6 @@ import { IMat3Like, IMat4Like, IVec2Like } from './type-define'; import { clamp, EPSILON, random } from './utils'; import { Vec3 } from './vec3'; -import { legacyCC } from '../global-exports'; import { warn } from '../platform/debug'; /** @@ -831,7 +831,7 @@ export class Vec2 extends ValueType { } CCClass.fastDefine('cc.Vec2', Vec2, { x: 0, y: 0 }); -legacyCC.Vec2 = Vec2; +cclegacy.Vec2 = Vec2; export function v2 (other: Vec2): Vec2; export function v2 (x?: number, y?: number): Vec2; @@ -840,4 +840,4 @@ export function v2 (x?: number | Vec2, y?: number): Vec2 { return new Vec2(x as any, y); } -legacyCC.v2 = v2; +cclegacy.v2 = v2; diff --git a/cocos/core/math/vec3.ts b/cocos/core/math/vec3.ts index 99a713e9b48..afac9896b3f 100644 --- a/cocos/core/math/vec3.ts +++ b/cocos/core/math/vec3.ts @@ -23,12 +23,12 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { CCClass } from '../data/class'; import { ValueType } from '../value-types/value-type'; import { Mat4 } from './mat4'; import { IMat3Like, IMat4Like, IQuatLike, IVec3Like } from './type-define'; import { clamp, EPSILON, lerp, random } from './utils'; -import { legacyCC } from '../global-exports'; import { warn } from '../platform/debug'; /** @@ -1207,7 +1207,7 @@ export class Vec3 extends ValueType { } CCClass.fastDefine('cc.Vec3', Vec3, { x: 0, y: 0, z: 0 }); -legacyCC.Vec3 = Vec3; +cclegacy.Vec3 = Vec3; export function v3 (other: Vec3): Vec3; export function v3 (x?: number, y?: number, z?: number): Vec3; @@ -1238,4 +1238,4 @@ const rotateAxisAngle = ((): (out: Vec3, input: Readonly, axis: Readonly { - if (!legacyCC.game.canvas) { + if (!cclegacy.game.canvas) { return; } @@ -128,7 +128,7 @@ function resetDebugSettingForWebPage (mode: DebugMode): void { const logDiv = ccdocument.createElement('Div'); logDiv.setAttribute('id', 'logInfoDiv'); logDiv.setAttribute('width', '200'); - logDiv.setAttribute('height', `${legacyCC.game.canvas.height}`); + logDiv.setAttribute('height', `${cclegacy.game.canvas.height}`); const logDivStyle = logDiv.style; logDivStyle.zIndex = '99999'; logDivStyle.position = 'absolute'; @@ -147,7 +147,7 @@ function resetDebugSettingForWebPage (mode: DebugMode): void { logListStyle.margin = '0px'; logDiv.appendChild(logList); - legacyCC.game.canvas.parentNode.appendChild(logDiv); + cclegacy.game.canvas.parentNode.appendChild(logDiv); } logList.value = `${logList.value + msg}\r\n`; @@ -419,7 +419,7 @@ export function getError (errorId: number, ...param: StringSubstitution[]): stri * @deprecated @zh 从v3.6开始不再支持，请使用 profiler.isShowingStates。@en Since v3.6, Please use profiler.isShowingStates instead. */ export function isDisplayStats (): boolean { - return legacyCC.profiler ? legacyCC.profiler.isShowingStats() as boolean : false; + return cclegacy.profiler ? cclegacy.profiler.isShowingStats() as boolean : false; } /** @@ -428,7 +428,7 @@ export function isDisplayStats (): boolean { * @deprecated @zh 从v3.6开始不再支持，请使用 profiler.showStats。@en Since v3.6, Please use profiler.showStats instead. */ export function setDisplayStats (displayStats: boolean): void { - if (legacyCC.profiler) { - displayStats ? legacyCC.profiler.showStats() : legacyCC.profiler.hideStats(); + if (cclegacy.profiler) { + displayStats ? cclegacy.profiler.showStats() : cclegacy.profiler.hideStats(); } } diff --git a/cocos/core/platform/deprecated.ts b/cocos/core/platform/deprecated.ts index 5b1fdc9b2ea..37397e59c79 100644 --- a/cocos/core/platform/deprecated.ts +++ b/cocos/core/platform/deprecated.ts @@ -22,12 +22,12 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { markAsWarning, removeProperty, replaceProperty } from '../utils'; import { sys } from './sys'; -import { legacyCC } from '../global-exports'; import { screen } from './screen'; -markAsWarning(legacyCC, 'cc', [ +markAsWarning(cclegacy, 'cc', [ { name: 'winSize', suggest: 'please use view.getVisibleSize() instead.', diff --git a/cocos/core/platform/macro.ts b/cocos/core/platform/macro.ts index aaf1bb5d308..96975419644 100644 --- a/cocos/core/platform/macro.ts +++ b/cocos/core/platform/macro.ts @@ -26,7 +26,7 @@ */ import { EDITOR, MINIGAME, NATIVE, PREVIEW, RUNTIME_BASED } from 'internal:constants'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { Settings, settings } from '../settings'; const SUPPORT_TEXTURE_FORMATS = ['.astc', '.pkm', '.pvr', '.webp', '.jpg', '.jpeg', '.bmp', '.png']; @@ -1134,6 +1134,6 @@ const macro: Macro = { }, }; -legacyCC.macro = macro; +cclegacy.macro = macro; export { macro }; export type { Macro }; diff --git a/cocos/core/platform/screen.ts b/cocos/core/platform/screen.ts index 97cffce324a..840b33f0bcd 100644 --- a/cocos/core/platform/screen.ts +++ b/cocos/core/platform/screen.ts @@ -26,7 +26,7 @@ */ import { IScreenOptions, screenAdapter } from 'pal/screen-adapter'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { Size } from '../math'; import { Settings, settings } from '../settings'; import { error, warn, warnID } from './debug'; @@ -44,7 +44,7 @@ export class Screen { const orientation = settings.querySettings(Settings.Category.SCREEN, 'orientation') ?? 'auto'; const isHeadlessMode = settings.querySettings(Settings.Category.RENDERING, 'renderMode') === 3; screenAdapter.init({ exactFitScreen, configOrientation: orientation, isHeadlessMode }, (): void => { - const director = legacyCC.director; + const director = cclegacy.director; if (!director.root?.pipeline) { warnID(1220); return; @@ -225,6 +225,6 @@ export class Screen { const screen = new Screen(); -legacyCC.screen = screen; +cclegacy.screen = screen; export { screen }; diff --git a/cocos/core/platform/sys.ts b/cocos/core/platform/sys.ts index 3a6dbeebcb6..9ad9b5c3174 100644 --- a/cocos/core/platform/sys.ts +++ b/cocos/core/platform/sys.ts @@ -26,7 +26,7 @@ import { systemInfo } from 'pal/system-info'; import { screenAdapter } from 'pal/screen-adapter'; import { WECHAT, WECHAT_MINI_PROGRAM } from 'internal:constants'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { Rect } from '../math/rect'; import { Vec2 } from '../math/vec2'; import { warnID, log } from './debug'; @@ -286,7 +286,7 @@ export const sys = { str += `os : ${this.os}\r\n`; str += `osVersion : ${this.osVersion}\r\n`; str += `platform : ${this.platform}\r\n`; - str += `Using ${legacyCC.game.renderType === legacyCC.game.RENDER_TYPE_WEBGL ? 'WEBGL' : 'CANVAS'} renderer.\r\n`; + str += `Using ${cclegacy.game.renderType === cclegacy.game.RENDER_TYPE_WEBGL ? 'WEBGL' : 'CANVAS'} renderer.\r\n`; log(str); }, @@ -364,7 +364,7 @@ export const sys = { * @return {Rect} */ getSafeAreaRect (): Rect { - const locView = legacyCC.view; + const locView = cclegacy.view; const edge = screenAdapter.safeAreaEdge; const windowSize = screenAdapter.windowSize; @@ -384,4 +384,4 @@ export const sys = { }, }; -legacyCC.sys = sys; +cclegacy.sys = sys; diff --git a/cocos/core/platform/visible-rect.ts b/cocos/core/platform/visible-rect.ts index 57e4b5dfb0e..f3f948129a2 100644 --- a/cocos/core/platform/visible-rect.ts +++ b/cocos/core/platform/visible-rect.ts @@ -24,8 +24,8 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { Rect } from '../math'; -import { legacyCC } from '../global-exports'; /** * @zh `visibleRect` is a singleton object which defines the actual visible rect of the current view. @@ -37,55 +37,55 @@ export const visibleRect = { * @zh 与游戏场景有关的屏幕左上方坐标。 * @en Top left coordinate of the screen related to the game scene. */ - topLeft: legacyCC.v2(0, 0), + topLeft: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕右上方坐标。 * @en Top right coordinate of the screen related to the game scene. */ - topRight: legacyCC.v2(0, 0), + topRight: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕上方中心坐标。 * @en Top center coordinate of the screen related to the game scene. */ - top: legacyCC.v2(0, 0), + top: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕左下坐标。 * @en Bottom left coordinate of the screen related to the game scene. */ - bottomLeft: legacyCC.v2(0, 0), + bottomLeft: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕右下坐标。 * @en Bottom right coordinate of the screen related to the game scene. */ - bottomRight: legacyCC.v2(0, 0), + bottomRight: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕下方中心坐标。 * @en Bottom center coordinate of the screen related to the game scene. */ - bottom: legacyCC.v2(0, 0), + bottom: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕中心坐标。 * @en Center coordinate of the screen related to the game scene. */ - center: legacyCC.v2(0, 0), + center: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕左边中心坐标。 * @en Left center coordinate of the screen related to the game scene. */ - left: legacyCC.v2(0, 0), + left: cclegacy.v2(0, 0), /** * @zh 与游戏场景有关的屏幕右边中心坐标。 * @en Right center coordinate of the screen related to the game scene. */ - right: legacyCC.v2(0, 0), + right: cclegacy.v2(0, 0), /** * @zh 屏幕宽度。 @@ -143,4 +143,4 @@ export const visibleRect = { }, }; -legacyCC.visibleRect = visibleRect; +cclegacy.visibleRect = visibleRect; diff --git a/cocos/core/scheduler.ts b/cocos/core/scheduler.ts index 8863514bca8..d8cb9f299b6 100644 --- a/cocos/core/scheduler.ts +++ b/cocos/core/scheduler.ts @@ -23,10 +23,10 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { IDGenerator } from './utils/id-generator'; import { createMap } from './utils/js'; import { System } from './system'; -import { legacyCC } from './global-exports'; import { errorID, warnID, logID, assertID } from './platform/debug'; const MAX_POOL_SIZE = 20; @@ -246,7 +246,7 @@ class CallbackTimer { this._delay = delay; this._useDelay = (this._delay > 0); this._repeat = repeat; - this._runForever = (this._repeat === legacyCC.macro.REPEAT_FOREVER); + this._runForever = (this._repeat === cclegacy.macro.REPEAT_FOREVER); return true; } /** @@ -591,7 +591,7 @@ export class Scheduler extends System { // selector, target, interval, paused if (arguments.length === 3 || arguments.length === 4 || arguments.length === 5) { paused = !!repeat; - repeat = legacyCC.macro.REPEAT_FOREVER; + repeat = cclegacy.macro.REPEAT_FOREVER; delay = 0; } @@ -1179,4 +1179,4 @@ export class Scheduler extends System { } } -legacyCC.Scheduler = Scheduler; +cclegacy.Scheduler = Scheduler; diff --git a/cocos/core/settings.ts b/cocos/core/settings.ts index 5869072b989..385a60a17ba 100644 --- a/cocos/core/settings.ts +++ b/cocos/core/settings.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ import { HTML5, TAOBAO, TAOBAO_MINIGAME } from 'internal:constants'; -import { legacyCC } from './global-exports'; +import { cclegacy } from '@base/global'; declare const fsUtils: any; declare const require: (path: string) => Promise; @@ -196,4 +196,4 @@ export declare namespace Settings { * Settings module singleton, through this you can access the configuration data in settings.json. */ export const settings = new Settings(); -legacyCC.settings = settings; +cclegacy.settings = settings; diff --git a/cocos/core/utils/coordinates-converts-utils.ts b/cocos/core/utils/coordinates-converts-utils.ts index 55479ef3612..6c01cee0098 100644 --- a/cocos/core/utils/coordinates-converts-utils.ts +++ b/cocos/core/utils/coordinates-converts-utils.ts @@ -26,7 +26,7 @@ import { Camera } from '../../misc/camera-component'; import { Vec3 } from '../math'; import { Node } from '../../scene-graph'; import { replaceProperty } from './x-deprecated'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; const _vec3 = new Vec3(); @@ -68,8 +68,8 @@ export function WorldNode3DToWorldNodeUI (mainCamera: Camera, wpos: Vec3, out?: } mainCamera.worldToScreen(wpos, out); - out.x /= legacyCC.view.getScaleX(); - out.y /= legacyCC.view.getScaleY(); + out.x /= cclegacy.view.getScaleX(); + out.y /= cclegacy.view.getScaleY(); return out; } @@ -84,9 +84,9 @@ const convertUtils = { }; export { convertUtils }; -legacyCC.pipelineUtils = convertUtils; +cclegacy.pipelineUtils = convertUtils; -replaceProperty(legacyCC.pipelineUtils, 'cc.pipelineUtils', [ +replaceProperty(cclegacy.pipelineUtils, 'cc.pipelineUtils', [ { name: 'WorldNode3DToLocalNodeUI', newName: 'convertToUINode', diff --git a/cocos/core/utils/decode-uuid.ts b/cocos/core/utils/decode-uuid.ts index d9cf49989f9..ab5c00b7b72 100644 --- a/cocos/core/utils/decode-uuid.ts +++ b/cocos/core/utils/decode-uuid.ts @@ -24,8 +24,8 @@ */ import { TEST } from 'internal:constants'; +import { cclegacy } from '@base/global'; import { BASE64_VALUES } from './misc'; -import { legacyCC } from '../global-exports'; const separator = '@'; @@ -70,5 +70,5 @@ export default function decodeUuid (base64: string): string { } if (TEST) { - legacyCC._Test.decodeUuid = decodeUuid; + cclegacy._Test.decodeUuid = decodeUuid; } diff --git a/cocos/core/utils/js.ts b/cocos/core/utils/js.ts index 54bb8b977fa..693833c4b77 100644 --- a/cocos/core/utils/js.ts +++ b/cocos/core/utils/js.ts @@ -25,6 +25,7 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { IDGenerator } from './id-generator'; import { _idToClass, @@ -61,7 +62,6 @@ import { } from './js-typed'; import { Pool } from './pool'; import * as array from './array'; -import { legacyCC } from '../global-exports'; export * from './js-typed'; export { IDGenerator } from './id-generator'; @@ -170,4 +170,4 @@ export const js = { * @en This module provides some JavaScript utilities. All members can be accessed via `import { js } from 'cc'`. * @zh 这个模块封装了 JavaScript 相关的一些实用函数，你可以通过 `import { js } from 'cc'` 来访问这个模块。 */ -legacyCC.js = js; +cclegacy.js = js; diff --git a/cocos/core/utils/misc.ts b/cocos/core/utils/misc.ts index bc78709db62..53a0f585566 100644 --- a/cocos/core/utils/misc.ts +++ b/cocos/core/utils/misc.ts @@ -27,8 +27,8 @@ import { DEV } from 'internal:constants'; import { setTimeoutRAF } from '@pal/utils'; +import { cclegacy } from '@base/global'; import { getClassName, getset, isEmptyObject } from './js'; -import { legacyCC } from '../global-exports'; import { warnID } from '../platform/debug'; import { macro } from '../platform/macro'; import type { Component } from '../../scene-graph'; @@ -61,7 +61,7 @@ export function propertyDefine (ctor, sameNameGetSets, diffNameGetSets): void { } else { const getterFunc: Getter = np[getter]; if (DEV && !getterFunc) { - const clsName: string = (legacyCC.Class._isCCClass(ctor) && getClassName(ctor)) + const clsName: string = (cclegacy.Class._isCCClass(ctor) && getClassName(ctor)) || ctor.name || '(anonymous class)'; warnID(5700, propName, getter, clsName); @@ -268,7 +268,7 @@ export function radiansToDegrees (angle): number { // } // } -legacyCC.misc = { +cclegacy.misc = { BUILTIN_CLASSID_RE, BASE64_VALUES, propertyDefine, diff --git a/cocos/core/value-types/bitmask.ts b/cocos/core/value-types/bitmask.ts index e4d2bd1f610..acf4ef3bd00 100644 --- a/cocos/core/value-types/bitmask.ts +++ b/cocos/core/value-types/bitmask.ts @@ -24,7 +24,7 @@ import { EDITOR, TEST } from 'internal:constants'; import { value } from '../utils/js'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { errorID } from '../platform/debug'; /** @@ -151,4 +151,4 @@ export function ccbitmask (bitmaskx: object): void { value(bitmaskx, '__bitmask__', null, true); } -legacyCC.BitMask = BitMask; +cclegacy.BitMask = BitMask; diff --git a/cocos/core/value-types/enum.ts b/cocos/core/value-types/enum.ts index 6dbfc8c5e4f..d68a49e98f8 100644 --- a/cocos/core/value-types/enum.ts +++ b/cocos/core/value-types/enum.ts @@ -25,7 +25,7 @@ import { EDITOR, TEST, DEV } from 'internal:constants'; import { value } from '../utils/js'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; import { errorID } from '../platform/debug'; import { assertIsTrue } from '../data/utils/asserts'; @@ -197,4 +197,4 @@ export function ccenum (enumType: EnumT): void { } } -legacyCC.Enum = Enum; +cclegacy.Enum = Enum; diff --git a/cocos/core/value-types/value-type.ts b/cocos/core/value-types/value-type.ts index 15473af19e8..7d87ff2a964 100644 --- a/cocos/core/value-types/value-type.ts +++ b/cocos/core/value-types/value-type.ts @@ -25,7 +25,7 @@ import { errorID } from '../platform/debug'; import * as js from '../utils/js'; -import { legacyCC } from '../global-exports'; +import { cclegacy } from '@base/global'; /** * @en The base class of all value types. @@ -93,4 +93,4 @@ export class ValueType { } js.setClassName('cc.ValueType', ValueType); -legacyCC.ValueType = ValueType; +cclegacy.ValueType = ValueType; diff --git a/cocos/dragon-bones/ArmatureDisplay.ts b/cocos/dragon-bones/ArmatureDisplay.ts index 8f2c08d8d3f..fea21ee8e53 100644 --- a/cocos/dragon-bones/ArmatureDisplay.ts +++ b/cocos/dragon-bones/ArmatureDisplay.ts @@ -25,7 +25,8 @@ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Armature, Bone, EventObject, AnimationState } from '@cocos/dragonbones-js'; import { UIRenderer } from '../2d/framework/ui-renderer'; -import { Color, Enum, ccenum, errorID, RecyclePool, js, CCObject, EventTarget, cclegacy, _decorator, warn, error } from '../core'; +import { Color, Enum, ccenum, errorID, RecyclePool, js, CCObject, EventTarget, _decorator, warn, error } from '../core'; +import { cclegacy } from '@base/global'; import { BlendFactor } from '../gfx'; import { AnimationCache, ArmatureCache, ArmatureFrame } from './ArmatureCache'; import { AttachUtil } from './AttachUtil'; diff --git a/cocos/dragon-bones/ArmatureSystem.ts b/cocos/dragon-bones/ArmatureSystem.ts index b019f5a4ce0..60710e03877 100644 --- a/cocos/dragon-bones/ArmatureSystem.ts +++ b/cocos/dragon-bones/ArmatureSystem.ts @@ -23,7 +23,8 @@ */ import { director } from '../game/director'; -import { System, cclegacy } from '../core'; +import { System } from '../core'; +import { cclegacy } from '@base/global'; import { ArmatureDisplay } from './ArmatureDisplay'; /** * @en The ArmatureSystem is mainly responsible for triggering and updating the animation uniformly. diff --git a/cocos/dragon-bones/DragonBonesAsset.ts b/cocos/dragon-bones/DragonBonesAsset.ts index f79e8c75667..6d0d2d5d419 100644 --- a/cocos/dragon-bones/DragonBonesAsset.ts +++ b/cocos/dragon-bones/DragonBonesAsset.ts @@ -25,7 +25,8 @@ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Asset } from '../asset/assets'; import { ArmatureCache } from './ArmatureCache'; -import { Enum, cclegacy, _decorator, warn } from '../core'; +import { Enum, _decorator, warn } from '../core'; +import { cclegacy } from '@base/global'; import { CCFactory } from './CCFactory'; import { Node } from '../scene-graph'; diff --git a/cocos/dragon-bones/DragonBonesAtlasAsset.ts b/cocos/dragon-bones/DragonBonesAtlasAsset.ts index fa72c13ff21..c4d2e071a13 100644 --- a/cocos/dragon-bones/DragonBonesAtlasAsset.ts +++ b/cocos/dragon-bones/DragonBonesAtlasAsset.ts @@ -27,7 +27,8 @@ import { TextureAtlasData } from '@cocos/dragonbones-js'; import { ArmatureCache } from './ArmatureCache'; import { ArmatureDisplay } from './ArmatureDisplay'; import { CCFactory } from './CCFactory'; -import { cclegacy, _decorator } from '../core'; +import { cclegacy } from '@base/global'; +import { _decorator } from '../core'; import { Asset, Texture2D } from '../asset/assets'; import { Node } from '../scene-graph'; diff --git a/cocos/dragon-bones/assembler/simple.ts b/cocos/dragon-bones/assembler/simple.ts index 5d579e472df..181ab4610b3 100644 --- a/cocos/dragon-bones/assembler/simple.ts +++ b/cocos/dragon-bones/assembler/simple.ts @@ -23,7 +23,8 @@ */ import { Armature, BlendMode } from '@cocos/dragonbones-js'; -import { Color, Mat4, Vec3, cclegacy } from '../../core'; +import { Color, Mat4, Vec3 } from '../../core'; +import { cclegacy } from '@base/global'; import { BlendFactor } from '../../gfx'; import { vfmtPosUvColor } from '../../2d/renderer/vertex-format'; import { MaterialInstance } from '../../render-scene/core/material-instance'; diff --git a/cocos/game/director.ts b/cocos/game/director.ts index 2a232bddb9d..8c728de81f8 100644 --- a/cocos/game/director.ts +++ b/cocos/game/director.ts @@ -29,7 +29,8 @@ import { DEBUG, EDITOR, BUILD, TEST, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { SceneAsset } from '../asset/assets/scene-asset'; -import { System, EventTarget, Scheduler, js, errorID, error, assertID, warnID, macro, CCObject, cclegacy, isValid } from '../core'; +import { System, EventTarget, Scheduler, js, errorID, error, assertID, warnID, macro, CCObject, isValid } from '../core'; +import { cclegacy } from '@base/global'; import { input } from '../input'; import { Root } from '../root'; import { Node, Scene } from '../scene-graph'; diff --git a/cocos/game/game.ts b/cocos/game/game.ts index 990d0baaca2..afa84144564 100644 --- a/cocos/game/game.ts +++ b/cocos/game/game.ts @@ -28,8 +28,10 @@ import { systemInfo } from 'pal/system-info'; import { findCanvas, loadJsFile } from '@pal/env'; import { Pacer } from 'pal/pacer'; import { ConfigOrientation } from 'pal/screen-adapter'; -import assetManager, { IAssetManagerOptions } from '../asset/asset-manager/asset-manager'; -import { EventTarget, AsyncDelegate, sys, macro, VERSION, cclegacy, screen, Settings, settings, assert, garbageCollectionManager, DebugMode, warn, _resetDebugSetting, log, error } from '../core'; +import assetManager from '../asset/asset-manager/asset-manager'; +import { IAssetManagerOptions } from '../asset/asset-manager/asset-manager'; +import { EventTarget, AsyncDelegate, sys, macro, screen, Settings, settings, assert, garbageCollectionManager, DebugMode, warn, _resetDebugSetting, log, error } from '../core'; +import { VERSION, cclegacy } from '@base/global'; import { input } from '../input'; import { deviceManager, LegacyRenderMode } from '../gfx'; import { SplashScreen } from './splash-screen'; diff --git a/cocos/game/splash-screen.ts b/cocos/game/splash-screen.ts index c0969d7ead3..a2792061f2f 100644 --- a/cocos/game/splash-screen.ts +++ b/cocos/game/splash-screen.ts @@ -25,15 +25,11 @@ import { EDITOR, TAOBAO } from 'internal:constants'; import { ImageData } from 'pal/image'; import { Material } from '../asset/assets/material'; -import { clamp01, Mat4, Vec2, Settings, settings, sys, cclegacy, easing, preTransforms } from '../core'; -import { - Sampler, SamplerInfo, Shader, Texture, TextureInfo, Device, InputAssembler, InputAssemblerInfo, Attribute, Buffer, - BufferInfo, Rect, Color, BufferTextureCopy, CommandBuffer, BufferUsageBit, Format, - MemoryUsageBit, TextureType, TextureUsageBit, Address, Swapchain, Framebuffer, -} from '../gfx'; +import { clamp01, Mat4, Vec2, Settings, settings, sys, easing, preTransforms } from '../core'; +import { cclegacy, ccwindow } from '@base/global'; +import { Sampler, SamplerInfo, Shader, Texture, TextureInfo, Device, InputAssembler, InputAssemblerInfo, Attribute, Buffer, BufferInfo, Rect, Color, BufferTextureCopy, CommandBuffer, BufferUsageBit, Format, MemoryUsageBit, TextureType, TextureUsageBit, Address, Swapchain, Framebuffer } from '../gfx'; import { PipelineStateManager } from '../rendering'; import { SetIndex } from '../rendering/define'; -import { ccwindow, legacyCC } from '../core/global-exports'; import { XREye } from '../xr/xr-enums'; import { ImageAsset } from '../asset/assets'; @@ -577,7 +573,7 @@ export class SplashScreen { device.flushCommands([cmdBuff]); device.queue.submit([cmdBuff]); device.present(); - device.enableAutoBarrier(!legacyCC.rendering); + device.enableAutoBarrier(!cclegacy.rendering); if (sys.isXR) { xr.entry.renderLoopEnd(xrEye); diff --git a/cocos/gfx/deprecated-3.0.0.ts b/cocos/gfx/deprecated-3.0.0.ts index c617631fb42..35c1c789282 100644 --- a/cocos/gfx/deprecated-3.0.0.ts +++ b/cocos/gfx/deprecated-3.0.0.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { replaceProperty, removeProperty, cclegacy } from '../core'; +import { replaceProperty, removeProperty } from '../core'; +import { cclegacy } from '@base/global'; // Deprecated CC polyfill const polyfills = { diff --git a/cocos/gfx/device-manager.ts b/cocos/gfx/device-manager.ts index 2db9c1c60aa..7a00e49d75b 100644 --- a/cocos/gfx/device-manager.ts +++ b/cocos/gfx/device-manager.ts @@ -24,7 +24,8 @@ */ import { JSB, WEBGPU } from 'internal:constants'; -import { cclegacy, error, getError, sys, screen, Settings, settings } from '../core'; +import { cclegacy } from '@base/global'; +import { error, getError, sys, screen, Settings, settings } from '../core'; import { BindingMappingInfo, DeviceInfo, SwapchainInfo } from './base/define'; import { Device } from './base/device'; import { Swapchain } from './base/swapchain'; diff --git a/cocos/gfx/empty/empty-device.ts b/cocos/gfx/empty/empty-device.ts index efb6c9abf52..e95bf30da9a 100644 --- a/cocos/gfx/empty/empty-device.ts +++ b/cocos/gfx/empty/empty-device.ts @@ -37,12 +37,7 @@ import { RenderPass } from '../base/render-pass'; import { Sampler } from '../base/states/sampler'; import { Shader } from '../base/shader'; import { Texture } from '../base/texture'; -import { - ShaderInfo, - QueueInfo, CommandBufferInfo, DescriptorSetInfo, DescriptorSetLayoutInfo, FramebufferInfo, InputAssemblerInfo, PipelineLayoutInfo, - RenderPassInfo, SamplerInfo, TextureInfo, TextureViewInfo, BufferInfo, BufferViewInfo, DeviceInfo, TextureBarrierInfo, GeneralBarrierInfo, - BufferBarrierInfo, QueueType, API, BufferTextureCopy, SwapchainInfo, -} from '../base/define'; +import { ShaderInfo, QueueInfo, CommandBufferInfo, DescriptorSetInfo, DescriptorSetLayoutInfo, FramebufferInfo, InputAssemblerInfo, PipelineLayoutInfo, RenderPassInfo, SamplerInfo, TextureInfo, TextureViewInfo, BufferInfo, BufferViewInfo, DeviceInfo, TextureBarrierInfo, GeneralBarrierInfo, BufferBarrierInfo, QueueType, API, BufferTextureCopy, SwapchainInfo } from '../base/define'; import { GeneralBarrier } from '../base/states/general-barrier'; import { TextureBarrier } from '../base/states/texture-barrier'; import { BufferBarrier } from '../base/states/buffer-barrier'; @@ -60,7 +55,8 @@ import { EmptyRenderPass } from './empty-render-pass'; import { EmptyShader } from './empty-shader'; import { EmptySwapchain } from './empty-swapchain'; import { EmptyTexture } from './empty-texture'; -import { debug, cclegacy } from '../../core'; +import { debug } from '../../core'; +import { cclegacy } from '@base/global'; import { ImageAsset } from '../../asset/assets'; export class EmptyDevice extends Device { diff --git a/cocos/gfx/index.ems.ts b/cocos/gfx/index.ems.ts index 4ef3ed9d731..c0a383407cc 100644 --- a/cocos/gfx/index.ems.ts +++ b/cocos/gfx/index.ems.ts @@ -27,12 +27,12 @@ * @module gfx */ -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { gfx, webgpuAdapter } from '../webgpu/instantiated'; import './deprecated-3.0.0'; -export { BlendState, PipelineStateInfo, RasterizerState, DepthStencilState, BlendTarget } from './base/pipeline-state' +export { BlendState, PipelineStateInfo, RasterizerState, DepthStencilState, BlendTarget } from './base/pipeline-state'; export * from './base/define'; export * from './device-manager'; @@ -56,7 +56,7 @@ polyfillCC.Queue = gfx.CCWGPUQueue; cclegacy.gfx = polyfillCC; export * from './webgpu/override'; -export * from './webgpu/webgpu-define' +export * from './webgpu/webgpu-define'; export const WGPU_WASM = true; diff --git a/cocos/gfx/index.jsb.ts b/cocos/gfx/index.jsb.ts index ecff904f0da..f45d00c635e 100644 --- a/cocos/gfx/index.jsb.ts +++ b/cocos/gfx/index.jsb.ts @@ -24,7 +24,7 @@ declare const gfx: any; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import * as defines from './base/define'; import * as pso from './base/pipeline-state'; diff --git a/cocos/gfx/polyfill-legacy-cc.ts b/cocos/gfx/polyfill-legacy-cc.ts index 3bcfa4c3266..3c9c844b915 100644 --- a/cocos/gfx/polyfill-legacy-cc.ts +++ b/cocos/gfx/polyfill-legacy-cc.ts @@ -40,7 +40,7 @@ import { Texture } from './base/texture'; import { GeneralBarrier } from './base/states/general-barrier'; import { TextureBarrier } from './base/states/texture-barrier'; import { BufferBarrier } from './base/states/buffer-barrier'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import * as defines from './base/define'; const polyfills: Record = { diff --git a/cocos/gfx/webgl/webgl-commands.ts b/cocos/gfx/webgl/webgl-commands.ts index 7355454b65b..7648969513f 100644 --- a/cocos/gfx/webgl/webgl-commands.ts +++ b/cocos/gfx/webgl/webgl-commands.ts @@ -22,21 +22,13 @@ THE SOFTWARE. */ -import { debug, error, errorID, CachedArray, cclegacy, assertID } from '../../core'; +import { debug, error, errorID, CachedArray, assertID } from '../../core'; +import { cclegacy } from '@base/global'; import { WebGLCommandAllocator } from './webgl-command-allocator'; import { WebGLEXT } from './webgl-define'; import { WebGLDevice } from './webgl-device'; -import { - IWebGLGPUInputAssembler, IWebGLGPUUniform, IWebGLAttrib, IWebGLGPUDescriptorSet, IWebGLGPUBuffer, IWebGLGPUFramebuffer, IWebGLGPUInput, - IWebGLGPUPipelineState, IWebGLGPUShader, IWebGLGPUTexture, IWebGLGPUUniformBlock, IWebGLGPUUniformSamplerTexture, IWebGLGPURenderPass, -} from './webgl-gpu-objects'; -import { - BufferUsageBit, ClearFlagBit, ClearFlags, ColorMask, CullMode, Format, BufferTextureCopy, Color, Rect, - FormatInfos, FormatSize, LoadOp, MemoryUsageBit, ShaderStageFlagBit, UniformSamplerTexture, - TextureFlagBit, TextureType, Type, FormatInfo, DynamicStateFlagBit, BufferSource, DrawInfo, - IndirectBuffer, DynamicStates, Extent, getTypedArrayConstructor, formatAlignment, Offset, alignTo, - TextureBlit, Filter, -} from '../base/define'; +import { IWebGLGPUInputAssembler, IWebGLGPUUniform, IWebGLAttrib, IWebGLGPUDescriptorSet, IWebGLGPUBuffer, IWebGLGPUFramebuffer, IWebGLGPUInput, IWebGLGPUPipelineState, IWebGLGPUShader, IWebGLGPUTexture, IWebGLGPUUniformBlock, IWebGLGPUUniformSamplerTexture, IWebGLGPURenderPass } from './webgl-gpu-objects'; +import { BufferUsageBit, ClearFlagBit, ClearFlags, ColorMask, CullMode, Format, BufferTextureCopy, Color, Rect, FormatInfos, FormatSize, LoadOp, MemoryUsageBit, ShaderStageFlagBit, UniformSamplerTexture, TextureFlagBit, TextureType, Type, FormatInfo, DynamicStateFlagBit, BufferSource, DrawInfo, IndirectBuffer, DynamicStates, Extent, getTypedArrayConstructor, formatAlignment, Offset, alignTo, TextureBlit, Filter } from '../base/define'; import { WebGLStateCache } from './webgl-state-cache'; export function GFXFormatToWebGLType (format: Format, gl: WebGLRenderingContext): GLenum { diff --git a/cocos/gfx/webgl2/webgl2-commands.ts b/cocos/gfx/webgl2/webgl2-commands.ts index 698558c8a6f..f942f0f07cc 100644 --- a/cocos/gfx/webgl2/webgl2-commands.ts +++ b/cocos/gfx/webgl2/webgl2-commands.ts @@ -22,31 +22,13 @@ THE SOFTWARE. */ -import { - BufferUsageBit, ColorMask, CullMode, DynamicStateFlagBit, Filter, Format, TextureType, Type, FormatInfo, - FormatInfos, FormatSize, LoadOp, MemoryUsageBit, SampleCount, ShaderStageFlagBit, TextureFlagBit, - Color, Rect, BufferTextureCopy, BufferSource, DrawInfo, IndirectBuffer, UniformBlock, DynamicStates, - UniformSamplerTexture, alignTo, Extent, formatAlignment, getTypedArrayConstructor, Offset, TextureBlit, -} from '../base/define'; +import { BufferUsageBit, ColorMask, CullMode, DynamicStateFlagBit, Filter, Format, TextureType, Type, FormatInfo, FormatInfos, FormatSize, LoadOp, MemoryUsageBit, SampleCount, ShaderStageFlagBit, TextureFlagBit, Color, Rect, BufferTextureCopy, BufferSource, DrawInfo, IndirectBuffer, UniformBlock, DynamicStates, UniformSamplerTexture, alignTo, Extent, formatAlignment, getTypedArrayConstructor, Offset, TextureBlit } from '../base/define'; import { WebGL2EXT } from './webgl2-define'; import { WebGL2CommandAllocator } from './webgl2-command-allocator'; import { WebGL2Device } from './webgl2-device'; -import { - IWebGL2GPUInputAssembler, - IWebGL2Attrib, - IWebGL2GPUDescriptorSet, - IWebGL2GPUBuffer, - IWebGL2GPUFramebuffer, - IWebGL2GPUInput, - IWebGL2GPUPipelineState, - IWebGL2GPUSampler, - IWebGL2GPUShader, - IWebGL2GPUTexture, - IWebGL2GPUUniformBlock, - IWebGL2GPUUniformSamplerTexture, - IWebGL2GPURenderPass, -} from './webgl2-gpu-objects'; -import { CachedArray, error, errorID, debug, cclegacy, assertID } from '../../core'; +import { IWebGL2GPUInputAssembler, IWebGL2Attrib, IWebGL2GPUDescriptorSet, IWebGL2GPUBuffer, IWebGL2GPUFramebuffer, IWebGL2GPUInput, IWebGL2GPUPipelineState, IWebGL2GPUSampler, IWebGL2GPUShader, IWebGL2GPUTexture, IWebGL2GPUUniformBlock, IWebGL2GPUUniformSamplerTexture, IWebGL2GPURenderPass } from './webgl2-gpu-objects'; +import { CachedArray, error, errorID, debug, assertID } from '../../core'; +import { cclegacy } from '@base/global'; const WebGLWraps: GLenum[] = [ 0x2901, // WebGLRenderingContext.REPEAT diff --git a/cocos/gfx/webgpu/webgpu-define.ts b/cocos/gfx/webgpu/webgpu-define.ts index a1486108987..04feca0a7cb 100644 --- a/cocos/gfx/webgpu/webgpu-define.ts +++ b/cocos/gfx/webgpu/webgpu-define.ts @@ -28,14 +28,10 @@ import { WEBGPU } from 'internal:constants'; import { gfx, webgpuAdapter, glslalgWasmModule, promiseForWebGPUInstantiation } from '../../webgpu/instantiated'; -import { - Texture, CommandBuffer, DescriptorSet, Device, InputAssembler, Buffer, Shader -} from './override'; -import { - DeviceInfo, BufferTextureCopy, ShaderInfo, ShaderStageFlagBit, TextureViewInfo, TextureInfo, DrawInfo, BufferViewInfo, BufferInfo, BufferUsageBit, IndirectBuffer, -} from '../base/define'; - -import { ccwindow } from '../../core/global-exports'; +import { Texture, CommandBuffer, DescriptorSet, Device, InputAssembler, Buffer, Shader } from './override'; +import { DeviceInfo, BufferTextureCopy, ShaderInfo, ShaderStageFlagBit, TextureViewInfo, TextureInfo, DrawInfo, BufferViewInfo, BufferInfo, BufferUsageBit, IndirectBuffer } from '../base/define'; + +import { ccwindow } from '@base/global'; import { ImageData } from 'pal/image'; diff --git a/cocos/gi/light-probe/light-probe.ts b/cocos/gi/light-probe/light-probe.ts index 585f2408a7b..8d368072bc7 100644 --- a/cocos/gi/light-probe/light-probe.ts +++ b/cocos/gi/light-probe/light-probe.ts @@ -26,7 +26,8 @@ import { ccclass, serializable, type } from 'cc.decorator'; import { Vertex, Tetrahedron, Delaunay } from './delaunay'; import { PolynomialSolver } from './polynomial-solver'; import { LightProbeInfo } from '../../scene-graph/scene-globals'; -import { Vec3, Vec4, cclegacy, EPSILON } from '../../core'; +import { Vec3, Vec4, EPSILON } from '../../core'; +import { cclegacy } from '@base/global'; import { SH } from './sh'; const _v1 = new Vec3(0.0, 0.0, 0.0); diff --git a/cocos/gi/light-probe/sh.ts b/cocos/gi/light-probe/sh.ts index 6ac5d872339..f919aa843c2 100644 --- a/cocos/gi/light-probe/sh.ts +++ b/cocos/gi/light-probe/sh.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec4, Vec3, cclegacy, assertIsTrue } from '../../core'; +import { Vec4, Vec3, assertIsTrue } from '../../core'; +import { cclegacy } from '@base/global'; const SH_BASIS_COUNT = 9; diff --git a/cocos/input/system-event.ts b/cocos/input/system-event.ts index b4ecaa76026..c467dbf09cc 100644 --- a/cocos/input/system-event.ts +++ b/cocos/input/system-event.ts @@ -23,7 +23,8 @@ THE SOFTWARE. */ -import { EventTarget, cclegacy } from '../core'; +import { EventTarget } from '../core'; +import { cclegacy } from '@base/global'; import { EventAcceleration, EventKeyboard, EventMouse, EventTouch, SystemEventType, Touch } from './types'; import { input } from './input'; import { InputEventType } from './types/event-enum'; diff --git a/cocos/input/types/event-enum.ts b/cocos/input/types/event-enum.ts index c8c2a8d4e82..f341570a8a2 100644 --- a/cocos/input/types/event-enum.ts +++ b/cocos/input/types/event-enum.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../../scene-graph/node-event'; /** diff --git a/cocos/input/types/event/event-mouse.ts b/cocos/input/types/event/event-mouse.ts index bbeef3a1e4e..7f9fabb7b00 100644 --- a/cocos/input/types/event/event-mouse.ts +++ b/cocos/input/types/event/event-mouse.ts @@ -24,7 +24,8 @@ */ import { Event } from './event'; -import { Vec2, cclegacy } from '../../../core'; +import { Vec2 } from '../../../core'; +import { cclegacy } from '@base/global'; import { SystemEventTypeUnion } from '../event-enum'; /** diff --git a/cocos/input/types/event/event.ts b/cocos/input/types/event/event.ts index 47f827af748..32ad7d573bc 100644 --- a/cocos/input/types/event/event.ts +++ b/cocos/input/types/event/event.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../../../core'; +import { cclegacy } from '@base/global'; import { SystemEventTypeUnion } from '../event-enum'; /** diff --git a/cocos/input/types/touch.ts b/cocos/input/types/touch.ts index 1be58d480e2..c105170a8e4 100644 --- a/cocos/input/types/touch.ts +++ b/cocos/input/types/touch.ts @@ -23,7 +23,8 @@ THE SOFTWARE. */ -import { Vec2, cclegacy } from '../../core'; +import { Vec2 } from '../../core'; +import { cclegacy } from '@base/global'; const _vec2 = new Vec2(); /** diff --git a/cocos/misc/camera-component.ts b/cocos/misc/camera-component.ts index e4201ecfcbd..6b85003f166 100644 --- a/cocos/misc/camera-component.ts +++ b/cocos/misc/camera-component.ts @@ -28,11 +28,11 @@ import { ccclass, help, executeInEditMode, menu, tooltip, displayOrder, type, se import { RenderTexture } from '../asset/assets/render-texture'; import { UITransform } from '../2d/framework'; import { Component } from '../scene-graph'; -import { Color, Rect, toRadian, Vec3, cclegacy, geometry, Enum } from '../core'; +import { Color, Rect, toRadian, Vec3, geometry, Enum } from '../core'; +import { cclegacy } from '@base/global'; import { CAMERA_DEFAULT_MASK } from '../rendering/define'; import { scene } from '../render-scene'; -import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter, - CameraType, TrackingType } from '../render-scene/scene/camera'; +import { SKYBOX_FLAG, CameraProjection, CameraFOVAxis, CameraAperture, CameraISO, CameraShutter, CameraType, TrackingType } from '../render-scene/scene/camera'; import { Node } from '../scene-graph/node'; import { Layers } from '../scene-graph/layers'; import { TransformBit } from '../scene-graph/node-enum'; diff --git a/cocos/misc/deprecated.ts b/cocos/misc/deprecated.ts index 2e6580ab35a..319c99ea73b 100644 --- a/cocos/misc/deprecated.ts +++ b/cocos/misc/deprecated.ts @@ -26,7 +26,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { Camera } from './camera-component'; -import { replaceProperty, cclegacy, js, markAsWarning } from '../core'; +import { replaceProperty, js, markAsWarning } from '../core'; +import { cclegacy } from '@base/global'; import { ModelRenderer } from './model-renderer'; import { Renderer } from './renderer'; diff --git a/cocos/misc/missing-script.ts b/cocos/misc/missing-script.ts index 3b36c747e49..69755a25ffe 100644 --- a/cocos/misc/missing-script.ts +++ b/cocos/misc/missing-script.ts @@ -25,7 +25,8 @@ import { ccclass, inspector, editorOnly, serializable } from 'cc.decorator'; import { Component } from '../scene-graph/component'; -import { warnID, error, js, cclegacy } from '../core'; +import { warnID, error, js } from '../core'; +import { cclegacy } from '@base/global'; /** * @en diff --git a/cocos/misc/model-renderer.ts b/cocos/misc/model-renderer.ts index 92fcbc81644..ed86161c82b 100644 --- a/cocos/misc/model-renderer.ts +++ b/cocos/misc/model-renderer.ts @@ -22,13 +22,12 @@ THE SOFTWARE. */ -import { - ccclass, serializable, tooltip, type, disallowAnimation, -} from 'cc.decorator'; +import { ccclass, serializable, tooltip, type, disallowAnimation } from 'cc.decorator'; import { scene } from '../render-scene'; import { Layers } from '../scene-graph/layers'; import { Renderer } from './renderer'; -import { CCBoolean, cclegacy, _decorator } from '../core'; +import { CCBoolean, _decorator } from '../core'; +import { cclegacy } from '@base/global'; import { Model, SubModel } from '../render-scene/scene'; import { isEnableEffect } from '../rendering/define'; import { Root } from '../root'; diff --git a/cocos/native-binding/decorators.ts b/cocos/native-binding/decorators.ts index 9ce7833ed02..948e3d11576 100644 --- a/cocos/native-binding/decorators.ts +++ b/cocos/native-binding/decorators.ts @@ -31,20 +31,20 @@ export function patch_BloomStage(ctx: BloomStage_Context_Args, apply = defaultEx //---- class cc_AmbientInfo interface cc_AmbientInfo_Context_Args { AmbientInfo: any; - legacyCC: any; + cclegacy: any; CCFloat: any; Vec4: any; Ambient: any; } export function patch_cc_AmbientInfo(ctx: cc_AmbientInfo_Context_Args, apply = defaultExec) { - const { AmbientInfo, legacyCC, CCFloat, Vec4, Ambient } = { ...ctx }; + const { AmbientInfo, cclegacy, CCFloat, Vec4, Ambient } = { ...ctx }; const skyLightingColorDescriptor = Object.getOwnPropertyDescriptor(AmbientInfo.prototype, 'skyLightingColor'); const skyIllumDescriptor = Object.getOwnPropertyDescriptor(AmbientInfo.prototype, 'skyIllum'); const groundLightingColorDescriptor = Object.getOwnPropertyDescriptor(AmbientInfo.prototype, 'groundLightingColor'); apply(() => { $.tooltip('i18n:ambient.skyLightingColor')(AmbientInfo.prototype, 'skyLightingColor', skyLightingColorDescriptor); }, 'tooltip', 'skyLightingColor'); apply(() => { $.editable(AmbientInfo.prototype, 'skyLightingColor', skyLightingColorDescriptor); }, 'editable', 'skyLightingColor'); apply(() => { $.visible(() => { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); const skybox = scene.globals.skybox; if (skybox.useIBL && skybox.applyDiffuseMap) { @@ -60,7 +60,7 @@ export function patch_cc_AmbientInfo(ctx: cc_AmbientInfo_Context_Args, apply = d apply(() => { $.tooltip('i18n:ambient.groundLightingColor')(AmbientInfo.prototype, 'groundLightingColor', groundLightingColorDescriptor); }, 'tooltip', 'groundLightingColor'); apply(() => { $.editable(AmbientInfo.prototype, 'groundLightingColor', groundLightingColorDescriptor); }, 'editable', 'groundLightingColor'); apply(() => { $.visible(() => { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); const skybox = scene.globals.skybox; if (skybox.useIBL && skybox.applyDiffuseMap) { diff --git a/cocos/particle-2d/particle-asset.ts b/cocos/particle-2d/particle-asset.ts index 9b75d43b85d..411bc43fba7 100644 --- a/cocos/particle-2d/particle-asset.ts +++ b/cocos/particle-2d/particle-asset.ts @@ -25,7 +25,8 @@ import { Asset } from '../asset/assets/asset'; import { SpriteFrame } from '../2d/assets/sprite-frame'; -import { cclegacy, _decorator } from '../core'; +import { cclegacy } from '@base/global'; +import { _decorator } from '../core'; const { ccclass, serializable, editable } = _decorator; diff --git a/cocos/particle-2d/particle-system-2d-assembler.ts b/cocos/particle-2d/particle-system-2d-assembler.ts index bb8032428d7..3a4f39de670 100644 --- a/cocos/particle-2d/particle-system-2d-assembler.ts +++ b/cocos/particle-2d/particle-system-2d-assembler.ts @@ -27,7 +27,7 @@ import { IAssembler, IAssemblerManager } from '../2d/renderer/base'; import { ParticleSystem2D } from './particle-system-2d'; import { MeshRenderData } from '../2d/renderer/render-data'; import { IBatcher } from '../2d/renderer/i-batcher'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; export const ParticleAssembler: IAssembler = { maxParticleDeltaTime: 0, diff --git a/cocos/particle-2d/particle-system-2d.ts b/cocos/particle-2d/particle-system-2d.ts index 2b40985c812..553a0b1e529 100644 --- a/cocos/particle-2d/particle-system-2d.ts +++ b/cocos/particle-2d/particle-system-2d.ts @@ -23,10 +23,7 @@ THE SOFTWARE. */ -import { - ccclass, editable, type, displayOrder, menu, - executeInEditMode, serializable, playOnFocus, tooltip, visible, formerlySerializedAs, override, -} from 'cc.decorator'; +import { ccclass, editable, type, displayOrder, menu, executeInEditMode, serializable, playOnFocus, tooltip, visible, formerlySerializedAs, override } from 'cc.decorator'; import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { UIRenderer } from '../2d/framework/ui-renderer'; import { Color, Vec2, warnID, errorID, error, path } from '../core'; @@ -41,7 +38,7 @@ import codec from '../../external/compression/ZipUtils'; import { IBatcher } from '../2d/renderer/i-batcher'; import { assetManager, builtinResMgr } from '../asset/asset-manager'; import { PositionType, EmitterMode, DURATION_INFINITY, START_RADIUS_EQUAL_TO_END_RADIUS, START_SIZE_EQUAL_TO_END_SIZE } from './define'; -import { ccwindow } from '../core/global-exports'; +import { ccwindow } from '@base/global'; import type { IAssembler } from '../2d'; import type { TextureBase } from '../asset/assets/texture-base'; diff --git a/cocos/particle-2d/tiff-reader.ts b/cocos/particle-2d/tiff-reader.ts index 6c594e5f0fa..fe88eac2779 100644 --- a/cocos/particle-2d/tiff-reader.ts +++ b/cocos/particle-2d/tiff-reader.ts @@ -29,7 +29,7 @@ */ import { getError, log, logID } from '../core'; -import { ccwindow } from '../core/global-exports'; +import { ccwindow } from '@base/global'; interface IFile { type: string, diff --git a/cocos/particle/billboard.ts b/cocos/particle/billboard.ts index 1e703d7fbde..bc5d0906e4f 100644 --- a/cocos/particle/billboard.ts +++ b/cocos/particle/billboard.ts @@ -29,7 +29,8 @@ import { Mesh } from '../3d/assets'; import { Material, Texture2D } from '../asset/assets'; import { Component } from '../scene-graph/component'; import { Attribute, AttributeName, Format, PrimitiveMode } from '../gfx'; -import { Color, toDegree, toRadian, Vec4, cclegacy } from '../core'; +import { Color, toDegree, toRadian, Vec4 } from '../core'; +import { cclegacy } from '@base/global'; import { scene } from '../render-scene'; @ccclass('cc.Billboard') diff --git a/cocos/particle/deprecated.ts b/cocos/particle/deprecated.ts index 7acc7cacb91..adb54bb3304 100644 --- a/cocos/particle/deprecated.ts +++ b/cocos/particle/deprecated.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { removeProperty, replaceProperty, js, cclegacy } from '../core'; +import { removeProperty, replaceProperty, js } from '../core'; +import { cclegacy } from '@base/global'; import Burst from './burst'; import { ParticleSystem } from './particle-system'; import { Billboard } from './billboard'; diff --git a/cocos/particle/index.ts b/cocos/particle/index.ts index 8e41509c24f..fecbc8343a5 100644 --- a/cocos/particle/index.ts +++ b/cocos/particle/index.ts @@ -27,7 +27,7 @@ import { Line } from './line'; import { ParticleSystem } from './particle-system'; import { ParticleUtils } from './particle-utils'; import CurveRange from './animator/curve-range'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import GradientRange from './animator/gradient-range'; import Burst from './burst'; diff --git a/cocos/particle/line.ts b/cocos/particle/line.ts index 348dcff09ce..bba54f0fbe2 100644 --- a/cocos/particle/line.ts +++ b/cocos/particle/line.ts @@ -24,7 +24,8 @@ import { ccclass, help, executeInEditMode, menu, tooltip, displayOrder, type, serializable, range, visible, override, displayName } from 'cc.decorator'; import { Material, Texture2D } from '../asset/assets'; -import { Vec3, cclegacy, Vec4, Vec2, CCBoolean } from '../core'; +import { Vec3, Vec4, Vec2, CCBoolean } from '../core'; +import { cclegacy } from '@base/global'; import { LineModel } from './models/line-model'; import { builtinResMgr } from '../asset/asset-manager'; import CurveRange from './animator/curve-range'; diff --git a/cocos/particle/particle-system.ts b/cocos/particle/particle-system.ts index 9c3673b3728..fcc9bbc8f8f 100644 --- a/cocos/particle/particle-system.ts +++ b/cocos/particle/particle-system.ts @@ -28,10 +28,12 @@ import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Renderer } from '../misc/renderer'; import { ModelRenderer } from '../misc/model-renderer'; import { Material } from '../asset/assets/material'; -import { Mat4, pseudoRandom, Quat, randomRangeInt, Vec2, Vec3, CCBoolean, CCFloat, bits, geometry, cclegacy, warn } from '../core'; +import { Mat4, pseudoRandom, Quat, randomRangeInt, Vec2, Vec3, CCBoolean, CCFloat, bits, geometry, warn } from '../core'; +import { cclegacy } from '@base/global'; import { scene } from '../render-scene'; import ColorOverLifetimeModule from './animator/color-overtime'; -import CurveRange, { Mode } from './animator/curve-range'; +import CurveRange from './animator/curve-range'; +import { Mode } from './animator/curve-range'; import ForceOvertimeModule from './animator/force-overtime'; import GradientRange from './animator/gradient-range'; import LimitVelocityOvertimeModule from './animator/limit-velocity-overtime'; diff --git a/cocos/particle/renderer/particle-system-renderer-base.ts b/cocos/particle/renderer/particle-system-renderer-base.ts index 64e76702973..3fb8fc75f70 100644 --- a/cocos/particle/renderer/particle-system-renderer-base.ts +++ b/cocos/particle/renderer/particle-system-renderer-base.ts @@ -29,7 +29,7 @@ import ParticleSystemRenderer from './particle-system-renderer-data'; import { Material } from '../../asset/assets'; import { Particle, IParticleModule } from '../particle'; import { RenderMode } from '../enum'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Pass } from '../../render-scene'; import type { ParticleSystem } from '../particle-system'; diff --git a/cocos/particle/renderer/particle-system-renderer-data.ts b/cocos/particle/renderer/particle-system-renderer-data.ts index f50bcce3c35..9e1e3f38ecf 100644 --- a/cocos/particle/renderer/particle-system-renderer-data.ts +++ b/cocos/particle/renderer/particle-system-renderer-data.ts @@ -30,7 +30,8 @@ import ParticleSystemRendererCPU from './particle-system-renderer-cpu'; import ParticleSystemRendererGPU from './particle-system-renderer-gpu'; import { director } from '../../game/director'; import { Device, Format, FormatFeatureBit } from '../../gfx'; -import { errorID, warnID, cclegacy } from '../../core'; +import { errorID, warnID } from '../../core'; +import { cclegacy } from '@base/global'; function isSupportGPUParticle (): boolean { const device: Device = director.root!.device; diff --git a/cocos/particle/renderer/trail.ts b/cocos/particle/renderer/trail.ts index 3493c6fea14..dc5d32a5291 100644 --- a/cocos/particle/renderer/trail.ts +++ b/cocos/particle/renderer/trail.ts @@ -26,9 +26,9 @@ import { ccclass, tooltip, displayOrder, type, serializable, range } from 'cc.de import { Material } from '../../asset/assets/material'; import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; import { director } from '../../game/director'; -import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode, - Device, Attribute, Buffer, BufferInfo, DrawInfo, DRAW_INFO_SIZE } from '../../gfx'; -import { Color, Mat4, Quat, toRadian, Vec3, Pool, warnID, cclegacy } from '../../core'; +import { AttributeName, BufferUsageBit, Format, FormatInfos, MemoryUsageBit, PrimitiveMode, Device, Attribute, Buffer, BufferInfo, DrawInfo, DRAW_INFO_SIZE } from '../../gfx'; +import { Color, Mat4, Quat, toRadian, Vec3, Pool, warnID } from '../../core'; +import { cclegacy } from '@base/global'; import { scene } from '../../render-scene'; import CurveRange from '../animator/curve-range'; import GradientRange from '../animator/gradient-range'; diff --git a/cocos/physics-2d/framework/components/colliders/collider-2d.ts b/cocos/physics-2d/framework/components/colliders/collider-2d.ts index dbe11aba6ad..b48dd0cb92b 100644 --- a/cocos/physics-2d/framework/components/colliders/collider-2d.ts +++ b/cocos/physics-2d/framework/components/colliders/collider-2d.ts @@ -24,7 +24,8 @@ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { Vec2, Rect, _decorator, Eventify, cclegacy, tooltip, CCInteger, serializable, CCFloat, CCBoolean } from '../../../../core'; +import { Vec2, Rect, _decorator, Eventify, tooltip, CCInteger, serializable, CCFloat, CCBoolean } from '../../../../core'; +import { cclegacy } from '@base/global'; import { PhysicsGroup } from '../../../../physics/framework/physics-enum'; import { RigidBody2D } from '../rigid-body-2d'; diff --git a/cocos/physics-2d/framework/index.ts b/cocos/physics-2d/framework/index.ts index 5ad79a2566a..e09e2555071 100644 --- a/cocos/physics-2d/framework/index.ts +++ b/cocos/physics-2d/framework/index.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import * as PolygonSeparator from './utils/polygon-separator'; import * as PolygonPartition from './utils/polygon-partition'; diff --git a/cocos/physics-2d/framework/physics-system.ts b/cocos/physics-2d/framework/physics-system.ts index 5f0a1de17de..e7cc372a2bb 100644 --- a/cocos/physics-2d/framework/physics-system.ts +++ b/cocos/physics-2d/framework/physics-system.ts @@ -23,7 +23,8 @@ */ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { System, Vec2, IVec2Like, Rect, Eventify, Enum, Settings, settings, cclegacy } from '../../core'; +import { System, Vec2, IVec2Like, Rect, Eventify, Enum, Settings, settings } from '../../core'; +import { cclegacy } from '@base/global'; import { createPhysicsWorld, selector, IPhysicsSelector } from './physics-selector'; import { DelayEvent } from './physics-internal-types'; diff --git a/cocos/physics/framework/deprecated.ts b/cocos/physics/framework/deprecated.ts index 6a9d9519d11..bf7d5ccee89 100644 --- a/cocos/physics/framework/deprecated.ts +++ b/cocos/physics/framework/deprecated.ts @@ -23,7 +23,8 @@ */ import { PhysicsSystem } from './physics-system'; -import { replaceProperty, removeProperty, js, cclegacy } from '../../core'; +import { replaceProperty, removeProperty, js } from '../../core'; +import { cclegacy } from '@base/global'; import { BoxCollider } from './components/colliders/box-collider'; import { SphereCollider } from './components/colliders/sphere-collider'; import { CapsuleCollider } from './components/colliders/capsule-collider'; diff --git a/cocos/physics/framework/index.ts b/cocos/physics/framework/index.ts index e75f54251fd..6ba559bd832 100644 --- a/cocos/physics/framework/index.ts +++ b/cocos/physics/framework/index.ts @@ -50,7 +50,7 @@ import { CharacterController } from './components/character-controllers/characte import { BoxCharacterController } from './components/character-controllers/box-character-controller'; import { CapsuleCharacterController } from './components/character-controllers/capsule-character-controller'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { selector } from './physics-selector'; import * as utils from '../utils/util'; diff --git a/cocos/physics/framework/physics-selector.ts b/cocos/physics/framework/physics-selector.ts index 7f05c944fee..309ce068020 100644 --- a/cocos/physics/framework/physics-selector.ts +++ b/cocos/physics/framework/physics-selector.ts @@ -26,16 +26,13 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { EDITOR, TEST } from 'internal:constants'; -import { IBaseConstraint, IPointToPointConstraint, IHingeConstraint, IConeTwistConstraint, IFixedConstraint, - IConfigurableConstraint } from '../spec/i-physics-constraint'; -import { - IBoxShape, ISphereShape, ICapsuleShape, ITrimeshShape, ICylinderShape, - IConeShape, ITerrainShape, ISimplexShape, IPlaneShape, IBaseShape, -} from '../spec/i-physics-shape'; +import { IBaseConstraint, IPointToPointConstraint, IHingeConstraint, IConeTwistConstraint, IFixedConstraint, IConfigurableConstraint } from '../spec/i-physics-constraint'; +import { IBoxShape, ISphereShape, ICapsuleShape, ITrimeshShape, ICylinderShape, IConeShape, ITerrainShape, ISimplexShape, IPlaneShape, IBaseShape } from '../spec/i-physics-shape'; import { IPhysicsWorld } from '../spec/i-physics-world'; import { IRigidBody } from '../spec/i-rigid-body'; import { IBoxCharacterController, ICapsuleCharacterController } from '../spec/i-character-controller'; -import { errorID, IVec3Like, warn, cclegacy, debug } from '../../core'; +import { errorID, IVec3Like, warn, debug } from '../../core'; +import { cclegacy } from '@base/global'; import { EColliderType, EConstraintType, ECharacterControllerType } from './physics-enum'; import { PhysicsMaterial } from '.'; diff --git a/cocos/physics/framework/physics-system.ts b/cocos/physics/framework/physics-system.ts index 59b35b85f2c..c816bc53156 100644 --- a/cocos/physics/framework/physics-system.ts +++ b/cocos/physics/framework/physics-system.ts @@ -23,7 +23,8 @@ */ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { Vec3, RecyclePool, Enum, System, cclegacy, Settings, settings, geometry, warn, IQuatLike, IVec3Like, error } from '../../core'; +import { Vec3, RecyclePool, Enum, System, Settings, settings, geometry, warn, IQuatLike, IVec3Like, error } from '../../core'; +import { cclegacy } from '@base/global'; import { IPhysicsWorld, IRaycastOptions } from '../spec/i-physics-world'; import { director, Director, game } from '../../game'; import { PhysicsMaterial } from './assets/physics-material'; diff --git a/cocos/physics/physx/physx-adapter.ts b/cocos/physics/physx/physx-adapter.ts index 505c1526c04..a7eefb10070 100644 --- a/cocos/physics/physx/physx-adapter.ts +++ b/cocos/physics/physx/physx-adapter.ts @@ -35,7 +35,8 @@ import { wasmFactory, PhysXWasmUrl } from './physx.wasmjs'; import { WebAssemblySupportMode } from '../../misc/webassembly-support'; import { instantiateWasm } from 'pal/wasm'; import { BYTEDANCE, DEBUG, EDITOR, TEST, WASM_SUPPORT_MODE } from 'internal:constants'; -import { IQuatLike, IVec3Like, Quat, RecyclePool, Vec3, cclegacy, geometry, Settings, settings, sys, debug, error } from '../../core'; +import { IQuatLike, IVec3Like, Quat, RecyclePool, Vec3, geometry, Settings, settings, sys, debug, error } from '../../core'; +import { cclegacy } from '@base/global'; import { shrinkPositions } from '../utils/util'; import { IRaycastOptions } from '../spec/i-physics-world'; import { IPhysicsConfig, PhysicsRayResult, PhysicsSystem, CharacterControllerContact } from '../framework'; diff --git a/cocos/primitive/primitive.ts b/cocos/primitive/primitive.ts index 9455de24558..9383b915213 100644 --- a/cocos/primitive/primitive.ts +++ b/cocos/primitive/primitive.ts @@ -26,7 +26,8 @@ import { ccclass, type, serializable, editable } from 'cc.decorator'; import { createMesh } from '../3d/misc'; import { Mesh } from '../3d/assets/mesh'; import * as primitives from '.'; -import { ccenum, cclegacy } from '../core'; +import { ccenum } from '../core'; +import { cclegacy } from '@base/global'; enum PrimitiveType { BOX = 0, diff --git a/cocos/profiler/profiler.ts b/cocos/profiler/profiler.ts index 6debc3d9953..ba6c085c93e 100644 --- a/cocos/profiler/profiler.ts +++ b/cocos/profiler/profiler.ts @@ -33,11 +33,11 @@ import { Node } from '../scene-graph/node'; import { ICounterOption } from './counter'; import { PerfCounter } from './perf-counter'; import { Pass } from '../render-scene'; -import { preTransforms, System, sys, cclegacy, Settings, settings, warn } from '../core'; +import { preTransforms, System, sys, Settings, settings, warn } from '../core'; +import { cclegacy, ccwindow } from '@base/global'; import { Root } from '../root'; import { PipelineRuntime } from '../rendering/custom/pipeline'; import { director } from '../game'; -import { ccwindow } from '../core/global-exports'; const _characters = '0123456789. '; diff --git a/cocos/render-scene/core/pass.ts b/cocos/render-scene/core/pass.ts index 408d5938c5f..814ef95e65e 100644 --- a/cocos/render-scene/core/pass.ts +++ b/cocos/render-scene/core/pass.ts @@ -27,18 +27,12 @@ import { Root } from '../../root'; import { TextureBase } from '../../asset/assets/texture-base'; import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr'; import { getPhaseID } from '../../rendering/pass-phase'; -import { murmurhash2_32_gc, errorID, assertID, cclegacy, warnID } from '../../core'; -import { - BufferUsageBit, DynamicStateFlagBit, DynamicStateFlags, Feature, GetTypeSize, MemoryUsageBit, PrimitiveMode, Type, Color, - BlendState, BlendTarget, Buffer, BufferInfo, BufferViewInfo, DepthStencilState, DescriptorSet, - DescriptorSetInfo, DescriptorSetLayout, Device, RasterizerState, Sampler, Texture, Shader, PipelineLayout, deviceManager, UniformBlock, -} from '../../gfx'; +import { murmurhash2_32_gc, errorID, assertID, warnID } from '../../core'; +import { cclegacy } from '@base/global'; +import { BufferUsageBit, DynamicStateFlagBit, DynamicStateFlags, Feature, GetTypeSize, MemoryUsageBit, PrimitiveMode, Type, Color, BlendState, BlendTarget, Buffer, BufferInfo, BufferViewInfo, DepthStencilState, DescriptorSet, DescriptorSetInfo, DescriptorSetLayout, Device, RasterizerState, Sampler, Texture, Shader, PipelineLayout, deviceManager, UniformBlock } from '../../gfx'; import { EffectAsset } from '../../asset/assets/effect-asset'; import { IProgramInfo, programLib } from './program-lib'; -import { - MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType, getStringFromType, - getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle, type2validator, -} from './pass-utils'; +import { MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType, getStringFromType, getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle, type2validator } from './pass-utils'; import { RenderPassStage, RenderPriority } from '../../rendering/define'; import { InstancedBuffer } from '../../rendering/instanced-buffer'; import { ProgramLibrary } from '../../rendering/custom/private'; diff --git a/cocos/render-scene/core/program-lib.jsb.ts b/cocos/render-scene/core/program-lib.jsb.ts index a909e2a9d96..f60b05550dd 100644 --- a/cocos/render-scene/core/program-lib.jsb.ts +++ b/cocos/render-scene/core/program-lib.jsb.ts @@ -22,8 +22,8 @@ THE SOFTWARE. */ -import { API, } from '../../gfx'; -import { cclegacy } from '../../core'; +import { API } from '../../gfx'; +import { cclegacy } from '@base/global'; import type { EffectAsset } from '../../asset/assets/effect-asset'; import type { Attribute, ShaderInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, PipelineLayout } from '../../gfx'; import type { IDefineRecord } from './program-lib'; diff --git a/cocos/render-scene/core/program-lib.ts b/cocos/render-scene/core/program-lib.ts index 0f46532e52b..f9295cac218 100644 --- a/cocos/render-scene/core/program-lib.ts +++ b/cocos/render-scene/core/program-lib.ts @@ -27,16 +27,10 @@ import { EffectAsset } from '../../asset/assets/effect-asset'; import { SetIndex, IDescriptorSetLayoutInfo, globalDescriptorSetLayout, localDescriptorSetLayout } from '../../rendering/define'; import { PipelineRuntime } from '../../rendering/custom/pipeline'; import { MacroRecord } from './pass-utils'; -import { - PipelineLayoutInfo, Device, Attribute, UniformBlock, ShaderInfo, - Uniform, ShaderStage, DESCRIPTOR_SAMPLER_TYPE, DESCRIPTOR_BUFFER_TYPE, - DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, - DescriptorType, ShaderStageFlagBit, API, UniformSamplerTexture, PipelineLayout, - Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment, -} from '../../gfx'; -import { genHandles, getActiveAttributes, getShaderInstanceName, getSize, - getVariantKey, IMacroInfo, populateMacros, prepareDefines } from './program-utils'; -import { debug, cclegacy, warn, error } from '../../core'; +import { PipelineLayoutInfo, Device, Attribute, UniformBlock, ShaderInfo, Uniform, ShaderStage, DESCRIPTOR_SAMPLER_TYPE, DESCRIPTOR_BUFFER_TYPE, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, ShaderStageFlagBit, API, UniformSamplerTexture, PipelineLayout, Shader, UniformStorageBuffer, UniformStorageImage, UniformSampler, UniformTexture, UniformInputAttachment } from '../../gfx'; +import { genHandles, getActiveAttributes, getShaderInstanceName, getSize, getVariantKey, IMacroInfo, populateMacros, prepareDefines } from './program-utils'; +import { debug, warn, error } from '../../core'; +import { cclegacy } from '@base/global'; const _dsLayoutInfo = new DescriptorSetLayoutInfo(); diff --git a/cocos/render-scene/deprecated.ts b/cocos/render-scene/deprecated.ts index 6e40912ffdf..cdb1e14d571 100644 --- a/cocos/render-scene/deprecated.ts +++ b/cocos/render-scene/deprecated.ts @@ -23,9 +23,9 @@ */ import { replaceProperty, removeProperty } from '../core'; +import { cclegacy } from '@base/global'; import { RenderScene } from './core/render-scene'; import { Layers } from '../scene-graph/layers'; -import { legacyCC } from '../core/global-exports'; import { Pass } from './core/pass'; import { Camera } from './scene/camera'; import { Shadows } from './scene/shadows'; @@ -94,7 +94,7 @@ replaceProperty(CameraVisFlags, 'CameraVisFlags', [ }, ]); -legacyCC.CameraVisFlags = CameraVisFlags; +cclegacy.CameraVisFlags = CameraVisFlags; export { CameraVisFlags }; @@ -145,7 +145,7 @@ replaceProperty(VisibilityFlags, 'VisibilityFlags', [ }, ]); -legacyCC.VisibilityFlags = VisibilityFlags; +cclegacy.VisibilityFlags = VisibilityFlags; export { VisibilityFlags }; diff --git a/cocos/render-scene/scene/ambient.ts b/cocos/render-scene/scene/ambient.ts index 9faf273aca2..2735b17e004 100644 --- a/cocos/render-scene/scene/ambient.ts +++ b/cocos/render-scene/scene/ambient.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec4, cclegacy } from '../../core'; +import { Vec4 } from '../../core'; +import { cclegacy } from '@base/global'; import { AmbientInfo } from '../../scene-graph/scene-globals'; /** diff --git a/cocos/render-scene/scene/camera.ts b/cocos/render-scene/scene/camera.ts index ab8cedbd6c2..82e020dd7cd 100644 --- a/cocos/render-scene/scene/camera.ts +++ b/cocos/render-scene/scene/camera.ts @@ -23,7 +23,8 @@ */ import { EDITOR } from 'internal:constants'; import { SurfaceTransform, ClearFlagBit, Device, Color, ClearFlags } from '../../gfx'; -import { lerp, Mat4, Rect, toRadian, Vec3, IVec4Like, preTransforms, warnID, geometry, cclegacy, Vec4 } from '../../core'; +import { lerp, Mat4, Rect, toRadian, Vec3, IVec4Like, preTransforms, warnID, geometry, Vec4 } from '../../core'; +import { cclegacy } from '@base/global'; import { CAMERA_DEFAULT_MASK } from '../../rendering/define'; import { Node } from '../../scene-graph'; import { RenderScene } from '../core/render-scene'; diff --git a/cocos/render-scene/scene/directional-light.ts b/cocos/render-scene/scene/directional-light.ts index aecb1f7bdf5..734a7add89f 100644 --- a/cocos/render-scene/scene/directional-light.ts +++ b/cocos/render-scene/scene/directional-light.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec3, cclegacy } from '../../core'; +import { Vec3 } from '../../core'; +import { cclegacy } from '@base/global'; import { Ambient } from './ambient'; import { Light, LightType } from './light'; import { CSMLevel, CSMOptimizationMode, PCFType, Shadows } from './shadows'; diff --git a/cocos/render-scene/scene/fog.ts b/cocos/render-scene/scene/fog.ts index 36a6f504ac5..9ca50b45c5d 100644 --- a/cocos/render-scene/scene/fog.ts +++ b/cocos/render-scene/scene/fog.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Enum, Color, Vec4, cclegacy } from '../../core'; +import { Enum, Color, Vec4 } from '../../core'; +import { cclegacy } from '@base/global'; import { FogInfo } from '../../scene-graph/scene-globals'; import { SRGBToLinear } from '../../rendering/pipeline-funcs'; import { Root } from '../../root'; diff --git a/cocos/render-scene/scene/index.jsb.ts b/cocos/render-scene/scene/index.jsb.ts index ca62fa94c93..3c699870ced 100644 --- a/cocos/render-scene/scene/index.jsb.ts +++ b/cocos/render-scene/scene/index.jsb.ts @@ -21,7 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { Vec3, Enum, cclegacy } from '../../core'; +import { Vec3, Enum } from '../../core'; +import { cclegacy } from '@base/global'; import type { LODData as JsbLODData, LODGroup as JsbLODGroup } from './lod-group'; export const LODData: typeof JsbLODData = jsb.LODData; @@ -29,25 +30,10 @@ export type LODData = JsbLODData; export const LODGroup: typeof JsbLODGroup = jsb.LODGroup; export type LODGroup = JsbLODGroup; -import type { - Ambient as JsbAmbient, - Light as JsbLight, - DirectionalLight as JsbDirectionalLight, - SpotLight as JsbSpotLight, - SphereLight as JsbSphereLight, - PointLight as JsbPointLight, - RangedDirectionalLight as JsbRangedDirectionalLight, - Fog as JsbFog, - Shadows as JsbShadows, - Skybox as JsbSkybox, - PostSettings as JsbPostSettings -} from './index'; +import type { Ambient as JsbAmbient, Light as JsbLight, DirectionalLight as JsbDirectionalLight, SpotLight as JsbSpotLight, SphereLight as JsbSphereLight, PointLight as JsbPointLight, RangedDirectionalLight as JsbRangedDirectionalLight, Fog as JsbFog, Shadows as JsbShadows, Skybox as JsbSkybox, PostSettings as JsbPostSettings } from './index'; // NOTE: why don't we export FogInfo and ShadowInfo from 'index.ts' -import type { - FogInfo as JsbFogInfo, - ShadowsInfo as JsbShadowsInfo, -} from '../../scene-graph/scene-globals'; +import type { FogInfo as JsbFogInfo, ShadowsInfo as JsbShadowsInfo } from '../../scene-graph/scene-globals'; declare const jsb: any; diff --git a/cocos/render-scene/scene/model.ts b/cocos/render-scene/scene/model.ts index 1e455089938..4b3e6ae4202 100644 --- a/cocos/render-scene/scene/model.ts +++ b/cocos/render-scene/scene/model.ts @@ -33,14 +33,10 @@ import { RenderScene } from '../core/render-scene'; import { Texture2D } from '../../asset/assets/texture-2d'; import { SubModel } from './submodel'; import { IMacroPatch } from '../core/pass'; -import { Mat4, Vec3, Vec4, geometry, cclegacy, EPSILON } from '../../core'; -import { Attribute, DescriptorSet, Device, Buffer, BufferInfo, - BufferUsageBit, MemoryUsageBit, Filter, Address, SamplerInfo, deviceManager, Texture } from '../../gfx'; -import { - UBOLocal, UBOSH, UBOWorldBound, UNIFORM_LIGHTMAP_TEXTURE_BINDING, UNIFORM_REFLECTION_PROBE_BLEND_CUBEMAP_BINDING, - UNIFORM_REFLECTION_PROBE_CUBEMAP_BINDING, UNIFORM_REFLECTION_PROBE_DATA_MAP_BINDING, - UNIFORM_REFLECTION_PROBE_TEXTURE_BINDING, -} from '../../rendering/define'; +import { Mat4, Vec3, Vec4, geometry, EPSILON } from '../../core'; +import { cclegacy } from '@base/global'; +import { Attribute, DescriptorSet, Device, Buffer, BufferInfo, BufferUsageBit, MemoryUsageBit, Filter, Address, SamplerInfo, deviceManager, Texture } from '../../gfx'; +import { UBOLocal, UBOSH, UBOWorldBound, UNIFORM_LIGHTMAP_TEXTURE_BINDING, UNIFORM_REFLECTION_PROBE_BLEND_CUBEMAP_BINDING, UNIFORM_REFLECTION_PROBE_CUBEMAP_BINDING, UNIFORM_REFLECTION_PROBE_DATA_MAP_BINDING, UNIFORM_REFLECTION_PROBE_TEXTURE_BINDING } from '../../rendering/define'; import { Root } from '../../root'; import { TextureCube } from '../../asset/assets'; import { ShadowType } from './shadows'; diff --git a/cocos/render-scene/scene/point-light.ts b/cocos/render-scene/scene/point-light.ts index 37fbf127659..a0062e1a6e8 100644 --- a/cocos/render-scene/scene/point-light.ts +++ b/cocos/render-scene/scene/point-light.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { cclegacy, geometry, Vec3 } from '../../core'; +import { cclegacy } from '@base/global'; +import { geometry, Vec3 } from '../../core'; import { AABB } from '../../core/geometry'; import { Light, LightType, nt2lm } from './light'; diff --git a/cocos/render-scene/scene/post-settings.ts b/cocos/render-scene/scene/post-settings.ts index 9d124385770..c9eefddcb1f 100644 --- a/cocos/render-scene/scene/post-settings.ts +++ b/cocos/render-scene/scene/post-settings.ts @@ -1,4 +1,5 @@ -import { Enum, cclegacy } from '../../core'; +import { Enum } from '../../core'; +import { cclegacy } from '@base/global'; import { PostSettingsInfo } from '../../scene-graph/scene-globals'; export const ToneMappingType = Enum({ diff --git a/cocos/render-scene/scene/ranged-directional-light.ts b/cocos/render-scene/scene/ranged-directional-light.ts index 121e6fb7d37..83a8de25166 100644 --- a/cocos/render-scene/scene/ranged-directional-light.ts +++ b/cocos/render-scene/scene/ranged-directional-light.ts @@ -19,7 +19,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Vec3 } from '../../core/math/vec3'; import { Ambient } from './ambient'; import { Light, LightType } from './light'; diff --git a/cocos/render-scene/scene/reflection-probe.ts b/cocos/render-scene/scene/reflection-probe.ts index c10d8548cc5..737d6f30ed3 100644 --- a/cocos/render-scene/scene/reflection-probe.ts +++ b/cocos/render-scene/scene/reflection-probe.ts @@ -24,7 +24,8 @@ import { EDITOR } from 'internal:constants'; import { Camera, CameraAperture, CameraFOVAxis, CameraISO, CameraProjection, CameraShutter, CameraType, SKYBOX_FLAG, TrackingType } from './camera'; import { Node } from '../../scene-graph/node'; -import { Color, Quat, Rect, toRadian, Vec2, Vec3, geometry, cclegacy, Vec4, Size } from '../../core'; +import { Color, Quat, Rect, toRadian, Vec2, Vec3, geometry, Vec4, Size } from '../../core'; +import { cclegacy } from '@base/global'; import { CAMERA_DEFAULT_MASK } from '../../rendering/define'; import { ClearFlagBit, Framebuffer } from '../../gfx'; import { TextureCube } from '../../asset/assets/texture-cube'; diff --git a/cocos/render-scene/scene/shadows.ts b/cocos/render-scene/scene/shadows.ts index 4e4c5c60ee1..8b8a03ef8bd 100644 --- a/cocos/render-scene/scene/shadows.ts +++ b/cocos/render-scene/scene/shadows.ts @@ -24,7 +24,8 @@ import { DEBUG } from 'internal:constants'; import { Material } from '../../asset/assets/material'; -import { Color, Mat4, Vec3, Vec2, Enum, assert, geometry, cclegacy } from '../../core'; +import { Color, Mat4, Vec3, Vec2, Enum, assert, geometry } from '../../core'; +import { cclegacy } from '@base/global'; import type { ShadowsInfo } from '../../scene-graph/scene-globals'; import { IMacroPatch } from '../core/pass'; import { Shader } from '../../gfx'; diff --git a/cocos/render-scene/scene/skybox.ts b/cocos/render-scene/scene/skybox.ts index 30ce5bb5960..43db04ce814 100644 --- a/cocos/render-scene/scene/skybox.ts +++ b/cocos/render-scene/scene/skybox.ts @@ -33,7 +33,8 @@ import type { SkyboxInfo } from '../../scene-graph/scene-globals'; import { Root } from '../../root'; import { GlobalDSManager } from '../../rendering/global-descriptor-set-manager'; import { deviceManager } from '../../gfx'; -import { Enum, cclegacy } from '../../core'; +import { Enum } from '../../core'; +import { cclegacy } from '@base/global'; let skybox_mesh: Mesh | null = null; let skybox_material: Material | null = null; diff --git a/cocos/render-scene/scene/sphere-light.ts b/cocos/render-scene/scene/sphere-light.ts index 22f7bb52c7e..4185bc8a7b0 100644 --- a/cocos/render-scene/scene/sphere-light.ts +++ b/cocos/render-scene/scene/sphere-light.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec3, cclegacy, geometry } from '../../core'; +import { Vec3, geometry } from '../../core'; +import { cclegacy } from '@base/global'; import { Light, LightType, nt2lm } from './light'; /** diff --git a/cocos/render-scene/scene/spot-light.ts b/cocos/render-scene/scene/spot-light.ts index 21cb28177cf..b18d0ed7bbd 100644 --- a/cocos/render-scene/scene/spot-light.ts +++ b/cocos/render-scene/scene/spot-light.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Mat4, Quat, Vec3, geometry, cclegacy } from '../../core'; +import { Mat4, Quat, Vec3, geometry } from '../../core'; +import { cclegacy } from '@base/global'; import type { Frustum } from '../../core/geometry'; import { Light, LightType, nt2lm } from './light'; import { PCFType } from './shadows'; diff --git a/cocos/render-scene/scene/submodel.ts b/cocos/render-scene/scene/submodel.ts index a1e51f42617..a77b388d3bb 100644 --- a/cocos/render-scene/scene/submodel.ts +++ b/cocos/render-scene/scene/submodel.ts @@ -23,13 +23,11 @@ */ import { RenderingSubMesh } from '../../asset/assets/rendering-sub-mesh'; -import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING, - INST_MAT_WORLD, INST_SH, UBOSH, isEnableEffect } from '../../rendering/define'; +import { RenderPriority, UNIFORM_REFLECTION_TEXTURE_BINDING, UNIFORM_REFLECTION_STORAGE_BINDING, INST_MAT_WORLD, INST_SH, UBOSH, isEnableEffect } from '../../rendering/define'; import { BatchingSchemes, IMacroPatch, Pass } from '../core/pass'; -import { DescriptorSet, DescriptorSetInfo, Device, InputAssembler, Texture, TextureType, TextureUsageBit, TextureInfo, - Format, Sampler, Filter, Address, Shader, SamplerInfo, deviceManager, - Attribute, Feature, FormatInfos, getTypedArrayConstructor } from '../../gfx'; -import { errorID, Mat4, cclegacy } from '../../core'; +import { DescriptorSet, DescriptorSetInfo, Device, InputAssembler, Texture, TextureType, TextureUsageBit, TextureInfo, Format, Sampler, Filter, Address, Shader, SamplerInfo, deviceManager, Attribute, Feature, FormatInfos, getTypedArrayConstructor } from '../../gfx'; +import { errorID, Mat4 } from '../../core'; +import { cclegacy } from '@base/global'; import { getPhaseID } from '../../rendering/pass-phase'; import { Root } from '../../root'; import { MacroRecord } from '../core/pass-utils'; diff --git a/cocos/rendering/custom/custom-pipeline.ts b/cocos/rendering/custom/custom-pipeline.ts index e68fbbd0039..b4ba762cce5 100644 --- a/cocos/rendering/custom/custom-pipeline.ts +++ b/cocos/rendering/custom/custom-pipeline.ts @@ -27,12 +27,11 @@ import { Color, Format, LoadOp, Rect, StoreOp, Viewport } from '../../gfx/base/d import { CSMLevel, Camera, CameraUsage, Light, DirectionalLight, Shadows, SpotLight } from '../../render-scene/scene'; import { BasicPipeline, PipelineBuilder } from './pipeline'; import { CopyPair, LightInfo, QueueHint, ResourceResidency, SceneFlags } from './types'; -import { buildBloomPass, buildForwardPass, buildFxaaPass, buildPostprocessPass, buildSSSSPass, - buildToneMappingPass, buildTransparencyPass, buildUIPass, hasSkinObject, - buildHBAOPasses, buildCopyPass, getRenderArea, buildReflectionProbePasss } from './define'; +import { buildBloomPass, buildForwardPass, buildFxaaPass, buildPostprocessPass, buildSSSSPass, buildToneMappingPass, buildTransparencyPass, buildUIPass, hasSkinObject, buildHBAOPasses, buildCopyPass, getRenderArea, buildReflectionProbePasss } from './define'; import { isUICamera } from './utils'; import { RenderWindow } from '../../render-scene/core/render-window'; -import { assert, cclegacy, geometry } from '../../core'; +import { assert, geometry } from '../../core'; +import { cclegacy } from '@base/global'; import { RenderScene } from '../../render-scene'; import { AABB } from '../../core/geometry/aabb'; import { PipelineSceneData } from '../pipeline-scene-data'; diff --git a/cocos/rendering/custom/define.ts b/cocos/rendering/custom/define.ts index b131e820357..c8e46df2a0b 100644 --- a/cocos/rendering/custom/define.ts +++ b/cocos/rendering/custom/define.ts @@ -23,8 +23,7 @@ */ import { EDITOR } from 'internal:constants'; -import { BufferInfo, Buffer, BufferUsageBit, ClearFlagBit, Color, DescriptorSet, LoadOp, - Format, Rect, Sampler, StoreOp, Texture, Viewport, MemoryUsageBit, Filter, Address } from '../../gfx'; +import { BufferInfo, Buffer, BufferUsageBit, ClearFlagBit, Color, DescriptorSet, LoadOp, Format, Rect, Sampler, StoreOp, Texture, Viewport, MemoryUsageBit, Filter, Address } from '../../gfx'; import { ProbeType, ReflectionProbe } from '../../render-scene/scene/reflection-probe'; import { Camera, SKYBOX_FLAG } from '../../render-scene/scene/camera'; import { CSMLevel, ShadowType } from '../../render-scene/scene/shadows'; @@ -36,11 +35,9 @@ import { SphereLight } from '../../render-scene/scene/sphere-light'; import { SpotLight } from '../../render-scene/scene/spot-light'; import { supportsR32FloatTexture, supportsRGBA16HalfFloatTexture } from '../define'; import { BasicPipeline, Pipeline } from './pipeline'; -import { - AccessType, AttachmentType, CopyPair, LightInfo, - QueueHint, ResourceResidency, SceneFlags, UpdateFrequency, UploadPair, -} from './types'; -import { Vec2, Vec3, Vec4, macro, geometry, toRadian, cclegacy, assert, nextPow2 } from '../../core'; +import { AccessType, AttachmentType, CopyPair, LightInfo, QueueHint, ResourceResidency, SceneFlags, UpdateFrequency, UploadPair } from './types'; +import { Vec2, Vec3, Vec4, macro, geometry, toRadian, assert, nextPow2 } from '../../core'; +import { cclegacy } from '@base/global'; import { ImageAsset, Material, Texture2D } from '../../asset/assets'; import { getProfilerCamera, SRGBToLinear } from '../pipeline-funcs'; import { RenderWindow } from '../../render-scene/core/render-window'; diff --git a/cocos/rendering/custom/executor.ts b/cocos/rendering/custom/executor.ts index 2ba97a70061..b3fee4599d8 100644 --- a/cocos/rendering/custom/executor.ts +++ b/cocos/rendering/custom/executor.ts @@ -29,47 +29,11 @@ */ /* eslint-disable max-len */ import { getPhaseID, InstancedBuffer, PipelineStateManager } from '..'; -import { assert, cclegacy, RecyclePool } from '../../core'; +import { assert, RecyclePool } from '../../core'; +import { cclegacy } from '@base/global'; import intersect from '../../core/geometry/intersect'; import { Sphere } from '../../core/geometry/sphere'; -import { - AccessFlagBit, - Attribute, - Buffer, - BufferInfo, - BufferUsageBit, - BufferViewInfo, - Color, - ColorAttachment, - CommandBuffer, - DepthStencilAttachment, - DescriptorSet, - DescriptorSetInfo, - Device, - deviceManager, - Format, - Framebuffer, - FramebufferInfo, - GeneralBarrierInfo, - InputAssembler, - InputAssemblerInfo, - LoadOp, - MemoryUsageBit, - PipelineState, - Rect, - RenderPass, - RenderPassInfo, - Shader, - StoreOp, - SurfaceTransform, - Swapchain, - Texture, - TextureInfo, - TextureType, - TextureUsageBit, - Viewport, -} from '../../gfx'; -import { legacyCC } from '../../core/global-exports'; +import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, BufferViewInfo, Color, ColorAttachment, CommandBuffer, DepthStencilAttachment, DescriptorSet, DescriptorSetInfo, Device, deviceManager, Format, Framebuffer, FramebufferInfo, GeneralBarrierInfo, InputAssembler, InputAssemblerInfo, LoadOp, MemoryUsageBit, PipelineState, Rect, RenderPass, RenderPassInfo, Shader, StoreOp, SurfaceTransform, Swapchain, Texture, TextureInfo, TextureType, TextureUsageBit, Viewport } from '../../gfx'; import { Vec3 } from '../../core/math/vec3'; import { Vec4 } from '../../core/math/vec4'; import { Pass } from '../../render-scene'; @@ -82,59 +46,15 @@ import { PipelineInputAssemblerData } from '../render-pipeline'; import { DescriptorSetData, LayoutGraphData, PipelineLayoutData, RenderPhaseData, RenderStageData } from './layout-graph'; import { BasicPipeline } from './pipeline'; import { SceneVisitor } from './scene'; -import { - Blit, - ClearView, - ComputePass, - ComputeSubpass, - ComputeView, - CopyPass, - Dispatch, - FormatView, - ManagedBuffer, - ManagedResource, - ManagedTexture, - MovePass, - RasterPass, - RasterSubpass, - RasterView, - RaytracePass, - RenderData, - RenderGraph, - RenderGraphVisitor, - RenderQueue, - RenderSwapchain, - ResolvePass, - ResourceDesc, - ResourceGraph, - ResourceGraphVisitor, - ResourceTraits, - SceneData, - SubresourceView, -} from './render-graph'; -import { - AttachmentType, - QueueHint, - ResourceDimension, - ResourceFlags, - ResourceResidency, - SceneFlags, - UpdateFrequency, -} from './types'; +import { Blit, ClearView, ComputePass, ComputeSubpass, ComputeView, CopyPass, Dispatch, FormatView, ManagedBuffer, ManagedResource, ManagedTexture, MovePass, RasterPass, RasterSubpass, RasterView, RaytracePass, RenderData, RenderGraph, RenderGraphVisitor, RenderQueue, RenderSwapchain, ResolvePass, ResourceDesc, ResourceGraph, ResourceGraphVisitor, ResourceTraits, SceneData, SubresourceView } from './render-graph'; +import { AttachmentType, QueueHint, ResourceDimension, ResourceFlags, ResourceResidency, SceneFlags, UpdateFrequency } from './types'; import { PipelineUBO } from '../pipeline-ubo'; import { WebSceneTask, WebSceneTransversal } from './web-scene'; import { WebSceneVisitor } from './web-scene-visitor'; import { RenderAdditiveLightQueue } from '../render-additive-light-queue'; import { DefaultVisitor, depthFirstSearch, ReferenceGraphView } from './graph'; import { VectorGraphColorMap } from './effect'; -import { - getDescriptorSetDataFromLayout, - getDescriptorSetDataFromLayoutId, - getRenderArea, - mergeSrcToTargetDesc, - updateGlobalDescBinding, - validPunctualLightsCulling, -} from './define'; +import { getDescriptorSetDataFromLayout, getDescriptorSetDataFromLayoutId, getRenderArea, mergeSrcToTargetDesc, updateGlobalDescBinding, validPunctualLightsCulling } from './define'; import { RenderReflectionProbeQueue } from '../render-reflection-probe-queue'; import { SceneCulling } from './scene-culling'; @@ -1588,7 +1508,7 @@ class ExecutorContext { this.pipelineSceneData = pipeline.pipelineSceneData; this.resourceGraph = resourceGraph; this.renderGraph = renderGraph; - this.root = legacyCC.director.root; + this.root = cclegacy.director.root; this.ubo = ubo; this.layoutGraph = layoutGraph; this.width = width; diff --git a/cocos/rendering/custom/pipeline-define.ts b/cocos/rendering/custom/pipeline-define.ts index c20f38c52a9..f51c173ff98 100644 --- a/cocos/rendering/custom/pipeline-define.ts +++ b/cocos/rendering/custom/pipeline-define.ts @@ -1,30 +1,12 @@ import { EDITOR } from 'internal:constants'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { ClearFlagBit, Color, Format, LoadOp, StoreOp, Viewport } from '../../gfx'; import { RenderWindow } from '../../render-scene/core/render-window'; import { Camera, Light, LightType, ProbeType, ReflectionProbe, ShadowType } from '../../render-scene/scene'; import { supportsR32FloatTexture } from '../define'; -import { - GBufferInfo, - getCameraUniqueID, - getLoadOpOfClearFlag, - getRenderArea, - getRTFormatBeforeToneMapping, - LightingInfo, - PostInfo, - ShadowInfo, - updateCameraUBO, - validPunctualLightsCulling, -} from './define'; +import { GBufferInfo, getCameraUniqueID, getLoadOpOfClearFlag, getRenderArea, getRTFormatBeforeToneMapping, LightingInfo, PostInfo, ShadowInfo, updateCameraUBO, validPunctualLightsCulling } from './define'; import { BasicPipeline, Pipeline, BasicRenderPassBuilder } from './pipeline'; -import { - AccessType, - AttachmentType, - LightInfo, - QueueHint, - ResourceResidency, - SceneFlags, -} from './types'; +import { AccessType, AttachmentType, LightInfo, QueueHint, ResourceResidency, SceneFlags } from './types'; import { getProfilerCamera, SRGBToLinear } from '../pipeline-funcs'; export class CameraInfo { diff --git a/cocos/rendering/custom/web-pipeline.ts b/cocos/rendering/custom/web-pipeline.ts index 82fadae57c5..1e3a33cd209 100644 --- a/cocos/rendering/custom/web-pipeline.ts +++ b/cocos/rendering/custom/web-pipeline.ts @@ -26,7 +26,8 @@ import { systemInfo } from 'pal/system-info'; import { DEBUG } from 'internal:constants'; import { Buffer, DescriptorSetLayout, Device, Feature, Format, FormatFeatureBit, Sampler, Swapchain, Texture, ClearFlagBit, DescriptorSet, deviceManager, Viewport, API, CommandBuffer, Type, SamplerInfo, Filter, Address, DescriptorSetInfo, LoadOp, StoreOp, ShaderStageFlagBit, BufferInfo, TextureInfo, TextureType, UniformBlock, ResolveMode, SampleCount, Color } from '../../gfx'; -import { Mat4, Quat, toRadian, Vec2, Vec3, Vec4, assert, macro, cclegacy, IVec4Like, IMat4Like, IVec2Like, Color as CoreColor } from '../../core'; +import { Mat4, Quat, toRadian, Vec2, Vec3, Vec4, assert, macro, IVec4Like, IMat4Like, IVec2Like, Color as CoreColor } from '../../core'; +import { cclegacy } from '@base/global'; import { AccessType, AttachmentType, CopyPair, LightInfo, LightingMode, MovePair, QueueHint, ResolvePair, ResourceDimension, ResourceFlags, ResourceResidency, SceneFlags, UpdateFrequency } from './types'; import { ComputeView, RasterView, Blit, ClearView, ComputePass, CopyPass, Dispatch, ManagedBuffer, ManagedResource, MovePass, RasterPass, RasterSubpass, RenderData, RenderGraph, RenderGraphComponent, RenderGraphValue, RenderQueue, RenderSwapchain, ResourceDesc, ResourceGraph, ResourceGraphValue, ResourceStates, ResourceTraits, SceneData, Subpass } from './render-graph'; import { ComputePassBuilder, ComputeQueueBuilder, ComputeSubpassBuilder, BasicPipeline, PipelineBuilder, RenderPassBuilder, RenderQueueBuilder, RenderSubpassBuilder, PipelineType, BasicRenderPassBuilder, PipelineCapabilities, BasicMultisampleRenderPassBuilder } from './pipeline'; diff --git a/cocos/rendering/debug-view.ts b/cocos/rendering/debug-view.ts index ebf10db4629..86af05736e7 100644 --- a/cocos/rendering/debug-view.ts +++ b/cocos/rendering/debug-view.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { Root } from '../root'; const enum RenderingDebugViewType { diff --git a/cocos/rendering/deferred/deferred-pipeline-scene-data.ts b/cocos/rendering/deferred/deferred-pipeline-scene-data.ts index 690d89dd069..122453bbdff 100644 --- a/cocos/rendering/deferred/deferred-pipeline-scene-data.ts +++ b/cocos/rendering/deferred/deferred-pipeline-scene-data.ts @@ -27,7 +27,7 @@ import { MAX_BLOOM_FILTER_PASS_NUM } from '../render-pipeline'; import { Material } from '../../asset/assets'; import { PipelineSceneData } from '../pipeline-scene-data'; import { macro } from '../../core/platform/macro'; -import { legacyCC } from '../../core/global-exports'; +import { cclegacy } from '@base/global'; // Anti-aliasing type, other types will be gradually added in the future export enum AntiAliasing { @@ -189,7 +189,7 @@ export class DeferredPipelineSceneData extends PipelineSceneData { if (!this._deferredLightingMaterial) return; // It's temporary solution for main light shadowmap - legacyCC.director.root.pipeline.macros.CC_RECEIVE_SHADOW = 1; + cclegacy.director.root.pipeline.macros.CC_RECEIVE_SHADOW = 1; const passLit = this._deferredLightingMaterial.passes[0]; passLit.beginChangeStatesSilently(); diff --git a/cocos/rendering/define.ts b/cocos/rendering/define.ts index 6b9c1a3593d..de74ff83b86 100644 --- a/cocos/rendering/define.ts +++ b/cocos/rendering/define.ts @@ -26,10 +26,8 @@ import { Pass } from '../render-scene/core/pass'; import { Model } from '../render-scene/scene/model'; import { SubModel } from '../render-scene/scene/submodel'; import { Layers } from '../scene-graph/layers'; -import { cclegacy } from '../core'; -import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer, DescriptorSetLayoutBinding, - Uniform, UniformBlock, UniformSamplerTexture, UniformStorageImage, Device, FormatFeatureBit, Format, API, -} from '../gfx'; +import { cclegacy } from '@base/global'; +import { BindingMappingInfo, DescriptorType, Type, ShaderStageFlagBit, UniformStorageBuffer, DescriptorSetLayoutBinding, Uniform, UniformBlock, UniformSamplerTexture, UniformStorageImage, Device, FormatFeatureBit, Format, API } from '../gfx'; export const PIPELINE_FLOW_MAIN = 'MainFlow'; export const PIPELINE_FLOW_FORWARD = 'ForwardFlow'; diff --git a/cocos/rendering/geometry-renderer.jsb.ts b/cocos/rendering/geometry-renderer.jsb.ts index be0b70c0388..27c8d695786 100644 --- a/cocos/rendering/geometry-renderer.jsb.ts +++ b/cocos/rendering/geometry-renderer.jsb.ts @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import type { GeometryRenderer as JsbGeometryRenderer } from './geometry-renderer'; declare const jsb: any; diff --git a/cocos/rendering/geometry-renderer.ts b/cocos/rendering/geometry-renderer.ts index 41ebe43f715..7729412efd7 100644 --- a/cocos/rendering/geometry-renderer.ts +++ b/cocos/rendering/geometry-renderer.ts @@ -22,12 +22,11 @@ THE SOFTWARE. */ -import { Color, Mat4, Vec3, Vec4, geometry, warnID, toRadian, cclegacy } from '../core'; +import { Color, Mat4, Vec3, Vec4, geometry, warnID, toRadian } from '../core'; +import { cclegacy } from '@base/global'; import { SetIndex } from './define'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Attribute, AttributeName, Buffer, BufferInfo, BufferUsageBit, - CommandBuffer, Device, DrawInfo, Format, InputAssembler, - InputAssemblerInfo, MemoryUsageBit, RenderPass } from '../gfx'; +import { Attribute, AttributeName, Buffer, BufferInfo, BufferUsageBit, CommandBuffer, Device, DrawInfo, Format, InputAssembler, InputAssemblerInfo, MemoryUsageBit, RenderPass } from '../gfx'; import { PipelineSceneData } from './pipeline-scene-data'; diff --git a/cocos/rendering/index.jsb.ts b/cocos/rendering/index.jsb.ts index f107345680b..172e750c28a 100644 --- a/cocos/rendering/index.jsb.ts +++ b/cocos/rendering/index.jsb.ts @@ -25,34 +25,15 @@ declare const nr: any; declare const jsb: any; -import { OPEN_HARMONY } from 'internal:constants' +import { OPEN_HARMONY } from 'internal:constants'; import { ccenum, CCString, js } from '../core'; import * as pipeline from './define'; import { ccclass, serializable, editable, type } from '../core/data/class-decorator'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import * as decors from '../native-binding/decorators'; import { RenderTexture } from '../asset/assets/render-texture'; import { Skin } from '../render-scene/scene/skin'; -import { - RenderPipeline as NrRenderPipeline, - RenderFlow as NrRenderFlow, - RenderStage as NrRenderStage, - InstancedBuffer as NrInstancedBuffer, - PipelineStateManager as NrPipelineStateManager, - ForwardPipeline as NrForwardPipeline, - ForwardFlow as NrForwardFlow, - ShadowFlow as NrShadowFlow, - ForwardStage as NrForwardStage, - ShadowStage as NrShadowStage, - DeferredPipeline as NrDeferredPipeline, - MainFlow as NrMainFlow, - LightingStage as NrLightingStage, - PostProcessStage as NrPostProcessStage, - GbufferStage as NrGbufferStage, - BloomStage as NrBloomStage, - ReflectionProbeFlow as NrReflectionProbeFlow, - ReflectionProbeStage as NrReflectionProbeStage, -} from './index'; +import { RenderPipeline as NrRenderPipeline, RenderFlow as NrRenderFlow, RenderStage as NrRenderStage, InstancedBuffer as NrInstancedBuffer, PipelineStateManager as NrPipelineStateManager, ForwardPipeline as NrForwardPipeline, ForwardFlow as NrForwardFlow, ShadowFlow as NrShadowFlow, ForwardStage as NrForwardStage, ShadowStage as NrShadowStage, DeferredPipeline as NrDeferredPipeline, MainFlow as NrMainFlow, LightingStage as NrLightingStage, PostProcessStage as NrPostProcessStage, GbufferStage as NrGbufferStage, BloomStage as NrBloomStage, ReflectionProbeFlow as NrReflectionProbeFlow, ReflectionProbeStage as NrReflectionProbeStage } from './index'; export { pipeline }; export * from './pass-phase'; @@ -403,9 +384,9 @@ postProcessStageProto.init = function (pipeline) { } -legacyCC.RenderFlow = RenderFlow; -legacyCC.RenderStage = RenderStage; -legacyCC.RenderPipeline = RenderPipeline; +cclegacy.RenderFlow = RenderFlow; +cclegacy.RenderStage = RenderStage; +cclegacy.RenderPipeline = RenderPipeline; @ccclass('RenderTextureConfig') class RenderTextureConfig { diff --git a/cocos/rendering/pipeline-scene-data.ts b/cocos/rendering/pipeline-scene-data.ts index 18f1f2fb9f2..fc013284111 100644 --- a/cocos/rendering/pipeline-scene-data.ts +++ b/cocos/rendering/pipeline-scene-data.ts @@ -26,13 +26,12 @@ import { Skybox } from '../render-scene/scene/skybox'; import { Shadows } from '../render-scene/scene/shadows'; import { Octree } from '../render-scene/scene/octree'; import { IRenderObject } from './define'; -import { Device, Framebuffer, InputAssembler, InputAssemblerInfo, Buffer, BufferInfo, - BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../gfx'; +import { Device, Framebuffer, InputAssembler, InputAssemblerInfo, Buffer, BufferInfo, BufferUsageBit, MemoryUsageBit, Attribute, Format, Shader } from '../gfx'; import { Light } from '../render-scene/scene/light'; import { Material } from '../asset/assets'; import { Pass } from '../render-scene/core/pass'; import { CSMLayers } from './shadow/csm-layers'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { Skin } from '../render-scene/scene/skin'; import { Model } from '../render-scene/scene/model'; import { PostSettings } from '../render-scene/scene/post-settings'; @@ -110,7 +109,7 @@ export class PipelineSceneData { public octree: Octree = new Octree(); public skin: Skin = new Skin(); public postSettings: PostSettings = new PostSettings(); - public lightProbes = legacyCC.internal.LightProbes ? new legacyCC.internal.LightProbes() : null; + public lightProbes = cclegacy.internal.LightProbes ? new cclegacy.internal.LightProbes() : null; /** * @en The list for valid punctual Lights, only available after the scene culling of the current frame. diff --git a/cocos/rendering/pipeline-ubo.ts b/cocos/rendering/pipeline-ubo.ts index 38bfb231123..06fe34fd746 100644 --- a/cocos/rendering/pipeline-ubo.ts +++ b/cocos/rendering/pipeline-ubo.ts @@ -22,11 +22,11 @@ THE SOFTWARE. */ -import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, - supportsR32FloatTexture, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, UBOCSM, isEnableEffect } from './define'; +import { UBOGlobal, UBOShadow, UBOCamera, UNIFORM_SHADOWMAP_BINDING, supportsR32FloatTexture, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, UBOCSM, isEnableEffect } from './define'; import { Device, BufferInfo, BufferUsageBit, MemoryUsageBit, DescriptorSet } from '../gfx'; import { Camera } from '../render-scene/scene/camera'; -import { Mat4, Vec3, Vec4, Color, toRadian, cclegacy } from '../core'; +import { Mat4, Vec3, Vec4, Color, toRadian } from '../core'; +import { cclegacy } from '@base/global'; import { PipelineRuntime } from './custom/pipeline'; import { CSMLevel, PCFType, Shadows, ShadowType } from '../render-scene/scene/shadows'; import { Light, LightType } from '../render-scene/scene/light'; diff --git a/cocos/rendering/planar-shadow-queue.ts b/cocos/rendering/planar-shadow-queue.ts index 8582458b1cd..136cecbd3e6 100644 --- a/cocos/rendering/planar-shadow-queue.ts +++ b/cocos/rendering/planar-shadow-queue.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { cclegacy, geometry } from '../core'; +import { cclegacy } from '@base/global'; +import { geometry } from '../core'; import { isEnableEffect, SetIndex } from './define'; import { CommandBuffer, Device, RenderPass, Shader } from '../gfx'; import { PipelineStateManager } from './pipeline-state-manager'; diff --git a/cocos/rendering/post-process/components/bloom.ts b/cocos/rendering/post-process/components/bloom.ts index 5432f2a93bd..98593bafe21 100644 --- a/cocos/rendering/post-process/components/bloom.ts +++ b/cocos/rendering/post-process/components/bloom.ts @@ -1,6 +1,5 @@ -import { cclegacy } from '../../../core'; -import { ccclass, disallowMultiple, executeInEditMode, help, menu, range, rangeMin, - serializable, slide, tooltip, type, visible } from '../../../core/data/decorators'; +import { cclegacy } from '@base/global'; +import { ccclass, disallowMultiple, executeInEditMode, help, menu, range, rangeMin, serializable, slide, tooltip, type, visible } from '../../../core/data/decorators'; import { CCBoolean, CCFloat, CCInteger } from '../../../core/data/utils/attribute'; import { Root } from '../../../root'; import { PostProcessSetting } from './post-process-setting'; diff --git a/cocos/rendering/post-process/passes/base-pass.ts b/cocos/rendering/post-process/passes/base-pass.ts index 54fecf11729..4d51dd774ae 100644 --- a/cocos/rendering/post-process/passes/base-pass.ts +++ b/cocos/rendering/post-process/passes/base-pass.ts @@ -7,7 +7,8 @@ import { BasicPipeline, Pipeline, PipelineRuntime } from '../../custom/pipeline' import { passContext } from '../utils/pass-context'; import { Address, Filter, Format, Sampler, SamplerInfo } from '../../../gfx'; import { supportsRGBA16HalfFloatTexture } from '../../define'; -import { cclegacy, macro } from '../../../core'; +import { cclegacy } from '@base/global'; +import { macro } from '../../../core'; let _BasePassID = 0; let _pointSampler: Sampler| null = null; diff --git a/cocos/rendering/post-process/passes/float-output-process-pass.ts b/cocos/rendering/post-process/passes/float-output-process-pass.ts index d48c97c47e0..dcde3ba6d34 100644 --- a/cocos/rendering/post-process/passes/float-output-process-pass.ts +++ b/cocos/rendering/post-process/passes/float-output-process-pass.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec4, cclegacy } from '../../../core'; +import { Vec4 } from '../../../core'; +import { cclegacy } from '@base/global'; import { ClearFlagBit, Format } from '../../../gfx'; import { Camera, FOG_TYPE_NONE } from '../../../render-scene/scene'; import { Pipeline } from '../../custom/pipeline'; diff --git a/cocos/rendering/post-process/passes/hbao-pass.ts b/cocos/rendering/post-process/passes/hbao-pass.ts index f6f0e8a5893..04c843c1942 100644 --- a/cocos/rendering/post-process/passes/hbao-pass.ts +++ b/cocos/rendering/post-process/passes/hbao-pass.ts @@ -23,7 +23,8 @@ */ import { EDITOR } from 'internal:constants'; -import { cclegacy, toRadian, Vec2, Vec4, Vec3, v3 } from '../../../core'; +import { cclegacy } from '@base/global'; +import { toRadian, Vec2, Vec4, Vec3, v3 } from '../../../core'; import { Camera, CameraUsage } from '../../../render-scene/scene'; import { Pipeline } from '../../custom/pipeline'; import { getCameraUniqueID } from '../../custom/define'; diff --git a/cocos/rendering/post-process/passes/skin-pass.ts b/cocos/rendering/post-process/passes/skin-pass.ts index 24bdd068a8b..5866a2fd675 100644 --- a/cocos/rendering/post-process/passes/skin-pass.ts +++ b/cocos/rendering/post-process/passes/skin-pass.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Vec4, Vec3, cclegacy, warnID } from '../../../core'; +import { Vec4, Vec3, warnID } from '../../../core'; +import { cclegacy } from '@base/global'; import { Camera } from '../../../render-scene/scene'; import { LightInfo, QueueHint, SceneFlags } from '../../custom/types'; import { BasicPipeline, PipelineRuntime } from '../../custom/pipeline'; diff --git a/cocos/rendering/reflection-probe/reflection-probe-flow.ts b/cocos/rendering/reflection-probe/reflection-probe-flow.ts index 3ceabf5a832..83a6a98dce0 100644 --- a/cocos/rendering/reflection-probe/reflection-probe-flow.ts +++ b/cocos/rendering/reflection-probe/reflection-probe-flow.ts @@ -29,7 +29,7 @@ import { RenderFlowTag } from '../pipeline-serialization'; import { RenderPipeline } from '../render-pipeline'; import { Camera } from '../../render-scene/scene/camera'; import { ProbeType, ReflectionProbe } from '../../render-scene/scene/reflection-probe'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; /** * @en reflection probe render flow diff --git a/cocos/rendering/render-additive-light-queue.ts b/cocos/rendering/render-additive-light-queue.ts index ce569f7260e..7a16ed0d3d4 100644 --- a/cocos/rendering/render-additive-light-queue.ts +++ b/cocos/rendering/render-additive-light-queue.ts @@ -25,9 +25,9 @@ import { BatchingSchemes, Pass } from '../render-scene/core/pass'; import { Model } from '../render-scene/scene/model'; import { PipelineStateManager } from './pipeline-state-manager'; -import { Vec3, nextPow2, Mat4, Color, Pool, geometry, cclegacy } from '../core'; -import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit, - BufferInfo, BufferViewInfo, CommandBuffer } from '../gfx'; +import { Vec3, nextPow2, Mat4, Color, Pool, geometry } from '../core'; +import { cclegacy } from '@base/global'; +import { Device, RenderPass, Buffer, BufferUsageBit, MemoryUsageBit, BufferInfo, BufferViewInfo, CommandBuffer } from '../gfx'; import { RenderInstancedQueue } from './render-instanced-queue'; import { SphereLight } from '../render-scene/scene/sphere-light'; import { SpotLight } from '../render-scene/scene/spot-light'; @@ -36,8 +36,7 @@ import { RangedDirectionalLight } from '../render-scene/scene/ranged-directional import { SubModel } from '../render-scene/scene/submodel'; import { getPhaseID } from './pass-phase'; import { Light, LightType } from '../render-scene/scene/light'; -import { SetIndex, UBOForwardLight, UBOShadow, UNIFORM_SHADOWMAP_BINDING, - UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, supportsR32FloatTexture, isEnableEffect } from './define'; +import { SetIndex, UBOForwardLight, UBOShadow, UNIFORM_SHADOWMAP_BINDING, UNIFORM_SPOT_SHADOW_MAP_TEXTURE_BINDING, supportsR32FloatTexture, isEnableEffect } from './define'; import { Camera } from '../render-scene/scene/camera'; import { ShadowType } from '../render-scene/scene/shadows'; import { GlobalDSManager } from './global-descriptor-set-manager'; diff --git a/cocos/rendering/render-flow.ts b/cocos/rendering/render-flow.ts index 7b27ed47472..5c314e89953 100644 --- a/cocos/rendering/render-flow.ts +++ b/cocos/rendering/render-flow.ts @@ -25,7 +25,7 @@ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; import { RenderStage } from './render-stage'; import { RenderPipeline } from './render-pipeline'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { Camera } from '../render-scene/scene'; /** diff --git a/cocos/rendering/render-pipeline.jsb.ts b/cocos/rendering/render-pipeline.jsb.ts index be43772d108..31fbeea9712 100644 --- a/cocos/rendering/render-pipeline.jsb.ts +++ b/cocos/rendering/render-pipeline.jsb.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { RenderPipeline as NrRenderPipeline } from './render-pipeline'; import { Buffer, InputAssembler } from '../gfx'; diff --git a/cocos/rendering/render-pipeline.ts b/cocos/rendering/render-pipeline.ts index bae3fbf16f6..1459a625b3d 100644 --- a/cocos/rendering/render-pipeline.ts +++ b/cocos/rendering/render-pipeline.ts @@ -26,11 +26,7 @@ import { ccclass, displayOrder, serializable, type } from 'cc.decorator'; import { systemInfo } from 'pal/system-info'; import { sceneCulling, validPunctualLightsCulling } from './scene-culling'; import { Asset } from '../asset/assets/asset'; -import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlagBit, ClearFlags, ColorAttachment, CommandBuffer, - DepthStencilAttachment, DescriptorSet, Device, Feature, Format, FormatFeatureBit, Framebuffer, FramebufferInfo, InputAssembler, - InputAssemblerInfo, LoadOp, MemoryUsageBit, Rect, RenderPass, RenderPassInfo, Sampler, StoreOp, SurfaceTransform, Swapchain, - Texture, TextureInfo, TextureType, TextureUsageBit, Viewport, GeneralBarrierInfo, deviceManager, DescriptorSetLayout, -} from '../gfx'; +import { AccessFlagBit, Attribute, Buffer, BufferInfo, BufferUsageBit, ClearFlagBit, ClearFlags, ColorAttachment, CommandBuffer, DepthStencilAttachment, DescriptorSet, Device, Feature, Format, FormatFeatureBit, Framebuffer, FramebufferInfo, InputAssembler, InputAssemblerInfo, LoadOp, MemoryUsageBit, Rect, RenderPass, RenderPassInfo, Sampler, StoreOp, SurfaceTransform, Swapchain, Texture, TextureInfo, TextureType, TextureUsageBit, Viewport, GeneralBarrierInfo, deviceManager, DescriptorSetLayout } from '../gfx'; import { MacroRecord } from '../render-scene/core/pass-utils'; import { RenderWindow } from '../render-scene/core/render-window'; import { Camera, SKYBOX_FLAG } from '../render-scene/scene/camera'; @@ -43,7 +39,8 @@ import { RenderFlow } from './render-flow'; import { IPipelineEvent, PipelineEventProcessor, PipelineEventType } from './pipeline-event'; import { decideProfilerCamera } from './pipeline-funcs'; import { OS } from '../../pal/system-info/enum-type'; -import { macro, murmurhash2_32_gc, cclegacy } from '../core'; +import { macro, murmurhash2_32_gc } from '../core'; +import { cclegacy } from '@base/global'; import { UBOSkinning } from './define'; import { PipelineRuntime } from './custom/pipeline'; diff --git a/cocos/rendering/render-reflection-probe-queue.ts b/cocos/rendering/render-reflection-probe-queue.ts index c5c35f91873..3fb8180d1ef 100644 --- a/cocos/rendering/render-reflection-probe-queue.ts +++ b/cocos/rendering/render-reflection-probe-queue.ts @@ -33,7 +33,8 @@ import { ProbeType, ReflectionProbe } from '../render-scene/scene/reflection-pro import { Camera, SKYBOX_FLAG } from '../render-scene/scene/camera'; import { PipelineRuntime } from './custom/pipeline'; import { RenderInstancedQueue } from './render-instanced-queue'; -import { cclegacy, geometry } from '../core'; +import { cclegacy } from '@base/global'; +import { geometry } from '../core'; const CC_USE_RGBE_OUTPUT = 'CC_USE_RGBE_OUTPUT'; let _phaseID = getPhaseID('default'); diff --git a/cocos/rendering/render-shadow-map-batched-queue.ts b/cocos/rendering/render-shadow-map-batched-queue.ts index f0aae7ff878..a5578444550 100644 --- a/cocos/rendering/render-shadow-map-batched-queue.ts +++ b/cocos/rendering/render-shadow-map-batched-queue.ts @@ -31,7 +31,8 @@ import { Pass, BatchingSchemes } from '../render-scene/core/pass'; import { RenderInstancedQueue } from './render-instanced-queue'; import { ShadowType } from '../render-scene/scene/shadows'; import { Light, LightType } from '../render-scene/scene/light'; -import { cclegacy, geometry } from '../core'; +import { cclegacy } from '@base/global'; +import { geometry } from '../core'; import { Model } from '../render-scene/scene/model'; import { Camera, DirectionalLight, SpotLight } from '../render-scene/scene'; import { shadowCulling } from './scene-culling'; diff --git a/cocos/rendering/render-stage.jsb.ts b/cocos/rendering/render-stage.jsb.ts index f45bfcc2a4c..ec9955ebfb8 100644 --- a/cocos/rendering/render-stage.jsb.ts +++ b/cocos/rendering/render-stage.jsb.ts @@ -24,13 +24,13 @@ declare var nr:any; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import type { RenderStage as NrRenderStage } from './render-stage'; import type { RenderQueueDesc } from './pipeline-serialization'; export const RenderStage: typeof NrRenderStage = nr.RenderStage; export type RenderStage = NrRenderStage; // Do not delete, for the class detection of editor -legacyCC.RenderStage = RenderStage; +cclegacy.RenderStage = RenderStage; /** * @en The render stage information descriptor diff --git a/cocos/rendering/render-stage.ts b/cocos/rendering/render-stage.ts index 46003ce956c..85f8467aa6c 100644 --- a/cocos/rendering/render-stage.ts +++ b/cocos/rendering/render-stage.ts @@ -23,7 +23,7 @@ */ import { ccclass, displayOrder, serializable } from 'cc.decorator'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; import { RenderPipeline } from './render-pipeline'; import { RenderFlow } from './render-flow'; import { RenderQueueDesc } from './pipeline-serialization'; diff --git a/cocos/rendering/scene-culling.ts b/cocos/rendering/scene-culling.ts index ca507ed247e..4a3ac0cdea2 100644 --- a/cocos/rendering/scene-culling.ts +++ b/cocos/rendering/scene-culling.ts @@ -23,7 +23,8 @@ */ import { Model } from '../render-scene/scene/model'; import { Camera, CameraUsage, SKYBOX_FLAG } from '../render-scene/scene/camera'; -import { Vec3, Pool, geometry, cclegacy } from '../core'; +import { Vec3, Pool, geometry } from '../core'; +import { cclegacy } from '@base/global'; import { RenderPipeline } from './render-pipeline'; import { IRenderObject, UBOShadow } from './define'; import { ShadowType, CSMOptimizationMode } from '../render-scene/scene/shadows'; diff --git a/cocos/rendering/shadow/csm-layers.ts b/cocos/rendering/shadow/csm-layers.ts index bed455e4bbe..a3829be5f4c 100644 --- a/cocos/rendering/shadow/csm-layers.ts +++ b/cocos/rendering/shadow/csm-layers.ts @@ -28,7 +28,7 @@ import { Frustum, AABB } from '../../core/geometry'; import { IRenderObject } from '../define'; import { PipelineSceneData } from '../pipeline-scene-data'; import { CachedArray } from '../../core/memop/cached-array'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; const _mat4Trans = new Mat4(); const _matShadowTrans = new Mat4(); diff --git a/cocos/rendering/ui-phase.ts b/cocos/rendering/ui-phase.ts index 43e223a5f61..8d1d843b108 100644 --- a/cocos/rendering/ui-phase.ts +++ b/cocos/rendering/ui-phase.ts @@ -28,7 +28,7 @@ import { isEnableEffect, SetIndex } from './define'; import { Camera } from '../render-scene/scene/camera'; import { RenderPipeline } from './render-pipeline'; import { getPhaseID } from './pass-phase'; -import { cclegacy } from '../core'; +import { cclegacy } from '@base/global'; export class UIPhase { private _phaseID = getPhaseID('default'); diff --git a/cocos/root.jsb.ts b/cocos/root.jsb.ts index 2e3ce09e2a4..0709139d5bc 100644 --- a/cocos/root.jsb.ts +++ b/cocos/root.jsb.ts @@ -22,10 +22,10 @@ THE SOFTWARE. */ -import { legacyCC } from './core/global-exports'; import { DataPoolManager } from './3d/skeletal-animation/data-pool-manager'; import { Device, deviceManager } from './gfx'; import { settings, Settings, warnID, Pool, macro } from './core'; +import { cclegacy } from '@base/global'; import { ForwardPipeline } from './rendering'; import type { Root as JsbRoot } from './root'; @@ -55,8 +55,8 @@ export interface IRootInfo { const rootProto: any = Root.prototype; rootProto._createBatcher2D = function () { - if (!this._batcher && legacyCC.internal.Batcher2D) { - this._batcher = new legacyCC.internal.Batcher2D(this); + if (!this._batcher && cclegacy.internal.Batcher2D) { + this._batcher = new cclegacy.internal.Batcher2D(this); if (!this._batcher!.initialize()) { this._batcher = null; this.destroy(); @@ -102,7 +102,7 @@ class DummyPipelineEvent { rootProto._ctor = function (device: Device) { this._device = device; - this._dataPoolMgr = legacyCC.internal.DataPoolManager && new legacyCC.internal.DataPoolManager(device) as DataPoolManager; + this._dataPoolMgr = cclegacy.internal.DataPoolManager && new cclegacy.internal.DataPoolManager(device) as DataPoolManager; this._modelPools = new Map(); this._lightPools = new Map(); this._batcher = null; @@ -206,19 +206,19 @@ rootProto.recycleLight = function (l) { }; rootProto._onDirectorBeforeCommit = function () { - legacyCC.director.emit(legacyCC.Director.EVENT_BEFORE_COMMIT); + cclegacy.director.emit(cclegacy.Director.EVENT_BEFORE_COMMIT); }; rootProto._onDirectorBeforeRender = function () { - legacyCC.director.emit(legacyCC.Director.EVENT_BEFORE_RENDER); + cclegacy.director.emit(cclegacy.Director.EVENT_BEFORE_RENDER); }; rootProto._onDirectorAfterRender = function () { - legacyCC.director.emit(legacyCC.Director.EVENT_AFTER_RENDER); + cclegacy.director.emit(cclegacy.Director.EVENT_AFTER_RENDER); }; rootProto._onDirectorPipelineChanged = function () { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); if (scene) { scene._activate(); } @@ -227,7 +227,7 @@ rootProto._onDirectorPipelineChanged = function () { const oldOnGlobalPipelineStateChanged = rootProto.onGlobalPipelineStateChanged; rootProto.onGlobalPipelineStateChanged = function() { oldOnGlobalPipelineStateChanged.call(this); - const builder = legacyCC.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME); + const builder = cclegacy.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME); if (builder) { if (typeof builder.onGlobalPipelineStateChanged === 'function') { builder.onGlobalPipelineStateChanged(); @@ -237,14 +237,14 @@ rootProto.onGlobalPipelineStateChanged = function() { const oldFrameMove = rootProto.frameMove; rootProto.frameMove = function (deltaTime: number) { - oldFrameMove.call(this, deltaTime, legacyCC.director.getTotalFrames()); + oldFrameMove.call(this, deltaTime, cclegacy.director.getTotalFrames()); }; const oldSetPipeline = rootProto.setRenderPipeline; rootProto.setRenderPipeline = function (pipeline) { let ppl; - if (macro.CUSTOM_PIPELINE_NAME !== '' && legacyCC.rendering && this.usesCustomPipeline) { - legacyCC.rendering.createCustomPipeline(); + if (macro.CUSTOM_PIPELINE_NAME !== '' && cclegacy.rendering && this.usesCustomPipeline) { + cclegacy.rendering.createCustomPipeline(); ppl = oldSetPipeline.call(this, null); } else { if (!pipeline) { diff --git a/cocos/root.ts b/cocos/root.ts index 17c61a1b5b8..be8a779ba8f 100644 --- a/cocos/root.ts +++ b/cocos/root.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { Pool, cclegacy, warnID, settings, Settings, macro } from './core'; +import { cclegacy } from '@base/global'; +import { Pool, warnID, settings, Settings, macro } from './core'; import type { RenderPipeline } from './rendering/render-pipeline'; import { DeferredPipeline } from './rendering/deferred/deferred-pipeline'; import { createDefaultPipeline } from './rendering/forward/forward-pipeline'; diff --git a/cocos/scene-graph/component-event-handler.ts b/cocos/scene-graph/component-event-handler.ts index 99865f80245..be988e1c8e9 100644 --- a/cocos/scene-graph/component-event-handler.ts +++ b/cocos/scene-graph/component-event-handler.ts @@ -25,7 +25,7 @@ import { ccclass, serializable, editable, tooltip } from 'cc.decorator'; import type { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; /** * @en @@ -155,13 +155,13 @@ export class EventHandler { */ public emit (params: any[]): void { const target = this.target; - if (!legacyCC.isValid(target)) { return; } + if (!cclegacy.isValid(target)) { return; } this._genCompIdIfNeeded(); - const compType = legacyCC.js.getClassById(this._componentId); + const compType = cclegacy.js.getClassById(this._componentId); const comp = target!.getComponent(compType); - if (!legacyCC.isValid(comp)) { return; } + if (!cclegacy.isValid(comp)) { return; } const handler = comp![this.handler]; if (typeof (handler) !== 'function') { return; } @@ -175,13 +175,13 @@ export class EventHandler { } private _compName2Id (compName): any { - const comp = legacyCC.js.getClassByName(compName); - return legacyCC.js.getClassId(comp); + const comp = cclegacy.js.getClassByName(compName); + return cclegacy.js.getClassId(comp); } private _compId2Name (compId): any { - const comp = legacyCC.js.getClassById(compId); - return legacyCC.js.getClassName(comp); + const comp = cclegacy.js.getClassById(compId); + return cclegacy.js.getClassName(comp); } // to be deprecated in the future diff --git a/cocos/scene-graph/component-scheduler.ts b/cocos/scene-graph/component-scheduler.ts index 3f2fe524d39..9b2fec86a7f 100644 --- a/cocos/scene-graph/component-scheduler.ts +++ b/cocos/scene-graph/component-scheduler.ts @@ -25,8 +25,8 @@ import { EDITOR, SUPPORT_JIT, DEV, TEST } from 'internal:constants'; import { CCObject } from '../core/data/object'; import { js } from '../core'; +import { cclegacy } from '@base/global'; import { tryCatchFunctor_EDITOR } from '../core/utils/misc'; -import { legacyCC } from '../core/global-exports'; import { error, assert } from '../core/platform/debug'; import type { Component } from './component'; @@ -216,8 +216,8 @@ class ReusableInvoker extends LifeCycleInvoker { function enableInEditor (comp): void { if (!(comp._objFlags & IsEditorOnEnableCalled)) { - legacyCC.engine.emit('component-enabled', comp.uuid); - if (!legacyCC.GAME_VIEW) { + cclegacy.engine.emit('component-enabled', comp.uuid); + if (!cclegacy.GAME_VIEW) { comp._objFlags |= IsEditorOnEnableCalled; } } @@ -247,7 +247,7 @@ export function createInvokeImpl (singleInvoke, fastPath, ensureFlag?): (iterato fastPath(iterator, dt); } catch (e) { // slow path - legacyCC._throw(e); + cclegacy._throw(e); const array = iterator.array; if (ensureFlag) { array[iterator.i]._objFlags |= ensureFlag; @@ -257,7 +257,7 @@ export function createInvokeImpl (singleInvoke, fastPath, ensureFlag?): (iterato try { singleInvoke(array[iterator.i], dt); } catch (e) { - legacyCC._throw(e); + cclegacy._throw(e); if (ensureFlag) { array[iterator.i]._objFlags |= ensureFlag; } @@ -311,7 +311,7 @@ const invokeLateUpdate = SUPPORT_JIT ? createInvokeImplJit('c.lateUpdate(dt)', t ); export const invokeOnEnable = EDITOR ? (iterator): void => { - const compScheduler = legacyCC.director._compScheduler; + const compScheduler = cclegacy.director._compScheduler; const array = iterator.array; for (iterator.i = 0; iterator.i < array.length; ++iterator.i) { const comp = array[iterator.i]; @@ -324,7 +324,7 @@ export const invokeOnEnable = EDITOR ? (iterator): void => { } } } : (iterator): void => { - const compScheduler = legacyCC.director._compScheduler; + const compScheduler = cclegacy.director._compScheduler; const array = iterator.array; for (iterator.i = 0; iterator.i < array.length; ++iterator.i) { const comp = array[iterator.i]; @@ -386,7 +386,7 @@ export class ComponentScheduler { * @deprecated since v3.5.0, this is an engine private interface that will be removed in the future. */ public _onEnabled (comp: Component): void { - legacyCC.director.getScheduler().resumeTarget(comp); + cclegacy.director.getScheduler().resumeTarget(comp); comp._objFlags |= IsOnEnableCalled; // schedule @@ -401,7 +401,7 @@ export class ComponentScheduler { * @deprecated since v3.5.0, this is an engine private interface that will be removed in the future. */ public _onDisabled (comp: Component): void { - legacyCC.director.getScheduler().pauseTarget(comp); + cclegacy.director.getScheduler().pauseTarget(comp); comp._objFlags &= ~IsOnEnableCalled; // cancel schedule task @@ -549,7 +549,7 @@ export class ComponentScheduler { if (EDITOR) { ComponentScheduler.prototype.enableComp = function (comp, invoker): void { // NOTE: _executeInEditMode is dynamically injected on Editor environment - if (legacyCC.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { + if (cclegacy.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { if (!(comp._objFlags & IsOnEnableCalled)) { if (comp.internalOnEnable) { if (invoker) { @@ -573,7 +573,7 @@ if (EDITOR) { ComponentScheduler.prototype.disableComp = function (comp): void { // NOTE: _executeInEditMode is dynamically injected on Editor environment - if (legacyCC.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { + if (cclegacy.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { if (comp._objFlags & IsOnEnableCalled) { if (comp.internalOnDisable) { callOnDisableInTryCatch(comp); @@ -582,7 +582,7 @@ if (EDITOR) { } } if (comp._objFlags & IsEditorOnEnableCalled) { - legacyCC.engine.emit('component-disabled', comp.uuid); + cclegacy.engine.emit('component-disabled', comp.uuid); comp._objFlags &= ~IsEditorOnEnableCalled; } }; diff --git a/cocos/scene-graph/component.ts b/cocos/scene-graph/component.ts index eaf681e175c..6188babab7d 100644 --- a/cocos/scene-graph/component.ts +++ b/cocos/scene-graph/component.ts @@ -33,7 +33,7 @@ import { RenderScene } from '../render-scene/core/render-scene'; import { Rect } from '../core/math'; import * as RF from '../core/data/utils/requiring-frame'; import { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { errorID, warnID, assertID } from '../core/platform/debug'; import { CompPrefabInfo } from './prefab/prefab-info'; import { EventHandler } from './component-event-handler'; @@ -131,7 +131,7 @@ class Component extends CCObject { if (this._enabled !== value) { this._enabled = value; if (this.node.activeInHierarchy) { - const compScheduler = legacyCC.director._compScheduler; + const compScheduler = cclegacy.director._compScheduler; if (value) { compScheduler.enableComp(this); } else { @@ -382,7 +382,7 @@ class Component extends CCObject { } if (super.destroy()) { if (this._enabled && this.node.activeInHierarchy) { - legacyCC.director._compScheduler.disableComp(this); + cclegacy.director._compScheduler.disableComp(this); } return true; } @@ -397,7 +397,7 @@ class Component extends CCObject { this.unscheduleAllCallbacks(); // onDestroy - legacyCC.director._nodeActivator.destroyComp(this); + cclegacy.director._nodeActivator.destroyComp(this); // do remove component this.node._removeComponent(this); @@ -408,7 +408,7 @@ class Component extends CCObject { */ public _instantiate (cloned?: Component): Component | undefined { if (!cloned) { - cloned = legacyCC.instantiate._clone(this, this); + cloned = cclegacy.instantiate._clone(this, this); } if (cloned) { @@ -437,16 +437,16 @@ class Component extends CCObject { * this.schedule((dt) => void log(`time: ${dt}`), 1); * ``` */ - public schedule (callback, interval = 0, repeat: number = legacyCC.macro.REPEAT_FOREVER, delay = 0): void { + public schedule (callback, interval = 0, repeat: number = cclegacy.macro.REPEAT_FOREVER, delay = 0): void { assertID(Boolean(callback), 1619); interval = interval || 0; assertID(interval >= 0, 1620); - repeat = Number.isNaN(repeat) ? legacyCC.macro.REPEAT_FOREVER : repeat; + repeat = Number.isNaN(repeat) ? cclegacy.macro.REPEAT_FOREVER : repeat; delay = delay || 0; - const scheduler = legacyCC.director.getScheduler(); + const scheduler = cclegacy.director.getScheduler(); // should not use enabledInHierarchy to judge whether paused, // because enabledInHierarchy is assigned after onEnable. @@ -488,7 +488,7 @@ class Component extends CCObject { return; } - legacyCC.director.getScheduler().unschedule(callback_fn, this); + cclegacy.director.getScheduler().unschedule(callback_fn, this); } /** @@ -500,7 +500,7 @@ class Component extends CCObject { * ``` */ public unscheduleAllCallbacks (): void { - legacyCC.director.getScheduler().unscheduleAllForTarget(this); + cclegacy.director.getScheduler().unscheduleAllForTarget(this); } // LIFECYCLE METHODS @@ -733,7 +733,7 @@ if (EDITOR || TEST) { // COMPONENT HELPERS // TODO Keep temporarily, compatible with old version - legacyCC._componentMenuItems = []; + cclegacy._componentMenuItems = []; } // we make this non-enumerable, to prevent inherited by sub classes. @@ -811,5 +811,5 @@ value(Component, '_registerEditorProps', (cls, props): void => { } }); -legacyCC.Component = Component; +cclegacy.Component = Component; export { Component }; diff --git a/cocos/scene-graph/deprecated.ts b/cocos/scene-graph/deprecated.ts index 072166d3851..2f34e8bbb41 100644 --- a/cocos/scene-graph/deprecated.ts +++ b/cocos/scene-graph/deprecated.ts @@ -29,7 +29,7 @@ import { Layers } from './layers'; import { Node } from './node'; import { Vec2 } from '../core/math/vec2'; import { Size } from '../core/math/size'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { CCObject } from '../core/data/object'; import { warnID } from '../core/platform/debug'; import { SceneGlobals } from './scene-globals'; @@ -364,4 +364,4 @@ replaceProperty(Node.EventType, 'Node.EventType', [ }, ]); -legacyCC.PrivateNode = PrivateNode; +cclegacy.PrivateNode = PrivateNode; diff --git a/cocos/scene-graph/find.ts b/cocos/scene-graph/find.ts index c8b93b9300f..bc6b7eb75e3 100644 --- a/cocos/scene-graph/find.ts +++ b/cocos/scene-graph/find.ts @@ -25,7 +25,7 @@ import { DEV } from 'internal:constants'; import { warnID } from '../core/platform/debug'; import { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; /** * @en Finds a node by hierarchy path, the path is case-sensitive. @@ -39,7 +39,7 @@ import { legacyCC } from '../core/global-exports'; */ export function find (path: string, referenceNode?: Node): Node | null { if (!referenceNode) { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); if (!scene) { if (DEV) { warnID(5601); @@ -57,4 +57,4 @@ export function find (path: string, referenceNode?: Node): Node | null { return referenceNode!.getChildByPath(path); } -legacyCC.find = find; +cclegacy.find = find; diff --git a/cocos/scene-graph/layers.jsb.ts b/cocos/scene-graph/layers.jsb.ts index 3aff979942f..eb56dc8a2aa 100644 --- a/cocos/scene-graph/layers.jsb.ts +++ b/cocos/scene-graph/layers.jsb.ts @@ -22,8 +22,8 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; export const Layers = jsb.Layers; export type Layers = jsb.Layers; -legacyCC.Layers = Layers; +cclegacy.Layers = Layers; diff --git a/cocos/scene-graph/layers.ts b/cocos/scene-graph/layers.ts index 681e4f142cd..807a17243a4 100644 --- a/cocos/scene-graph/layers.ts +++ b/cocos/scene-graph/layers.ts @@ -23,9 +23,9 @@ */ import { BitMask, Enum } from '../core/value-types'; -import { legacyCC } from '../core/global-exports'; -import { log2 } from '../core/math/bits'; +import { cclegacy } from '@base/global'; import { js } from '../core'; +import { log2 } from '../core/math/bits'; import { assertIsTrue } from '../core/data/utils/asserts'; import { getError, warn } from '../core/platform/debug'; import { Settings, settings } from '../core/settings'; @@ -189,4 +189,4 @@ export declare namespace Layers { export type BitMask = EnumAlias; } -legacyCC.Layers = Layers; +cclegacy.Layers = Layers; diff --git a/cocos/scene-graph/node-activator.ts b/cocos/scene-graph/node-activator.ts index bf6d0b286f6..0bb35af5801 100644 --- a/cocos/scene-graph/node-activator.ts +++ b/cocos/scene-graph/node-activator.ts @@ -27,7 +27,7 @@ import { CCObject, isValid } from '../core/data/object'; import { array, Pool } from '../core/utils/js'; import { tryCatchFunctor_EDITOR } from '../core/utils/misc'; import { invokeOnEnable, createInvokeImpl, createInvokeImplJit, OneOffInvoker, LifeCycleInvoker } from './component-scheduler'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { assert, errorID, getError, log } from '../core/platform/debug'; import { NodeEventType } from './node-event'; import { assertIsTrue } from '../core/data/utils/asserts'; @@ -224,7 +224,7 @@ export default class NodeActivator { if (deactivatedOnLoading) { return; } - legacyCC.director._compScheduler.enableComp(comp, onEnableInvoker); + cclegacy.director._compScheduler.enableComp(comp, onEnableInvoker); } } @@ -235,7 +235,7 @@ export default class NodeActivator { */ public destroyComp (comp: Component): void { // ensure onDisable called - legacyCC.director._compScheduler.disableComp(comp); + cclegacy.director._compScheduler.disableComp(comp); if (comp.internalOnDestroy && (comp._objFlags & IsOnLoadCalled)) { comp.internalOnDestroy(); @@ -262,7 +262,7 @@ export default class NodeActivator { // activate components for (let i = 0; i < originCount; ++i) { const component = node.components[i]; - if (component instanceof legacyCC.Component) { + if (component instanceof cclegacy.Component) { this.activateComp(component, preloadInvoker, onLoadInvoker, onEnableInvoker); } else { _componentCorrupted(node, component, i); @@ -296,7 +296,7 @@ export default class NodeActivator { for (let c = 0; c < originCount; ++c) { const component = node.components[c]; if (component._enabled) { - legacyCC.director._compScheduler.disableComp(component); + cclegacy.director._compScheduler.disableComp(component); if (node.activeInHierarchy) { // reactivated from root @@ -329,7 +329,7 @@ if (EDITOR) { try { c.internalOnLoad?.(); } catch (e) { - legacyCC._throw(e); + cclegacy._throw(e); } c._objFlags |= IsOnLoadCalled; _onLoadInEditor(c); @@ -339,7 +339,7 @@ if (EDITOR) { const callOnLostFocusInTryCatch = tryCatchFunctor_EDITOR('onLostFocusInEditor'); const _onLoadInEditor = (comp: Component): void => { - if (comp.internalOnLoad && !legacyCC.GAME_VIEW) { + if (comp.internalOnLoad && !cclegacy.GAME_VIEW) { const focused = Editor.Selection.getLastSelected('node') === comp.node.uuid; if (focused) { if (comp.onFocusInEditor && callOnFocusInTryCatch) { @@ -357,7 +357,7 @@ if (EDITOR) { return; } // NOTE: _executeInEditMode is dynamically injected on Editor environment - if (legacyCC.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { + if (cclegacy.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { if (!(comp._objFlags & IsPreloadStarted)) { comp._objFlags |= IsPreloadStarted; if (comp.internalPreload) { @@ -390,17 +390,17 @@ if (EDITOR) { if (deactivatedOnLoading) { return; } - legacyCC.director._compScheduler.enableComp(comp, onEnableInvoker); + cclegacy.director._compScheduler.enableComp(comp, onEnableInvoker); } }; NodeActivator.prototype.destroyComp = (comp: Component): void => { // ensure onDisable called - legacyCC.director._compScheduler.disableComp(comp); + cclegacy.director._compScheduler.disableComp(comp); if (comp.internalOnDestroy && (comp._objFlags & IsOnLoadCalled)) { // NOTE: _executeInEditMode is dynamically injected on Editor environment - if (legacyCC.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { + if (cclegacy.GAME_VIEW || (comp.constructor as any)._executeInEditMode) { callOnDestroyInTryCatch && callOnDestroyInTryCatch(comp); } } @@ -411,7 +411,7 @@ if (EDITOR) { try { comp.resetInEditor(didResetToDefault); } catch (e) { - legacyCC._throw(e); + cclegacy._throw(e); } } }; diff --git a/cocos/scene-graph/node-dev.ts b/cocos/scene-graph/node-dev.ts index 6515b71886e..4dfb1885be5 100644 --- a/cocos/scene-graph/node-dev.ts +++ b/cocos/scene-graph/node-dev.ts @@ -25,12 +25,12 @@ import { EDITOR, DEV, TEST } from 'internal:constants'; import { CCObject } from '../core/data/object'; import * as js from '../core/utils/js'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { error, errorID, getError, warn } from '../core/platform/debug'; import { Component } from './component'; const Destroying = CCObject.Flags.Destroying; -const IS_PREVIEW = !!legacyCC.GAME_VIEW; +const IS_PREVIEW = !!cclegacy.GAME_VIEW; export function nodePolyfill (Node): void { if ((EDITOR && !IS_PREVIEW) || TEST) { @@ -66,7 +66,7 @@ export function nodePolyfill (Node): void { const dependant: Component[] = []; for (let i = 0; i < this._components.length; i++) { const comp = this._components[i]; - if (comp !== depended && comp.isValid && !legacyCC.Object._willDestroy(comp)) { + if (comp !== depended && comp.isValid && !cclegacy.Object._willDestroy(comp)) { const reqComps = comp.constructor._requireComponent; if (reqComps) { if (Array.isArray(reqComps)) { @@ -93,7 +93,7 @@ export function nodePolyfill (Node): void { if (this._objFlags & Destroying) { return error('isDestroying'); } - if (!(comp instanceof legacyCC.Component)) { + if (!(comp instanceof cclegacy.Component)) { return errorID(3811); } if (index > this._components.length) { @@ -131,7 +131,7 @@ export function nodePolyfill (Node): void { } } if (this._activeInHierarchy) { - legacyCC.director._nodeActivator.activateComp(comp); + cclegacy.director._nodeActivator.activateComp(comp); } return undefined; }; @@ -140,7 +140,7 @@ export function nodePolyfill (Node): void { // check activity state const shouldActiveNow = this._active && !!(this._parent && this._parent._activeInHierarchy); if (this._activeInHierarchy !== shouldActiveNow) { - legacyCC.director._nodeActivator.activateNode(this, shouldActiveNow); + cclegacy.director._nodeActivator.activateNode(this, shouldActiveNow); } }; Node.prototype._onRestoreBase = Node.prototype.onRestore; @@ -190,7 +190,7 @@ export function nodePolyfill (Node): void { let path = ''; // eslint-disable-next-line @typescript-eslint/no-this-alias let node: any = this; - while (node && !(node instanceof legacyCC.Scene)) { + while (node && !(node instanceof cclegacy.Scene)) { if (path) { path = `${node.name}/${path}`; } else { diff --git a/cocos/scene-graph/node-enum.ts b/cocos/scene-graph/node-enum.ts index 086dcec26ff..b9cd58c435e 100644 --- a/cocos/scene-graph/node-enum.ts +++ b/cocos/scene-graph/node-enum.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { Enum } from '../core/value-types'; /** @@ -76,7 +76,7 @@ export enum TransformBit { TRS_MASK = ~TransformBit.TRS, } -legacyCC.internal.TransformBit = TransformBit; +cclegacy.internal.TransformBit = TransformBit; /** * @en Node's mobility diff --git a/cocos/scene-graph/node-event-processor.ts b/cocos/scene-graph/node-event-processor.ts index b2f10963fdf..45dfc4d1ed2 100644 --- a/cocos/scene-graph/node-event-processor.ts +++ b/cocos/scene-graph/node-event-processor.ts @@ -26,7 +26,7 @@ import { CallbacksInvoker } from '../core/event/callbacks-invoker'; import { Event, EventMouse, EventTouch, Touch } from '../input/types'; import { Vec2 } from '../core/math/vec2'; import { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { Component } from './component'; import { NodeEventType } from './node-event'; import { InputEventType, SystemEventTypeUnion } from '../input/types/event-enum'; @@ -672,4 +672,4 @@ export class NodeEventProcessor { // #endregion handle touch event } -legacyCC.NodeEventProcessor = NodeEventProcessor; +cclegacy.NodeEventProcessor = NodeEventProcessor; diff --git a/cocos/scene-graph/node.jsb.ts b/cocos/scene-graph/node.jsb.ts index ed2e4274521..0575106d65b 100644 --- a/cocos/scene-graph/node.jsb.ts +++ b/cocos/scene-graph/node.jsb.ts @@ -21,7 +21,7 @@ */ import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { errorID, getError } from '../core/platform/debug'; import { Component } from './component'; import { NodeEventType } from './node-event'; @@ -33,7 +33,7 @@ import { Layers } from './layers'; import { editorExtrasTag, SerializationContext, SerializationOutput, serializeTag } from '../core/data'; import { _tempFloatArray, fillMat4WithTempFloatArray } from './utils.jsb'; import { getClassByName, isChildClassOf } from '../core/utils/js-typed'; -import { syncNodeValues } from "../core/utils/jsb-utils"; +import { syncNodeValues } from '../core/utils/jsb-utils'; import { nodePolyfill } from './node-dev'; import * as js from '../core/utils/js'; import { patch_cc_Node } from '../native-binding/decorators'; @@ -45,7 +45,7 @@ declare const jsb: any; export const Node: typeof JsbNode = jsb.Node; export type Node = JsbNode; -legacyCC.Node = Node; +cclegacy.Node = Node; const NodeCls: any = Node; @@ -162,7 +162,7 @@ nodeProto.addComponent = function (typeOrClassName) { if (typeof typeOrClassName === 'string') { constructor = getClassByName(typeOrClassName); if (!constructor) { - if (legacyCC._RF.peek()) { + if (cclegacy._RF.peek()) { errorID(3808, typeOrClassName); } throw TypeError(getError(3807, typeOrClassName)); @@ -221,7 +221,7 @@ nodeProto.addComponent = function (typeOrClassName) { } this.emit(NodeEventType.COMPONENT_ADDED, component); if (this._activeInHierarchy) { - legacyCC.director._nodeActivator.activateComp(component); + cclegacy.director._nodeActivator.activateComp(component); } if (EDITOR_NOT_IN_PREVIEW) { component.resetInEditor?.(); @@ -419,7 +419,7 @@ nodeProto._onEditorAttached = function (attached: boolean) { }; nodeProto._onRemovePersistRootNode = function () { - legacyCC.game.removePersistRootNode(this); + cclegacy.game.removePersistRootNode(this); }; nodeProto._onDestroyComponents = function () { @@ -496,7 +496,7 @@ nodeProto._onSiblingOrderChanged = function () { }; nodeProto._onActivateNode = function (shouldActiveNow) { - legacyCC.director._nodeActivator.activateNode(this, shouldActiveNow); + cclegacy.director._nodeActivator.activateNode(this, shouldActiveNow); }; nodeProto._onPostActivated = function (active: boolean) { @@ -600,7 +600,7 @@ NodeCls._findChildComponents = function (children, constructor, components) { // @ts-ignore NodeCls.isNode = function (obj: unknown): obj is jsb.Node { // @ts-ignore - return obj instanceof jsb.Node && (obj.constructor === jsb.Node || !(obj instanceof legacyCC.Scene)); + return obj instanceof jsb.Node && (obj.constructor === jsb.Node || !(obj instanceof cclegacy.Scene)); }; let _tempQuat = new Quat(); @@ -1253,7 +1253,7 @@ nodeProto[serializeTag] = function (serializationOutput: SerializationOutput, co }; nodeProto._onActiveNode = function (shouldActiveNow: boolean) { - legacyCC.director._nodeActivator.activateNode(this, shouldActiveNow); + cclegacy.director._nodeActivator.activateNode(this, shouldActiveNow); }; nodeProto._onBatchCreated = function (dontSyncChildPrefab: boolean) { @@ -1318,7 +1318,7 @@ nodeProto._onLocalPositionRotationScaleUpdated = function (px, py, pz, rx, ry, r nodeProto._instantiate = function (cloned: Node, isSyncedNode: boolean) { if (!cloned) { - cloned = legacyCC.instantiate._clone(this, this); + cloned = cclegacy.instantiate._clone(this, this); } // TODO(PP_Pro): after we support editorOnly tag, we could remove this any type assertion. @@ -1366,7 +1366,7 @@ nodeProto._ctor = function (name?: string) { this.__editorExtras__ = { editorOnly: true }; this._components = []; - this._eventProcessor = new legacyCC.NodeEventProcessor(this); + this._eventProcessor = new cclegacy.NodeEventProcessor(this); this._uiProps = new NodeUIProperties(this); const sharedArrayBuffer = this._initAndReturnSharedBuffer(); diff --git a/cocos/scene-graph/node.ts b/cocos/scene-graph/node.ts index 264ea385397..8008abebf1c 100644 --- a/cocos/scene-graph/node.ts +++ b/cocos/scene-graph/node.ts @@ -26,7 +26,8 @@ import { ccclass, editable, serializable, type, visible } from 'cc.decorator'; import { DEV, DEBUG, EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Layers } from './layers'; import { NodeUIProperties } from './node-ui-properties'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; +import { CCObject, js } from '../core'; import { nodePolyfill } from './node-dev'; import { ISchedulable } from '../core/scheduler'; import { approx, EPSILON, Mat3, Mat4, Quat, Vec3 } from '../core/math'; @@ -35,7 +36,6 @@ import { CustomSerializable, editorExtrasTag, SerializationContext, Serializatio import { errorID, warnID, error, log, getError } from '../core/platform/debug'; import { Component } from './component'; import { property } from '../core/data/decorators/property'; -import { CCObject, js } from '../core'; import type { Scene } from './scene'; import { PrefabInfo, PrefabInstance } from './prefab/prefab-info'; import { NodeEventType } from './node-event'; @@ -192,7 +192,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { if (parent) { const couldActiveInScene = parent._activeInHierarchy; if (couldActiveInScene) { - legacyCC.director._nodeActivator.activateNode(this, isActive); + cclegacy.director._nodeActivator.activateNode(this, isActive); } } } @@ -381,7 +381,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { protected _name: string; - protected _eventProcessor: NodeEventProcessor = new (legacyCC.NodeEventProcessor as typeof NodeEventProcessor)(this); + protected _eventProcessor: NodeEventProcessor = new (cclegacy.NodeEventProcessor as typeof NodeEventProcessor)(this); protected _eventMask = 0; protected _siblingIndex = 0; @@ -978,7 +978,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { if (typeof typeOrClassName === 'string') { constructor = js.getClassByName(typeOrClassName) as Constructor | undefined; if (!constructor) { - if (legacyCC._RF.peek()) { + if (cclegacy._RF.peek()) { errorID(3808, typeOrClassName); } throw TypeError(getError(3807, typeOrClassName)); @@ -995,7 +995,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { if (typeof constructor !== 'function') { throw TypeError(getError(3809)); } - if (!js.isChildClassOf(constructor, legacyCC.Component)) { + if (!js.isChildClassOf(constructor, cclegacy.Component)) { throw TypeError(getError(3810)); } @@ -1041,7 +1041,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { } this.emit(NodeEventType.COMPONENT_ADDED, component); if (this._activeInHierarchy) { - legacyCC.director._nodeActivator.activateComp(component); + cclegacy.director._nodeActivator.activateComp(component); } if (EDITOR_NOT_IN_PREVIEW) { component.resetInEditor?.(); @@ -1320,7 +1320,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { protected _instantiate (cloned, isSyncedNode): any { if (!cloned) { - cloned = legacyCC.instantiate._clone(this, this); + cloned = cclegacy.instantiate._clone(this, this); } const newPrefabInfo = cloned._prefab; @@ -1345,15 +1345,15 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { protected _onHierarchyChangedBase (oldParent: this | null): void { const newParent = this._parent; - if (this._persistNode && !(newParent instanceof legacyCC.Scene)) { - legacyCC.game.removePersistRootNode(this); + if (this._persistNode && !(newParent instanceof cclegacy.Scene)) { + cclegacy.game.removePersistRootNode(this); if (EDITOR) { warnID(1623); } } if (EDITOR) { - const scene = legacyCC.director.getScene() as this | null; + const scene = cclegacy.director.getScene() as this | null; const inCurrentSceneBefore = oldParent && oldParent.isChildOf(scene); const inCurrentSceneNow = newParent && newParent.isChildOf(scene); if (!inCurrentSceneBefore && inCurrentSceneNow) { @@ -1374,7 +1374,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { const shouldActiveNow = this._active && !!(newParent && newParent._activeInHierarchy); if (this._activeInHierarchy !== shouldActiveNow) { - legacyCC.director._nodeActivator.activateNode(this, shouldActiveNow); + cclegacy.director._nodeActivator.activateNode(this, shouldActiveNow); } } @@ -1393,7 +1393,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { // remove from persist if (this._persistNode) { - legacyCC.game.removePersistRootNode(this); + cclegacy.game.removePersistRootNode(this); } if (!destroyByParent) { @@ -1552,7 +1552,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { * @zh 指定对象是否是普通的节点？如果传入 [[Scene]] 会返回 false。 */ public static isNode (obj: unknown): obj is Node { - return obj instanceof Node && (obj.constructor === Node || !(obj instanceof legacyCC.Scene)); + return obj instanceof Node && (obj.constructor === Node || !(obj instanceof cclegacy.Scene)); } protected _onPreDestroy (): boolean { @@ -2625,7 +2625,7 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { public getPathInHierarchy (): string { let result = this.name; let curNode: Node | null = this.parent; - while (curNode && !(curNode instanceof legacyCC.Scene)) { + while (curNode && !(curNode instanceof cclegacy.Scene)) { result = `${curNode.name}/${result}`; curNode = curNode.parent; } @@ -2636,4 +2636,4 @@ export class Node extends CCObject implements ISchedulable, CustomSerializable { nodePolyfill(Node); -legacyCC.Node = Node; +cclegacy.Node = Node; diff --git a/cocos/scene-graph/prefab/prefab-info.ts b/cocos/scene-graph/prefab/prefab-info.ts index dac885a21aa..de1e4889f44 100644 --- a/cocos/scene-graph/prefab/prefab-info.ts +++ b/cocos/scene-graph/prefab/prefab-info.ts @@ -24,7 +24,7 @@ import { ccclass, serializable, editable, type } from 'cc.decorator'; import { EDITOR } from 'internal:constants'; -import { cclegacy } from '../../core'; +import { cclegacy } from '@base/global'; import { Prefab } from './prefab'; import { CCObject, CCString } from '../../core/data'; import { Component } from '../component'; diff --git a/cocos/scene-graph/prefab/prefab.ts b/cocos/scene-graph/prefab/prefab.ts index 05773443275..f4e33525349 100644 --- a/cocos/scene-graph/prefab/prefab.ts +++ b/cocos/scene-graph/prefab/prefab.ts @@ -27,10 +27,10 @@ import { ccclass, serializable, editable } from 'cc.decorator'; import { SUPPORT_JIT, ALIPAY, RUNTIME_BASED, JSB } from 'internal:constants'; import { compile } from '../../serialization/instantiate-jit'; import { js } from '../../core'; +import { cclegacy } from '@base/global'; import { Enum } from '../../core/value-types'; import { Asset } from '../../asset/assets/asset'; import { Node } from '../node'; -import { legacyCC } from '../../core/global-exports'; import { warnID } from '../../core/platform/debug'; import { updateChildrenForDeserialize } from '../../core/utils/jsb-utils'; import * as utils from './utils'; @@ -122,7 +122,7 @@ export class Prefab extends Asset { } public createNode (cb: (err: Error | null, node: Node) => void): void { - const node = legacyCC.instantiate(this); + const node = cclegacy.instantiate(this); node.name = this.name; cb(null, node); } @@ -189,7 +189,7 @@ export class Prefab extends Asset { super.initDefault(uuid); this.data = new Node(); this.data.name = '(Missing Node)'; - const prefabInfo = new legacyCC._PrefabInfo(); + const prefabInfo = new cclegacy._PrefabInfo(); prefabInfo.asset = this; prefabInfo.root = this.data; this.data._prefab = prefabInfo; @@ -215,9 +215,9 @@ export declare namespace Prefab { js.value(Prefab, '_utils', utils); -legacyCC.Prefab = Prefab; +cclegacy.Prefab = Prefab; if (ALIPAY || RUNTIME_BASED) { - legacyCC._Prefab = Prefab; + cclegacy._Prefab = Prefab; } else { - js.obsolete(legacyCC, 'cc._Prefab', 'Prefab'); + js.obsolete(cclegacy, 'cc._Prefab', 'Prefab'); } diff --git a/cocos/scene-graph/prefab/utils.ts b/cocos/scene-graph/prefab/utils.ts index 94c31c8b6b4..6163bcf1fd7 100644 --- a/cocos/scene-graph/prefab/utils.ts +++ b/cocos/scene-graph/prefab/utils.ts @@ -24,17 +24,11 @@ */ import { EDITOR, SUPPORT_JIT } from 'internal:constants'; -import { cclegacy, errorID, warn, editorExtrasTag } from '../../core'; +import { cclegacy } from '@base/global'; +import { errorID, warn, editorExtrasTag } from '../../core'; import { Node } from '../node'; import { Component } from '../component'; -import { - MountedChildrenInfo, - PropertyOverrideInfo, - MountedComponentsInfo, - TargetInfo, TargetMap, - PrefabInstance, - TargetOverrideInfo, -} from './prefab-info'; +import { MountedChildrenInfo, PropertyOverrideInfo, MountedComponentsInfo, TargetInfo, TargetMap, PrefabInstance, TargetOverrideInfo } from './prefab-info'; import { ValueType } from '../../core/value-types'; export * from './prefab-info'; diff --git a/cocos/scene-graph/scene-globals.jsb.ts b/cocos/scene-graph/scene-globals.jsb.ts index fc00e60db45..9d4f7359c4a 100644 --- a/cocos/scene-graph/scene-globals.jsb.ts +++ b/cocos/scene-graph/scene-globals.jsb.ts @@ -20,7 +20,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { CCFloat, CCInteger } from '../core/data'; import { TextureCube } from '../asset/assets/texture-cube'; import { Enum } from '../core/value-types'; @@ -28,17 +28,7 @@ import { Ambient, EnvironmentLightingType, ToneMappingType } from '../render-sce import { Material } from '../asset/assets/material'; import { Vec2, Vec3, Color, Vec4 } from '../core/math'; import * as decros from '../native-binding/decorators'; -import type { - AmbientInfo as JsbAmbientInfo, - SkyboxInfo as JsbSkyboxInfo, - FogInfo as JsbFogInfo, - ShadowsInfo as JsbShadowsInfo, - OctreeInfo as JsbOctreeInfo, - SceneGlobals as JsbSceneGlobals, - LightProbeInfo as JsbLightProbeInfo, - SkinInfo as JsbSkinInfo, - PostSettingsInfo as JsbPostSettingsInfo, -} from './scene-globals'; +import type { AmbientInfo as JsbAmbientInfo, SkyboxInfo as JsbSkyboxInfo, FogInfo as JsbFogInfo, ShadowsInfo as JsbShadowsInfo, OctreeInfo as JsbOctreeInfo, SceneGlobals as JsbSceneGlobals, LightProbeInfo as JsbLightProbeInfo, SkinInfo as JsbSkinInfo, PostSettingsInfo as JsbPostSettingsInfo } from './scene-globals'; declare const jsb: any; @@ -150,41 +140,41 @@ export const ShadowType = Enum({ export const AmbientInfo: typeof JsbAmbientInfo = jsb.AmbientInfo; export type AmbientInfo = JsbAmbientInfo; -legacyCC.AmbientInfo = AmbientInfo; +cclegacy.AmbientInfo = AmbientInfo; export const SkyboxInfo: typeof JsbSkyboxInfo = jsb.SkyboxInfo; export type SkyboxInfo = JsbSkyboxInfo; -legacyCC.SkyboxInfo = SkyboxInfo; +cclegacy.SkyboxInfo = SkyboxInfo; export const FogInfo: typeof JsbFogInfo = jsb.FogInfo; export type FogInfo = JsbFogInfo; -legacyCC.FogInfo = FogInfo; +cclegacy.FogInfo = FogInfo; FogInfo.FogType = FogType; export const ShadowsInfo: typeof JsbShadowsInfo = jsb.ShadowsInfo; export type ShadowsInfo = JsbShadowsInfo; -legacyCC.ShadowsInfo = ShadowsInfo; +cclegacy.ShadowsInfo = ShadowsInfo; export const OctreeInfo: typeof JsbOctreeInfo = jsb.OctreeInfo; export type OctreeInfo = JsbOctreeInfo; -legacyCC.OctreeInfo = OctreeInfo; +cclegacy.OctreeInfo = OctreeInfo; export const LightProbeInfo: typeof JsbLightProbeInfo = jsb.LightProbeInfo; export type LightProbeInfo = JsbLightProbeInfo; -//legacyCC.LightProbeInfo = LightProbeInfo; +//cclegacy.LightProbeInfo = LightProbeInfo; export const SceneGlobals: typeof JsbSceneGlobals = jsb.SceneGlobals; export type SceneGlobals = JsbSceneGlobals; -legacyCC.SceneGlobals = SceneGlobals; +cclegacy.SceneGlobals = SceneGlobals; export const SkinInfo: typeof JsbSkinInfo = jsb.SkinInfo; export type SkinInfo = JsbSkinInfo; -legacyCC.SkinInfo = SkinInfo; +cclegacy.SkinInfo = SkinInfo; export const PostSettingsInfo: typeof JsbPostSettingsInfo = jsb.PostSettingsInfo; export type PostSettingsInfo = JsbPostSettingsInfo; -legacyCC.PostSettingsInfo = PostSettingsInfo; +cclegacy.PostSettingsInfo = PostSettingsInfo; (function () { const sceneGlobalsProto: any = SceneGlobals.prototype; @@ -324,7 +314,7 @@ decros.patch_cc_FogInfo({FogInfo, FogType, CCFloat, Color}); decros.patch_cc_SkyboxInfo({SkyboxInfo, EnvironmentLightingType, TextureCube, CCFloat, Material }); -decros.patch_cc_AmbientInfo({AmbientInfo, Vec4, Ambient, CCFloat, legacyCC}); +decros.patch_cc_AmbientInfo({AmbientInfo, Vec4, Ambient, CCFloat, cclegacy}); decros.patch_cc_LightProbeInfo({LightProbeInfo, CCFloat, CCInteger}); diff --git a/cocos/scene-graph/scene-globals.ts b/cocos/scene-graph/scene-globals.ts index 4907c9e0d2f..42f81a846f1 100644 --- a/cocos/scene-graph/scene-globals.ts +++ b/cocos/scene-graph/scene-globals.ts @@ -21,10 +21,7 @@ THE SOFTWARE. */ -import { - ccclass, visible, type, displayOrder, readOnly, slide, range, rangeStep, - editable, serializable, rangeMin, tooltip, formerlySerializedAs, displayName, -} from 'cc.decorator'; +import { ccclass, visible, type, displayOrder, readOnly, slide, range, rangeStep, editable, serializable, rangeMin, tooltip, formerlySerializedAs, displayName } from 'cc.decorator'; import { BAIDU } from 'internal:constants'; import { TextureCube } from '../asset/assets/texture-cube'; import { CCFloat, CCInteger } from '../core/data/utils/attribute'; @@ -37,11 +34,11 @@ import { Skin } from '../render-scene/scene/skin'; import { Fog, FogType } from '../render-scene/scene/fog'; import { LightProbesData, LightProbes } from '../gi/light-probe/light-probe'; import { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; +import { macro } from '../core'; import { Root } from '../root'; import { warnID } from '../core/platform/debug'; import { Material, MaterialPropertyFull } from '../asset/assets/material'; -import { cclegacy, macro } from '../core'; import { Scene } from './scene'; import { NodeEventType } from './node-event'; import { property } from '../core/data/class-decorator'; @@ -121,7 +118,7 @@ export class AmbientInfo { * @zh 编辑器中可配置的天空光照颜色（通过颜色拾取器） */ @visible(() => { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); const skybox = scene.globals.skybox; if (skybox.useIBL && skybox.applyDiffuseMap) { return false; @@ -133,7 +130,7 @@ export class AmbientInfo { @tooltip('i18n:ambient.skyLightingColor') set skyLightingColor (val: Color) { _v4.set(val.x, val.y, val.z, val.w); - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { this._skyColorHDR.set(_v4); } else { this._skyColorLDR.set(_v4); @@ -141,7 +138,7 @@ export class AmbientInfo { if (this._resource) { this._resource.skyColor.set(_v4); } } get skyLightingColor (): Color { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; _v4.set(isHDR ? this._skyColorHDR : this._skyColorLDR); normalizeHDRColor(_v4); return _col.set(_v4.x * 255, _v4.y * 255, _v4.z * 255, 255); @@ -151,7 +148,7 @@ export class AmbientInfo { * @internal */ set skyColor (val: Vec4) { - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { this._skyColorHDR.set(val); } else { this._skyColorLDR.set(val); @@ -168,7 +165,7 @@ export class AmbientInfo { @tooltip('i18n:ambient.skyIllum') @range([0, Number.POSITIVE_INFINITY, 100]) set skyIllum (val: number) { - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { this._skyIllumHDR = val; } else { this._skyIllumLDR = val; @@ -177,7 +174,7 @@ export class AmbientInfo { if (this._resource) { this._resource.skyIllum = val; } } get skyIllum (): number { - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { return this._skyIllumHDR; } else { return this._skyIllumLDR; @@ -189,7 +186,7 @@ export class AmbientInfo { * @zh 编辑器中可配置的地面光照颜色（通过颜色拾取器） */ @visible(() => { - const scene = legacyCC.director.getScene(); + const scene = cclegacy.director.getScene(); const skybox = scene.globals.skybox; if (skybox.useIBL && skybox.applyDiffuseMap) { return false; @@ -201,7 +198,7 @@ export class AmbientInfo { @tooltip('i18n:ambient.groundLightingColor') set groundLightingColor (val: Color) { _v4.set(val.x, val.y, val.z, val.w); - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { this._groundAlbedoHDR.set(_v4); } else { this._groundAlbedoLDR.set(_v4); @@ -209,7 +206,7 @@ export class AmbientInfo { if (this._resource) { this._resource.groundAlbedo.set(_v4); } } get groundLightingColor (): Color { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; _v4.set(isHDR ? this._groundAlbedoHDR : this._groundAlbedoLDR); normalizeHDRColor(_v4); return _col.set(_v4.x * 255, _v4.y * 255, _v4.z * 255, 255); @@ -219,7 +216,7 @@ export class AmbientInfo { * @internal */ set groundAlbedo (val: Vec4) { - if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) { + if ((cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR) { this._groundAlbedoHDR.set(val); } else { this._groundAlbedoLDR.set(val); @@ -256,7 +253,7 @@ export class AmbientInfo { this._resource.initialize(this); } } -legacyCC.AmbientInfo = AmbientInfo; +cclegacy.AmbientInfo = AmbientInfo; /** * @en Skybox related configuration @@ -350,7 +347,7 @@ export class SkyboxInfo { @editable @tooltip('i18n:skybox.useHDR') set useHDR (val) { - (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR = val; + (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR = val; this._useHDR = val; // Switch UI to and from LDR/HDR textures depends on HDR state @@ -371,7 +368,7 @@ export class SkyboxInfo { } } get useHDR (): boolean { - (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR = this._useHDR; + (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR = this._useHDR; return this._useHDR; } @@ -383,7 +380,7 @@ export class SkyboxInfo { @type(TextureCube) @tooltip('i18n:skybox.envmap') set envmap (val) { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { this._envmapHDR = val; this._reflectionHDR = null; @@ -412,7 +409,7 @@ export class SkyboxInfo { } } get envmap (): TextureCube | null { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { return this._envmapHDR; } else { @@ -451,7 +448,7 @@ export class SkyboxInfo { @type(TextureCube) @displayOrder(100) set diffuseMap (val: TextureCube | null) { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { this._diffuseMapHDR = val; } else { @@ -463,7 +460,7 @@ export class SkyboxInfo { } } get diffuseMap (): TextureCube | null { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { return this._diffuseMapHDR; } else { @@ -486,7 +483,7 @@ export class SkyboxInfo { @type(TextureCube) @displayOrder(100) set reflectionMap (val: TextureCube | null) { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { this._reflectionHDR = val; } else { @@ -497,7 +494,7 @@ export class SkyboxInfo { } } get reflectionMap (): TextureCube | null { - const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR; + const isHDR = (cclegacy.director.root as Root).pipeline.pipelineSceneData.isHDR; if (isHDR) { return this._reflectionHDR; } else { @@ -614,7 +611,7 @@ export class SkyboxInfo { } } } -legacyCC.SkyboxInfo = SkyboxInfo; +cclegacy.SkyboxInfo = SkyboxInfo; /** * @zh 全局雾相关配置 @@ -1003,7 +1000,7 @@ export class ShadowsInfo { this._resource.activate(); } } -legacyCC.ShadowsInfo = ShadowsInfo; +cclegacy.ShadowsInfo = ShadowsInfo; export const DEFAULT_WORLD_MIN_POS = new Vec3(-1024.0, -1024.0, -1024.0); export const DEFAULT_WORLD_MAX_POS = new Vec3(1024.0, 1024.0, 1024.0); @@ -1102,7 +1099,7 @@ export class OctreeInfo { this._resource.initialize(this); } } -legacyCC.OctreeInfo = OctreeInfo; +cclegacy.OctreeInfo = OctreeInfo; /** * @en Global skin in the render scene. @@ -1182,7 +1179,7 @@ export class SkinInfo { this._resource.initialize(this); } } -legacyCC.SkinInfo = SkinInfo; +cclegacy.SkinInfo = SkinInfo; @ccclass('cc.PostSettingsInfo') export class PostSettingsInfo { @@ -1216,7 +1213,7 @@ export class PostSettingsInfo { } } -legacyCC.PostSettingsInfo = PostSettingsInfo; +cclegacy.PostSettingsInfo = PostSettingsInfo; export interface ILightProbeNode { node: Node; @@ -1681,7 +1678,7 @@ export class SceneGlobals { * @zh 启用和初始化场景全局配置，不需要手动调用 */ public activate (scene: Scene): void { - const sceneData = (legacyCC.director.root as Root).pipeline.pipelineSceneData; + const sceneData = (cclegacy.director.root as Root).pipeline.pipelineSceneData; this.skybox.activate(sceneData.skybox); this.ambient.activate(sceneData.ambient); @@ -1694,8 +1691,8 @@ export class SceneGlobals { this.lightProbeInfo.activate(scene, sceneData.lightProbes as LightProbes); } - const root = legacyCC.director.root as Root; + const root = cclegacy.director.root as Root; root.onGlobalPipelineStateChanged(); } } -legacyCC.SceneGlobals = SceneGlobals; +cclegacy.SceneGlobals = SceneGlobals; diff --git a/cocos/scene-graph/scene.jsb.ts b/cocos/scene-graph/scene.jsb.ts index 7c71fba6dab..bc4c0d89559 100644 --- a/cocos/scene-graph/scene.jsb.ts +++ b/cocos/scene-graph/scene.jsb.ts @@ -20,11 +20,11 @@ THE SOFTWARE. */ -import { EDITOR, TEST } from "internal:constants"; -import { legacyCC } from '../core/global-exports'; +import { EDITOR, TEST } from 'internal:constants'; +import { cclegacy } from '@base/global'; import { Node } from './node'; -import { applyTargetOverrides, expandNestedPrefabInstanceNode } from "./prefab/utils"; -import { assert } from "../core/platform/debug"; +import { applyTargetOverrides, expandNestedPrefabInstanceNode } from './prefab/utils'; +import { assert } from '../core/platform/debug'; import { updateChildrenForDeserialize } from '../core/utils/jsb-utils'; import { SceneGlobals } from './scene-globals'; import { patch_cc_Scene } from '../native-binding/decorators'; @@ -34,7 +34,7 @@ declare const jsb: any; export const Scene: typeof JsbScene = jsb.Scene; export type Scene = JsbScene; -legacyCC.Scene = Scene; +cclegacy.Scene = Scene; const sceneProto: any = Scene.prototype; @@ -128,7 +128,7 @@ sceneProto._activate = function (active: boolean) { // register all nodes to editor this._registerIfAttached!(active); } - legacyCC.director._nodeActivator.activateNode(this, active); + cclegacy.director._nodeActivator.activateNode(this, active); // The test environment does not currently support the renderer if (!TEST || EDITOR) { this._globals.activate(this); diff --git a/cocos/scene-graph/scene.ts b/cocos/scene-graph/scene.ts index 9afac73b272..93d8af7c9f9 100644 --- a/cocos/scene-graph/scene.ts +++ b/cocos/scene-graph/scene.ts @@ -28,7 +28,7 @@ import { CCObject } from '../core/data/object'; import { assert, getError } from '../core/platform/debug'; import { RenderScene } from '../render-scene/core/render-scene'; import { Node } from './node'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { Component } from './component'; import { SceneGlobals } from './scene-globals'; import { applyTargetOverrides, expandNestedPrefabInstanceNode } from './prefab/utils'; @@ -88,10 +88,10 @@ export class Scene extends Node { constructor (name: string) { super(name); this._activeInHierarchy = false; - if (legacyCC.director && legacyCC.director.root) { - this._renderScene = legacyCC.director.root.createScene({}); + if (cclegacy.director && cclegacy.director.root) { + this._renderScene = cclegacy.director.root.createScene({}); } - this._inited = legacyCC.game ? !legacyCC.game._isCloning : true; + this._inited = cclegacy.game ? !cclegacy.game._isCloning : true; } /** @@ -106,7 +106,7 @@ export class Scene extends Node { children[i].active = false; } } - if (this._renderScene) legacyCC.director.root.destroyScene(this._renderScene); + if (this._renderScene) cclegacy.director.root.destroyScene(this._renderScene); this._active = false; this._activeInHierarchy = false; return success; @@ -189,7 +189,7 @@ export class Scene extends Node { // issue: https://github.com/cocos/cocos-engine/issues/14643 (this as any)._registerIfAttached!(active); } - legacyCC.director._nodeActivator.activateNode(this, active); + cclegacy.director._nodeActivator.activateNode(this, active); // The test environment does not currently support the renderer if (!TEST) { this._globals.activate(this); @@ -197,4 +197,4 @@ export class Scene extends Node { } } -legacyCC.Scene = Scene; +cclegacy.Scene = Scene; diff --git a/cocos/serialization/ccon.ts b/cocos/serialization/ccon.ts index 735161c99a4..93c821997fd 100644 --- a/cocos/serialization/ccon.ts +++ b/cocos/serialization/ccon.ts @@ -22,7 +22,8 @@ THE SOFTWARE. */ -import { getError, cclegacy } from '../core'; +import { getError } from '../core'; +import { cclegacy } from '@base/global'; const VERSION = 1; diff --git a/cocos/serialization/deserialize-dynamic.ts b/cocos/serialization/deserialize-dynamic.ts index 242fa67c069..78cb3831c30 100644 --- a/cocos/serialization/deserialize-dynamic.ts +++ b/cocos/serialization/deserialize-dynamic.ts @@ -24,7 +24,8 @@ */ import { EDITOR, TEST, DEV, DEBUG, JSB, PREVIEW, SUPPORT_JIT } from 'internal:constants'; -import { cclegacy, js, misc, CCClass, ENUM_TAG, BITMASK_TAG, sys, error, assertIsTrue, CustomSerializable, DeserializationContext, deserializeTag, SerializationInput } from '../core'; +import { cclegacy } from '@base/global'; +import { js, misc, CCClass, ENUM_TAG, BITMASK_TAG, sys, error, assertIsTrue, CustomSerializable, DeserializationContext, deserializeTag, SerializationInput } from '../core'; import { MissingScript } from '../misc/missing-script'; import { Details } from './deserialize'; import { Platform } from '../../pal/system-info/enum-type'; diff --git a/cocos/serialization/deserialize.ts b/cocos/serialization/deserialize.ts index 14a79642325..4478c1a98ba 100644 --- a/cocos/serialization/deserialize.ts +++ b/cocos/serialization/deserialize.ts @@ -23,7 +23,8 @@ */ import { EDITOR, TEST, PREVIEW, DEBUG, JSB, DEV } from 'internal:constants'; -import { cclegacy, errorID, getError, js, assertIsTrue } from '../core'; +import { cclegacy } from '@base/global'; +import { errorID, getError, js, assertIsTrue } from '../core'; import { deserializeDynamic, DeserializeDynamicOptions, parseUuidDependenciesDynamic } from './deserialize-dynamic'; import { Asset } from '../asset/assets/asset'; @@ -123,7 +124,7 @@ const enum DataTypeID { // (The objects in INSTANCES do not need to dynamically resolve resource reference relationships, so there is no need to have the AssetRef type.) AssetRefByInnerObj, - // Common TypedArray for legacyCC.Node only. Never be null. + // Common TypedArray for cclegacy.Node only. Never be null. TRS, // From the point of view of simplified implementation, diff --git a/cocos/serialization/instantiate-jit.ts b/cocos/serialization/instantiate-jit.ts index a05cb0a7699..41df3bff4e4 100644 --- a/cocos/serialization/instantiate-jit.ts +++ b/cocos/serialization/instantiate-jit.ts @@ -26,7 +26,8 @@ // Some helper methods for compile instantiation code import { TEST } from 'internal:constants'; -import { CCClass, isCCClassOrFastDefined, js, CCObject, isCCObject, cclegacy, flattenCodeArray } from '../core'; +import { CCClass, isCCClassOrFastDefined, js, CCObject, isCCObject, flattenCodeArray } from '../core'; +import { cclegacy } from '@base/global'; const Destroyed = CCObject.Flags.Destroyed; const PersistentMask = CCObject.Flags.PersistentMask; diff --git a/cocos/serialization/instantiate.ts b/cocos/serialization/instantiate.ts index 03c0afbff18..ef59cfb8a18 100644 --- a/cocos/serialization/instantiate.ts +++ b/cocos/serialization/instantiate.ts @@ -24,7 +24,8 @@ */ import { DEV, JSB } from 'internal:constants'; -import { CCObject, isCCObject, js, ValueType, jsbUtils, isCCClassOrFastDefined, getError, warn, misc, cclegacy } from '../core'; +import { CCObject, isCCObject, js, ValueType, jsbUtils, isCCClassOrFastDefined, getError, warn, misc } from '../core'; +import { cclegacy } from '@base/global'; import { Prefab } from '../scene-graph/prefab'; import { Node } from '../scene-graph/node'; import { Component } from '../scene-graph/component'; diff --git a/cocos/spine/assembler/simple.ts b/cocos/spine/assembler/simple.ts index f7e853bc516..f4fc8fa6316 100644 --- a/cocos/spine/assembler/simple.ts +++ b/cocos/spine/assembler/simple.ts @@ -30,11 +30,11 @@ import { StaticVBAccessor } from '../../2d/renderer/static-vb-accessor'; import { vfmtPosUvColor4B, vfmtPosUvTwoColor4B, getAttributeStride } from '../../2d/renderer/vertex-format'; import { Skeleton, SpineMaterialType } from '../skeleton'; import { BlendFactor } from '../../gfx'; -import { legacyCC } from '../../core/global-exports'; +import { cclegacy } from '@base/global'; +import { Color, Vec3 } from '../../core'; import { RenderData } from '../../2d/renderer/render-data'; import { director } from '../../game'; import spine from '../lib/spine-core.js'; -import { Color, Vec3 } from '../../core'; import { MaterialInstance } from '../../render-scene'; const _slotColor = new Color(0, 0, 255, 255); @@ -355,4 +355,4 @@ function cacheTraverse (comp: Skeleton): void { } } -legacyCC.internal.SpineAssembler = simple; +cclegacy.internal.SpineAssembler = simple; diff --git a/cocos/spine/index.jsb.ts b/cocos/spine/index.jsb.ts index e0727d5fdf8..2b064dcd567 100644 --- a/cocos/spine/index.jsb.ts +++ b/cocos/spine/index.jsb.ts @@ -23,7 +23,7 @@ */ import { ccenum } from '../core'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; /** * @en @@ -108,5 +108,5 @@ export enum AnimationEventType { } ccenum(AnimationEventType); -legacyCC.internal.SpineAnimationEventType = AnimationEventType; +cclegacy.internal.SpineAnimationEventType = AnimationEventType; diff --git a/cocos/spine/skeleton-data.ts b/cocos/spine/skeleton-data.ts index 93c46ea9900..64b97119bc5 100644 --- a/cocos/spine/skeleton-data.ts +++ b/cocos/spine/skeleton-data.ts @@ -24,11 +24,11 @@ import { EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { CCString, Enum, error } from '../core'; +import { cclegacy } from '@base/global'; import SkeletonCache from './skeleton-cache'; import { Skeleton } from './skeleton'; import spine from './lib/spine-core.js'; import { ccclass, serializable, type } from '../core/data/decorators'; -import { legacyCC } from '../core/global-exports'; import { Texture2D, Asset } from '../asset/assets'; import { Node } from '../scene-graph'; /** @@ -281,4 +281,4 @@ export class SkeletonData extends Asset { } } -legacyCC.internal.SpineSkeletonData = SkeletonData; +cclegacy.internal.SpineSkeletonData = SkeletonData; diff --git a/cocos/spine/skeleton-system.ts b/cocos/spine/skeleton-system.ts index d629b72c66a..be1ddd2f093 100644 --- a/cocos/spine/skeleton-system.ts +++ b/cocos/spine/skeleton-system.ts @@ -24,8 +24,8 @@ import { director } from '../game/director'; import { System } from '../core'; +import { cclegacy } from '@base/global'; import { Skeleton } from './skeleton'; -import { legacyCC } from '../core/global-exports'; export class SkeletonSystem extends System { /** @@ -91,4 +91,4 @@ export class SkeletonSystem extends System { }); } } -legacyCC.internal.SpineSkeletonSystem = SkeletonSystem; +cclegacy.internal.SpineSkeletonSystem = SkeletonSystem; diff --git a/cocos/spine/skeleton.ts b/cocos/spine/skeleton.ts index 90c375bb127..86738fd35db 100644 --- a/cocos/spine/skeleton.ts +++ b/cocos/spine/skeleton.ts @@ -28,20 +28,21 @@ import { error, logID, warn } from '../core/platform/debug'; import { Enum, EnumType, ccenum } from '../core/value-types/enum'; import { Node } from '../scene-graph'; import { CCObject, Color, RecyclePool, js } from '../core'; +import { cclegacy } from '@base/global'; import { SkeletonData } from './skeleton-data'; import { Graphics, UIRenderer } from '../2d'; import { Batcher2D } from '../2d/renderer/batcher-2d'; import { BlendFactor, BlendOp } from '../gfx'; import { MaterialInstance } from '../render-scene'; import { builtinResMgr } from '../asset/asset-manager'; -import { legacyCC } from '../core/global-exports'; import { SkeletonSystem } from './skeleton-system'; import { RenderEntity, RenderEntityType } from '../2d/renderer/render-entity'; import { AttachUtil } from './attach-util'; import { SPINE_WASM } from './lib/instantiated'; import spine from './lib/spine-core.js'; import { VertexEffectDelegate } from './vertex-effect-delegate'; -import SkeletonCache, { AnimationCache, AnimationFrame } from './skeleton-cache'; +import SkeletonCache from './skeleton-cache'; +import { AnimationCache, AnimationFrame } from './skeleton-cache'; import { TrackEntryListeners } from './track-entry-listeners'; import { setPropertyEnumType } from '../core/internal-index'; @@ -1790,4 +1791,4 @@ export class Skeleton extends UIRenderer { } } -legacyCC.internal.SpineSkeleton = Skeleton; +cclegacy.internal.SpineSkeleton = Skeleton; diff --git a/cocos/terrain/terrain.ts b/cocos/terrain/terrain.ts index e973a6b2e71..5b9ee73d7ff 100644 --- a/cocos/terrain/terrain.ts +++ b/cocos/terrain/terrain.ts @@ -40,12 +40,10 @@ import { Pass, scene } from '../render-scene'; import { Camera } from '../render-scene/scene/camera'; import { Root } from '../root'; import { HeightField } from './height-field'; -import { legacyCC } from '../core/global-exports'; -import { TerrainLod, TerrainLodKey, TERRAIN_LOD_LEVELS, TERRAIN_LOD_MAX_DISTANCE, TerrainIndexData } from './terrain-lod'; -import { TerrainAsset, TerrainLayerInfo, TERRAIN_HEIGHT_BASE, TERRAIN_HEIGHT_FACTORY, - TERRAIN_BLOCK_TILE_COMPLEXITY, TERRAIN_BLOCK_VERTEX_SIZE, TERRAIN_BLOCK_VERTEX_COMPLEXITY, - TERRAIN_MAX_LAYER_COUNT, TERRAIN_HEIGHT_FMIN, TERRAIN_HEIGHT_FMAX, TERRAIN_MAX_BLEND_LAYERS, TERRAIN_DATA_VERSION5 } from './terrain-asset'; +import { cclegacy } from '@base/global'; import { CCFloat } from '../core'; +import { TerrainLod, TerrainLodKey, TERRAIN_LOD_LEVELS, TERRAIN_LOD_MAX_DISTANCE, TerrainIndexData } from './terrain-lod'; +import { TerrainAsset, TerrainLayerInfo, TERRAIN_HEIGHT_BASE, TERRAIN_HEIGHT_FACTORY, TERRAIN_BLOCK_TILE_COMPLEXITY, TERRAIN_BLOCK_VERTEX_SIZE, TERRAIN_BLOCK_VERTEX_COMPLEXITY, TERRAIN_MAX_LAYER_COUNT, TERRAIN_HEIGHT_FMIN, TERRAIN_HEIGHT_FMAX, TERRAIN_MAX_BLEND_LAYERS, TERRAIN_DATA_VERSION5 } from './terrain-asset'; import { PipelineEventType } from '../rendering'; import { MobilityMode, Node } from '../scene-graph'; @@ -208,7 +206,7 @@ class TerrainRenderable extends ModelRenderer { public destroy (): boolean { // this._invalidMaterial(); if (this._model != null) { - legacyCC.director.root.destroyModel(this._model); + cclegacy.director.root.destroyModel(this._model); this._model = null; } @@ -221,7 +219,7 @@ class TerrainRenderable extends ModelRenderer { public _destroyModel (): void { // this._invalidMaterial(); if (this._model != null) { - legacyCC.director.root.destroyModel(this._model); + cclegacy.director.root.destroyModel(this._model); this._model = null; } @@ -454,7 +452,7 @@ export class TerrainBlock { null, false, ); - this._renderable._model = (legacyCC.director.root as Root).createModel(scene.Model); + this._renderable._model = (cclegacy.director.root as Root).createModel(scene.Model); this._renderable._model.createBoundingShape(this._bbMin, this._bbMax); this._renderable._model.node = this._renderable._model.transform = this._node; // ensure the terrain node is in the scene @@ -1689,7 +1687,7 @@ export class Terrain extends Component { public getEffectAsset (): EffectAsset { if (this._effectAsset === null) { - return legacyCC.EffectAsset.get(TERRAIN_EFFECT_UUID) as EffectAsset; + return cclegacy.EffectAsset.get(TERRAIN_EFFECT_UUID) as EffectAsset; } return this._effectAsset; @@ -1704,11 +1702,11 @@ export class Terrain extends Component { this._blocks[i].visible = true; } - (legacyCC.director.root as Root).pipelineEvent.on(PipelineEventType.RENDER_CAMERA_BEGIN, this.onUpdateFromCamera, this); + (cclegacy.director.root as Root).pipelineEvent.on(PipelineEventType.RENDER_CAMERA_BEGIN, this.onUpdateFromCamera, this); } public onDisable (): void { - (legacyCC.director.root as Root).pipelineEvent.off(PipelineEventType.RENDER_CAMERA_BEGIN, this.onUpdateFromCamera, this); + (cclegacy.director.root as Root).pipelineEvent.off(PipelineEventType.RENDER_CAMERA_BEGIN, this.onUpdateFromCamera, this); for (let i = 0; i < this._blocks.length; ++i) { this._blocks[i].visible = false; @@ -2433,12 +2431,12 @@ export class Terrain extends Component { const layer = new TerrainLayer(); const layerInfo = terrainAsset.layerBinaryInfos[i]; layer.tileSize = layerInfo.tileSize; - legacyCC.assetManager.loadAny(layerInfo.detailMapId, (err, asset) => { + cclegacy.assetManager.loadAny(layerInfo.detailMapId, (err, asset) => { layer.detailMap = asset; }); if (layerInfo.normalMapId !== '') { - legacyCC.assetManager.loadAny(layerInfo.normalMapId, (err, asset) => { + cclegacy.assetManager.loadAny(layerInfo.normalMapId, (err, asset) => { layer.normalMap = asset; }); } diff --git a/cocos/tween/actions/action-manager.ts b/cocos/tween/actions/action-manager.ts index 738a6416bbc..fdc1f08fa9b 100644 --- a/cocos/tween/actions/action-manager.ts +++ b/cocos/tween/actions/action-manager.ts @@ -28,7 +28,7 @@ import { errorID, logID } from '../../core/platform/debug'; import { Action } from './action'; import { Node } from '../../scene-graph'; -import { legacyCC } from '../../core/global-exports'; +import { cclegacy } from '@base/global'; import { isCCObject } from '../../core/data/object'; import type { ActionInterval } from './action-interval'; @@ -408,7 +408,7 @@ export class ActionManager { * @method purgeSharedManager */ purgeSharedManager (): void { - legacyCC.director.getScheduler().unscheduleUpdate(this); + cclegacy.director.getScheduler().unscheduleUpdate(this); } // protected diff --git a/cocos/tween/tween-action.ts b/cocos/tween/tween-action.ts index 4a5c80120d6..8cae3d8fbaf 100644 --- a/cocos/tween/tween-action.ts +++ b/cocos/tween/tween-action.ts @@ -25,7 +25,7 @@ import { warnID, warn, easing } from '../core'; import { ActionInterval } from './actions/action-interval'; import { ITweenOption } from './export-api'; -import { VERSION } from '../core/global-exports'; +import { VERSION } from '@base/global'; /** adapter */ function TweenEasingAdapter (easingName: string): string { diff --git a/cocos/tween/tween.ts b/cocos/tween/tween.ts index 3beb6574466..78d4508a9f2 100644 --- a/cocos/tween/tween.ts +++ b/cocos/tween/tween.ts @@ -24,13 +24,13 @@ import { TweenSystem } from './tween-system'; import { warn } from '../core'; +import { cclegacy } from '@base/global'; import { ActionInterval, sequence, repeat, repeatForever, reverseTime, delayTime, spawn } from './actions/action-interval'; import { removeSelf, show, hide, callFunc } from './actions/action-instant'; import { Action, FiniteTimeAction } from './actions/action'; import { ITweenOption } from './export-api'; import { TweenAction } from './tween-action'; import { SetAction } from './set-action'; -import { legacyCC } from '../core/global-exports'; // https://medium.com/dailyjs/typescript-create-a-condition-based-subset-types-9d902cea5b8c type FlagExcludedType = { [Key in keyof Base]: Base[Key] extends Type ? never : Key }; @@ -475,7 +475,7 @@ export class Tween { return spawn.apply(spawn, tmp_args as any); } } -legacyCC.Tween = Tween; +cclegacy.Tween = Tween; /** * @en @@ -494,7 +494,7 @@ legacyCC.Tween = Tween; export function tween (target?: T): Tween { return new Tween(target); } -legacyCC.tween = tween; +cclegacy.tween = tween; /** * @en @@ -507,4 +507,4 @@ export function tweenUtil (target?: T): Tween { warn('tweenUtil\' is deprecated, please use \'tween\' instead '); return new Tween(target); } -legacyCC.tweenUtil = tweenUtil; +cclegacy.tweenUtil = tweenUtil; diff --git a/cocos/ui/button.ts b/cocos/ui/button.ts index 067da5d4525..c45ebbc428b 100644 --- a/cocos/ui/button.ts +++ b/cocos/ui/button.ts @@ -23,8 +23,7 @@ THE SOFTWARE. */ -import { ccclass, help, executionOrder, menu, requireComponent, tooltip, displayOrder, type, rangeMin, - rangeMax, serializable, executeInEditMode } from 'cc.decorator'; +import { ccclass, help, executionOrder, menu, requireComponent, tooltip, displayOrder, type, rangeMin, rangeMax, serializable, executeInEditMode } from 'cc.decorator'; import { EDITOR, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { SpriteFrame } from '../2d/assets'; import { Component, EventHandler as ComponentEventHandler } from '../scene-graph'; @@ -35,7 +34,7 @@ import { ccenum } from '../core/value-types/enum'; import { lerp } from '../core/math/utils'; import { Node } from '../scene-graph/node'; import { Sprite } from '../2d/components/sprite'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { TransformBit } from '../scene-graph/node-enum'; import { NodeEventType } from '../scene-graph/node-event'; import { XrUIPressEventType } from '../xr/event/xr-event-handle'; @@ -1032,4 +1031,4 @@ export class Button extends Component { } } -legacyCC.Button = Button; +cclegacy.Button = Button; diff --git a/cocos/ui/deprecated.ts b/cocos/ui/deprecated.ts index a706f9ae989..72e6b039d8c 100644 --- a/cocos/ui/deprecated.ts +++ b/cocos/ui/deprecated.ts @@ -41,7 +41,7 @@ import { SafeArea } from './safe-area'; import { warnID } from '../core/platform/debug'; import { ccclass } from '../core/data/class-decorator'; import { js, removeProperty, markAsWarning } from '../core'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { View } from './view'; /** @@ -53,98 +53,98 @@ export class UIReorderComponent { warnID(1408, 'UIReorderComponent'); } } -legacyCC.UIReorderComponent = UIReorderComponent; +cclegacy.UIReorderComponent = UIReorderComponent; /** * Alias of [[Button]] * @deprecated Since v1.2 */ export { Button as ButtonComponent }; -legacyCC.ButtonComponent = Button; +cclegacy.ButtonComponent = Button; js.setClassAlias(Button, 'cc.ButtonComponent'); /** * Alias of [[EditBox]] * @deprecated Since v1.2 */ export { EditBox as EditBoxComponent }; -legacyCC.EditBoxComponent = EditBox; +cclegacy.EditBoxComponent = EditBox; js.setClassAlias(EditBox, 'cc.EditBoxComponent'); /** * Alias of [[Layout]] * @deprecated Since v1.2 */ export { Layout as LayoutComponent }; -legacyCC.LayoutComponent = Layout; +cclegacy.LayoutComponent = Layout; js.setClassAlias(Layout, 'cc.LayoutComponent'); /** * Alias of [[ProgressBar]] * @deprecated Since v1.2 */ export { ProgressBar as ProgressBarComponent }; -legacyCC.ProgressBarComponent = ProgressBar; +cclegacy.ProgressBarComponent = ProgressBar; js.setClassAlias(ProgressBar, 'cc.ProgressBarComponent'); /** * Alias of [[ScrollView]] * @deprecated Since v1.2 */ export { ScrollView as ScrollViewComponent }; -legacyCC.ScrollViewComponent = ScrollView; +cclegacy.ScrollViewComponent = ScrollView; js.setClassAlias(ScrollView, 'cc.ScrollViewComponent'); /** * Alias of [[ScrollBar]] * @deprecated Since v1.2 */ export { ScrollBar as ScrollBarComponent }; -legacyCC.ScrollBarComponent = ScrollBar; +cclegacy.ScrollBarComponent = ScrollBar; js.setClassAlias(ScrollBar, 'cc.ScrollBarComponent'); /** * Alias of [[Slider]] * @deprecated Since v1.2 */ export { Slider as SliderComponent }; -legacyCC.SliderComponent = Slider; +cclegacy.SliderComponent = Slider; js.setClassAlias(Slider, 'cc.SliderComponent'); /** * Alias of [[Toggle]] * @deprecated Since v1.2 */ export { Toggle as ToggleComponent }; -legacyCC.ToggleComponent = Toggle; +cclegacy.ToggleComponent = Toggle; js.setClassAlias(Toggle, 'cc.ToggleComponent'); /** * Alias of [[ToggleContainer]] * @deprecated Since v1.2 */ export { ToggleContainer as ToggleContainerComponent }; -legacyCC.ToggleContainerComponent = ToggleContainer; +cclegacy.ToggleContainerComponent = ToggleContainer; js.setClassAlias(ToggleContainer, 'cc.ToggleContainerComponent'); /** * Alias of [[Widget]] * @deprecated Since v1.2 */ export { Widget as WidgetComponent }; -legacyCC.WidgetComponent = Widget; +cclegacy.WidgetComponent = Widget; js.setClassAlias(Widget, 'cc.WidgetComponent'); /** * Alias of [[PageView]] * @deprecated Since v1.2 */ export { PageView as PageViewComponent }; -legacyCC.PageViewComponent = PageView; +cclegacy.PageViewComponent = PageView; js.setClassAlias(PageView, 'cc.PageViewComponent'); /** * Alias of [[PageViewIndicator]] * @deprecated Since v1.2 */ export { PageViewIndicator as PageViewIndicatorComponent }; -legacyCC.PageViewIndicatorComponent = PageViewIndicator; +cclegacy.PageViewIndicatorComponent = PageViewIndicator; js.setClassAlias(PageViewIndicator, 'cc.PageViewIndicatorComponent'); /** * Alias of [[SafeArea]] * @deprecated Since v1.2 */ export { SafeArea as SafeAreaComponent }; -legacyCC.SafeAreaComponent = SafeArea; +cclegacy.SafeAreaComponent = SafeArea; js.setClassAlias(SafeArea, 'cc.SafeAreaComponent'); /** * Alias of [[UICoordinateTracker]] @@ -157,7 +157,7 @@ js.setClassAlias(UICoordinateTracker, 'cc.UICoordinateTrackerComponent'); * @deprecated Since v1.2 */ export { BlockInputEvents as BlockInputEventsComponent }; -legacyCC.BlockInputEventsComponent = BlockInputEvents; +cclegacy.BlockInputEventsComponent = BlockInputEvents; js.setClassAlias(BlockInputEvents, 'cc.BlockInputEventsComponent'); // #region deprecation on view diff --git a/cocos/ui/editbox/edit-box-impl.ts b/cocos/ui/editbox/edit-box-impl.ts index 14e1bb11270..1fc85bcc6aa 100644 --- a/cocos/ui/editbox/edit-box-impl.ts +++ b/cocos/ui/editbox/edit-box-impl.ts @@ -39,7 +39,7 @@ import { tabIndexUtil } from './tabIndexUtil'; import { InputFlag, InputMode, KeyboardReturnType } from './types'; import { EditBoxImplBase } from './edit-box-impl-base'; import { BrowserType, OS } from '../../../pal/system-info/enum-type'; -import { ccwindow } from '../../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/ui/editbox/edit-box.ts b/cocos/ui/editbox/edit-box.ts index 4bca693cdc7..9b6abff4fbc 100644 --- a/cocos/ui/editbox/edit-box.ts +++ b/cocos/ui/editbox/edit-box.ts @@ -37,7 +37,7 @@ import { Sprite } from '../../2d/components/sprite'; import { EditBoxImpl } from './edit-box-impl'; import { EditBoxImplBase } from './edit-box-impl-base'; import { InputFlag, InputMode, KeyboardReturnType } from './types'; -import { legacyCC } from '../../core/global-exports'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../../scene-graph/node-event'; import { XrKeyboardEventType, XrUIPressEventType } from '../../xr/event/xr-event-handle'; @@ -815,4 +815,4 @@ if (typeof window === 'object' && typeof document === 'object' && !MINIGAME && ! * @return {Boolean} whether it is the first time the destroy being called */ -legacyCC.internal.EditBox = EditBox; +cclegacy.internal.EditBox = EditBox; diff --git a/cocos/ui/layout.ts b/cocos/ui/layout.ts index 88c64aec0c1..5d81d4f9509 100644 --- a/cocos/ui/layout.ts +++ b/cocos/ui/layout.ts @@ -31,8 +31,8 @@ import { UITransform } from '../2d/framework/ui-transform'; import { director, Director } from '../game/director'; import { TransformBit } from '../scene-graph/node-enum'; import { warn } from '../core'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../scene-graph/node-event'; -import { legacyCC } from '../core/global-exports'; import { Node } from '../scene-graph/node'; /** @@ -1179,4 +1179,4 @@ export class Layout extends Component { } } -legacyCC.Layout = Layout; +cclegacy.Layout = Layout; diff --git a/cocos/ui/page-view-indicator.ts b/cocos/ui/page-view-indicator.ts index c11fa514e81..35fb194d46e 100644 --- a/cocos/ui/page-view-indicator.ts +++ b/cocos/ui/page-view-indicator.ts @@ -33,7 +33,7 @@ import { Layout } from './layout'; import { PageView } from './page-view'; import { Sprite } from '../2d/components/sprite'; import { UIRenderer } from '../2d/framework/ui-renderer'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; const _color = new Color(); @@ -274,4 +274,4 @@ export class PageViewIndicator extends Component { } } -legacyCC.PageViewIndicator = PageViewIndicator; +cclegacy.PageViewIndicator = PageViewIndicator; diff --git a/cocos/ui/page-view.ts b/cocos/ui/page-view.ts index 30fbcacecc6..175dd828f0b 100644 --- a/cocos/ui/page-view.ts +++ b/cocos/ui/page-view.ts @@ -35,7 +35,7 @@ import { ScrollView, EventType as ScrollEventType } from './scroll-view'; import { ScrollBar } from './scroll-bar'; import { warnID, logID } from '../core/platform/debug'; import { extendsEnum } from '../core/data/utils/extends-enum'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../scene-graph/node-event'; const _tempVec2 = new Vec2(); @@ -824,4 +824,4 @@ export class PageView extends ScrollView { * @param pageView - The PageView component. */ -legacyCC.PageView = PageView; +cclegacy.PageView = PageView; diff --git a/cocos/ui/progress-bar.ts b/cocos/ui/progress-bar.ts index 73f22fb9425..3c41864cad3 100644 --- a/cocos/ui/progress-bar.ts +++ b/cocos/ui/progress-bar.ts @@ -31,7 +31,7 @@ import { Enum } from '../core/value-types'; import { clamp01 } from '../core/math/utils'; import { Sprite } from '../2d/components/sprite'; import { warn } from '../core/platform/debug'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; /** * @en @@ -342,4 +342,4 @@ export class ProgressBar extends Component { } } -legacyCC.ProgressBar = ProgressBar; +cclegacy.ProgressBar = ProgressBar; diff --git a/cocos/ui/safe-area.ts b/cocos/ui/safe-area.ts index ecb6646c1ee..ee7c246d951 100644 --- a/cocos/ui/safe-area.ts +++ b/cocos/ui/safe-area.ts @@ -30,7 +30,7 @@ import { UITransform } from '../2d/framework'; import { sys } from '../core/platform'; import { Widget } from './widget'; import { widgetManager } from './widget-manager'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { view } from './view'; /** @@ -116,4 +116,4 @@ export class SafeArea extends Component { } } -legacyCC.SafeArea = SafeArea; +cclegacy.SafeArea = SafeArea; diff --git a/cocos/ui/scroll-bar.ts b/cocos/ui/scroll-bar.ts index 9ee14709b1a..e966e9e28c7 100644 --- a/cocos/ui/scroll-bar.ts +++ b/cocos/ui/scroll-bar.ts @@ -32,7 +32,7 @@ import { clamp01 } from '../core/math/utils'; import { ScrollView } from './scroll-view'; import { Sprite } from '../2d/components/sprite'; import { Node } from '../scene-graph'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; const GETTING_SHORTER_FACTOR = 20; const _tempPos_1 = new Vec3(); @@ -495,4 +495,4 @@ export class ScrollBar extends Component { } } -legacyCC.ScrollBar = ScrollBar; +cclegacy.ScrollBar = ScrollBar; diff --git a/cocos/ui/scroll-view.ts b/cocos/ui/scroll-view.ts index 7f568589dba..7d77d378549 100644 --- a/cocos/ui/scroll-view.ts +++ b/cocos/ui/scroll-view.ts @@ -36,7 +36,7 @@ import { ViewGroup } from './view-group'; import { Node } from '../scene-graph/node'; import { director, Director } from '../game/director'; import { TransformBit } from '../scene-graph/node-enum'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../scene-graph/node-event'; import { Input, input } from '../input/input'; import { DeviceType, XrUIPressEvent, XrUIPressEventType } from '../xr/event/xr-event-handle'; @@ -2042,4 +2042,4 @@ export class ScrollView extends ViewGroup { * @param {ScrollView} scrollView - The ScrollView component. */ -legacyCC.ScrollView = ScrollView; +cclegacy.ScrollView = ScrollView; diff --git a/cocos/ui/slider.ts b/cocos/ui/slider.ts index 69f53555198..3b85f877309 100644 --- a/cocos/ui/slider.ts +++ b/cocos/ui/slider.ts @@ -32,7 +32,7 @@ import { Vec3 } from '../core/math'; import { ccenum } from '../core/value-types/enum'; import { clamp01 } from '../core/math/utils'; import { Sprite } from '../2d/components/sprite'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../scene-graph/node-event'; import { XrUIPressEvent, XrUIPressEventType } from '../xr/event/xr-event-handle'; @@ -367,4 +367,4 @@ export class Slider extends Component { * @param {Slider} slider - The slider component. */ -legacyCC.Slider = Slider; +cclegacy.Slider = Slider; diff --git a/cocos/ui/sub-context-view.ts b/cocos/ui/sub-context-view.ts index a67217ff2d1..c3be602c323 100644 --- a/cocos/ui/sub-context-view.ts +++ b/cocos/ui/sub-context-view.ts @@ -33,11 +33,11 @@ import { Node } from '../scene-graph'; import { UITransform } from '../2d/framework/ui-transform'; import { SpriteFrame } from '../2d/assets'; import { ImageAsset } from '../asset/assets/image-asset'; -import { Size } from '../core/math'; +import { Size } from '../core/math'; -import { legacyCC } from '../core/global-exports'; -import { NodeEventType } from '../scene-graph/node-event'; +import { cclegacy } from '@base/global'; import { CCObject } from '../core'; +import { NodeEventType } from '../scene-graph/node-event'; import { Texture2D } from '../asset/assets'; /** @@ -293,4 +293,4 @@ export class SubContextView extends Component { } } -legacyCC.SubContextView = SubContextView; +cclegacy.SubContextView = SubContextView; diff --git a/cocos/ui/toggle-container.ts b/cocos/ui/toggle-container.ts index 8ea5b30e0d2..8fee4aad8ac 100644 --- a/cocos/ui/toggle-container.ts +++ b/cocos/ui/toggle-container.ts @@ -26,7 +26,7 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, tooltip, type, serializable } from 'cc.decorator'; import { Component, EventHandler as ComponentEventHandler } from '../scene-graph'; import { Toggle } from './toggle'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { NodeEventType } from '../scene-graph/node-event'; /** @@ -140,7 +140,7 @@ export class ToggleContainer extends Component { } if (this.checkEvents) { - legacyCC.Component.EventHandler.emitEvents(this.checkEvents, toggle); + cclegacy.Component.EventHandler.emitEvents(this.checkEvents, toggle); } } @@ -170,4 +170,4 @@ export class ToggleContainer extends Component { } } -legacyCC.ToggleContainer = ToggleContainer; +cclegacy.ToggleContainer = ToggleContainer; diff --git a/cocos/ui/toggle.ts b/cocos/ui/toggle.ts index 34fc12008ae..8db39ba2048 100644 --- a/cocos/ui/toggle.ts +++ b/cocos/ui/toggle.ts @@ -31,7 +31,7 @@ import { Sprite } from '../2d/components/sprite'; import { ToggleContainer } from './toggle-container'; import { extendsEnum } from '../core/data/utils/extends-enum'; import { EventType as ButtonEventType, Button } from './button'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; enum EventType { TOGGLE = 'toggle', @@ -105,7 +105,7 @@ export class Toggle extends Button { */ get _toggleContainer (): ToggleContainer | null { const parent = this.node.parent!; - if (legacyCC.Node.isNode(parent)) { + if (cclegacy.Node.isNode(parent)) { return parent.getComponent('cc.ToggleContainer') as ToggleContainer; } return null; @@ -212,4 +212,4 @@ export class Toggle extends Button { * @param toggle @en The Toggle component. @zh 切换键组件。 */ -legacyCC.Toggle = Toggle; +cclegacy.Toggle = Toggle; diff --git a/cocos/ui/view-group.ts b/cocos/ui/view-group.ts index 383afce0c60..f22c5e7c178 100644 --- a/cocos/ui/view-group.ts +++ b/cocos/ui/view-group.ts @@ -39,7 +39,7 @@ import { ccclass, executionOrder } from 'cc.decorator'; import { Component } from '../scene-graph/component'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; @ccclass('cc.ViewGroup') @executionOrder(110) @@ -47,4 +47,4 @@ export class ViewGroup extends Component { } -legacyCC.ViewGroup = ViewGroup; +cclegacy.ViewGroup = ViewGroup; diff --git a/cocos/ui/view.ts b/cocos/ui/view.ts index 09230bbf4d7..474789eecfa 100644 --- a/cocos/ui/view.ts +++ b/cocos/ui/view.ts @@ -30,7 +30,8 @@ import { MINIGAME, JSB, RUNTIME_BASED, EDITOR } from 'internal:constants'; import { screenAdapter } from 'pal/screen-adapter'; import { Eventify } from '../core/event'; import { Rect, Size, Vec2 } from '../core/math'; -import { visibleRect, cclegacy, errorID, screen, macro, System } from '../core'; +import { visibleRect, errorID, screen, macro, System } from '../core'; +import { cclegacy } from '@base/global'; import { Orientation } from '../../pal/screen-adapter/enum-type'; import { director } from '../game/director'; import { Settings, settings } from '../core/settings'; diff --git a/cocos/ui/widget-manager.ts b/cocos/ui/widget-manager.ts index f3fc2288cd2..be210a6c9c9 100644 --- a/cocos/ui/widget-manager.ts +++ b/cocos/ui/widget-manager.ts @@ -26,7 +26,8 @@ import { EDITOR, DEV } from 'internal:constants'; import { screenAdapter } from 'pal/screen-adapter'; import { Director, director } from '../game/director'; -import { Vec2, Vec3, visibleRect, js, cclegacy, approx, EPSILON } from '../core'; +import { Vec2, Vec3, visibleRect, js, approx, EPSILON } from '../core'; +import { cclegacy } from '@base/global'; import { View } from './view'; import { Scene } from '../scene-graph'; import { Node } from '../scene-graph/node'; diff --git a/cocos/ui/widget.ts b/cocos/ui/widget.ts index eba312d279b..5aae0c17f6f 100644 --- a/cocos/ui/widget.ts +++ b/cocos/ui/widget.ts @@ -27,7 +27,8 @@ import { ccclass, help, executeInEditMode, executionOrder, menu, requireComponen import { EDITOR, DEV, EDITOR_NOT_IN_PREVIEW } from 'internal:constants'; import { Component } from '../scene-graph/component'; import { UITransform } from '../2d/framework/ui-transform'; -import { Size, Vec2, Vec3, visibleRect, ccenum, errorID, cclegacy, Rect } from '../core'; +import { Size, Vec2, Vec3, visibleRect, ccenum, errorID, Rect } from '../core'; +import { cclegacy } from '@base/global'; import { View } from './view'; import { Scene } from '../scene-graph'; import { Node } from '../scene-graph/node'; diff --git a/cocos/video/video-downloader.ts b/cocos/video/video-downloader.ts index 226a7d0064f..d0398cd2e66 100644 --- a/cocos/video/video-downloader.ts +++ b/cocos/video/video-downloader.ts @@ -27,7 +27,7 @@ import downloader from '../asset/asset-manager/downloader'; import factory from '../asset/asset-manager/factory'; import { log } from '../core/platform/debug'; import { VideoClip } from './assets/video-clip'; -import { ccwindow } from '../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/video/video-player-impl-manager.ts b/cocos/video/video-player-impl-manager.ts index 4b709dd5df6..aecd754244d 100644 --- a/cocos/video/video-player-impl-manager.ts +++ b/cocos/video/video-player-impl-manager.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { VideoPlayer } from './video-player'; import { VideoPlayerImplWeb } from './video-player-impl-web'; @@ -33,4 +33,4 @@ export class VideoPlayerImplManager { } } -legacyCC.internal.VideoPlayerImplManager = VideoPlayerImplManager; +cclegacy.internal.VideoPlayerImplManager = VideoPlayerImplManager; diff --git a/cocos/video/video-player-impl-web.ts b/cocos/video/video-player-impl-web.ts index 0df7831777a..940953ed401 100644 --- a/cocos/video/video-player-impl-web.ts +++ b/cocos/video/video-player-impl-web.ts @@ -31,7 +31,7 @@ import { EventType, READY_STATE } from './video-player-enums'; import { VideoPlayerImpl } from './video-player-impl'; import { ClearFlagBit } from '../gfx'; import { BrowserType, OS } from '../../pal/system-info/enum-type'; -import { ccwindow } from '../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/video/video-player-impl.ts b/cocos/video/video-player-impl.ts index cc9a4ba7d64..51d4d413a8d 100644 --- a/cocos/video/video-player-impl.ts +++ b/cocos/video/video-player-impl.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { UITransform } from '../2d/framework'; import { VideoPlayer } from './video-player'; import { EventType } from './video-player-enums'; @@ -87,8 +87,8 @@ export abstract class VideoPlayerImpl { this._interrupted = false; }; /* handle pause & resume */ - legacyCC.game.on(legacyCC.Game.EVENT_PAUSE, this._onInterruptedBegin); - legacyCC.game.on(legacyCC.Game.EVENT_RESUME, this._onInterruptedEnd); + cclegacy.game.on(cclegacy.Game.EVENT_PAUSE, this._onInterruptedBegin); + cclegacy.game.on(cclegacy.Game.EVENT_RESUME, this._onInterruptedEnd); } // @@ -253,9 +253,9 @@ export abstract class VideoPlayerImpl { public destroy (): void { this.removeVideoPlayer(); this._componentEventList.clear(); - legacyCC.game.off(legacyCC.Game.EVENT_PAUSE, this._onInterruptedBegin); - legacyCC.game.off(legacyCC.Game.EVENT_RESUME, this._onInterruptedEnd); + cclegacy.game.off(cclegacy.Game.EVENT_PAUSE, this._onInterruptedBegin); + cclegacy.game.off(cclegacy.Game.EVENT_RESUME, this._onInterruptedEnd); } } -legacyCC.internal.VideoPlayerImpl = VideoPlayerImpl; +cclegacy.internal.VideoPlayerImpl = VideoPlayerImpl; diff --git a/cocos/video/video-player.ts b/cocos/video/video-player.ts index f441585075e..44cfadc6417 100644 --- a/cocos/video/video-player.ts +++ b/cocos/video/video-player.ts @@ -31,7 +31,7 @@ import { clamp } from '../core/math'; import { VideoClip } from './assets/video-clip'; import { VideoPlayerImplManager } from './video-player-impl-manager'; import { EventType, ResourceType } from './video-player-enums'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { VideoPlayerImplWeb } from './video-player-impl-web'; /** @@ -527,4 +527,4 @@ export class VideoPlayer extends Component { } // TODO Since jsb adapter does not support import cc, put it on internal first and adjust it later. -legacyCC.internal.VideoPlayer = VideoPlayer; +cclegacy.internal.VideoPlayer = VideoPlayer; diff --git a/cocos/web-view/web-view-impl-manager.ts b/cocos/web-view/web-view-impl-manager.ts index 445aff22acd..004ad54c32e 100644 --- a/cocos/web-view/web-view-impl-manager.ts +++ b/cocos/web-view/web-view-impl-manager.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { WebViewImplWeb } from './web-view-impl-web'; export class WebViewImplManager { @@ -32,4 +32,4 @@ export class WebViewImplManager { } } -legacyCC.internal.WebViewImplManager = WebViewImplManager; +cclegacy.internal.WebViewImplManager = WebViewImplManager; diff --git a/cocos/web-view/web-view-impl-web.ts b/cocos/web-view/web-view-impl-web.ts index a290677d4b8..14d61c7b8d8 100644 --- a/cocos/web-view/web-view-impl-web.ts +++ b/cocos/web-view/web-view-impl-web.ts @@ -29,7 +29,7 @@ import { WebViewImpl } from './web-view-impl'; import { game } from '../game'; import { mat4 } from '../core/math'; import { contains } from '../core/utils/misc'; -import { ccwindow } from '../core/global-exports'; +import { ccwindow } from '@base/global'; const ccdocument = ccwindow.document; diff --git a/cocos/web-view/web-view-impl.ts b/cocos/web-view/web-view-impl.ts index 85828f81347..85e9886601b 100644 --- a/cocos/web-view/web-view-impl.ts +++ b/cocos/web-view/web-view-impl.ts @@ -22,7 +22,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { WebView } from './web-view'; import { EventType } from './web-view-enums'; import { UITransform } from '../2d/framework'; @@ -115,4 +115,4 @@ export abstract class WebViewImpl { } } -legacyCC.internal.WebViewImpl = WebViewImpl; +cclegacy.internal.WebViewImpl = WebViewImpl; diff --git a/cocos/web-view/web-view.ts b/cocos/web-view/web-view.ts index 68f7d978fc5..7017b28aa73 100644 --- a/cocos/web-view/web-view.ts +++ b/cocos/web-view/web-view.ts @@ -28,8 +28,8 @@ import { UITransform } from '../2d/framework'; import { Component, EventHandler as ComponentEventHandler } from '../scene-graph'; import { WebViewImplManager } from './web-view-impl-manager'; import { EventType } from './web-view-enums'; -import { legacyCC } from '../core/global-exports'; -import type { WebViewImpl } from './web-view-impl'; +import { cclegacy } from '@base/global'; +import type { WebViewImpl } from './web-view-impl'; /** * @en @@ -215,4 +215,4 @@ export class WebView extends Component { } // TODO Since jsb adapter does not support import cc, put it on internal first and adjust it later. -legacyCC.internal.WebView = WebView; +cclegacy.internal.WebView = WebView; diff --git a/cocos/webgpu/instantiated.ts b/cocos/webgpu/instantiated.ts index fe96a4b212f..fa23ac1e456 100644 --- a/cocos/webgpu/instantiated.ts +++ b/cocos/webgpu/instantiated.ts @@ -32,7 +32,7 @@ import webgpuUrl from 'external:emscripten/webgpu/webgpu_wasm.wasm'; import glslangUrl from 'external:emscripten/webgpu/glslang.wasm'; import wasmDevice from 'external:emscripten/webgpu/webgpu_wasm.js'; import glslangLoader from 'external:emscripten/webgpu/glslang.js'; -import { legacyCC } from '../core/global-exports'; +import { cclegacy } from '@base/global'; import { WebAssemblySupportMode } from '../misc/webassembly-support'; import { log } from 'console'; @@ -40,7 +40,7 @@ export const glslalgWasmModule: any = { glslang: null, }; -export const gfx: any = legacyCC.gfx = { +export const gfx: any = cclegacy.gfx = { wasmBinary: null, nativeDevice: null, }; @@ -62,7 +62,7 @@ export const promiseForWebGPUInstantiation = (() => { response.arrayBuffer().then((buffer) => { gfx.wasmBinary = buffer; wasmDevice(gfx).then(() => { - legacyCC.WebGPUDevice = gfx.CCWGPUDevice; + cclegacy.WebGPUDevice = gfx.CCWGPUDevice; resolve(); }); }); @@ -85,8 +85,8 @@ export const promiseForWebGPUInstantiation = (() => { if (WEBGPU && WASM_SUPPORT_MODE !== WebAssemblySupportMode.NONE) { const intervalId = setInterval(() => { - if (legacyCC.game) { - legacyCC.game.onPreInfrastructureInitDelegate.add(() => promiseForWebGPUInstantiation); + if (cclegacy.game) { + cclegacy.game.onPreInfrastructureInitDelegate.add(() => promiseForWebGPUInstantiation); clearInterval(intervalId); } }, 10); diff --git a/exports/base.ts b/exports/base.ts index 82338a6f59f..e2233f60b75 100644 --- a/exports/base.ts +++ b/exports/base.ts @@ -23,7 +23,7 @@ THE SOFTWARE. */ -import { legacyCC } from '../cocos/core/global-exports'; +import { cclegacy } from '@base/global'; // has to import predefines first import '../predefine'; @@ -50,7 +50,7 @@ export * from '../cocos/asset/assets'; export * from '../cocos/asset/asset-manager'; export { renderer }; -legacyCC.renderer = renderer; +cclegacy.renderer = renderer; export * from '../extensions/ccpool/node-pool'; diff --git a/exports/custom-pipeline.ts b/exports/custom-pipeline.ts index d3cfd957dd0..038c2357ddb 100644 --- a/exports/custom-pipeline.ts +++ b/exports/custom-pipeline.ts @@ -1,8 +1,8 @@ -import { legacyCC } from '../cocos/core/global-exports'; +import { cclegacy } from '@base/global'; import * as rendering from '../cocos/rendering/custom'; import * as postProcess from '../cocos/rendering/post-process'; export { rendering }; export { postProcess }; -legacyCC.rendering = rendering; +cclegacy.rendering = rendering; diff --git a/exports/gfx-empty.ts b/exports/gfx-empty.ts index e755ce96acc..29df7b9be49 100644 --- a/exports/gfx-empty.ts +++ b/exports/gfx-empty.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { EmptyDevice } from '../cocos/gfx/empty/empty-device'; -import { legacyCC } from '../cocos/core/global-exports'; export { EmptyDevice }; -legacyCC.EmptyDevice = EmptyDevice; +cclegacy.EmptyDevice = EmptyDevice; diff --git a/exports/gfx-webgl.ts b/exports/gfx-webgl.ts index b6d987c586b..04ea4b40098 100644 --- a/exports/gfx-webgl.ts +++ b/exports/gfx-webgl.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { WebGLDevice } from '../cocos/gfx/webgl/webgl-device'; -import { legacyCC } from '../cocos/core/global-exports'; export { WebGLDevice }; -legacyCC.WebGLDevice = WebGLDevice; +cclegacy.WebGLDevice = WebGLDevice; diff --git a/exports/gfx-webgl2.ts b/exports/gfx-webgl2.ts index b67fd16fb2b..e8e802ec1dd 100644 --- a/exports/gfx-webgl2.ts +++ b/exports/gfx-webgl2.ts @@ -23,8 +23,8 @@ THE SOFTWARE. */ +import { cclegacy } from '@base/global'; import { WebGL2Device } from '../cocos/gfx/webgl2/webgl2-device'; -import { legacyCC } from '../cocos/core/global-exports'; export { WebGL2Device }; -legacyCC.WebGL2Device = WebGL2Device; +cclegacy.WebGL2Device = WebGL2Device; diff --git a/exports/physics-framework.ts b/exports/physics-framework.ts index cbadf86dfa5..c7e3d13a3d6 100644 --- a/exports/physics-framework.ts +++ b/exports/physics-framework.ts @@ -25,59 +25,16 @@ /// physics namespace /// +import { cclegacy } from '@base/global'; import * as physics from '../cocos/physics/framework'; -import { cclegacy } from './base'; export { physics }; cclegacy.physics = physics; /// cc namespace /// -export { - PhysicsSystem, - RigidBody, - CharacterController, - ConstantForce, - PhysicsMaterial, - PhysicsRayResult, - PhysicsLineStripCastResult, +export { PhysicsSystem, RigidBody, CharacterController, ConstantForce, PhysicsMaterial, PhysicsRayResult, PhysicsLineStripCastResult, Collider, BoxCollider, SphereCollider, CapsuleCollider, MeshCollider, CylinderCollider, ConeCollider, TerrainCollider, SimplexCollider, PlaneCollider, Constraint, HingeConstraint, ConfigurableConstraint, FixedConstraint, PointToPointConstraint, CapsuleCharacterController, BoxCharacterController, EAxisDirection, ERigidBodyType, EColliderType } from '../cocos/physics/framework'; - Collider, - BoxCollider, - SphereCollider, - CapsuleCollider, - MeshCollider, - CylinderCollider, - ConeCollider, - TerrainCollider, - SimplexCollider, - PlaneCollider, - - Constraint, - HingeConstraint, - ConfigurableConstraint, - FixedConstraint, - PointToPointConstraint, - - CapsuleCharacterController, - BoxCharacterController, - - EAxisDirection, - ERigidBodyType, - EColliderType, -} from '../cocos/physics/framework'; - -export type { - ITriggerEvent, - ICollisionEvent, - IContactEquation, - CollisionEventType, - CollisionCallback, - TriggerEventType, - TriggerCallback, - CharacterCollisionEventType, - CharacterControllerContact, - CharacterTriggerEventType, -} from '../cocos/physics/framework'; +export type { ITriggerEvent, ICollisionEvent, IContactEquation, CollisionEventType, CollisionCallback, TriggerEventType, TriggerCallback, CharacterCollisionEventType, CharacterControllerContact, CharacterTriggerEventType } from '../cocos/physics/framework'; export * from '../cocos/physics/framework/deprecated'; diff --git a/exports/primitive.ts b/exports/primitive.ts index fcd210a58b3..39b605c4230 100644 --- a/exports/primitive.ts +++ b/exports/primitive.ts @@ -1,8 +1,8 @@ +import { cclegacy } from '@base/global'; import * as primitives from '../cocos/primitive'; -import { legacyCC } from '../cocos/core/global-exports'; export { primitives, }; -legacyCC.primitives = primitives; +cclegacy.primitives = primitives; export * from '../cocos/primitive/primitive'; diff --git a/extensions/ccpool/node-pool.ts b/extensions/ccpool/node-pool.ts index 221a6fc6a64..5933a757dcf 100644 --- a/extensions/ccpool/node-pool.ts +++ b/extensions/ccpool/node-pool.ts @@ -25,7 +25,7 @@ import { Component } from '../../cocos/scene-graph/component'; import { Node } from '../../cocos/scene-graph'; -import { legacyCC } from '../../cocos/core/global-exports'; +import { cclegacy } from '@base/global'; type Constructor = new(...args: any[]) => T; @@ -169,4 +169,4 @@ export class NodePool { } } -legacyCC.NodePool = NodePool; +cclegacy.NodePool = NodePool; diff --git a/native/cocos/3d/assets/Skeleton.cpp b/native/cocos/3d/assets/Skeleton.cpp index 55541947667..706aa81ac7c 100644 --- a/native/cocos/3d/assets/Skeleton.cpp +++ b/native/cocos/3d/assets/Skeleton.cpp @@ -61,7 +61,7 @@ ccstd::hash_t Skeleton::getHash() { } bool Skeleton::destroy() { - //cjh TODO: (legacyCC.director.root?.dataPoolManager as DataPoolManager)?.releaseSkeleton(this); + //cjh TODO: (cclegacy.director.root?.dataPoolManager as DataPoolManager)?.releaseSkeleton(this); return Super::destroy(); } diff --git a/native/cocos/core/Root.cpp b/native/cocos/core/Root.cpp index 7632201a69f..b8d84d399c4 100644 --- a/native/cocos/core/Root.cpp +++ b/native/cocos/core/Root.cpp @@ -64,7 +64,7 @@ Root::Root(gfx::Device *device) : _device(device) { instance = this; // TODO(minggo): - // this._dataPoolMgr = legacyCC.internal.DataPoolManager && new legacyCC.internal.DataPoolManager(device) as DataPoolManager; + // this._dataPoolMgr = cclegacy.internal.DataPoolManager && new cclegacy.internal.DataPoolManager(device) as DataPoolManager; _cameraList.reserve(6); _swapchains.reserve(2); diff --git a/native/cocos/core/assets/TextureBase.cpp b/native/cocos/core/assets/TextureBase.cpp index 696e0bc16c0..0c549c2733a 100644 --- a/native/cocos/core/assets/TextureBase.cpp +++ b/native/cocos/core/assets/TextureBase.cpp @@ -107,8 +107,8 @@ void TextureBase::setAnisotropy(uint32_t anisotropy) { bool TextureBase::destroy() { const bool destroyed = Super::destroy(); - //cjh TODO: if (destroyed && legacyCC.director.root?.batcher2D) { - // legacyCC.director.root.batcher2D._releaseDescriptorSetCache(this._textureHash); + //cjh TODO: if (destroyed && cclegacy.director.root?.batcher2D) { + // cclegacy.director.root.batcher2D._releaseDescriptorSetCache(this._textureHash); // } return destroyed; } diff --git a/native/cocos/core/scene-graph/Node.cpp b/native/cocos/core/scene-graph/Node.cpp index 631cf892896..f0e5e948089 100644 --- a/native/cocos/core/scene-graph/Node.cpp +++ b/native/cocos/core/scene-graph/Node.cpp @@ -82,7 +82,7 @@ void Node::onBatchCreated(bool dontChildPrefab) { Node *Node::instantiate(Node *cloned, bool isSyncedNode) { if (!cloned) { CC_ABORT(); - // TODO(): cloned = legacyCC.instantiate._clone(this, this); + // TODO(): cloned = cclegacy.instantiate._clone(this, this); return nullptr; } // TODO(): @@ -95,7 +95,7 @@ Node *Node::instantiate(Node *cloned, bool isSyncedNode) { // // PrefabUtils.unlinkPrefab(cloned); // } //} - // if (EDITOR && legacyCC.GAME_VIEW) { + // if (EDITOR && cclegacy.GAME_VIEW) { // const syncing = newPrefabInfo&& cloned == = newPrefabInfo.root && newPrefabInfo.sync; // if (!syncing) { // cloned._name += ' (Clone)'; diff --git a/native/cocos/scene/Ambient.h b/native/cocos/scene/Ambient.h index 05c1b0a27f8..24fc1ebc1c2 100644 --- a/native/cocos/scene/Ambient.h +++ b/native/cocos/scene/Ambient.h @@ -122,7 +122,7 @@ class AmbientInfo : public RefCounted { * @zh 编辑器中可配置的天空光照颜色（通过颜色拾取器） */ // @visible(() => { - // const scene = legacyCC.director.getScene(); + // const scene = cclegacy.director.getScene(); // const skybox = scene.globals.skybox; // if (skybox.useIBL && skybox.applyDiffuseMap) { // return false; @@ -152,7 +152,7 @@ class AmbientInfo : public RefCounted { * @zh 编辑器中可配置的地面光照颜色（通过颜色拾取器） */ // @visible(() => { - // const scene = legacyCC.director.getScene(); + // const scene = cclegacy.director.getScene(); // const skybox = scene.globals.skybox; // if (skybox.useIBL && skybox.applyDiffuseMap) { // return false; diff --git a/package-lock.json b/package-lock.json index f99e1bb429d..07cbbfaf650 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,12 +11,14 @@ "license": "MIT", "workspaces": [ "packages/*", - "pal/*" + "pal/*", + "cocos/base/*" ], "dependencies": { + "@base/global": "*", "@cocos/box2d": "1.0.1", "@cocos/cannon": "1.2.8", - "@cocos/ccbuild": "2.0.3-alpha.14", + "@cocos/ccbuild": "2.0.3-alpha.16", "@cocos/dragonbones-js": "^1.0.1", "@pal/env": "*", "@pal/utils": "*" @@ -54,6 +56,8 @@ "gulp-uglify": "^3.0.2", "gulp-zip": "^5.0.2", "http-server": "^0.12.3", + "import-redirect": "^1.0.2", + "inquirer": "^8.2.6", "jest": "^28.0.2", "jest-environment-jsdom": "^28.0.2", "jest-extended": "^1.1.0", @@ -82,6 +86,11 @@ "node": ">=18.0.0" } }, + "cocos/base/global": { + "name": "@base/global", + "version": "1.0.0", + "license": "MIT" + }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmmirror.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -104,11 +113,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dependencies": { - "@babel/highlight": "^7.22.10", + "@babel/highlight": "^7.22.13", "chalk": "^2.4.2" }, "engines": { @@ -153,37 +162,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/@babel/generator": { - "version": "7.13.9", - "resolved": "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.13.9.tgz", - "integrity": "sha1-Onqpb577jivkLTjYDizrTGTY3jk=", - "dependencies": { - "@babel/types": "^7.13.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/traverse": { - "version": "7.13.0", - "resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.13.0.tgz", - "integrity": "sha1-bZV1JHX4bufe0GU23jCaZfyJZsw=", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.13.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.13.0", - "@babel/types": "^7.13.0", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, - "node_modules/@babel/core/node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835860585&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz", - "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=" - }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", @@ -193,14 +171,30 @@ } }, "node_modules/@babel/generator": { - "version": "7.9.4", - "resolved": "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.9.4.tgz?cache=0&sync_timestamp=1585038762678&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fgenerator%2Fdownload%2F%40babel%2Fgenerator-7.9.4.tgz", - "integrity": "sha1-EkQekMOzxBWc3s8xIHW/Gozi284=", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz", + "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", "dependencies": { - "@babel/types": "^7.9.0", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" + "@babel/types": "^7.22.15", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/@babel/helper-annotate-as-pure": { @@ -494,9 +488,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz", + "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==", "engines": { "node": ">=6.9.0" } @@ -532,41 +526,10 @@ "@babel/types": "^7.13.0" } }, - "node_modules/@babel/helpers/node_modules/@babel/generator": { - "version": "7.13.9", - "resolved": "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.13.9.tgz", - "integrity": "sha1-Onqpb577jivkLTjYDizrTGTY3jk=", - "dependencies": { - "@babel/types": "^7.13.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/helpers/node_modules/@babel/traverse": { - "version": "7.13.0", - "resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.13.0.tgz", - "integrity": "sha1-bZV1JHX4bufe0GU23jCaZfyJZsw=", - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@babel/generator": "^7.13.0", - "@babel/helper-function-name": "^7.12.13", - "@babel/helper-split-export-declaration": "^7.12.13", - "@babel/parser": "^7.13.0", - "@babel/types": "^7.13.0", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, - "node_modules/@babel/helpers/node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835860585&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz", - "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=" - }, "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz", + "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==", "dependencies": { "@babel/helper-validator-identifier": "^7.22.5", "chalk": "^2.4.2", @@ -577,9 +540,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.22.16", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz", + "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1915,35 +1878,42 @@ } }, "node_modules/@babel/traverse": { - "version": "7.9.0", - "resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.9.0.tgz?cache=0&sync_timestamp=1584720333049&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.9.0.tgz", - "integrity": "sha1-04gsKDDlE/T+TOyf526hzHh0eJI=", - "dev": true, + "version": "7.22.17", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.17.tgz", + "integrity": "sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==", "dependencies": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.16", + "@babel/types": "^7.22.17", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.22.17", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.17.tgz", + "integrity": "sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.15", "to-fast-properties": "^2.0.0" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@base/global": { + "resolved": "cocos/base/global", + "link": true + }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", @@ -2001,9 +1971,9 @@ } }, "node_modules/@cocos/ccbuild": { - "version": "2.0.3-alpha.14", - "resolved": "https://registry.npmjs.org/@cocos/ccbuild/-/ccbuild-2.0.3-alpha.14.tgz", - "integrity": "sha512-Hy6dInlmxnLwaaYeZKjPlUCvDmJk0bWb/2irqCIGSvU4JBEjFJCPVsGK1+9MCMQyb2YPW1StAgjVM651nGWGuw==", + "version": "2.0.3-alpha.16", + "resolved": "https://registry.npmjs.org/@cocos/ccbuild/-/ccbuild-2.0.3-alpha.16.tgz", + "integrity": "sha512-rrJTgQI3ugnpWTVo0YKRVAgyZ+T3pCt9CQgCjsYmBow6mkPgvvazRloXZfyYTAIPtmqfjxhkgfbRaimqmv6/gg==", "dependencies": { "@babel/core": "^7.20.12", "@babel/helper-module-imports": "7.18.6", @@ -2015,7 +1985,7 @@ "@babel/preset-env": "^7.20.2", "@babel/traverse": "^7.20.13", "@cocos/babel-plugin-dynamic-import-vars": "^1.0.2", - "@cocos/creator-programming-babel-preset-cc": "1.0.1-alpha.4", + "@cocos/creator-programming-babel-preset-cc": "1.0.1-alpha.5", "@rollup/plugin-babel": "^6.0.3", "@rollup/plugin-commonjs": "^11.1.0", "@rollup/plugin-json": "^4.1.0", @@ -2040,7 +2010,7 @@ "rollup": "^2.79.1", "rollup-plugin-terser": "^7.0.2", "semver": "~7.5.3", - "tfig": "^3.3.1", + "tfig": "^3.3.2", "typescript": "^4.9.5" } }, @@ -2081,20 +2051,6 @@ "semver": "bin/semver.js" } }, - "node_modules/@cocos/ccbuild/node_modules/@babel/generator": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", - "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", - "dependencies": { - "@babel/types": "^7.21.3", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@cocos/ccbuild/node_modules/@babel/helper-module-imports": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", @@ -2234,19 +2190,6 @@ "node": ">=6.9.0" } }, - "node_modules/@cocos/ccbuild/node_modules/@babel/preset-env/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@cocos/ccbuild/node_modules/@babel/preset-env/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2255,30 +2198,10 @@ "semver": "bin/semver.js" } }, - "node_modules/@cocos/ccbuild/node_modules/@babel/traverse": { - "version": "7.21.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", - "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.21.3", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.3", - "@babel/types": "^7.21.3", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@cocos/ccbuild/node_modules/@cocos/creator-programming-babel-preset-cc": { - "version": "1.0.1-alpha.4", - "resolved": "https://registry.npmjs.org/@cocos/creator-programming-babel-preset-cc/-/creator-programming-babel-preset-cc-1.0.1-alpha.4.tgz", - "integrity": "sha512-oQbVg2/GJ2eCg/0dzPxrVYkWqjlqK73oK7lQT4dS1VShXmOyG4vmVS5NkPSIiaO0M11u/IoIuGhvLGRnTxWmlQ==", + "version": "1.0.1-alpha.5", + "resolved": "https://registry.npmjs.org/@cocos/creator-programming-babel-preset-cc/-/creator-programming-babel-preset-cc-1.0.1-alpha.5.tgz", + "integrity": "sha512-XSS5N3/8w1u3WD5qolRmhdYpLfo9nbiqNl1nMNO/PybXhIArn9e1cGOcg51tkLTwCxdonxHsOIJEzGY8Vj+CJw==", "dependencies": { "@babel/core": "7.19.6", "@babel/generator": "7.20.1", @@ -2423,9 +2346,9 @@ } }, "node_modules/@cocos/ccbuild/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -2435,28 +2358,6 @@ "node": ">=6.0.0" } }, - "node_modules/@cocos/ccbuild/node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@cocos/ccbuild/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@cocos/ccbuild/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" - }, "node_modules/@cocos/ccbuild/node_modules/@rollup/plugin-babel": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.0.3.tgz", @@ -2529,6 +2430,24 @@ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" }, + "node_modules/@cocos/ccbuild/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@cocos/ccbuild/node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, "node_modules/@cocos/ccbuild/node_modules/commander": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", @@ -2537,6 +2456,11 @@ "node": ">=16" } }, + "node_modules/@cocos/ccbuild/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, "node_modules/@cocos/ccbuild/node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", @@ -2568,6 +2492,14 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/@cocos/ccbuild/node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/@cocos/ccbuild/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -2579,6 +2511,11 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/@cocos/ccbuild/node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, "node_modules/@cocos/ccbuild/node_modules/rollup": { "version": "2.79.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", @@ -2607,6 +2544,69 @@ "node": ">=10" } }, + "node_modules/@cocos/ccbuild/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@cocos/ccbuild/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@cocos/ccbuild/node_modules/tfig": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/tfig/-/tfig-3.3.2.tgz", + "integrity": "sha512-tNHgcai8dGxB7CW8qZRhlT+YW+I54k+VIbErxdkNyxBFU1ykuYiswEV1NrU74nf2Iy7TAdGg2KPrKsC+NhGYPw==", + "dependencies": { + "fs-extra": "^7.0.1", + "typescript": "^4.9.3", + "yargs": "^13.2.2" + } + }, + "node_modules/@cocos/ccbuild/node_modules/tfig/node_modules/fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/@cocos/ccbuild/node_modules/tfig/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/@cocos/ccbuild/node_modules/tfig/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/@cocos/ccbuild/node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -2615,6 +2615,55 @@ "node": ">= 10.0.0" } }, + "node_modules/@cocos/ccbuild/node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" + }, + "node_modules/@cocos/ccbuild/node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@cocos/ccbuild/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + }, + "node_modules/@cocos/ccbuild/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/@cocos/ccbuild/node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, "node_modules/@cocos/creator-programming-babel-preset-cc": { "version": "1.0.1-alpha.2", "resolved": "https://registry.npmjs.org/@cocos/creator-programming-babel-preset-cc/-/creator-programming-babel-preset-cc-1.0.1-alpha.2.tgz", @@ -2668,20 +2717,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@babel/generator": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz", - "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==", - "dependencies": { - "@babel/types": "^7.21.5", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@babel/helpers": { "version": "7.21.5", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz", @@ -2740,61 +2775,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@babel/traverse": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz", - "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==", - "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.21.5", - "@babel/helper-environment-visitor": "^7.21.5", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.5", - "@babel/types": "^7.21.5", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", - "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" - }, "node_modules/@cocos/creator-programming-babel-preset-cc/node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -4420,9 +4400,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "engines": { "node": ">=6.0.0" } @@ -4458,17 +4438,17 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@mrmlnc/readdir-enhanced": { @@ -7243,6 +7223,12 @@ "node": ">=10" } }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, "node_modules/child_process": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz", @@ -7389,6 +7375,39 @@ "node": ">=6" } }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz", + "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, "node_modules/cliui": { "version": "3.2.0", "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1573943292170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz", @@ -7876,6 +7895,27 @@ "node": ">= 0.10" } }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dev": true, + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defaults/node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz", @@ -9728,6 +9768,32 @@ "node": ">=0.10.0" } }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/external-editor/node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/extglob": { "version": "2.0.4", "resolved": "https://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz", @@ -9928,6 +9994,21 @@ "bser": "2.1.1" } }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -12203,9 +12284,133 @@ }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-redirect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/import-redirect/-/import-redirect-1.0.2.tgz", + "integrity": "sha512-Y/8xsifp/Rgohe6/FiEL1mNfDSlPQATPdLVUXFQt71dyM/CB2imsG4BhUv4NOAPbCf5klNRUiEQnXxa/Fb+0ng==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.18.6", + "@babel/traverse": "^7.18.6", + "chalk": "^4.1.2", + "fs": "^0.0.1-security", + "glob": "^8.0.3", + "path": "^0.12.7" + } + }, + "node_modules/import-redirect/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/import-redirect/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/import-redirect/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/import-redirect/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/import-redirect/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/import-redirect/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/import-redirect/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/import-redirect/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/import-redirect/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/imurmurhash": { @@ -12259,6 +12464,160 @@ "source-map": "~0.5.3" } }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/inquirer/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/inquirer/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/insert-module-globals": { "version": "7.2.1", "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", @@ -12718,6 +13077,15 @@ "node": ">=0.10.0" } }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", @@ -17049,65 +17417,163 @@ "resolve": "^1.1.7" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.8" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" + }, + "node_modules/lodash.memoize": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", + "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==", + "dev": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" } }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "node_modules/log-symbols/node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - }, "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/lodash": { - "version": "4.17.15", - "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&sync_timestamp=1571657272199&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz", - "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=" - }, - "node_modules/lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" - }, - "node_modules/lodash.memoize": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", - "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==", - "dev": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, "node_modules/loose-envify": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz", @@ -17555,6 +18021,12 @@ "node": ">= 0.10" } }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, "node_modules/nan": { "version": "2.14.0", "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz", @@ -18093,6 +18565,210 @@ "node": ">= 0.8.0" } }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/ora/node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/ora/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/ora/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/ora/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/ora/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/ora/node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/ora/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ordered-read-streams": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/ordered-read-streams/download/ordered-read-streams-1.0.1.tgz", @@ -18120,6 +18796,15 @@ "node": ">=0.10.0" } }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/p-defer": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz", @@ -19227,6 +19912,19 @@ "node": ">=10" } }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/ret": { "version": "0.1.15", "resolved": "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz", @@ -19482,6 +20180,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/run-parallel": { "version": "1.1.10", "resolved": "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.1.10.tgz?cache=0&sync_timestamp=1603768238747&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frun-parallel%2Fdownload%2Frun-parallel-1.1.10.tgz", @@ -19501,6 +20208,15 @@ } ] }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", @@ -21224,11 +21940,10 @@ } }, "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "optional": true, - "peer": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "devOptional": true }, "node_modules/tty-browserify": { "version": "0.0.1", @@ -22187,6 +22902,15 @@ "makeerror": "1.0.12" } }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "dependencies": { + "defaults": "^1.0.3" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 8c24b55d274..521b667aa8d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ }, "workspaces": [ "packages/*", - "pal/*" + "pal/*", + "cocos/base/*" ], "scripts": { "server": "http-server . -p 8002 -o playground/index.html", @@ -39,15 +40,15 @@ "url": "git+https://github.com/cocos-creator/engine.git" }, "dependencies": { - "@pal/env": "*", - "@pal/utils": "*", "@cocos/box2d": "1.0.1", "@cocos/cannon": "1.2.8", - "@cocos/ccbuild": "2.0.3-alpha.14", - "@cocos/dragonbones-js": "^1.0.1" + "@cocos/ccbuild": "2.0.3-alpha.16", + "@cocos/dragonbones-js": "^1.0.1", + "@pal/env": "*", + "@pal/utils": "*", + "@base/global": "*" }, "devDependencies": { - "@types/node": "^20.5.9", "@babel/core": "^7.13.10", "@babel/plugin-proposal-export-default-from": "^7.17.12", "@babel/preset-env": "7.8.7", @@ -55,6 +56,7 @@ "@types/fs-extra": "^5.0.4", "@types/istanbul-lib-report": "^3.0.0", "@types/jest": "^28.1.8", + "@types/node": "^20.5.9", "@types/yargs": "^12.0.14", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", @@ -79,6 +81,8 @@ "gulp-uglify": "^3.0.2", "gulp-zip": "^5.0.2", "http-server": "^0.12.3", + "import-redirect": "^1.0.2", + "inquirer": "^8.2.6", "jest": "^28.0.2", "jest-environment-jsdom": "^28.0.2", "jest-extended": "^1.1.0", diff --git a/packages/build-engine/src/babel-plugins/decorator-parser.ts b/packages/build-engine/src/babel-plugins/decorator-parser.ts index 83a22532c06..2f0dcd986d6 100644 --- a/packages/build-engine/src/babel-plugins/decorator-parser.ts +++ b/packages/build-engine/src/babel-plugins/decorator-parser.ts @@ -344,7 +344,7 @@ export default function recordDecorators(): babel.PluginObj { } - const currentClassName = nodePath.node.id.name; + const currentClassName = nodePath.node.id!.name; const classDecoratorNodes: any[] | undefined | null = nodePath.node.decorators; let classDecoratorResults: DecoratorParseResult[] = []; if (!classDecoratorNodes) { // filter #3, no decorators for current class diff --git a/pal/audio/minigame/player.ts b/pal/audio/minigame/player.ts index bd4c433b9cd..17ccb9d3e2e 100644 --- a/pal/audio/minigame/player.ts +++ b/pal/audio/minigame/player.ts @@ -23,7 +23,7 @@ */ import { minigame } from 'pal/minigame'; -import { legacyCC } from '../../../cocos/core/global-exports'; +import { cclegacy } from '@base/global'; import { AudioLoadOptions, AudioType, AudioState, AudioPCMDataView } from '../type'; import { AudioPlayerMinigame, OneShotAudioMinigame } from './player-minigame'; import { AudioPlayerWeb, OneShotAudioWeb } from './player-web'; @@ -128,4 +128,4 @@ export class AudioPlayer { } // REMOVE_ME -legacyCC.AudioPlayer = AudioPlayer; +cclegacy.AudioPlayer = AudioPlayer; diff --git a/pal/audio/native/player.ts b/pal/audio/native/player.ts index d7b20f746ea..1d0a1691099 100644 --- a/pal/audio/native/player.ts +++ b/pal/audio/native/player.ts @@ -25,8 +25,8 @@ import { systemInfo } from 'pal/system-info'; import { AudioType, AudioState, AudioEvent, AudioPCMDataView, AudioBufferView, AudioLoadOptions } from '../type'; import { EventTarget } from '../../../cocos/core/event'; -import { legacyCC } from '../../../cocos/core/global-exports'; -import { clamp, clamp01 } from '../../../cocos/core'; +import { clamp01 } from '../../../cocos/core'; +import { cclegacy } from '@base/global'; import { enqueueOperation, OperationInfo, OperationQueueable } from '../operation-queue'; import { Platform } from '../../system-info/enum-type'; import { Game, game } from '../../../cocos/game'; @@ -125,7 +125,7 @@ export class AudioPlayer implements OperationQueueable { loop: false, currentTime: 0, volume: 1, - } + }; constructor (url: string) { this._url = url; @@ -340,4 +340,4 @@ export class AudioPlayer implements OperationQueueable { } // REMOVE_ME -legacyCC.AudioPlayer = AudioPlayer; +cclegacy.AudioPlayer = AudioPlayer; diff --git a/pal/env/package.json b/pal/env/package.json index fd575880504..9911a7618d7 100644 --- a/pal/env/package.json +++ b/pal/env/package.json @@ -9,7 +9,7 @@ "exports": { ".": { "node": "./package.json", - "types": "./src/index.d.ts", + "types": "./src/index.ts", "native": "./src/native/env.ts", "web": "./src/web/env.ts", "minigame": { diff --git a/pal/env/src/index.d.ts b/pal/env/src/index.d.ts deleted file mode 100644 index 23ee96605ee..00000000000 --- a/pal/env/src/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export function findCanvas (): { frame: HTMLDivElement, container: HTMLDivElement, canvas: HTMLCanvasElement }; -export function loadJsFile (path: string): Promise; diff --git a/pal/env/src/index.ts b/pal/env/src/index.ts new file mode 100644 index 00000000000..1c6c04fa8ec --- /dev/null +++ b/pal/env/src/index.ts @@ -0,0 +1,2 @@ +export declare function findCanvas (): { frame: HTMLDivElement, container: HTMLDivElement, canvas: HTMLCanvasElement }; +export declare function loadJsFile (path: string): Promise; diff --git a/pal/image/base-image-data.ts b/pal/image/base-image-data.ts index 7d27b68b7a7..904a66e95e4 100644 --- a/pal/image/base-image-data.ts +++ b/pal/image/base-image-data.ts @@ -21,9 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +import { ccwindow } from '@base/global'; import { RawDataType, ImageSource } from './types'; import { sys } from '../../cocos/core/platform/sys'; -import { ccwindow } from '../../cocos/core/global-exports'; import { assert } from '../../cocos/core/platform/debug'; export class BaseImageData { diff --git a/pal/image/minigame/image-data.ts b/pal/image/minigame/image-data.ts index aaa36afc979..847a908362d 100644 --- a/pal/image/minigame/image-data.ts +++ b/pal/image/minigame/image-data.ts @@ -22,8 +22,8 @@ THE SOFTWARE. */ import { ALIPAY, XIAOMI, JSB, BAIDU, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants'; +import { ccwindow } from '@base/global'; import { BaseImageData } from '../base-image-data'; -import { ccwindow } from '../../../cocos/core/global-exports'; import { getError } from '../../../cocos/core/platform/debug'; export class ImageData extends BaseImageData { diff --git a/pal/image/web/image-data.ts b/pal/image/web/image-data.ts index 47d0547fa1a..0d7be9e3fc9 100644 --- a/pal/image/web/image-data.ts +++ b/pal/image/web/image-data.ts @@ -21,8 +21,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +import { ccwindow } from '@base/global'; import { BaseImageData } from '../base-image-data'; -import { ccwindow } from '../../../cocos/core/global-exports'; import { getError } from '../../../cocos/core/platform/debug'; export class ImageData extends BaseImageData { diff --git a/pal/input/web/gamepad-input.ts b/pal/input/web/gamepad-input.ts index 15bdcd3f051..ad247f44156 100644 --- a/pal/input/web/gamepad-input.ts +++ b/pal/input/web/gamepad-input.ts @@ -24,12 +24,12 @@ import { GamepadCallback } from 'pal/input'; import { systemInfo } from 'pal/system-info'; +import { cclegacy } from '@base/global'; import { InputEventType } from '../../../cocos/input/types/event-enum'; import { EventTarget } from '../../../cocos/core/event/event-target'; -import legacyCC from '../../../predefine'; +import { Quat, Vec3, js } from '../../../cocos/core/index'; import { Feature } from '../../system-info/enum-type'; import { InputSourceButton, InputSourceDpad, InputSourceOrientation, InputSourcePosition, InputSourceStick } from '../input-source'; -import { Quat, Vec3, js } from '../../../cocos/core'; import { EventGamepad } from '../../../cocos/input/types'; //#region button index alias @@ -229,7 +229,7 @@ export class GamepadInputDevice { private static _ensureDirectorDefined (callback: () => void): void { GamepadInputDevice._intervalId = setInterval(() => { - if (legacyCC.director && legacyCC.Director) { + if (cclegacy.director && cclegacy.Director) { clearInterval(GamepadInputDevice._intervalId); GamepadInputDevice._intervalId = -1; callback(); @@ -250,7 +250,7 @@ export class GamepadInputDevice { GamepadInputDevice._ensureDirectorDefined(() => { GamepadInputDevice._cachedWebGamepads = GamepadInputDevice._getWebGamePads(); GamepadInputDevice._updateGamepadCnt(); - legacyCC.director.on(legacyCC.Director.EVENT_BEGIN_FRAME, GamepadInputDevice._scanGamepads); + cclegacy.director.on(cclegacy.Director.EVENT_BEGIN_FRAME, GamepadInputDevice._scanGamepads); }); window.addEventListener('gamepadconnected', (e) => { GamepadInputDevice._cachedWebGamepads[e.gamepad.index] = e.gamepad; diff --git a/pal/input/web/hmd-input.ts b/pal/input/web/hmd-input.ts index 442815dc8a5..38ccd95eb89 100644 --- a/pal/input/web/hmd-input.ts +++ b/pal/input/web/hmd-input.ts @@ -23,12 +23,12 @@ */ import { HMDCallback } from 'pal/input'; +import { cclegacy } from '@base/global'; import { InputEventType } from '../../../cocos/input/types/event-enum'; import { EventTarget } from '../../../cocos/core/event/event-target'; import { EventHMD } from '../../../cocos/input/types'; import { InputSourcePosition, InputSourceOrientation } from '../input-source'; import { Vec3, Quat } from '../../../cocos/core/math'; -import legacyCC from '../../../predefine'; enum Pose { VIEW_LEFT = 0, @@ -81,7 +81,7 @@ export class HMDInputDevice { private _ensureDirectorDefined (): Promise { return new Promise((resolve) => { this._intervalId = setInterval(() => { - if (legacyCC.director && legacyCC.Director) { + if ( cclegacy .director && cclegacy .Director) { clearInterval(this._intervalId); this._intervalId = -1; resolve(); @@ -92,7 +92,7 @@ export class HMDInputDevice { private _registerEvent (): void { this._ensureDirectorDefined().then(() => { - legacyCC.director.on(legacyCC.Director.EVENT_BEGIN_FRAME, this._scanHmd, this); + cclegacy .director.on( cclegacy .Director.EVENT_BEGIN_FRAME, this._scanHmd, this); }).catch((e) => {}); } diff --git a/pal/screen-adapter/web/screen-adapter.ts b/pal/screen-adapter/web/screen-adapter.ts index 4576707d5ea..2d3441c6155 100644 --- a/pal/screen-adapter/web/screen-adapter.ts +++ b/pal/screen-adapter/web/screen-adapter.ts @@ -26,11 +26,11 @@ import { EDITOR, TEST } from 'internal:constants'; import { ConfigOrientation, IScreenOptions, SafeAreaEdge } from 'pal/screen-adapter'; import { systemInfo } from 'pal/system-info'; import { checkPalIntegrity, withImpl } from '@pal/utils'; +import { cclegacy } from '@base/global'; import { warnID } from '../../../cocos/core/platform/debug'; import { EventTarget } from '../../../cocos/core/event/event-target'; import { Size } from '../../../cocos/core/math'; import { Orientation } from '../enum-type'; -import legacyCC from '../../../predefine'; interface ICachedStyle { width: string; @@ -516,7 +516,7 @@ class ScreenAdapter extends EventTarget { return; } // TODO: access designedResolution from Launcher module. - const designedResolution = legacyCC.view.getDesignResolutionSize() as Size; + const designedResolution = cclegacy.view.getDesignResolutionSize() as Size; const frame = this._gameFrame; const frameW = frame.clientWidth; const frameH = frame.clientHeight; diff --git a/platforms/native/engine/jsb-spine-skeleton.js b/platforms/native/engine/jsb-spine-skeleton.js index 10e1bacf9a6..5fd4172ff6e 100644 --- a/platforms/native/engine/jsb-spine-skeleton.js +++ b/platforms/native/engine/jsb-spine-skeleton.js @@ -177,7 +177,7 @@ const cacheManager = require('./jsb-cache-manager'); this._callback = callback; // eslint-disable-next-line no-undef - const AnimationEventType = legacyCC.internal.SpineAnimationEventType; + const AnimationEventType = cc.internal.SpineAnimationEventType; this.setStartListener(function (trackEntry) { if (this._target && this._callback) { diff --git a/predefine.ts b/predefine.ts index 7a1607065f8..7abf403f74b 100644 --- a/predefine.ts +++ b/predefine.ts @@ -23,6 +23,6 @@ THE SOFTWARE. */ -import { legacyCC } from './cocos/core/global-exports'; +import { cclegacy } from '@base/global'; -export default legacyCC; +export default cclegacy; diff --git a/scripts/recast-import.js b/scripts/recast-import.js new file mode 100644 index 00000000000..796fb806a56 --- /dev/null +++ b/scripts/recast-import.js @@ -0,0 +1,71 @@ +const { ir } = require('import-redirect') +const ps = require('path'); +const fs = require('fs'); +const inquirer = require('inquirer'); +const chalk = require('chalk').default; + +inquirer.prompt([ + { + name: 'moduleName', + type: 'input', + message: `Please enter the module name you want to recast:`, + }, + { + name: 'moduleIndex', + type: 'input', + message: `Please enter the path of module index file:`, + validate (input) { + if (!ps.isAbsolute(input)) { + input = ps.join(process.cwd(), input); + } + if (!fs.existsSync(input)) { + return `No such file or directory: ${input}`; + } + if (fs.statSync(input).isDirectory()) { + return `This should be a file instead of a directory: ${input}`; + } + return true; + } + }, + { + name: 'confirm', + type: 'confirm', + message: 'This command would override the files in your engine repository, are you sure ?', + prefix: chalk.red('DANGER'), + } +]).then(answers => { + if (answers.confirm) { + console.log(chalk.green('Start to recast the import statement in your repo, please wait...')); + + let { moduleName, moduleIndex } = answers; + if (!ps.isAbsolute(moduleIndex)) { + moduleIndex = ps.join(process.cwd(), moduleIndex); + } + console.log(chalk.green(`module name: ${moduleName}\n module index path: ${moduleIndex}`)); + + console.log('Scanning files...') + const engineDir = ps.join(__dirname, '..'); + const res = ir.transformPatternImport({ + moduleIndex: moduleIndex.replace(/\\/g, '/'), + moduleName, + mergeSpecifier: true, + pattern: ps.join(engineDir, '/**/*.ts').replace(/\\/g, '/'), + ignorePatterns: [ + '**/node_modules/**/*', + '**/templates/**/*', + '**/native/**/*', + ], + verbose: true, + }); + + console.log('Overriding files...') + for (let fileName in res) { + const content = res[fileName]; + fs.writeFileSync(fileName, content, 'utf8') + } + + console.log('finish !') + } else { + console.log(chalk.yellow('skip the import recast, nothing happens')); + } +}) diff --git a/tests/core/components/lod-group.test.ts b/tests/core/components/lod-group.test.ts index f7ae23e35e8..2d7f211fc65 100644 --- a/tests/core/components/lod-group.test.ts +++ b/tests/core/components/lod-group.test.ts @@ -1,7 +1,8 @@ import { LODGroup, LOD } from '../../../cocos/3d/lod'; -import { Node, NodeActivator } from "../../../cocos/scene-graph" +import { Node, NodeActivator } from '../../../cocos/scene-graph'; import { MeshRenderer } from '../../../cocos/3d/framework/mesh-renderer'; -import { Vec3, cclegacy } from '../../../cocos/core'; +import { Vec3 } from '../../../cocos/core'; +import { cclegacy } from '@base/global'; const fs = require('fs-extra'); describe('LOD', () => { diff --git a/tests/init.ts b/tests/init.ts index 3fb2cbfee0e..c0d43a203b7 100644 --- a/tests/init.ts +++ b/tests/init.ts @@ -55,6 +55,12 @@ jest.mock( { virtual: true, }, ); +jest.mock( + '@base/global', + () => jest.requireActual('../cocos/base/global/src/index.ts'), + { virtual: true, }, +); + jest.mock( 'pal/pacer', () => jest.requireActual('../pal/pacer/pacer-web'), diff --git a/tests/particle/capacity.test.ts b/tests/particle/capacity.test.ts index f293e0e9bd8..70322797d82 100644 --- a/tests/particle/capacity.test.ts +++ b/tests/particle/capacity.test.ts @@ -1,7 +1,7 @@ -import { director } from "../../cocos/game"; -import { legacyCC } from "../../cocos/core/global-exports"; -import { Node, Scene } from "../../cocos/scene-graph"; -import { ParticleSystem } from "../../exports/particle"; +import { director } from '../../cocos/game'; +import { cclegacy } from '@base/global'; +import { Node, Scene } from '../../cocos/scene-graph'; +import { ParticleSystem } from '../../exports/particle'; test('particle system capacity test', function () { const scene = new Scene('test'); @@ -15,7 +15,7 @@ test('particle system capacity test', function () { particle.capacity = 0; particle.renderer.useGPU = false; - legacyCC.game.step(); + cclegacy.game.step(); // @ts-expect-error expect(!!particle.processor.getModel()._vBuffer).toBe(true); diff --git a/tests/particle/cpu-culling.test.ts b/tests/particle/cpu-culling.test.ts index af7b64e2d15..951a37a7b1f 100644 --- a/tests/particle/cpu-culling.test.ts +++ b/tests/particle/cpu-culling.test.ts @@ -1,7 +1,7 @@ -import { director } from "../../cocos/game"; -import { legacyCC } from "../../cocos/core/global-exports"; -import { ParticleSystem } from "../../exports/particle"; -import { Node, Scene } from "../../cocos/scene-graph"; +import { director } from '../../cocos/game'; +import { cclegacy } from '@base/global'; +import { ParticleSystem } from '../../exports/particle'; +import { Node, Scene } from '../../cocos/scene-graph'; test('particle system cpu culling test', function () { const scene = new Scene('test'); @@ -17,7 +17,7 @@ test('particle system cpu culling test', function () { particle.playOnAwake = true; particle.renderer.useGPU = false; - legacyCC.game.step(); + cclegacy.game.step(); // @ts-expect-error expect(particle.aabbHalfX > 0 && particle.aabbHalfY > 0 && particle.aabbHalfZ > 0).toBeTruthy(); // ensure bounding box size > 0 @@ -27,7 +27,7 @@ test('particle system cpu culling test', function () { particle.renderCulling = false; - legacyCC.game.step(); + cclegacy.game.step(); // @ts-expect-error expect(particle._isSimulating).toBeTruthy(); // close culling, particle should continue simulating diff --git a/tests/particle/gpu-culling.test.ts b/tests/particle/gpu-culling.test.ts index 05750042d2d..37c0cf72399 100644 --- a/tests/particle/gpu-culling.test.ts +++ b/tests/particle/gpu-culling.test.ts @@ -1,7 +1,7 @@ -import { director } from "../../cocos/game"; -import { legacyCC } from "../../cocos/core/global-exports"; -import { ParticleSystem } from "../../exports/particle"; -import { Node, Scene } from "../../cocos/scene-graph"; +import { director } from '../../cocos/game'; +import { cclegacy } from '@base/global'; +import { ParticleSystem } from '../../exports/particle'; +import { Node, Scene } from '../../cocos/scene-graph'; test('particle system gpu culling test', function () { const scene = new Scene('test'); @@ -17,9 +17,8 @@ test('particle system gpu culling test', function () { particle.playOnAwake = true; particle.renderer.useGPU = true; - legacyCC.game.step(); + cclegacy.game.step(); - // @ts-expect-error expect(particle.aabbHalfX > 0 && particle.aabbHalfY > 0 && particle.aabbHalfZ > 0).toBeTruthy(); // ensure bounding box size > 0 // @ts-expect-error @@ -27,7 +26,7 @@ test('particle system gpu culling test', function () { particle.renderCulling = false; - legacyCC.game.step(); + cclegacy.game.step(); // @ts-expect-error expect(particle._isSimulating).toBeTruthy(); // close culling, particle should continue simulating diff --git a/tests/particle/material.test.ts b/tests/particle/material.test.ts index 5c3f43b4481..cb6d125b5f2 100644 --- a/tests/particle/material.test.ts +++ b/tests/particle/material.test.ts @@ -1,7 +1,7 @@ -import { director } from "../../cocos/game"; -import { legacyCC } from "../../cocos/core/global-exports"; -import { ParticleSystem } from "../../exports/particle"; -import { Node, Scene } from "../../cocos/scene-graph"; +import { director } from '../../cocos/game'; +import { cclegacy } from '@base/global'; +import { ParticleSystem } from '../../exports/particle'; +import { Node, Scene } from '../../cocos/scene-graph'; test('particle system material test', function () { const scene = new Scene('test'); @@ -13,5 +13,5 @@ test('particle system material test', function () { const particle = temp0.addComponent(ParticleSystem) as ParticleSystem; expect(particle.sharedMaterials).toBeDefined(); - legacyCC.game.step(); + cclegacy.game.step(); }); \ No newline at end of file diff --git a/tests/utils/random-seed.ts b/tests/utils/random-seed.ts index 4979e2dfb63..ffc0f3b6b2d 100644 --- a/tests/utils/random-seed.ts +++ b/tests/utils/random-seed.ts @@ -1,5 +1,5 @@ import crypto from 'crypto'; -import { VERSION } from '../../exports/base'; +import { VERSION } from '@base/global'; export const getMagicSeed = () => { const text = `${VERSION}: ${expect.getState().currentTestName ?? ''}`;