chore: setup pipeline with vscode-js-debug

software-mansion · Dec 16, 2024 · e131888 · e131888
1 parent c2c0e78
commit e131888
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/typecheck-extension.yml b/.github/workflows/typecheck-extension.yml
@@ -38,10 +38,6 @@ jobs:
           cache: "npm"
           cache-dependency-path: packages/vscode-extension/package-lock.json
 
-      - name: Install submodule node dependencies
-        working-directory: ${{ env.SUBMODULE_DIRECTORY }}
-        run: npm i
-
       - name: Install node dependencies
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: npm i

diff --git a/packages/vscode-extension/package-lock.json b/packages/vscode-extension/package-lock.json
diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -452,7 +452,8 @@
     "typecheck": "tsc --noEmit",
     "format": "prettier --write --list-different src",
     "build:tests": "tsc --project tsconfig.test.json",
-    "test": "npm run build:extension-code && npm run build:webview && npm run build:tests && vscode-test"
+    "test": "npm run build:extension-code && npm run build:webview && npm run build:tests && vscode-test",
+    "preinstall": "cd ../vscode-js-debug && npm install && npx tsc"
   },
   "devDependencies": {
     "vscode-js-debug": "file:../vscode-js-debug",

diff --git a/packages/vscode-extension/src/debugging/DebugAdapter.ts b/packages/vscode-extension/src/debugging/DebugAdapter.ts
@@ -12,16 +12,16 @@ import {
   Source,
   StackFrame,
 } from "@vscode/debugadapter";
-import { DebugProtocol } from "@vscode/debugprotocol";
-import Cdp from "vscode-js-debug/src/cdp/api";
-import { AnyObject } from "vscode-js-debug/src/adapter/objectPreview/betterTypes";
+import { DebugProtocol } from "@vscode/debugprotocol"; 
+import {Cdp} from "vscode-js-debug/out/cdp/index";
+import { AnyObject } from "vscode-js-debug/out/adapter/objectPreview/betterTypes";
 import {
   messageFormatters,
   previewAsObject,
   previewRemoteObject,
-} from "vscode-js-debug/src/adapter/objectPreview";
-import { formatMessage as externalFormatMessage } from "vscode-js-debug/src/adapter/messageFormat";
-import { PreviewContextType } from "vscode-js-debug/src/adapter/objectPreview/contexts";
+} from "vscode-js-debug/out/adapter/objectPreview";
+import { formatMessage } from "vscode-js-debug/out/adapter/messageFormat";
+import { PreviewContextType } from "vscode-js-debug/out/adapter/objectPreview/contexts";
 import { Logger } from "../Logger";
 import {
   inferDAPScopePresentationHintFromCDPType,
@@ -156,8 +156,8 @@ export class DebugAdapter extends DebugSession {
   async formatDefaultString(args: ReadonlyArray<Cdp.Runtime.RemoteObject>) {
     const useMessageFormat = args.length > 1 && args[0].type === "string";
     const formatResult = useMessageFormat
-      ? externalFormatMessage(args[0].value, args.slice(1) as AnyObject[], messageFormatters)
-      : externalFormatMessage("", args as AnyObject[], messageFormatters);
+      ? formatMessage(args[0].value, args.slice(1) as AnyObject[], messageFormatters)
+      : formatMessage("", args as AnyObject[], messageFormatters);
 
     const output = formatResult.result + "\n";
 

diff --git a/packages/vscode-extension/tsconfig.json b/packages/vscode-extension/tsconfig.json
@@ -5,7 +5,7 @@
     "outDir": "out",
     "lib": ["es6", "dom", "ESNext"],
     "sourceMap": true,
-    "rootDirs": ["src", "../vscode-js-debug"],
+    "rootDir": "src",
     "strict": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,

diff --git a/packages/vscode-js-debug b/packages/vscode-js-debug
+0 −4		.husky/pre-commit
+4 −0		CHANGELOG.md
+0 −1		package-lock.json
+0 −3		package.json
+5 −0		src/cdp/index.ts
+1 −10		src/common/logging/fileLogSink.ts
+1 −1		src/common/logging/index.ts
+1 −1		src/targets/browser/vscodeRendererTargetManager.ts
+1 −1		src/targets/node/nodeSourcePathResolver.ts
+21 −0		src/test/node/node-source-path-resolver.test.ts
+3 −1		tsconfig.json