Skip to content

Commit 641276b

Browse files
author
Miguel Solorio
committed
Merge remote-tracking branch 'origin/master' into misolori/icon-font
2 parents ff3ff70 + 02a3cf3 commit 641276b

144 files changed

Lines changed: 3242 additions & 2018 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.

.vscode/launch.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,22 @@
158158
"${workspaceFolder}/out/**/*.js"
159159
]
160160
},
161+
{
162+
"type": "node",
163+
"request": "launch",
164+
"name": "Launch VS Code (Web)",
165+
"runtimeExecutable": "yarn",
166+
"runtimeArgs": [
167+
"web"
168+
],
169+
},
170+
{
171+
"type": "chrome",
172+
"request": "launch",
173+
"name": "Launch VS Code (Web, Chrome)",
174+
"url": "http://localhost:8080",
175+
"preLaunchTask": "Run web"
176+
},
161177
{
162178
"type": "node",
163179
"request": "launch",

.vscode/tasks.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,24 @@
8585
"task": "hygiene",
8686
"problemMatcher": []
8787
},
88+
{
89+
"type": "shell",
90+
"command": "yarn web -- --no-launch",
91+
"label": "Run web",
92+
"isBackground": true,
93+
// This section to make error go away when launching the debug config
94+
"problemMatcher": {
95+
"pattern": {
96+
"regexp": ""
97+
},
98+
"background": {
99+
"beginsPattern": ".*node .*",
100+
"endsPattern": "Web UI available at .*"
101+
}
102+
},
103+
"presentation": {
104+
"reveal": "never"
105+
}
106+
},
88107
]
89108
}

build/azure-pipelines/darwin/continuous-build-darwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
vstsFeed: '$(ArtifactFeed)'
2222
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2323
- script: |
24-
yarn gulp electron-x64
24+
yarn electron x64
2525
displayName: Download Electron
2626
- script: |
2727
yarn gulp hygiene --skip-tslint

build/azure-pipelines/linux/continuous-build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
vstsFeed: '$(ArtifactFeed)'
3030
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
3131
- script: |
32-
yarn gulp electron-x64
32+
yarn electron x64
3333
displayName: Download Electron
3434
- script: |
3535
yarn gulp hygiene --skip-tslint

build/azure-pipelines/win32/continuous-build-win32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
vstsFeed: '$(ArtifactFeed)'
2626
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2727
- powershell: |
28-
yarn gulp electron
28+
yarn electron
2929
- script: |
3030
yarn gulp hygiene --skip-tslint
3131
displayName: Run Hygiene Checks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ steps:
107107
- powershell: |
108108
. build/azure-pipelines/win32/exec.ps1
109109
$ErrorActionPreference = "Stop"
110-
exec { yarn gulp "electron-$(VSCODE_ARCH)" }
110+
exec { yarn electron $(VSCODE_ARCH) }
111111
exec { .\scripts\test.bat --build --tfs "Unit Tests" }
112112
displayName: Run unit tests
113113
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))

build/gulpfile.hygiene.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ const copyrightFilter = [
124124
'!extensions/html-language-features/server/src/modes/typescript/*',
125125
'!extensions/*/server/bin/*',
126126
'!src/vs/editor/test/node/classification/typescript-test.ts',
127+
'!scripts/code-web.js'
127128
];
128129

129130
const eslintFilter = [

build/gulpfile.vscode.js

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const product = require('../product.json');
3030
const crypto = require('crypto');
3131
const i18n = require('./lib/i18n');
3232
const deps = require('./dependencies');
33-
const getElectronVersion = require('./lib/electron').getElectronVersion;
33+
const { config } = require('./lib/electron');
3434
const createAsar = require('./lib/asar').createAsar;
3535
const minimist = require('minimist');
3636
const { compileBuildTask } = require('./gulpfile.compile');
@@ -112,99 +112,6 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
112112
));
113113
gulp.task(minifyVSCodeTask);
114114

