From 18089721971d69364a6249936669eefc45e2bf66 Mon Sep 17 00:00:00 2001
From: tiddlygit-test <linonetwo012@gmail.com>
Date: Sun, 20 Dec 2020 23:35:49 +0800
Subject: [PATCH] fix: wiki worker.js

---
 src/services/electron.ts                                  | 3 +--
 src/services/libs/wiki/wiki-worker-mamager.ts             | 5 ++++-
 src/services/libs/wiki/{wiki-worker.ts => wiki-worker.js} | 4 ++--
 webpack.plugins.js                                        | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename src/services/libs/wiki/{wiki-worker.ts => wiki-worker.js} (93%)

diff --git a/src/services/electron.ts b/src/services/electron.ts
index 332183d7..3422e232 100755
--- a/src/services/electron.ts
+++ b/src/services/electron.ts
@@ -9,8 +9,7 @@ import { autoUpdater } from 'electron-updater';
 import loadListeners from './listeners';
 
 import * as mainWindow from './windows/main';
-// @ts-expect-error ts-migrate(1192) FIXME: Module '"/Users/linonetwo/Desktop/repo/TiddlyGit-D... Remove this comment to see the full error message
-import openUrlWithWindow from './windows/open-url-with';
+import * as openUrlWithWindow from './windows/open-url-with';
 
 import createMenu from './libs/create-menu';
 import extractHostname from './libs/extract-hostname';
diff --git a/src/services/libs/wiki/wiki-worker-mamager.ts b/src/services/libs/wiki/wiki-worker-mamager.ts
index e2471521..6ff9db2f 100644
--- a/src/services/libs/wiki/wiki-worker-mamager.ts
+++ b/src/services/libs/wiki/wiki-worker-mamager.ts
@@ -25,7 +25,10 @@ const logMessage = (loggerMeta: any) => (message: any) => {
 const wikiWorkers = {};
 // don't forget to config option in `dist.js` https://github.com/electron/electron/issues/18540#issuecomment-652430001
 // to copy all worker.js and its local dependence to `process.resourcesPath`
-const WIKI_WORKER_PATH = isDev ? path.resolve(__dirname, './wiki-worker.js') : path.resolve(process.resourcesPath, 'app.asar.unpacked', 'wiki-worker.js');
+// On dev, this file will be in .webpack/main/index.js ,so:
+const WIKI_WORKER_PATH = isDev
+  ? path.resolve(__dirname, '..', '..', 'src', 'services', 'libs', 'wiki', './wiki-worker.js')
+  : path.resolve(process.resourcesPath, 'app.asar.unpacked', 'wiki-worker.js');
 export function startWiki(homePath: any, tiddlyWikiPort: any, userName: any) {
   return new Promise((resolve, reject) => {
     // require here to prevent circular dependence, which will cause "TypeError: getWorkspaceByName is not a function"
diff --git a/src/services/libs/wiki/wiki-worker.ts b/src/services/libs/wiki/wiki-worker.js
similarity index 93%
rename from src/services/libs/wiki/wiki-worker.ts
rename to src/services/libs/wiki/wiki-worker.js
index 767cbf04..e5767e94 100644
--- a/src/services/libs/wiki/wiki-worker.ts
+++ b/src/services/libs/wiki/wiki-worker.js
@@ -25,11 +25,11 @@ function startNodeJSWiki() {
     parentPort.postMessage(`Tiddlywiki booted failed with error ${error.message} ${error.stack}`);
   }
 }
-export default startNodeJSWiki;
+module.exports = startNodeJSWiki;
 
 if (!isMainThread) {
   startNodeJSWiki();
-  parentPort.once('message', async (message: any) => {
+  parentPort.once('message', async (message) => {
     if (typeof message === 'object' && message.type === 'command' && message.message === 'exit') {
       process.exit(0);
     }
diff --git a/webpack.plugins.js b/webpack.plugins.js
index 379a0988..b1287539 100644
--- a/webpack.plugins.js
+++ b/webpack.plugins.js
@@ -4,7 +4,7 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const CspHtmlWebpackPlugin = require('csp-html-webpack-plugin');
 
 module.exports = [
-  new ForkTsCheckerWebpackPlugin(),
+  // new ForkTsCheckerWebpackPlugin(),
   new webpack.DefinePlugin({
     'process.env': '{}',
     global: {},