Skip to content

Commit bf94bed

Browse files
author
Benjamin Pasero
committed
build - workbench.main => workbench.desktop.main
1 parent 5246465 commit bf94bed

12 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎build/gulpfile.vscode.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const nodeModules = ['electron', 'original-fs']
4747

4848
// Build
4949
const vscodeEntryPoints = _.flatten([
50-
buildfile.entrypoint('vs/workbench/workbench.main'),
50+
buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
5151
buildfile.base,
5252
buildfile.serviceWorker,
5353
buildfile.workbench,
@@ -250,8 +250,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
250250
const out = sourceFolderName;
251251

252252
const checksums = computeChecksums(out, [
253-
'vs/workbench/workbench.main.js',
254-
'vs/workbench/workbench.main.css',
253+
'vs/workbench/workbench.desktop.main.js',
254+
'vs/workbench/workbench.desktop.main.css',
255255
'vs/code/electron-browser/workbench/workbench.html',
256256
'vs/code/electron-browser/workbench/workbench.js'
257257
]);

‎src/buildfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports.serviceWorker = [{
1919
dest: 'vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.js'
2020
}];
2121

22-
exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
22+
exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.desktop.main']);
2323
exports.workbenchWeb = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.web.api']);
2424

2525
exports.code = require('./vs/code/buildfile').collectModules();

‎src/vs/code/electron-browser/workbench/workbench.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ process['lazyEnv'] = getLazyEnv();
1616

1717
// Load workbench main
1818
bootstrapWindow.load([
19-
'vs/workbench/workbench.main',
20-
'vs/nls!vs/workbench/workbench.main',
21-
'vs/css!vs/workbench/workbench.main'
19+
'vs/workbench/workbench.desktop.main',
20+
'vs/nls!vs/workbench/workbench.desktop.main',
21+
'vs/css!vs/workbench/workbench.desktop.main'
2222
],
2323
function (workbench, configuration) {
2424
perf.mark('didLoadWorkbenchMain');

‎src/vs/workbench/browser/web.main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class CodeRendererMain extends Disposable {
109109

110110
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
111111
// NOTE: DO NOT ADD ANY OTHER SERVICE INTO THE COLLECTION HERE.
112-
// CONTRIBUTE IT VIA WORKBENCH.MAIN.TS AND registerSingleton().
112+
// CONTRIBUTE IT VIA WORKBENCH.WEB.MAIN.TS AND registerSingleton().
113113
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
114114

115115
// Log

‎src/vs/workbench/browser/workbench.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export class Workbench extends Layout {
185185

186186
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
187187
// NOTE: DO NOT ADD ANY OTHER SERVICE INTO THE COLLECTION HERE.
188-
// CONTRIBUTE IT VIA WORKBENCH.MAIN.TS AND registerSingleton().
188+
// CONTRIBUTE IT VIA WORKBENCH.DESKTOP.MAIN.TS AND registerSingleton().
189189
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
190190

191191
// All Contributed Services

‎src/vs/workbench/contrib/performance/electron-browser/perfviewEditor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ class PerfModelContentProvider implements ITextModelContentProvider {
152152
table.push(['nls:start => nls:end', metrics.timers.ellapsedNlsGeneration, '[main]', `initial startup: ${metrics.initialStartup}`]);
153153
table.push(['require(main.bundle.js)', metrics.initialStartup ? perf.getDuration('willLoadMainBundle', 'didLoadMainBundle') : undefined, '[main]', `initial startup: ${metrics.initialStartup}`]);
154154
table.push(['app.isReady => window.loadUrl()', metrics.timers.ellapsedWindowLoad, '[main]', `initial startup: ${metrics.initialStartup}`]);
155-
table.push(['window.loadUrl() => begin to require(workbench.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
156-
table.push(['require(workbench.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
155+
table.push(['window.loadUrl() => begin to require(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
156+
table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
157157
table.push(['require & init workspace storage', metrics.timers.ellapsedWorkspaceStorageInit, '[renderer]', undefined]);
158158
table.push(['init workspace service', metrics.timers.ellapsedWorkspaceServiceInit, '[renderer]', undefined]);
159159
table.push(['register extensions & spawn extension host', metrics.timers.ellapsedExtensions, '[renderer]', undefined]);

‎src/vs/workbench/electron-browser/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class CodeRendererMain extends Disposable {
167167

168168
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
169169
// NOTE: DO NOT ADD ANY OTHER SERVICE INTO THE COLLECTION HERE.
170-
// CONTRIBUTE IT VIA WORKBENCH.MAIN.TS AND registerSingleton().
170+
// CONTRIBUTE IT VIA WORKBENCH.DESKTOP.MAIN.TS AND registerSingleton().
171171
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
172172

173173
// Main Process

‎src/vs/workbench/services/timer/electron-browser/timerService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export interface IStartupMetrics {
180180

181181
/**
182182
* The time it took to create a new renderer (browser window) and to initialize that to the point
183-
* of load the main-bundle (`workbench.main.js`).
183+
* of load the main-bundle (`workbench.desktop.main.js`).
184184
*
185185
* * Happens in the main-process *and* the renderer-process
186186
* * Measured with the `main:loadWindow` and `willLoadWorkbenchMain` performance marks.
@@ -208,7 +208,7 @@ export interface IStartupMetrics {
208208
readonly ellapsedWorkspaceServiceInit: number;
209209

210210
/**
211-
* The time it took to load the main-bundle of the workbench, e.g. `workbench.main.js`.
211+
* The time it took to load the main-bundle of the workbench, e.g. `workbench.desktop.main.js`.
212212
*
213213
* * Happens in the renderer-process
214214
* * Measured with the `willLoadWorkbenchMain` and `didLoadWorkbenchMain` performance marks.

src/vs/workbench/workbench.main.css renamed to src/vs/workbench/workbench.desktop.main.css

File renamed without changes.

src/vs/workbench/workbench.main.nls.js renamed to src/vs/workbench/workbench.desktop.main.nls.js

File renamed without changes.

0 commit comments

Comments
 (0)