115-
// Package
116-
117-
// @ts-ignore JSON checking: darwinCredits is optional
118-
const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
119-
120-
function darwinBundleDocumentType(extensions, icon) {
121-
return {
122-
name: product.nameLong + ' document',
123-
role: 'Editor',
124-
ostypes: ["TEXT", "utxt", "TUTX", "****"],
125-
extensions: extensions,
126-
iconFile: icon
127-
};
128-
}
129-
130-
const config = {
131-
version: getElectronVersion(),
132-
productAppName: product.nameLong,
133-
companyName: 'Microsoft Corporation',
134-
copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
135-
darwinIcon: 'resources/darwin/code.icns',
136-
darwinBundleIdentifier: product.darwinBundleIdentifier,
137-
darwinApplicationCategoryType: 'public.app-category.developer-tools',
138-
darwinHelpBookFolder: 'VS Code HelpBook',
139-
darwinHelpBookName: 'VS Code HelpBook',
140-
darwinBundleDocumentTypes: [
141-
darwinBundleDocumentType(["bat", "cmd"], 'resources/darwin/bat.icns'),
142-
darwinBundleDocumentType(["bowerrc"], 'resources/darwin/bower.icns'),
143-
darwinBundleDocumentType(["c", "h"], 'resources/darwin/c.icns'),
144-
darwinBundleDocumentType(["config", "editorconfig", "gitattributes", "gitconfig", "gitignore", "ini"], 'resources/darwin/config.icns'),
145-
darwinBundleDocumentType(["cc", "cpp", "cxx", "hh", "hpp", "hxx"], 'resources/darwin/cpp.icns'),
146-
darwinBundleDocumentType(["cs", "csx"], 'resources/darwin/csharp.icns'),
147-
darwinBundleDocumentType(["css"], 'resources/darwin/css.icns'),
148-
darwinBundleDocumentType(["go"], 'resources/darwin/go.icns'),
149-
darwinBundleDocumentType(["asp", "aspx", "cshtml", "htm", "html", "jshtm", "jsp", "phtml", "shtml"], 'resources/darwin/html.icns'),
150-
darwinBundleDocumentType(["jade"], 'resources/darwin/jade.icns'),
151-
darwinBundleDocumentType(["jav", "java"], 'resources/darwin/java.icns'),
152-
darwinBundleDocumentType(["js", "jscsrc", "jshintrc", "mjs"], 'resources/darwin/javascript.icns'),
153-
darwinBundleDocumentType(["json"], 'resources/darwin/json.icns'),
154-
darwinBundleDocumentType(["less"], 'resources/darwin/less.icns'),
155-
darwinBundleDocumentType(["markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn"], 'resources/darwin/markdown.icns'),
156-
darwinBundleDocumentType(["php"], 'resources/darwin/php.icns'),
157-
darwinBundleDocumentType(["ps1", "psd1", "psm1"], 'resources/darwin/powershell.icns'),
158-
darwinBundleDocumentType(["py"], 'resources/darwin/python.icns'),
159-
darwinBundleDocumentType(["gemspec", "rb"], 'resources/darwin/ruby.icns'),
160-
darwinBundleDocumentType(["scss"], 'resources/darwin/sass.icns'),
161-
darwinBundleDocumentType(["bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "profile", "rhistory", "rprofile", "sh", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"], 'resources/darwin/shell.icns'),
162-
darwinBundleDocumentType(["sql"], 'resources/darwin/sql.icns'),
163-
darwinBundleDocumentType(["ts"], 'resources/darwin/typescript.icns'),
164-
darwinBundleDocumentType(["tsx", "jsx"], 'resources/darwin/react.icns'),
165-
darwinBundleDocumentType(["vue"], 'resources/darwin/vue.icns'),
166-
darwinBundleDocumentType(["ascx", "csproj", "dtd", "wxi", "wxl", "wxs", "xml", "xaml"], 'resources/darwin/xml.icns'),
167-
darwinBundleDocumentType(["eyaml", "eyml", "yaml", "yml"], 'resources/darwin/yaml.icns'),
168-
darwinBundleDocumentType(["clj", "cljs", "cljx", "clojure", "code-workspace", "coffee", "ctp", "dockerfile", "dot", "edn", "fs", "fsi", "fsscript", "fsx", "handlebars", "hbs", "lua", "m", "makefile", "ml", "mli", "pl", "pl6", "pm", "pm6", "pod", "pp", "properties", "psgi", "pug", "r", "rs", "rt", "svg", "svgz", "t", "txt", "vb", "xcodeproj", "xcworkspace"], 'resources/darwin/default.icns')
169-
],
170-
darwinBundleURLTypes: [{
171-
role: 'Viewer',
172-
name: product.nameLong,
173-
urlSchemes: [product.urlProtocol]
174-
}],
175-
darwinForceDarkModeSupport: true,
176-
darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
177-
linuxExecutableName: product.applicationName,
178-
winIcon: 'resources/win32/code.ico',
179-
token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
180-
181-
// @ts-ignore JSON checking: electronRepository is optional
182-
repo: product.electronRepository || undefined
183-
};
184-
185-
function getElectron(arch) {
186-
return () => {
187-
const electronOpts = _.extend({}, config, {
188-
platform: process.platform,
189-
arch,
190-
ffmpegChromium: true,
191-
keepDefaultApp: true
192-
});
193-
194-
return gulp.src('package.json')
195-
.pipe(json({ name: product.nameShort }))
196-
.pipe(electron(electronOpts))
197-
.pipe(filter(['**', '!**/app/package.json']))
198-
.pipe(vfs.dest('.build/electron'));
199-
};
200-
}
201-
202-
gulp.task(task.define('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch))));
203-
gulp.task(task.define('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32'))));
204-
gulp.task(task.define('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64'))));
205-
gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('armv7l'))));
206-
gulp.task(task.define('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64'))));
207-
208115
/**
209116
* Compute checksums for some files.
210117
*

build/lib/electron.js

Lines changed: 106 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,115 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5-
65
'use strict';
7-
8-
const fs = require('fs');
9-
const path = require('path');
6+
Object.defineProperty(exports, "__esModule", { value: true });
7+
const fs = require("fs");
8+
const path = require("path");
9+
const vfs = require("vinyl-fs");
10+
const filter = require("gulp-filter");
11+
const json = require("gulp-json-editor");
12+
const _ = require("underscore");
13+
const util = require("./util");
14+
const electron = require('gulp-atom-electron');
1015
const root = path.dirname(path.dirname(__dirname));
11-
16+
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
17+
const commit = util.getVersion(root);
1218
function getElectronVersion() {
13-
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
14-
// @ts-ignore
15-
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
16-
17-
return target;
19+
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
20+
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
21+
return target;
22+
}
23+
exports.getElectronVersion = getElectronVersion;
24+
const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
25+
function darwinBundleDocumentType(extensions, icon) {
26+
return {
27+
name: product.nameLong + ' document',
28+
role: 'Editor',
29+
ostypes: ["TEXT", "utxt", "TUTX", "****"],
30+
extensions: extensions,
31+
iconFile: icon
32+
};
33+
}
34+
exports.config = {
35+
version: getElectronVersion(),
36+
productAppName: product.nameLong,
37+
companyName: 'Microsoft Corporation',
38+
copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
39+
darwinIcon: 'resources/darwin/code.icns',
40+
darwinBundleIdentifier: product.darwinBundleIdentifier,
41+
darwinApplicationCategoryType: 'public.app-category.developer-tools',
42+
darwinHelpBookFolder: 'VS Code HelpBook',
43+
darwinHelpBookName: 'VS Code HelpBook',
44+
darwinBundleDocumentTypes: [
45+
darwinBundleDocumentType(["bat", "cmd"], 'resources/darwin/bat.icns'),
46+
darwinBundleDocumentType(["bowerrc"], 'resources/darwin/bower.icns'),
47+
darwinBundleDocumentType(["c", "h"], 'resources/darwin/c.icns'),
48+
darwinBundleDocumentType(["config", "editorconfig", "gitattributes", "gitconfig", "gitignore", "ini"], 'resources/darwin/config.icns'),
49+
darwinBundleDocumentType(["cc", "cpp", "cxx", "hh", "hpp", "hxx"], 'resources/darwin/cpp.icns'),
50+
darwinBundleDocumentType(["cs", "csx"], 'resources/darwin/csharp.icns'),
51+
darwinBundleDocumentType(["css"], 'resources/darwin/css.icns'),
52+
darwinBundleDocumentType(["go"], 'resources/darwin/go.icns'),
53+
darwinBundleDocumentType(["asp", "aspx", "cshtml", "htm", "html", "jshtm", "jsp", "phtml", "shtml"], 'resources/darwin/html.icns'),
54+
darwinBundleDocumentType(["jade"], 'resources/darwin/jade.icns'),
55+
darwinBundleDocumentType(["jav", "java"], 'resources/darwin/java.icns'),
56+
darwinBundleDocumentType(["js", "jscsrc", "jshintrc", "mjs"], 'resources/darwin/javascript.icns'),
57+
darwinBundleDocumentType(["json"], 'resources/darwin/json.icns'),
58+
darwinBundleDocumentType(["less"], 'resources/darwin/less.icns'),
59+
darwinBundleDocumentType(["markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn"], 'resources/darwin/markdown.icns'),
60+
darwinBundleDocumentType(["php"], 'resources/darwin/php.icns'),
61+
darwinBundleDocumentType(["ps1", "psd1", "psm1"], 'resources/darwin/powershell.icns'),
62+
darwinBundleDocumentType(["py"], 'resources/darwin/python.icns'),
63+
darwinBundleDocumentType(["gemspec", "rb"], 'resources/darwin/ruby.icns'),
64+
darwinBundleDocumentType(["scss"], 'resources/darwin/sass.icns'),
65+
darwinBundleDocumentType(["bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "profile", "rhistory", "rprofile", "sh", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"], 'resources/darwin/shell.icns'),
66+
darwinBundleDocumentType(["sql"], 'resources/darwin/sql.icns'),
67+
darwinBundleDocumentType(["ts"], 'resources/darwin/typescript.icns'),
68+
darwinBundleDocumentType(["tsx", "jsx"], 'resources/darwin/react.icns'),
69+
darwinBundleDocumentType(["vue"], 'resources/darwin/vue.icns'),
70+
darwinBundleDocumentType(["ascx", "csproj", "dtd", "wxi", "wxl", "wxs", "xml", "xaml"], 'resources/darwin/xml.icns'),
71+
darwinBundleDocumentType(["eyaml", "eyml", "yaml", "yml"], 'resources/darwin/yaml.icns'),
72+
darwinBundleDocumentType(["clj", "cljs", "cljx", "clojure", "code-workspace", "coffee", "ctp", "dockerfile", "dot", "edn", "fs", "fsi", "fsscript", "fsx", "handlebars", "hbs", "lua", "m", "makefile", "ml", "mli", "pl", "pl6", "pm", "pm6", "pod", "pp", "properties", "psgi", "pug", "r", "rs", "rt", "svg", "svgz", "t", "txt", "vb", "xcodeproj", "xcworkspace"], 'resources/darwin/default.icns')
73+
],
74+
darwinBundleURLTypes: [{
75+
role: 'Viewer',
76+
name: product.nameLong,
77+
urlSchemes: [product.urlProtocol]
78+
}],
79+
darwinForceDarkModeSupport: true,
80+
darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
81+
linuxExecutableName: product.applicationName,
82+
winIcon: 'resources/win32/code.ico',
83+
token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
84+
repo: product.electronRepository || undefined
85+
};
86+
function getElectron(arch) {
87+
return () => {
88+
const electronOpts = _.extend({}, exports.config, {
89+
platform: process.platform,
90+
arch,
91+
ffmpegChromium: true,
92+
keepDefaultApp: true
93+
});
94+
return vfs.src('package.json')
95+
.pipe(json({ name: product.nameShort }))
96+
.pipe(electron(electronOpts))
97+
.pipe(filter(['**', '!**/app/package.json']))
98+
.pipe(vfs.dest('.build/electron'));
99+
};
100+
}
101+
async function main(arch = process.arch) {
102+
const version = getElectronVersion();
103+
const electronPath = path.join(root, '.build', 'electron');
104+
const versionFile = path.join(electronPath, 'version');
105+
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
106+
if (!isUpToDate) {
107+
await util.rimraf(electronPath)();
108+
await util.streamToPromise(getElectron(arch)());
109+
}
18110
}
19-
20-
module.exports.getElectronVersion = getElectronVersion;
21-
22-
// returns 0 if the right version of electron is in .build/electron
23-
// @ts-ignore
24111
if (require.main === module) {
25-
const version = getElectronVersion();
26-
const versionFile = path.join(root, '.build', 'electron', 'version');
27-
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
28-
29-
process.exit(isUpToDate ? 0 : 1);
112+
main(process.argv[2]).catch(err => {
113+
console.error(err);
114+
process.exit(1);
115+
});
30116
}

0 commit comments

Comments
 (0)