A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix(app): an optional subsystem's plugin is built per app, not shared
esengine754bcc39a31e
diff --git a/sdk/src/ai/aiSupport.ts b/sdk/src/ai/aiSupport.tsindex b0e9325c5..0bb220c31 100644--- a/sdk/src/ai/aiSupport.ts+++ b/sdk/src/ai/aiSupport.ts@@ -13,18 +13,18 @@ import { addAssetLoader } from '../asset/optionalLoaders';// From each plugin's own module, not from './index': the barrel calls this at// the end of its own evaluation, and a support module that reads the barrel back// is a cycle whose bindings are not ready when the call lands.-import { navPlugin } from './nav/NavPlugin';-import { fsmPlugin } from './fsm/FsmPlugin';-import { btPlugin } from './bt/BtPlugin';-import { perceptionPlugin } from './perception/PerceptionPlugin';+import { NavPlugin } from './nav/NavPlugin';+import { FsmPlugin } from './fsm/FsmPlugin';+import { BtPlugin } from './bt/BtPlugin';+import { PerceptionPlugin } from './perception/PerceptionPlugin';import { FsmAssetLoader } from '../asset/loaders/FsmAssetLoader';import { BtAssetLoader } from '../asset/loaders/BtAssetLoader';export function registerAiSupport(): void {- addEntryPlugin('ai:nav', () => navPlugin);- addEntryPlugin('ai:fsm', () => fsmPlugin);- addEntryPlugin('ai:bt', () => btPlugin);- addEntryPlugin('ai:perception', () => perceptionPlugin);+ addEntryPlugin('ai:nav', () => new NavPlugin());+ addEntryPlugin('ai:fsm', () => new FsmPlugin());+ addEntryPlugin('ai:bt', () => new BtPlugin());+ addEntryPlugin('ai:perception', () => new PerceptionPlugin());addAssetLoader('fsm', () => new FsmAssetLoader() as never);addAssetLoader('bt', () => new BtAssetLoader() as never);}diff --git a/sdk/src/logic/logicSupport.ts b/sdk/src/logic/logicSupport.tsindex 0bd5adac7..5e2af92e8 100644--- a/sdk/src/logic/logicSupport.ts+++ b/sdk/src/logic/logicSupport.ts@@ -9,10 +9,10 @@*/import { addEntryPlugin } from '../runtime/entryPlugins';import { addAssetLoader } from '../asset/optionalLoaders';-import { scriptGraphPlugin } from './ScriptGraphPlugin';+import { ScriptGraphPlugin } from './ScriptGraphPlugin';import { ScriptGraphAssetLoader } from '../asset/loaders/ScriptGraphAssetLoader';export function registerScriptGraphSupport(): void {- addEntryPlugin('logic', () => scriptGraphPlugin);+ addEntryPlugin('logic', () => new ScriptGraphPlugin());addAssetLoader('scriptGraph', () => new ScriptGraphAssetLoader() as never);}diff --git a/sdk/src/tilemap/tilemapSupport.ts b/sdk/src/tilemap/tilemapSupport.tsindex a5d5175a9..eaf7576de 100644--- a/sdk/src/tilemap/tilemapSupport.ts+++ b/sdk/src/tilemap/tilemapSupport.ts@@ -10,12 +10,12 @@*/import { addEntryPlugin } from '../runtime/entryPlugins';import { addAssetLoader } from '../asset/optionalLoaders';-import { tilemapPlugin } from './tilemapPlugin';+import { TilemapPlugin } from './tilemapPlugin';import { TilemapAssetLoader } from '../asset/loaders/TilemapAssetLoader';import { TilesetAssetLoader } from '../asset/loaders/TilesetAssetLoader';export function registerTilemapSupport(): void {- addEntryPlugin('tilemap', () => tilemapPlugin);+ addEntryPlugin('tilemap', () => new TilemapPlugin());addAssetLoader('tilemap', () => new TilemapAssetLoader() as never);addAssetLoader('tileset', () => new TilesetAssetLoader() as never);}diff --git a/sdk/tests/entry-installs-optionals.test.ts b/sdk/tests/entry-installs-optionals.test.tsindex 367655f7e..2335d0be4 100644--- a/sdk/tests/entry-installs-optionals.test.ts+++ b/sdk/tests/entry-installs-optionals.test.ts@@ -31,8 +31,14 @@ describe('an SDK entry installs the optional subsystems', () => {expect(names).toContain('DragonBonesPlugin');});+ // Every one, not the first one: asking only entryPlugins()[0] proved the+ // property for whichever subsystem registers earliest, and four later ones+ // registered module-level singletons under it without turning this red.it('builds a fresh plugin instance per app, since a plugin carries app state', async () => {const { entryPlugins } = await import('../src/runtime/entryPlugins');- expect(entryPlugins()[0]).not.toBe(entryPlugins()[0]);+ const a = entryPlugins();+ const b = entryPlugins();+ const shared = a.filter((p, i) => p === b[i]).map((p) => p.constructor.name);+ expect(shared).toEqual([]);});});