Read launch config from devcontainers (#388)

* Use workspace when getting the launch.json * fix local vsix creation
microsoft · Jul 18, 2024 · 481ccdb · 481ccdb
1 parent 161cd6b
commit 481ccdb
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 82 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/extension/debugger/configuration/launch.json/launchJsonReader.ts b/src/extension/debugger/configuration/launch.json/launchJsonReader.ts
@@ -11,7 +11,7 @@ export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder):
     const filename = path.join(workspace.uri.fsPath, '.vscode', 'launch.json');
     if (!(await fs.pathExists(filename))) {
         // Check launch config in the workspace file
-        const codeWorkspaceConfig = getConfiguration('launch');
+        const codeWorkspaceConfig = getConfiguration('launch', workspace);
         if (!codeWorkspaceConfig.configurations || !Array.isArray(codeWorkspaceConfig.configurations)) {
             return [];
         }

diff --git a/webpack.config.js b/webpack.config.js
@@ -38,6 +38,7 @@ const extensionConfig = {
     '@opentelemetry/instrumentation': 'commonjs @opentelemetry/instrumentation', // ignored because we don't ship instrumentation
     '@azure/opentelemetry-instrumentation-azure-sdk': 'commonjs @azure/opentelemetry-instrumentation-azure-sdk', // ignored because we don't ship instrumentation
     '@azure/functions-core': '@azure/functions-core', // ignored because we don't ship instrumentation
+    '@microsoft/dynamicproto-js': '@microsoft/dynamicproto-js', // ignored because we don't ship instrumentation
   },
   resolve: {
     // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader