Skip to content

Commit bcb31b9

Browse files
disable nls on the web for now (microsoft#157665)
1 parent 41d9c49 commit bcb31b9

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

extensions/shared.webpack.config.js

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,27 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi
112112
rules: [{
113113
test: /\.ts$/,
114114
exclude: /node_modules/,
115-
use: [{
116-
// vscode-nls-dev loader:
117-
// * rewrite nls-calls
118-
loader: 'vscode-nls-dev/lib/webpack-loader',
119-
options: {
120-
base: path.join(extConfig.context, 'src')
121-
}
122-
}, {
123-
// configure TypeScript loader:
124-
// * enable sources maps for end-to-end source maps
125-
loader: 'ts-loader',
126-
options: {
127-
compilerOptions: {
128-
'sourceMap': true,
129-
},
130-
...(additionalOptions ? {} : { configFile: additionalOptions.configFile })
131-
}
132-
}]
115+
use: [
116+
// TODO: bring this back once vscode-nls-dev supports browser
117+
// {
118+
// // vscode-nls-dev loader:
119+
// // * rewrite nls-calls
120+
// loader: 'vscode-nls-dev/lib/webpack-loader',
121+
// options: {
122+
// base: path.join(extConfig.context, 'src')
123+
// }
124+
// },
125+
{
126+
// configure TypeScript loader:
127+
// * enable sources maps for end-to-end source maps
128+
loader: 'ts-loader',
129+
options: {
130+
compilerOptions: {
131+
'sourceMap': true,
132+
},
133+
...(additionalOptions ? {} : { configFile: additionalOptions.configFile })
134+
}
135+
}]
133136
}]
134137
},
135138
externals: {
@@ -162,10 +165,10 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi
162165
*/
163166
function browserPlugins(context) {
164167
// Need to find the top-most `package.json` file
165-
const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0];
166-
const pkgPath = path.join(__dirname, folderName, 'package.json');
167-
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
168-
const id = `${pkg.publisher}.${pkg.name}`;
168+
// const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0];
169+
// const pkgPath = path.join(__dirname, folderName, 'package.json');
170+
// const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
171+
// const id = `${pkg.publisher}.${pkg.name}`;
169172
return [
170173
new optimize.LimitChunkCountPlugin({
171174
maxChunks: 1
@@ -180,7 +183,8 @@ function browserPlugins(context) {
180183
'process.env': JSON.stringify({}),
181184
'process.env.BROWSER_ENV': JSON.stringify('true')
182185
}),
183-
new NLSBundlePlugin(id)
186+
// TODO: bring this back once vscode-nls-dev supports browser
187+
// new NLSBundlePlugin(id)
184188
];
185189
}
186190

0 commit comments

Comments
 (0)