chore: migrate submodule cactbot to download from npm (#455)

MaikoTan · Jun 3, 2024 · 95cec03 · 95cec03
1 parent 2eb0e89
commit 95cec03
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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"