修复 shader-graph 插件 run build 失败的问题 (#6)

cocos · Dec 11, 2023 · bb07575 · bb07575
1 parent 500d7a7
commit bb07575
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/extensions/shader-graph/src/contributions/assets-menu.ts b/extensions/shader-graph/src/contributions/assets-menu.ts
@@ -1,4 +1,4 @@
-import { MenuAssetInfo } from '@editor/library-type/packages/package-asset/@types/public';
+import { MenuAssetInfo } from '@cocos/creator-types/editor/packages/package-asset/@types/public';
 import { PACKAGE_NAME, DEFAULT_ASSET_NAME, GraphDataMgr, getName } from '../shader-graph';
 
 function getMenu(assetInfo: MenuAssetInfo) {

diff --git a/extensions/shader-graph/src/importer/shader-graph-handler.ts b/extensions/shader-graph/src/importer/shader-graph-handler.ts
@@ -1,13 +1,10 @@
-import { gte } from 'semver';
-import { basename, extname } from 'path';
 import { writeFileSync } from 'fs-extra';
-import { AssetHandler, CreateAssetOptions } from '@editor/library-type/packages/asset-db/@types/protected';
 import { Asset } from '@editor/asset-db';
 
 import shaderGraph from './shader-graph';
 import { PACKAGE_NAME, GraphDataMgr, getName } from '../shader-graph';
 
-const ShaderGraphHandler: AssetHandler = {
+const ShaderGraphHandler = {
 
     name: shaderGraph.name,
 
@@ -44,7 +41,7 @@ const ShaderGraphHandler: AssetHandler = {
                 },
             ];
         },
-        async create(options: CreateAssetOptions): Promise<string | null> {
+        async create(options: { target: string, template: string }): Promise<string | null> {
             try {
                 let shaderGraph = '';
                 const name = getName(options.target);
@@ -64,7 +61,7 @@ const ShaderGraphHandler: AssetHandler = {
         },
     },
 
-    async open(asset): Promise<boolean> {
+    async open(asset: Asset): Promise<boolean> {
         Editor.Message.send('shader-graph', 'open', asset.uuid);
         return true;
     },

diff --git a/extensions/shader-graph/src/importer/utils-3.8.ts b/extensions/shader-graph/src/importer/utils-3.8.ts
@@ -1,6 +1,5 @@
 import { basename, extname, resolve } from 'path';
-import { AssetDB, forEach } from '@editor/asset-db';
-import { IAsset } from '@editor/library-type/packages/asset-db/@types/protected/asset';
+import { AssetDB, forEach, Asset } from '@editor/asset-db';
 
 // @ts-ignore
 import { CCON } from 'cc/editor/serialization';
@@ -26,7 +25,7 @@ async function loadTexture(assetId: string): Promise<any | null> {
  * @param asset 资源数据
  * @param code
  */
-export async function generateEffectAsset(asset: IAsset, code: string){
+export async function generateEffectAsset(asset: Asset, code: string){
     const name = basename(asset.source, extname(asset.source));
 
     const effect = await buildEffect(name, code);

diff --git a/...ions/shader-graph/src/panels/shader-graph/components/float-window/graph-property/index.ts b/...ions/shader-graph/src/panels/shader-graph/components/float-window/graph-property/index.ts
@@ -1,6 +1,6 @@
 import { merge, debounce } from 'lodash';
 
-import type { IProperty } from '@editor/library-type/packages/scene/@types/public';
+import type { IProperty } from '@cocos/creator-types/editor/packages/scene/@types/public';
 import type { PropertyDefine } from '../../../../../../@types/shader-node-type';
 
 import { FloatWindowConfig, FloatWindowDragTarget } from '../internal';

diff --git a/extensions/shader-graph/src/panels/shader-graph/index.ts b/extensions/shader-graph/src/panels/shader-graph/index.ts
@@ -15,7 +15,7 @@ import {
     GraphConfigMgr,
     PANEL_NAME,
 } from '../../shader-graph';
-import { AssetInfo } from '@editor/library-type/packages/asset-db/@types/public';
+import { AssetInfo } from '@cocos/creator-types/editor/packages/asset-db/@types/public';
 import { MaskType, declareGraphBlock } from '../../shader-graph';
 
 let vm: any = null;

diff --git a/extensions/shader-graph/src/shader-graph/base/graph-asset-mgr.ts b/extensions/shader-graph/src/shader-graph/base/graph-asset-mgr.ts
@@ -1,7 +1,7 @@
 import { join } from 'path';
 import { existsSync, readFileSync } from 'fs-extra';
 
-import type { AssetInfo } from '@editor/library-type/packages/asset-db/@types/public';
+import type { AssetInfo } from '@cocos/creator-types/editor/packages/asset-db/@types/public';
 
 import { MaskType } from './internal';
 

diff --git a/extensions/shader-graph/src/shader-graph/base/graph-data-mgr.ts b/extensions/shader-graph/src/shader-graph/base/graph-data-mgr.ts
@@ -9,7 +9,7 @@ import { getBlockDataByType, getBlockTemplateByType } from '../declare';
 import { generateUUID, HTMLGraphForgeElement } from '../../block-forge';
 
 import { BaseMgr, MessageMgr, MessageType, MaskMgr, GraphConfigMgr, IGraphConfig } from './index';
-import { AssetInfo } from '@editor/library-type/packages/asset-db/@types/public';
+import { AssetInfo } from '@cocos/creator-types/editor/packages/asset-db/@types/public';
 import { getName } from '../utils';
 
 /**