Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Coder
code-server
提交
73c2a9f0
C
code-server
项目概览
镜像
/
Coder
/
code-server
2022-09-21 03:15:05同步失败
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
73c2a9f0
编写于
5月 03, 2021
作者:
A
Akash Satheesan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(lib/vscode): fix conflicts in package.json
上级
70bf7ed9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
4 addition
and
32 deletion
+4
-32
lib/vscode/package.json
lib/vscode/package.json
+4
-26
lib/vscode/test/smoke/package.json
lib/vscode/test/smoke/package.json
+0
-6
未找到文件。
lib/vscode/package.json
浏览文件 @
73c2a9f0
...
...
@@ -61,33 +61,21 @@
},
"dependencies_comment"
:
"Move rimraf to dependencies because it is used in the postinstall script."
,
"dependencies"
:
{
"@coder/logger"
:
"1.1.16"
,
"@coder/logger"
:
"
^
1.1.16"
,
"applicationinsights"
:
"1.0.8"
,
"chokidar"
:
"3.5.1"
,
"graceful-fs"
:
"4.2.3"
,
"http-proxy-agent"
:
"^2.1.0"
,
"https-proxy-agent"
:
"^2.2.3"
,
"iconv-lite-umd"
:
"0.6.8"
,
<<<<<<<
HEAD
"jschardet"
:
"2.2.1"
,
"minimist"
:
"^1.2.5"
,
"native-is-elevated"
:
"0.4.1"
,
"native-watchdog"
:
"1.3.0"
,
"node-pty"
:
"0.10.0-beta19"
,
"proxy-agent"
:
"^4.0.0"
,
"proxy-from-env"
:
"^1.1.0"
,
"rimraf"
:
"^2.2.8"
,
"nsfw"
:
"^2.1.1"
,
=======
"jschardet"
:
"2.3.0"
,
"keytar"
:
"7.2.0"
,
"minimist"
:
"^1.2.5"
,
"native-is-elevated"
:
"0.4.3"
,
"native-keymap"
:
"2.2.1"
,
"native-watchdog"
:
"1.3.0"
,
"node-pty"
:
"0.10.1"
,
"nsfw"
:
"2.1.2"
,
>>>>>>>
58
ce
849223667
f
77
dc
0
d
6
d
7658870
ca
3
f
815e17
f
"proxy-agent"
:
"^4.0.1"
,
"proxy-from-env"
:
"^1.1.0"
,
"spdlog"
:
"^0.11.1"
,
"sudo-prompt"
:
"9.2.1"
,
"tas-client-umd"
:
"0.1.4"
,
...
...
@@ -118,12 +106,7 @@
"@types/http-proxy-agent"
:
"^2.0.1"
,
"@types/minimist"
:
"^1.2.1"
,
"@types/mocha"
:
"^8.2.0"
,
<<<<<<<
HEAD
"@types/node"
:
"^12.19.9"
,
"@types/proxy-from-env"
:
"^1.0.1"
,
=======
"@types/node"
:
"^14.14.37"
,
>>>>>>>
58
ce
849223667
f
77
dc
0
d
6
d
7658870
ca
3
f
815e17
f
"@types/sinon"
:
"^1.16.36"
,
"@types/trusted-types"
:
"^1.0.6"
,
"@types/vscode-windows-registry"
:
"^1.0.0"
,
...
...
@@ -146,10 +129,6 @@
"cssnano"
:
"^4.1.11"
,
"debounce"
:
"^1.0.0"
,
"deemon"
:
"^1.4.0"
,
<<<<<<<
HEAD
=======
"electron"
:
"12.0.4"
,
>>>>>>>
58
ce
849223667
f
77
dc
0
d
6
d
7658870
ca
3
f
815e17
f
"eslint"
:
"6.8.0"
,
"eslint-plugin-jsdoc"
:
"^19.1.0"
,
"event-stream"
:
"3.3.4"
,
...
...
@@ -206,7 +185,7 @@
"queue"
:
"3.0.6"
,
"rcedit"
:
"^1.1.0"
,
"request"
:
"^2.85.0"
,
"rimraf"
:
"^
2.2.8
"
,
"rimraf"
:
"^
3.0.2
"
,
"sinon"
:
"^1.17.2"
,
"source-map"
:
"0.6.1"
,
"source-map-support"
:
"^0.3.2"
,
...
...
@@ -241,7 +220,6 @@
"windows-process-tree"
:
"0.3.0"
},
"resolutions"
:
{
"minimist"
:
"^1.2.5"
,
"elliptic"
:
"^6.5.3"
,
"nwmatcher"
:
"^1.4.4"
}
...
...
lib/vscode/test/smoke/package.json
浏览文件 @
73c2a9f0
...
...
@@ -17,14 +17,8 @@
"@types/ncp"
:
"2.0.1"
,
"@types/node"
:
"^12.19.9"
,
"@types/rimraf"
:
"^2.0.4"
,
<<<<<<<
HEAD
"cpx"
:
"^1.5.0"
,
"htmlparser2"
:
"^3.9.3"
,
"mkdirp"
:
"^0.5.1"
,
=======
"htmlparser2"
:
"^3.9.2"
,
"mkdirp"
:
"^1.0.4"
,
>>>>>>>
58
ce
849223667
f
77
dc
0
d
6
d
7658870
ca
3
f
815e17
f
"ncp"
:
"^2.0.0"
,
"npm-run-all"
:
"^4.1.5"
,
"portastic"
:
"^1.0.1"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录