Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9774c071
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,发现更多精彩内容 >>
提交
9774c071
编写于
1月 09, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use node_modules.asar if present
上级
f4ed56b0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
76 addition
and
7 deletion
+76
-7
src/bootstrap.js
src/bootstrap.js
+23
-4
src/main.js
src/main.js
+24
-0
src/vs/base/node/stdFork.ts
src/vs/base/node/stdFork.ts
+1
-2
src/vs/workbench/electron-browser/bootstrap/index.js
src/vs/workbench/electron-browser/bootstrap/index.js
+28
-0
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
...nch/services/extensions/electron-browser/extensionHost.ts
+0
-1
未找到文件。
src/bootstrap.js
浏览文件 @
9774c071
...
@@ -3,10 +3,29 @@
...
@@ -3,10 +3,29 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/
// disable electron's asar support early on because bootstrap.js is used in forked processes
//#region Add support for using node_modules.asar
// where the environment is purely node based. this will instruct electron to not treat files
(
function
()
{
// with *.asar ending any special from normal files.
const
path
=
require
(
'
path
'
);
process
.
noAsar
=
true
;
const
Module
=
require
(
'
module
'
);
const
NODE_MODULES_PATH
=
path
.
join
(
__dirname
,
'
../node_modules
'
);
const
NODE_MODULES_ASAR_PATH
=
NODE_MODULES_PATH
+
'
.asar
'
;
const
originalResolveLookupPaths
=
Module
.
_resolveLookupPaths
;
Module
.
_resolveLookupPaths
=
function
(
request
,
parent
)
{
const
result
=
originalResolveLookupPaths
(
request
,
parent
);
const
paths
=
result
[
1
];
for
(
let
i
=
0
,
len
=
paths
.
length
;
i
<
len
;
i
++
)
{
if
(
paths
[
i
]
===
NODE_MODULES_PATH
)
{
paths
.
splice
(
i
,
0
,
NODE_MODULES_ASAR_PATH
);
break
;
}
}
return
result
;
};
})();
//#endregion
// Will be defined if we got forked from another node process
// Will be defined if we got forked from another node process
// In that case we override console.log/warn/error to be able
// In that case we override console.log/warn/error to be able
...
...
src/main.js
浏览文件 @
9774c071
...
@@ -11,6 +11,30 @@ perf.mark('main:started');
...
@@ -11,6 +11,30 @@ perf.mark('main:started');
// Perf measurements
// Perf measurements
global
.
perfStartTime
=
Date
.
now
();
global
.
perfStartTime
=
Date
.
now
();
//#region Add support for using node_modules.asar
(
function
()
{
const
path
=
require
(
'
path
'
);
const
Module
=
require
(
'
module
'
);
const
NODE_MODULES_PATH
=
path
.
join
(
__dirname
,
'
../node_modules
'
);
const
NODE_MODULES_ASAR_PATH
=
NODE_MODULES_PATH
+
'
.asar
'
;
const
originalResolveLookupPaths
=
Module
.
_resolveLookupPaths
;
Module
.
_resolveLookupPaths
=
function
(
request
,
parent
)
{
const
result
=
originalResolveLookupPaths
(
request
,
parent
);
const
paths
=
result
[
1
];
for
(
let
i
=
0
,
len
=
paths
.
length
;
i
<
len
;
i
++
)
{
if
(
paths
[
i
]
===
NODE_MODULES_PATH
)
{
paths
.
splice
(
i
,
0
,
NODE_MODULES_ASAR_PATH
);
break
;
}
}
return
result
;
};
})();
//#endregion
var
app
=
require
(
'
electron
'
).
app
;
var
app
=
require
(
'
electron
'
).
app
;
var
fs
=
require
(
'
fs
'
);
var
fs
=
require
(
'
fs
'
);
var
path
=
require
(
'
path
'
);
var
path
=
require
(
'
path
'
);
...
...
src/vs/base/node/stdFork.ts
浏览文件 @
9774c071
...
@@ -50,7 +50,6 @@ function generatePatchedEnv(env: any, stdInPipeName: string, stdOutPipeName: str
...
@@ -50,7 +50,6 @@ function generatePatchedEnv(env: any, stdInPipeName: string, stdOutPipeName: str
newEnv
[
'
STDOUT_PIPE_NAME
'
]
=
stdOutPipeName
;
newEnv
[
'
STDOUT_PIPE_NAME
'
]
=
stdOutPipeName
;
newEnv
[
'
STDERR_PIPE_NAME
'
]
=
stdErrPipeName
;
newEnv
[
'
STDERR_PIPE_NAME
'
]
=
stdErrPipeName
;
newEnv
[
'
ELECTRON_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ELECTRON_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ELECTRON_NO_ASAR
'
]
=
'
1
'
;
return
newEnv
;
return
newEnv
;
}
}
...
@@ -138,4 +137,4 @@ export function fork(modulePath: string, args: string[], options: IForkOpts, cal
...
@@ -138,4 +137,4 @@ export function fork(modulePath: string, args: string[], options: IForkOpts, cal
// On vscode exit still close server #7758
// On vscode exit still close server #7758
process
.
once
(
'
exit
'
,
closeServer
);
process
.
once
(
'
exit
'
,
closeServer
);
}
}
\ No newline at end of file
src/vs/workbench/electron-browser/bootstrap/index.js
浏览文件 @
9774c071
...
@@ -110,6 +110,34 @@ function main() {
...
@@ -110,6 +110,34 @@ function main() {
const
args
=
parseURLQueryArgs
();
const
args
=
parseURLQueryArgs
();
const
configuration
=
JSON
.
parse
(
args
[
'
config
'
]
||
'
{}
'
)
||
{};
const
configuration
=
JSON
.
parse
(
args
[
'
config
'
]
||
'
{}
'
)
||
{};
//#region Add support for using node_modules.asar
(
function
()
{
const
path
=
require
(
'
path
'
);
const
Module
=
require
(
'
module
'
);
let
NODE_MODULES_PATH
=
path
.
join
(
configuration
.
appRoot
,
'
node_modules
'
);
if
(
/
[
a-z
]\:
/
.
test
(
NODE_MODULES_PATH
))
{
// Make drive letter uppercase
NODE_MODULES_PATH
=
NODE_MODULES_PATH
.
charAt
(
0
).
toUpperCase
()
+
NODE_MODULES_PATH
.
substr
(
1
);
}
const
NODE_MODULES_ASAR_PATH
=
NODE_MODULES_PATH
+
'
.asar
'
;
const
originalResolveLookupPaths
=
Module
.
_resolveLookupPaths
;
Module
.
_resolveLookupPaths
=
function
(
request
,
parent
)
{
const
result
=
originalResolveLookupPaths
(
request
,
parent
);
const
paths
=
result
[
1
];
for
(
let
i
=
0
,
len
=
paths
.
length
;
i
<
len
;
i
++
)
{
if
(
paths
[
i
]
===
NODE_MODULES_PATH
)
{
paths
.
splice
(
i
,
0
,
NODE_MODULES_ASAR_PATH
);
break
;
}
}
return
result
;
};
})();
//#endregion
// Correctly inherit the parent's environment
// Correctly inherit the parent's environment
assign
(
process
.
env
,
configuration
.
userEnv
);
assign
(
process
.
env
,
configuration
.
userEnv
);
perf
.
importEntries
(
configuration
.
perfEntries
);
perf
.
importEntries
(
configuration
.
perfEntries
);
...
...
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
浏览文件 @
9774c071
...
@@ -142,7 +142,6 @@ export class ExtensionHostProcessWorker {
...
@@ -142,7 +142,6 @@ export class ExtensionHostProcessWorker {
VSCODE_WINDOW_ID
:
String
(
this
.
_windowService
.
getCurrentWindowId
()),
VSCODE_WINDOW_ID
:
String
(
this
.
_windowService
.
getCurrentWindowId
()),
VSCODE_IPC_HOOK_EXTHOST
:
pipeName
,
VSCODE_IPC_HOOK_EXTHOST
:
pipeName
,
VSCODE_HANDLES_UNCAUGHT_ERRORS
:
true
,
VSCODE_HANDLES_UNCAUGHT_ERRORS
:
true
,
ELECTRON_NO_ASAR
:
'
1
'
,
VSCODE_LOG_STACK
:
!
this
.
_isExtensionDevTestFromCli
&&
(
this
.
_isExtensionDevHost
||
!
this
.
_environmentService
.
isBuilt
||
product
.
quality
!==
'
stable
'
||
this
.
_environmentService
.
verbose
)
VSCODE_LOG_STACK
:
!
this
.
_isExtensionDevTestFromCli
&&
(
this
.
_isExtensionDevHost
||
!
this
.
_environmentService
.
isBuilt
||
product
.
quality
!==
'
stable
'
||
this
.
_environmentService
.
verbose
)
}),
}),
// We only detach the extension host on windows. Linux and Mac orphan by default
// We only detach the extension host on windows. Linux and Mac orphan by default
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录