Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,11 @@
"type": "node",
"request": "launch",
"name": "Attach Web Test",
"program": "${workspaceFolder}/node_modules/vscode-test-web/out/index.js",
"program": "${workspaceFolder}/node_modules/@vscode/test-web/out/server/index.js",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to upgrade packages in #7305 but I forgot to update the the launch.json

"args": [
"--extensionTestsPath=dist/browser/test/index.js",
"--extensionDevelopmentPath=.",
"--browserType=chromium",
"--attach=9229"
],
"cascadeTerminateToConfigurations": [
"Launch Web Test"
Expand Down
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3975,13 +3975,13 @@
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "6.10.0",
"@typescript-eslint/parser": "6.10.0",
"@vscode/test-electron": "^2.3.8",
"@vscode/test-web": "^0.0.29",
"@vscode/test-electron": "^2.5.2",
"@vscode/test-web": "^0.0.71",
"assert": "^2.0.0",
"buffer": "^6.0.3",
"constants-browserify": "^1.0.0",
"crypto-browserify": "3.12.0",
"css-loader": "5.1.3",
"css-loader": "7.1.2",
"esbuild-loader": "4.2.2",
"eslint": "7.22.0",
"eslint-cli": "1.1.1",
Expand All @@ -4007,17 +4007,16 @@
"p-all": "^1.0.0",
"path-browserify": "1.0.1",
"process": "^0.11.10",
"raw-loader": "4.0.2",
"react-testing-library": "7.0.1",
"sinon": "9.0.0",
"source-map-support": "0.5.19",
"stream-browserify": "^3.0.0",
"style-loader": "2.0.0",
"style-loader": "4.0.0",
"svg-inline-loader": "^0.8.2",
"temp": "0.9.4",
"terser-webpack-plugin": "5.1.1",
"timers-browserify": "^2.0.12",
"ts-loader": "8.0.18",
"ts-loader": "9.5.2",
"tty": "1.0.1",
"typescript": "4.5.5",
"typescript-formatter": "^7.2.2",
Expand Down
12 changes: 5 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ async function getExtensionConfig(target, mode, env) {
typescript: {
configFile: path.join(__dirname, target === 'webworker' ? 'tsconfig.browser.json' : 'tsconfig.json'),
},
})
}),
new webpack.ContextReplacementPlugin(/mocha/, /^$/)
];

if (target === 'webworker') {
Expand Down Expand Up @@ -294,11 +295,7 @@ async function getExtensionConfig(target, mode, env) {
exclude: /node_modules/,
test: /\.(graphql|gql)$/,
loader: 'graphql-tag/loader',
},
// {
// test: /webview-*\.js/,
// use: 'raw-loader'
// },
}
],
},
resolve: {
Expand Down Expand Up @@ -352,6 +349,7 @@ async function getExtensionConfig(target, mode, env) {
'@opentelemetry/instrumentation': '@opentelemetry/instrumentation',
'@azure/opentelemetry-instrumentation-azure-sdk': '@azure/opentelemetry-instrumentation-azure-sdk',
'fs': 'fs',
'mocha': 'commonjs mocha',
},
plugins: plugins,
stats: {
Expand All @@ -362,7 +360,7 @@ async function getExtensionConfig(target, mode, env) {
errorsCount: true,
warningsCount: true,
timings: true,
},
}
};
}

Expand Down
Loading