From 95cec03e8c6e1e2719d4cfdf6a6f55f71e8fad86 Mon Sep 17 00:00:00 2001
From: Maiko Sinkyaet Tan <maiko.tan.coding@gmail.com>
Date: Mon, 3 Jun 2024 11:32:52 +0800
Subject: [PATCH] chore: migrate submodule cactbot to download from npm (#455)

---
 .gitmodules               | 4 ----
 3rdparty/cactbot          | 1 -
 package.json              | 1 +
 src/timeline/translate.ts | 3 +--
 tsconfig.json             | 6 ++----
 yarn.lock                 | 5 +++++
 6 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 160000 3rdparty/cactbot

diff --git a/.gitmodules b/.gitmodules
index ca77de7..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "3rdparty/cactbot"]
-	path = 3rdparty/cactbot
-	url = https://github.com/OverlayPlugin/cactbot.git
-	shallow = true
diff --git a/3rdparty/cactbot b/3rdparty/cactbot
deleted file mode 160000
index f62736e..0000000
--- a/3rdparty/cactbot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f62736e549315b12f12d2718e81a7c8aa40578e1
diff --git a/package.json b/package.json
index 3f9e44a..ffccd94 100644
--- a/package.json
+++ b/package.json
@@ -177,6 +177,7 @@
     "vsce": "^2.15.0"
   },
   "dependencies": {
+    "cactbot": "^0.31.5",
     "typescript": "^5.4.2"
   },
   "prettier": {
diff --git a/src/timeline/translate.ts b/src/timeline/translate.ts
index f745be8..ba91eae 100644
--- a/src/timeline/translate.ts
+++ b/src/timeline/translate.ts
@@ -1,11 +1,10 @@
 /* eslint-disable import/no-named-as-default-member */
 import { access, constants, readFile } from 'fs/promises'
 
+import { commonReplacement } from 'cactbot/ui/raidboss/common_replacement'
 import ts from 'typescript'
 import { EventEmitter, l10n, languages, TextDocumentContentProvider, Uri, window, workspace } from 'vscode'
 
-import { commonReplacement } from 'cactbot/ui/raidboss/common_replacement'
-
 import { output } from '../utils'
 
 import type { Lang } from 'cactbot/resources/languages'
diff --git a/tsconfig.json b/tsconfig.json
index 8f964c5..8f0e328 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,10 +15,8 @@
     // "noUnusedParameters": true,  /* Report errors on unused parameters. */
     "allowJs": true,
     "esModuleInterop": true,
-    "paths": {
-      "cactbot/*": ["./3rdparty/cactbot/*"]
-    }
+    "skipLibCheck": true,
   },
-  "include": ["src", "./node_modules/vscode/vscode.d.ts", "./node_modules/vscode/lib/*"],
+  "include": ["src"],
   "exclude": ["node_modules", ".vscode-test"]
 }
diff --git a/yarn.lock b/yarn.lock
index 99784d6..f072b74 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1069,6 +1069,11 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
+cactbot@^0.31.5:
+  version "0.31.5"
+  resolved "https://registry.yarnpkg.com/cactbot/-/cactbot-0.31.5.tgz#00e94bf8a1f4aee86a696e70ef0848acd0ac24d2"
+  integrity sha512-MXGDbWtEAfP6r4vNJKCZ5UxPXcpl6MbbpAMPJ25Vs8uSok7BTcG40fOMxTL5jPwwc9Uno5K6YxYzuTbzFLRgOg==
+
 call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"