Skip to content

Commit f8fbd86

Browse files
committed
Fix release build
1 parent ad986dd commit f8fbd86

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

build/.moduleignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ vscode-nsfw/includes/**
9090
@parcel/watcher/build/**
9191
@parcel/watcher/prebuilds/**
9292
@parcel/watcher/src/**
93-
!@parcel/watcher/build/Release/*.node
93+
!@parcel/watcher/prebuilds/**/*.node
9494

9595
vsda/build/**
9696
vsda/ci/**
@@ -150,5 +150,3 @@ xterm-addon-*/src/**
150150
xterm-addon-*/fixtures/**
151151
xterm-addon-*/out/**
152152
xterm-addon-*/out-test/**
153-
154-

build/gulpfile.server.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* Copyright (C) Gitpod. All rights reserved.
33
*--------------------------------------------------------*/
44

5-
// @ts-check
65
'use strict';
76

87
const cp = require('child_process');
98
const gulp = require('gulp');
109
const path = require('path');
1110
const es = require('event-stream');
1211
const util = require('./lib/util');
12+
const buildfile = require('../src/buildfile');
1313
const task = require('./lib/task');
1414
const common = require('./lib/optimize');
1515
const product = require('../product.json');
@@ -77,14 +77,13 @@ function defineTasks(options) {
7777
'!**/test/**'
7878
];
7979

80-
const buildfile = require('../src/buildfile');
81-
8280
const webEntryPoints = _.flatten([
8381
buildfile.entrypoint('vs/workbench/workbench.web.api'),
8482
buildfile.base,
8583
buildfile.workerExtensionHost,
8684
buildfile.workerNotebook,
8785
buildfile.workerLanguageDetection,
86+
buildfile.workerLocalFileSearch,
8887
buildfile.keyboardMaps,
8988
buildfile.workbenchWeb
9089
]).map(p => {
@@ -100,10 +99,7 @@ function defineTasks(options) {
10099
const serverEntryPoints = _.flatten([
101100
buildfile.entrypoint(`vs/${qualifier}/node/cli`),
102101
buildfile.entrypoint(`vs/${qualifier}/node/server`),
103-
buildfile.entrypoint('vs/workbench/services/extensions/node/extensionHostProcess'),
104-
buildfile.entrypoint('vs/platform/files/node/watcher/unix/watcherApp'),
105-
buildfile.entrypoint('vs/platform/files/node/watcher/nsfw/watcherApp'),
106-
buildfile.entrypoint('vs/platform/terminal/node/ptyHostMain')
102+
buildfile.codeServer
107103
]);
108104

109105
const outWeb = `out-${qualifier}-web`;

src/buildfile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ exports.keyboardMaps = [
2929

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

32+
exports.codeServer = require('./vs/server/buildfile.server').collectModules();
33+
3234
exports.entrypoint = createModuleDescription;

src/vs/server/buildfile.server.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
'use strict';
6+
7+
const { createModuleDescription, createEditorWorkerModuleDescription } = require('../base/buildfile');
8+
9+
exports.collectModules = function () {
10+
return [
11+
createModuleDescription('vs/workbench/services/search/node/searchApp'),
12+
13+
createModuleDescription('vs/platform/files/node/watcher/unix/watcherApp'),
14+
createModuleDescription('vs/platform/files/node/watcher/nsfw/watcherApp'),
15+
createModuleDescription('vs/platform/files/node/watcher/parcel/watcherApp'),
16+
17+
createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
18+
19+
createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess'),
20+
];
21+
};

0 commit comments

Comments
 (0)