danog/code-server
1
0
Fork 0
mirror of https://github.com/danog/code-server.git synced 2024-11-30 04:39:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts in package.json

Browse Source 
I hope this was done correctly.

It upgraded a few packages, we left out the electron packages and it added two
resolutions.
This commit is contained in:
Joe Previte 2021-02-25 11:52:27 -07:00
parent b952616725
commit 9e61540840
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/vscode/package.json
View File

@ -75,14 +75,10 @@
"native-is-elevated": "0.4.1",
"native-keymap": "2.2.1",
"native-watchdog": "1.3.0",
<<<<<<< HEAD
"node-pty": "0.10.0-beta17",
"node-pty": "0.10.0-beta19",
"proxy-agent": "^4.0.0",
"proxy-from-env": "^1.1.0",
"rimraf": "^2.2.8",
=======
"node-pty": "0.10.0-beta19",
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
"spdlog": "^0.11.1",
"sudo-prompt": "9.1.1",
"tas-client-umd": "0.1.2",
@ -113,16 +109,10 @@
"@types/gulp-postcss": "^8.0.0",
"@types/http-proxy-agent": "^2.0.1",
"@types/keytar": "^4.4.0",
<<<<<<< HEAD
"@types/minimist": "^1.2.0",
"@types/mocha": "2.2.39",
"@types/node": "^12.11.7",
"@types/proxy-from-env": "^1.0.1",
=======
"@types/minimist": "^1.2.1",
"@types/mocha": "^8.2.0",
"@types/node": "^12.19.9",
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
"@types/sinon": "^1.16.36",
"@types/trusted-types": "^1.0.6",
"@types/vscode-windows-registry": "^1.0.0",
@ -144,11 +134,6 @@
"cssnano": "^4.1.10",
"debounce": "^1.0.0",
"deemon": "^1.4.0",
<<<<<<< HEAD
=======
"electron": "11.2.1",
"electron-rebuild": "2.0.3",
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
"eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0",
"event-stream": "3.3.4",
@ -204,11 +189,8 @@
"pump": "^1.0.1",
"queue": "3.0.6",
"rcedit": "^1.1.0",
<<<<<<< HEAD
=======
"request": "^2.85.0",
"rimraf": "^2.2.8",
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
"sinon": "^1.17.2",
"source-map": "0.6.1",
"source-map-support": "^0.3.2",
@ -244,11 +226,8 @@
"windows-process-tree": "0.2.4"
},
"resolutions": {
<<<<<<< HEAD
"minimist": "^1.2.5"
=======
"minimist": "^1.2.5",
"elliptic": "^6.5.3",
"nwmatcher": "^1.4.4"
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
}
}