feat: add export of "editor" in index.ts so scripts and plugins can i…

…mport the current instance of the editor
BabylonJS · julien-moreau · Apr 22, 2023 · Feb 7, 2023 · Mar 1, 2023 · Mar 1, 2023
commit ab11ffcb7418acc867134ad3e91031d468c86e3d
diff --git a/script/electron.js b/script/electron.js
@@ -44,6 +44,9 @@ const build = ({ x64, arm64 } = options) => {
                 "assets/scripts/**",
                 "assets/graphs/**",
                 "assets/extras/**",
+
+                "module/index.d.ts",
+                "module/package.json",
             ],
             files: [
                 "src/**",

diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,5 @@
+import { Editor } from "./renderer/editor/editor";
+
 // Plugins
 export { IPluginAssets } from "./renderer/editor/plugins/assets";
 export { IPluginToolbar } from "./renderer/editor/plugins/toolbar";
@@ -67,3 +69,5 @@ export { SceneImporterTools, ISceneImporterToolsConfiguration } from "./renderer
 
 // Packer
 export { Packer, IPackerOptions, PackerStatus } from "./renderer/editor/project/packer/packer";
+
+export let editor: Editor | null = null;
diff --git a/src/preloaders/editor.ts b/src/preloaders/editor.ts
@@ -32,6 +32,9 @@ function runEditor(): void {
         if (!(window as any).editor) {
             (window as any).editor = new Editor.default();
         }
+
+        const editorExports = require('../index.js');
+        editorExports.editor = (window as any).editor;
     });
 }
 

diff --git a/src/renderer/editor/editor.tsx b/src/renderer/editor/editor.tsx
@@ -1,6 +1,6 @@
 import { dirname, join } from "path";
-import { pathExists, readJSON } from "fs-extra";
 import { ipcRenderer, shell, webFrame } from "electron";
+import { copyFile, mkdir, pathExists, readJSON } from "fs-extra";
 
 import { IPCRequests, IPCResponses } from "../../shared/ipc";
 import { IStringDictionary, Nullable, Undefinable } from "../../shared/types";
@@ -735,21 +735,21 @@ export class Editor {
 
         if (!workspace.customWebServer) {
             const task = this.addTaskFeedback(0, "Running Server");
-    
+
             const httpsConfig = https ? workspace.https : undefined;
             const serverResult = await IPCTools.CallWithPromise<{ ips?: string[]; error?: string }>(IPCRequests.StartGameServer, WorkSpace.DirPath!, workspace.serverPort, httpsConfig);
-    
+
             this.updateTaskFeedback(task, 100);
             this.closeTaskFeedback(task, 500);
-    
+
             if (serverResult?.error) {
                 return this.notifyMessage(`Failed to run server: ${serverResult.error}`, 3000, null, "danger");
             }
-    
+
             const protocol = https ? "https" : "http";
-    
+
             this.console.logSection("Running Game Server");
-    
+
             if (serverResult.ips) {
                 this.console.logCustom(
                     <>
@@ -995,7 +995,7 @@ export class Editor {
             }
 
             let forceInstall = false;
-            
+
             const editorVersion = this._packageJson.dependencies["@babylonjs/core"];
             const matchesVersions = await WorkSpace.MatchesEditorBabylonJSMajorVersion(editorVersion);
             if (!matchesVersions) {
@@ -1022,6 +1022,23 @@ export class Editor {
                 await WorkSpace.InstallAndBuild(this);
             }
 
+            // Copy node_modules
+            try {
+                const nodeModulesOutput = join(WorkSpace.DirPath!, "node_modules/babylonjs-editor");
+
+                if (!await pathExists(nodeModulesOutput)) {
+                    await mkdir(nodeModulesOutput);
+                }
+
+                await copyFile(join(AppTools.GetAppPath(), "module/index.d.ts"), join(nodeModulesOutput, "index.d.ts"));
+                await copyFile(join(AppTools.GetAppPath(), "module/package.json"), join(nodeModulesOutput, "package.json"));
+            } catch (e) {
+                this.console.logError(`Failed to generate "babylonjs-editor" package in node_modules`);
+                if (e.message) {
+                    this.console.logError(e.message);
+                }
+            }
+
             // Watch typescript project.
             await WorkSpace.WatchTypeScript(this);
 
@@ -1469,7 +1486,7 @@ export class Editor {
                 } catch (e) {
                     exports = require(p.path);
                 }
-                
+
                 const plugin = exports.registerEditorPlugin(this, {
                     pluginAbsolutePath: fromWorkspace ? join(WorkSpace.DirPath!, "node_modules", p.path) : p.path,
                 } as IPluginConfiguration) as IPlugin;