Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
afbf447c
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
afbf447c
编写于
7月 06, 2018
作者:
E
Erich Gamma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for #53710 adopt TS support for checking JSON files
上级
da4dae44
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
18 addition
and
13 deletion
+18
-13
build/gulpfile.editor.js
build/gulpfile.editor.js
+1
-2
build/gulpfile.mixin.js
build/gulpfile.mixin.js
+0
-2
build/gulpfile.vscode.js
build/gulpfile.vscode.js
+7
-3
build/gulpfile.vscode.linux.js
build/gulpfile.vscode.linux.js
+4
-3
build/gulpfile.vscode.win32.js
build/gulpfile.vscode.win32.js
+0
-2
build/lib/builtInExtensions.js
build/lib/builtInExtensions.js
+0
-1
build/lib/optimize.ts
build/lib/optimize.ts
+5
-0
build/tsconfig.json
build/tsconfig.json
+1
-0
未找到文件。
build/gulpfile.editor.js
浏览文件 @
afbf447c
...
...
@@ -15,7 +15,6 @@ const cp = require('child_process');
var
root
=
path
.
dirname
(
__dirname
);
var
sha1
=
util
.
getVersion
(
root
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
var
semver
=
require
(
'
./monaco/package.json
'
).
version
;
var
headerVersion
=
semver
+
'
(
'
+
sha1
+
'
)
'
;
...
...
@@ -230,7 +229,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify
});
gulp
.
task
(
'
analyze-editor-distro
'
,
function
()
{
// @ts-ignore
Microsoft/TypeScript#21262 complains about a require of a JSON file
// @ts-ignore
var
bundleInfo
=
require
(
'
../out-editor/bundleInfo.json
'
);
var
graph
=
bundleInfo
.
graph
;
var
bundles
=
bundleInfo
.
bundles
;
...
...
build/gulpfile.mixin.js
浏览文件 @
afbf447c
...
...
@@ -15,7 +15,6 @@ const remote = require('gulp-remote-src');
const
zip
=
require
(
'
gulp-vinyl-zip
'
);
const
assign
=
require
(
'
object-assign
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
pkg
=
require
(
'
../package.json
'
);
gulp
.
task
(
'
mixin
'
,
function
()
{
...
...
@@ -56,7 +55,6 @@ gulp.task('mixin', function () {
.
pipe
(
util
.
rebase
(
2
))
.
pipe
(
productJsonFilter
)
.
pipe
(
buffer
())
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
.
pipe
(
json
(
o
=>
assign
({},
require
(
'
../product.json
'
),
o
)))
.
pipe
(
productJsonFilter
.
restore
);
...
...
build/gulpfile.vscode.js
浏览文件 @
afbf447c
...
...
@@ -25,9 +25,7 @@ const buildfile = require('../src/buildfile');
const
common
=
require
(
'
./lib/optimize
'
);
const
root
=
path
.
dirname
(
__dirname
);
const
commit
=
util
.
getVersion
(
root
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
packageJson
=
require
(
'
../package.json
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
product
=
require
(
'
../product.json
'
);
const
crypto
=
require
(
'
crypto
'
);
const
i18n
=
require
(
'
./lib/i18n
'
);
...
...
@@ -40,12 +38,12 @@ const productionDependencies = deps.getProductionDependencies(path.dirname(__dir
// @ts-ignore
const
baseModules
=
Object
.
keys
(
process
.
binding
(
'
natives
'
)).
filter
(
n
=>
!
/^_|
\/
/
.
test
(
n
));
const
nodeModules
=
[
'
electron
'
,
'
original-fs
'
]
// @ts-ignore JSON checking: dependencies property is optional
.
concat
(
Object
.
keys
(
product
.
dependencies
||
{}))
.
concat
(
_
.
uniq
(
productionDependencies
.
map
(
d
=>
d
.
name
)))
.
concat
(
baseModules
);
// Build
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
builtInExtensions
=
require
(
'
./builtInExtensions.json
'
);
const
excludedExtensions
=
[
...
...
@@ -120,6 +118,8 @@ gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
gulp
.
task
(
'
minify-vscode
'
,
[
'
clean-minified-vscode
'
,
'
optimize-index-js
'
],
common
.
minifyTask
(
'
out-vscode
'
,
baseUrl
));
// Package
// @ts-ignore JSON checking: darwinCredits is optional
const
darwinCreditsTemplate
=
product
.
darwinCredits
&&
_
.
template
(
fs
.
readFileSync
(
path
.
join
(
root
,
product
.
darwinCredits
),
'
utf8
'
));
const
config
=
{
...
...
@@ -148,6 +148,8 @@ const config = {
linuxExecutableName
:
product
.
applicationName
,
winIcon
:
'
resources/win32/code.ico
'
,
token
:
process
.
env
[
'
VSCODE_MIXIN_PASSWORD
'
]
||
process
.
env
[
'
GITHUB_TOKEN
'
]
||
void
0
,
// @ts-ignore JSON checking: electronRepository is optional
repo
:
product
.
electronRepository
||
void
0
};
...
...
@@ -255,6 +257,7 @@ function packageTask(platform, arch, opts) {
.
pipe
(
filter
([
'
**
'
,
'
!**/*.js.map
'
]));
let
version
=
packageJson
.
version
;
// @ts-ignore JSON checking: quality is optional
const
quality
=
product
.
quality
;
if
(
quality
&&
quality
!==
'
stable
'
)
{
...
...
@@ -286,6 +289,7 @@ function packageTask(platform, arch, opts) {
const
depsSrc
=
[
...
_
.
flatten
(
productionDependencies
.
map
(
d
=>
path
.
relative
(
root
,
d
.
path
)).
map
(
d
=>
[
`
${
d
}
/**`
,
`!
${
d
}
/**/{test,tests}/**`
])),
// @ts-ignore JSON checking: dependencies is optional
...
_
.
flatten
(
Object
.
keys
(
product
.
dependencies
||
{}).
map
(
d
=>
[
`node_modules/
${
d
}
/**`
,
`!node_modules/
${
d
}
/**/{test,tests}/**`
]))
];
...
...
build/gulpfile.vscode.linux.js
浏览文件 @
afbf447c
...
...
@@ -12,11 +12,8 @@ const shell = require('gulp-shell');
const
es
=
require
(
'
event-stream
'
);
const
vfs
=
require
(
'
vinyl-fs
'
);
const
util
=
require
(
'
./lib/util
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
packageJson
=
require
(
'
../package.json
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
product
=
require
(
'
../product.json
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
rpmDependencies
=
require
(
'
../resources/linux/rpm/dependencies.json
'
);
const
linuxPackageRevision
=
Math
.
floor
(
new
Date
().
getTime
()
/
1000
);
...
...
@@ -75,7 +72,9 @@ function prepareDebPackage(arch) {
const
postinst
=
gulp
.
src
(
'
resources/linux/debian/postinst.template
'
,
{
base
:
'
.
'
})
.
pipe
(
replace
(
'
@@NAME@@
'
,
product
.
applicationName
))
.
pipe
(
replace
(
'
@@ARCHITECTURE@@
'
,
debArch
))
// @ts-ignore JSON checking: quality is optional
.
pipe
(
replace
(
'
@@QUALITY@@
'
,
product
.
quality
||
'
@@QUALITY@@
'
))
// @ts-ignore JSON checking: updateUrl is optional
.
pipe
(
replace
(
'
@@UPDATEURL@@
'
,
product
.
updateUrl
||
'
@@UPDATEURL@@
'
))
.
pipe
(
rename
(
'
DEBIAN/postinst
'
));
...
...
@@ -133,7 +132,9 @@ function prepareRpmPackage(arch) {
.
pipe
(
replace
(
'
@@RELEASE@@
'
,
linuxPackageRevision
))
.
pipe
(
replace
(
'
@@ARCHITECTURE@@
'
,
rpmArch
))
.
pipe
(
replace
(
'
@@LICENSE@@
'
,
product
.
licenseName
))
// @ts-ignore JSON checking: quality is optional
.
pipe
(
replace
(
'
@@QUALITY@@
'
,
product
.
quality
||
'
@@QUALITY@@
'
))
// @ts-ignore JSON checking: updateUrl is optional
.
pipe
(
replace
(
'
@@UPDATEURL@@
'
,
product
.
updateUrl
||
'
@@UPDATEURL@@
'
))
.
pipe
(
replace
(
'
@@DEPENDENCIES@@
'
,
rpmDependencies
[
rpmArch
].
join
(
'
,
'
)))
.
pipe
(
rename
(
'
SPECS/
'
+
product
.
applicationName
+
'
.spec
'
));
...
...
build/gulpfile.vscode.win32.js
浏览文件 @
afbf447c
...
...
@@ -12,9 +12,7 @@ const assert = require('assert');
const
cp
=
require
(
'
child_process
'
);
const
_7z
=
require
(
'
7zip
'
)[
'
7z
'
];
const
util
=
require
(
'
./lib/util
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
pkg
=
require
(
'
../package.json
'
);
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
product
=
require
(
'
../product.json
'
);
const
vfs
=
require
(
'
vinyl-fs
'
);
const
mkdirp
=
require
(
'
mkdirp
'
);
...
...
build/lib/builtInExtensions.js
浏览文件 @
afbf447c
...
...
@@ -17,7 +17,6 @@ const ext = require('./extensions');
const
util
=
require
(
'
gulp-util
'
);
const
root
=
path
.
dirname
(
path
.
dirname
(
__dirname
));
// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
const
builtInExtensions
=
require
(
'
../builtInExtensions.json
'
);
const
controlFilePath
=
path
.
join
(
os
.
homedir
(),
'
.vscode-oss-dev
'
,
'
extensions
'
,
'
control.json
'
);
...
...
build/lib/optimize.ts
浏览文件 @
afbf447c
...
...
@@ -22,6 +22,7 @@ import * as gulpUtil from 'gulp-util';
import
*
as
flatmap
from
'
gulp-flatmap
'
;
import
*
as
pump
from
'
pump
'
;
import
*
as
sm
from
'
source-map
'
;
import
{
Language
}
from
'
./i18n
'
;
const
REPO_ROOT_PATH
=
path
.
join
(
__dirname
,
'
../..
'
);
...
...
@@ -159,6 +160,10 @@ export interface IOptimizeTaskOpts {
* (out folder name)
*/
out
:
string
;
/**
* (out folder name)
*/
languages
?:
Language
[];
}
export
function
optimizeTask
(
opts
:
IOptimizeTaskOpts
):
()
=>
NodeJS
.
ReadWriteStream
{
...
...
build/tsconfig.json
浏览文件 @
afbf447c
...
...
@@ -6,6 +6,7 @@
"removeComments"
:
false
,
"preserveConstEnums"
:
true
,
"sourceMap"
:
false
,
"resolveJsonModule"
:
true
,
"experimentalDecorators"
:
true
,
//
enable
JavaScript
type
checking
for
the
language
service
//
use
the
tsconfig.build.json
for
compiling
wich
disable
JavaScript
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录