diff --git a/.github/workflows/typecheck-extension.yml b/.github/workflows/typecheck-extension.yml index ceaa77864..fd64fc6e7 100644 --- 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 index 445a3a0a2..e6b39077b 100644 --- a/packages/vscode-extension/package-lock.json +++ b/packages/vscode-extension/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "react-native-ide", "version": "1.0.0", + "hasInstallScript": true, "license": "https://ide.swmansion.com/legal", "devDependencies": { "@babel/preset-react": "^7.23.3", @@ -91,7 +92,6 @@ "name": "js-debug", "version": "1.96.0", "dev": true, - "hasInstallScript": true, "license": "MIT", "dependencies": { "@c4312/chromehash": "^0.3.1", diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json index fa64ed792..cd0db25eb 100644 --- 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 index 6f3972a88..617cff277 100644 --- 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) { 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 index 1cd20f028..f41f5907f 100644 --- 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 index 9a436b1a3..a5794161f 160000 --- a/packages/vscode-js-debug +++ b/packages/vscode-js-debug @@ -1 +1 @@ -Subproject commit 9a436b1a3060958110959c590eac9d1a8d548922 +Subproject commit a5794161fde3e3b55df4633104d3aba414194aad