Skip to content

Commit 3581908

Browse files
TyriarTyriar
authored
Merge branch 'master' into tyriar/term_errors
2 parents 0fff54a + 7cdd76d commit 3581908

207 files changed

Lines changed: 2663 additions & 2064 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/lib/util.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function loadSourcemaps() {
138138
version: '3',
139139
names: [],
140140
mappings: '',
141-
sources: [f.relative.replace(/\//g, '/')],
141+
sources: [f.relative],
142142
sourcesContent: [contents]
143143
};
144144
cb(undefined, f);

extensions/github-authentication/polyfills/vscode-extension-telemetry.js renamed to build/polyfills/vscode-extension-telemetry.js

File renamed without changes.

extensions/css-language-features/polyfills/vscode-nls.js renamed to build/polyfills/vscode-nls.js

File renamed without changes.

‎extensions/configuration-editing/.vscodeignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ src/**
33
tsconfig.json
44
out/**
55
extension.webpack.config.js
6+
extension-browser.webpack.config.js
67
yarn.lock

‎extensions/configuration-editing/extension-browser.webpack.config.js‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
//@ts-check
7+
8+
'use strict';
9+
10+
const withDefaults = require('../shared.webpack.config');
11+
const path = require('path');
12+
13+
const clientConfig = withDefaults({
14+
target: 'webworker',
15+
context: __dirname,
16+
entry: {
17+
extension: './src/configurationEditingMain.ts'
18+
},
19+
output: {
20+
filename: 'configurationEditingMain.js'
21+
},
22+
performance: {
23+
hints: false
24+
},
25+
resolve: {
26+
alias: {
27+
'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
28+
}
29+
}
30+
});
31+
clientConfig.module.rules[0].use.shift(); // remove nls loader
32+
33+
module.exports = clientConfig;

‎extensions/configuration-editing/extension.webpack.config.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ const withDefaults = require('../shared.webpack.config');
1212
module.exports = withDefaults({
1313
context: __dirname,
1414
entry: {
15-
extension: './src/extension.ts',
15+
extension: './src/configurationEditingMain.ts',
16+
},
17+
output: {
18+
filename: 'configurationEditingMain.js'
1619
},
1720
resolve: {
1821
mainFields: ['module', 'main']

‎extensions/configuration-editing/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"onLanguage:json",
1313
"onLanguage:jsonc"
1414
],
15-
"main": "./out/extension",
15+
"main": "./out/configurationEditingMain",
16+
"browser": "./dist/configurationEditingMain",
1617
"scripts": {
1718
"compile": "gulp compile-extension:configuration-editing",
1819
"watch": "gulp watch-extension:configuration-editing"

extensions/configuration-editing/src/extension.ts renamed to extensions/configuration-editing/src/configurationEditingMain.ts

File renamed without changes.

‎extensions/css-language-features/.vscodeignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ server/bin/**
1313
server/build/**
1414
server/yarn.lock
1515
server/.npmignore
16-
polyfills/**
1716
yarn.lock
1817
server/extension.webpack.config.js
1918
extension.webpack.config.js

‎extensions/css-language-features/extension-browser.webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const clientConfig = withDefaults({
2525
},
2626
resolve: {
2727
alias: {
28-
'vscode-nls': path.resolve(__dirname, 'polyfills/vscode-nls.js')
28+
'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
2929
}
3030
}
3131
});

0 commit comments

Comments
 (0)