From e55ece3736c46bc256773023976b72c29cebcaf0 Mon Sep 17 00:00:00 2001 From: tiddlygit-test Date: Fri, 10 Dec 2021 00:27:44 +0800 Subject: [PATCH] Revert "feat: use official tiddlywiki" This reverts commit cbb22661638ab240ebbb339e4c678ba4440d0c8a. --- package-lock.json | 34 ++++++++++++++++----------------- package.json | 2 +- src/services/wiki/wikiWorker.ts | 2 +- src/type.d.ts | 6 ------ 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index faf68afa..022a62d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.6.5-a1", "license": "MPL 2.0", "dependencies": { + "@tiddlygit/tiddlywiki": "5.2.1-prerelease-2021-10-17", "app-path": "^3.3.0", "best-effort-json-parser": "0.1.1", "bluebird": "3.7.2", @@ -42,7 +43,6 @@ "semver": "7.3.5", "source-map-support": "0.5.20", "threads": "1.7.0", - "tiddlywiki": "5.2.1", "type-fest": "2.5.1", "uuid": "8.3.2", "winston": "3.3.3", @@ -3883,6 +3883,17 @@ "node": ">=6" } }, + "node_modules/@tiddlygit/tiddlywiki": { + "version": "5.2.1-prerelease-2021-10-17", + "resolved": "https://registry.npmmirror.com/@tiddlygit/tiddlywiki/download/@tiddlygit/tiddlywiki-5.2.1-prerelease-2021-10-17.tgz", + "integrity": "sha512-tJQPTVqtpMFhDmQ/vTAn0kxBepgJS3eY34MF8O/mkaScZhAYilZd/ypoBuVmfAsKa9lxV3NwfQNb+wP0SAOFdw== sha1-/txovvcAek36R7EYGnPew/uIUiU=", + "bin": { + "tiddlywiki": "tiddlywiki.js" + }, + "engines": { + "node": ">=0.8.2" + } + }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/@tootallnate/once/download/@tootallnate/once-1.1.2.tgz?cache=0&sync_timestamp=1632734110536&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40tootallnate%2Fonce%2Fdownload%2F%40tootallnate%2Fonce-1.1.2.tgz", @@ -20232,17 +20243,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30=", "dev": true }, - "node_modules/tiddlywiki": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.1.tgz", - "integrity": "sha512-cfZX8G4/ymQzBmPcI8UWJ317eDrLf4INto99m7M8Nkbx5BMA3+Uapht7OPNaXZRR4RqvVJ7N1Ie1xYMWtvjnpw==", - "bin": { - "tiddlywiki": "tiddlywiki.js" - }, - "engines": { - "node": ">=0.8.2" - } - }, "node_modules/timm": { "version": "1.7.1", "resolved": "https://registry.npm.taobao.org/timm/download/timm-1.7.1.tgz", @@ -25850,6 +25850,11 @@ "defer-to-connect": "^1.0.1" } }, + "@tiddlygit/tiddlywiki": { + "version": "5.2.1-prerelease-2021-10-17", + "resolved": "https://registry.npmmirror.com/@tiddlygit/tiddlywiki/download/@tiddlygit/tiddlywiki-5.2.1-prerelease-2021-10-17.tgz", + "integrity": "sha512-tJQPTVqtpMFhDmQ/vTAn0kxBepgJS3eY34MF8O/mkaScZhAYilZd/ypoBuVmfAsKa9lxV3NwfQNb+wP0SAOFdw== sha1-/txovvcAek36R7EYGnPew/uIUiU=" + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/@tootallnate/once/download/@tootallnate/once-1.1.2.tgz?cache=0&sync_timestamp=1632734110536&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40tootallnate%2Fonce%2Fdownload%2F%40tootallnate%2Fonce-1.1.2.tgz", @@ -38733,11 +38738,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30=", "dev": true }, - "tiddlywiki": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.1.tgz", - "integrity": "sha512-cfZX8G4/ymQzBmPcI8UWJ317eDrLf4INto99m7M8Nkbx5BMA3+Uapht7OPNaXZRR4RqvVJ7N1Ie1xYMWtvjnpw==" - }, "timm": { "version": "1.7.1", "resolved": "https://registry.npm.taobao.org/timm/download/timm-1.7.1.tgz", diff --git a/package.json b/package.json index dc209466..8151ecc3 100755 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "author": "Lin Onetwo , Quang Lam ", "main": ".webpack/main", "dependencies": { - "tiddlywiki": "5.2.1", + "@tiddlygit/tiddlywiki": "5.2.1-prerelease-2021-10-17", "app-path": "^3.3.0", "best-effort-json-parser": "0.1.1", "bluebird": "3.7.2", diff --git a/src/services/wiki/wikiWorker.ts b/src/services/wiki/wikiWorker.ts index 95bb4cfb..d95114b8 100644 --- a/src/services/wiki/wikiWorker.ts +++ b/src/services/wiki/wikiWorker.ts @@ -1,7 +1,7 @@ import 'source-map-support/register'; import { expose } from 'threads/worker'; import path from 'path'; -import tiddlywiki from 'tiddlywiki'; +import tiddlywiki from '@tiddlygit/tiddlywiki'; import { Observable } from 'rxjs'; import intercept from 'intercept-stdout'; diff --git a/src/type.d.ts b/src/type.d.ts index 0b08cf42..6bf241fa 100644 --- a/src/type.d.ts +++ b/src/type.d.ts @@ -9,12 +9,6 @@ declare module '@tiddlygit/tiddlywiki' { } export function TiddlyWiki(): I$TW; } -declare module 'tiddlywiki' { - export interface I$TW { - boot: { argv: string[]; startup: (options: { callback: () => unknown }) => void }; - } - export function TiddlyWiki(): I$TW; -} declare module 'threads-plugin' { const value: any;