update: template

windingwind · Dec 14, 2023 · 1e9236d · 1e9236d
1 parent 452f6f0
commit 1e9236d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/scripts/server.mjs b/scripts/server.mjs
@@ -68,10 +68,7 @@ async function main() {
   await build();
 
   // start Zotero
-  startZotero();
-  setTimeout(() => {
-    openDevTool();
-  }, 2000);
+  startZotero(openDevTool);
 
   // watch
   await watch();

diff --git a/scripts/start.mjs b/scripts/start.mjs
@@ -10,6 +10,9 @@ import { exit } from "process";
 const { addonID } = details.config;
 const { zoteroBinPath, profilePath, dataDir } = cmd.exec;
 
+// Keep in sync with the addon's onStartup
+const loadDevToolWhen = `Plugin ${addonID} startup`;
+
 const logPath = "logs";
 const logFilePath = path.join(logPath, "zotero.log");
 
@@ -68,7 +71,9 @@ function prepareLog() {
   writeFileSync(logFilePath, "");
 }
 
-export function main() {
+export function main(callback) {
+  let isZoteroReady = false;
+
   prepareDevEnv();
 
   prepareLog();
@@ -81,6 +86,10 @@ export function main() {
   ]);
 
   zoteroProcess.stdout.on("data", (data) => {
+    if (!isZoteroReady && data.toString().includes(loadDevToolWhen)) {
+      isZoteroReady = true;
+      callback();
+    }
     writeFileSync(logFilePath, data, {
       flag: "a",
     });

diff --git a/scripts/zotero-cmd-default.json → scripts/zotero-cmd-template.json b/scripts/zotero-cmd-default.json → scripts/zotero-cmd-template.json
diff --git a/src/hooks.ts b/src/hooks.ts
@@ -19,6 +19,14 @@ async function onStartup() {
     Zotero.unlockPromise,
     Zotero.uiReadyPromise,
   ]);
+
+  // TODO: Remove this after zotero#3387 is merged
+  if (__env__ === "development") {
+    // Keep in sync with the scripts/startup.mjs
+    const loadDevToolWhen = `Plugin ${config.addonID} startup`;
+    ztoolkit.log(loadDevToolWhen);
+  }
+
   initLocale();
 
   initActions();