From bcb31b9cfb2261ddbabfb73defed9ae78680b9b2 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Tue, 9 Aug 2022 09:30:23 -0700 Subject: [PATCH] disable nls on the web for now (#157665) --- extensions/shared.webpack.config.js | 50 ++++++++++++++++------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js index 59689e5b16b..a8f24c1a572 100644 --- a/extensions/shared.webpack.config.js +++ b/extensions/shared.webpack.config.js @@ -112,24 +112,27 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi rules: [{ test: /\.ts$/, exclude: /node_modules/, - use: [{ - // vscode-nls-dev loader: - // * rewrite nls-calls - loader: 'vscode-nls-dev/lib/webpack-loader', - options: { - base: path.join(extConfig.context, 'src') - } - }, { - // configure TypeScript loader: - // * enable sources maps for end-to-end source maps - loader: 'ts-loader', - options: { - compilerOptions: { - 'sourceMap': true, - }, - ...(additionalOptions ? {} : { configFile: additionalOptions.configFile }) - } - }] + use: [ + // TODO: bring this back once vscode-nls-dev supports browser + // { + // // vscode-nls-dev loader: + // // * rewrite nls-calls + // loader: 'vscode-nls-dev/lib/webpack-loader', + // options: { + // base: path.join(extConfig.context, 'src') + // } + // }, + { + // configure TypeScript loader: + // * enable sources maps for end-to-end source maps + loader: 'ts-loader', + options: { + compilerOptions: { + 'sourceMap': true, + }, + ...(additionalOptions ? {} : { configFile: additionalOptions.configFile }) + } + }] }] }, externals: { @@ -162,10 +165,10 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi */ function browserPlugins(context) { // Need to find the top-most `package.json` file - const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0]; - const pkgPath = path.join(__dirname, folderName, 'package.json'); - const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')); - const id = `${pkg.publisher}.${pkg.name}`; + // const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0]; + // const pkgPath = path.join(__dirname, folderName, 'package.json'); + // const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')); + // const id = `${pkg.publisher}.${pkg.name}`; return [ new optimize.LimitChunkCountPlugin({ maxChunks: 1 @@ -180,7 +183,8 @@ function browserPlugins(context) { 'process.env': JSON.stringify({}), 'process.env.BROWSER_ENV': JSON.stringify('true') }), - new NLSBundlePlugin(id) + // TODO: bring this back once vscode-nls-dev supports browser + // new NLSBundlePlugin(id) ]; }