Skip to content

Commit 256d205

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/master' into pr/JacksonKearl/52634
2 parents 277d02d + df2ecbf commit 256d205

559 files changed

Lines changed: 15500 additions & 11305 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.

‎.github/calendar.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@
2525
'2018-06-25 18:00, US/Pacific': 'endgame',
2626
'2018-07-05 12:00, US/Pacific': 'development', # 1.25.0 released
2727
'2018-07-30 18:00, US/Pacific': 'endgame',
28-
# '2018-08-08 12:00, US/Pacific': 'development', # 1.26.0 released
28+
'2018-08-13 12:00, US/Pacific': 'development', # 1.26.0 released
29+
'2018-08-27 18:00, US/Pacific': 'endgame',
30+
# '2018-09-05 12:00, US/Pacific': 'development', # 1.27.0 released
2931
}

‎.github/classifier.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
css-less-scss: [ aeschli ],
1616
debug-console: [],
1717
debug: {
18-
assignees: [ weinand ],
18+
assignees: [ isidorn ],
1919
assignLabel: false
2020
},
2121
diff-editor: [],

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ npm-debug.log
33
Thumbs.db
44
node_modules/
55
.build/
6+
extensions/**/dist/
67
out/
78
out-build/
89
out-editor/
@@ -17,4 +18,4 @@ build/node_modules
1718
coverage/
1819
test_data/
1920
test-results/
20-
yarn-error.log
21+
yarn-error.log

‎.vscode/launch.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"protocol": "inspector",
2020
"port": 5870,
2121
"restart": true,
22+
"smartStep": true,
2223
"outFiles": [
2324
"${workspaceFolder}/out/**/*.js"
2425
]
@@ -29,6 +30,7 @@
2930
"name": "Attach to Shared Process",
3031
"protocol": "inspector",
3132
"port": 5871,
33+
"smartStep": true,
3234
"outFiles": [
3335
"${workspaceFolder}/out/**/*.js"
3436
]
@@ -39,6 +41,7 @@
3941
"protocol": "inspector",
4042
"name": "Attach to Search Process",
4143
"port": 5876,
44+
"smartStep": true,
4245
"outFiles": [
4346
"${workspaceFolder}/out/**/*.js"
4447
]
@@ -49,6 +52,7 @@
4952
"name": "Attach to CLI Process",
5053
"protocol": "inspector",
5154
"port": 5874,
55+
"smartStep": true,
5256
"outFiles": [
5357
"${workspaceFolder}/out/**/*.js"
5458
]
@@ -59,6 +63,7 @@
5963
"name": "Attach to Main Process",
6064
"protocol": "inspector",
6165
"port": 5875,
66+
"smartStep": true,
6267
"outFiles": [
6368
"${workspaceFolder}/out/**/*.js"
6469
]
@@ -124,6 +129,7 @@
124129
"type": "chrome",
125130
"request": "attach",
126131
"name": "Attach to VS Code",
132+
"smartStep": true,
127133
"port": 9222
128134
},
129135
{
@@ -143,6 +149,7 @@
143149
"runtimeArgs": [
144150
"--inspect=5875"
145151
],
152+
"smartStep": true,
146153
"skipFiles": [
147154
"**/winjs*.js"
148155
],
@@ -201,7 +208,6 @@
201208
"linux": {
202209
"runtimeExecutable": "${workspaceFolder}/.build/electron/code-oss"
203210
},
204-
"stopOnEntry": false,
205211
"outputCapture": "std",
206212
"args": [
207213
"--delay",

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "2.0.5"
2+
target "2.0.7"
33
runtime "electron"

‎OSSREADME.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"name": "electron",
54-
"version": "2.0.5",
54+
"version": "2.0.7",
5555
"license": "MIT",
5656
"repositoryURL": "https://github.com/electron/electron",
5757
"isProd": true

‎build/builtInExtensions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.27.1",
4+
"version": "1.27.4",
55
"repo": "https://github.com/Microsoft/vscode-node-debug"
66
},
77
{
88
"name": "ms-vscode.node-debug2",
9-
"version": "1.26.8",
9+
"version": "1.27.0",
1010
"repo": "https://github.com/Microsoft/vscode-node-debug2"
1111
}
1212
]

‎build/dependencies.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function asYarnDependency(prefix, tree) {
4343
}
4444

4545
function getYarnProductionDependencies(cwd) {
46-
const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'ignore'] });
46+
const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
4747
const match = /^{"type":"tree".*$/m.exec(raw);
4848

4949
if (!match || match.length !== 1) {

‎build/gulpfile.editor.js‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,25 @@ gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
122122
gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
123123

124124
gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
125-
gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function () {
126-
standalone.createESMSourcesAndResources({
127-
entryPoints: [
128-
'vs/editor/editor.main',
129-
'vs/editor/editor.worker'
130-
],
125+
gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro', 'extract-editor-src'], function () {
126+
standalone.createESMSourcesAndResources2({
127+
srcFolder: './out-editor-src',
131128
outFolder: './out-editor-esm/src',
132129
outResourcesFolder: './out-monaco-editor-core/esm',
133-
redirects: {
134-
'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
135-
'vs/nls': 'vs/nls.mock',
130+
ignores: [
131+
'inlineEntryPoint:0.ts',
132+
'inlineEntryPoint:1.ts',
133+
'vs/loader.js',
134+
'vs/nls.ts',
135+
'vs/nls.build.js',
136+
'vs/nls.d.ts',
137+
'vs/css.js',
138+
'vs/css.build.js',
139+
'vs/css.d.ts',
140+
'vs/base/worker/workerMain.ts',
141+
],
142+
renames: {
143+
'vs/nls.mock.ts': 'vs/nls.ts'
136144
}
137145
});
138146
});

‎build/gulpfile.extensions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ gulp.task('watch-extensions', tasks.map(t => t.watch));
167167

168168
gulp.task('clean-extensions-build', tasks.map(t => t.cleanBuild));
169169
gulp.task('compile-extensions-build', tasks.map(t => t.compileBuild));
170-
gulp.task('watch-extensions-build', tasks.map(t => t.watchBuild));
170+
gulp.task('watch-extensions-build', tasks.map(t => t.watchBuild));

0 commit comments

Comments
 (0)