Skip to content

Commit 3f09008

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/main' into alexd/editor-drag-scrolling
2 parents dfc8776 + 9db57e7 commit 3f09008

File tree

136 files changed

+1500
-895
lines changed

Some content is hidden

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

136 files changed

+1500
-895
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
7070
7171
- name: Compile and Download
72-
run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
72+
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
7373

7474
- name: Compile Integration Tests
7575
run: yarn --cwd test/integration/browser compile
@@ -145,7 +145,7 @@ jobs:
145145
run: yarn --frozen-lockfile --network-timeout 180000
146146

147147
- name: Compile and Download
148-
run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
148+
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
149149

150150
- name: Compile Integration Tests
151151
run: yarn --cwd test/integration/browser compile
@@ -216,7 +216,7 @@ jobs:
216216
run: yarn --frozen-lockfile --network-timeout 180000
217217

218218
- name: Compile and Download
219-
run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
219+
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
220220

221221
- name: Compile Integration Tests
222222
run: yarn --cwd test/integration/browser compile
@@ -289,7 +289,7 @@ jobs:
289289
run: yarn --frozen-lockfile --network-timeout 180000
290290

291291
- name: Download Playwright
292-
run: DEBUG=pw:install yarn playwright-install
292+
run: yarn playwright-install
293293

294294
- name: Run Hygiene Checks
295295
run: yarn gulp hygiene

‎.github/workflows/monaco-editor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: yarn --frozen-lockfile --network-timeout 180000
5454

5555
- name: Download Playwright
56-
run: DEBUG=pw:install yarn playwright-install
56+
run: yarn playwright-install
5757

5858
- name: Run Monaco Editor Checks
5959
run: yarn monaco-compile-check

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"name": "Attach to Shared Process",
3030
"timeout": 30000,
3131
"port": 9222,
32-
"urlFilter": "*sharedProcess.html*",
32+
"urlFilter": "*sharedProcess*.html*",
3333
"presentation": {
3434
"hidden": true
3535
}
@@ -236,7 +236,7 @@
236236
"VSCODE_SKIP_PRELAUNCH": "1"
237237
},
238238
"cleanUp": "wholeBrowser",
239-
"urlFilter": "*workbench.html*",
239+
"urlFilter": "*workbench*.html*",
240240
"runtimeArgs": [
241241
"--inspect-brk=5875",
242242
"--no-cached-data",

‎build/azure-pipelines/common/installPlaywright.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* Copyright (c) Microsoft Corporation. All rights reserved.
44
* Licensed under the MIT License. See License.txt in the project root for license information.
55
*--------------------------------------------------------------------------------------------*/
6-
Object.defineProperty(exports, "__esModule", { value: true });
7-
const retry_1 = require("./retry");
6+
process.env.DEBUG = 'pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394)
87
const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server');
98
async function install() {
10-
await (0, retry_1.retry)(() => installDefaultBrowsersForNpmInstall());
9+
await installDefaultBrowsersForNpmInstall();
1110
}
1211
install();

‎build/azure-pipelines/common/installPlaywright.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { retry } from './retry';
6+
process.env.DEBUG='pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394)
7+
78
const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server');
89

910
async function install() {
10-
await retry(() => installDefaultBrowsersForNpmInstall());
11+
await installDefaultBrowsersForNpmInstall();
1112
}
1213

1314
install();

‎build/azure-pipelines/darwin/product-build-darwin-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ steps:
1212
- script: |
1313
set -e
1414
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
15-
DEBUG=pw:install yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
16-
timeoutInMinutes: 5
17-
retryCountOnTaskFailure: 3
15+
yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
1816
displayName: Download Electron and Playwright
1917
2018
- ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:

‎build/azure-pipelines/linux/product-build-linux-client-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ steps:
1212
- script: |
1313
set -e
1414
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
15-
DEBUG=pw:install yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
16-
timeoutInMinutes: 5
17-
retryCountOnTaskFailure: 3
15+
yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
1816
displayName: Download Electron and Playwright
1917
2018
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:

‎build/azure-pipelines/win32/product-build-win32-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ steps:
1313
. build/azure-pipelines/win32/exec.ps1
1414
$ErrorActionPreference = "Stop"
1515
$env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
16-
exec { $env:DEBUG = "pw:install"; yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" }
17-
timeoutInMinutes: 5
18-
retryCountOnTaskFailure: 3
16+
exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" }
1917
displayName: Download Electron and Playwright
2018
2119
- ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:

‎build/gulpfile.compile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ const gulp = require('gulp');
99
const util = require('./lib/util');
1010
const task = require('./lib/task');
1111
const compilation = require('./lib/compilation');
12+
const optimize = require('./lib/optimize');
1213

1314
// Full compile, including nls and inline sources in sourcemaps, for build
1415
const compileBuildTask = task.define('compile-build',
1516
task.series(
1617
util.rimraf('out-build'),
1718
util.buildWebNodePaths('out-build'),
18-
compilation.compileTask('src', 'out-build', true)
19+
compilation.compileTask('src', 'out-build', true),
20+
optimize.optimizeLoaderTask('out-build', 'out-build', true)
1921
)
2022
);
2123
gulp.task(compileBuildTask);

‎build/gulpfile.editor.js

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const gulp = require('gulp');
77
const path = require('path');
88
const util = require('./lib/util');
99
const task = require('./lib/task');
10-
const common = require('./lib/optimize');
10+
const optimize = require('./lib/optimize');
1111
const es = require('event-stream');
1212
const File = require('vinyl');
1313
const i18n = require('./lib/i18n');
@@ -86,26 +86,29 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
8686

8787
const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true));
8888

89-
const optimizeEditorAMDTask = task.define('optimize-editor-amd', common.optimizeTask({
90-
src: 'out-editor-build',
91-
entryPoints: editorEntryPoints,
92-
resources: editorResources,
93-
loaderConfig: {
94-
paths: {
95-
'vs': 'out-editor-build/vs',
96-
'vs/css': 'out-editor-build/vs/css.build',
97-
'vs/nls': 'out-editor-build/vs/nls.build',
98-
'vscode': 'empty:'
89+
const optimizeEditorAMDTask = task.define('optimize-editor-amd', optimize.optimizeTask(
90+
{
91+
out: 'out-editor',
92+
amd: {
93+
src: 'out-editor-build',
94+
entryPoints: editorEntryPoints,
95+
resources: editorResources,
96+
loaderConfig: {
97+
paths: {
98+
'vs': 'out-editor-build/vs',
99+
'vs/css': 'out-editor-build/vs/css.build',
100+
'vs/nls': 'out-editor-build/vs/nls.build',
101+
'vscode': 'empty:'
102+
}
103+
},
104+
header: BUNDLED_FILE_HEADER,
105+
bundleInfo: true,
106+
languages
99107
}
100-
},
101-
bundleLoader: false,
102-
header: BUNDLED_FILE_HEADER,
103-
bundleInfo: true,
104-
out: 'out-editor',
105-
languages: languages
106-
}));
108+
}
109+
));
107110

108-
const minifyEditorAMDTask = task.define('minify-editor-amd', common.minifyTask('out-editor'));
111+
const minifyEditorAMDTask = task.define('minify-editor-amd', optimize.minifyTask('out-editor'));
109112

110113
const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () => {
111114
standalone.createESMSourcesAndResources2({

0 commit comments

Comments
 (0)