Archived
1
0
This repository has been archived on 2024-09-09. You can view files and clone it, but cannot push or open issues or pull requests.
code-server/lib/vscode/build
Joe Previte f214235e2d
fix: resolve conflicts in build/lib/node.ts
It looks like they added a few more variables and cleaned this file up.

I removed the yarn and yarnRc stuff. Hope that doesn't break anything.
2021-02-25 12:08:12 -07:00
..
azure-pipelines chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
builtin chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
darwin chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
lib fix: resolve conflicts in build/lib/node.ts 2021-02-25 12:08:12 -07:00
monaco chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
npm fix: postinstall.js conflicts 2021-02-25 11:57:35 -07:00
polyfills Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
win32 Update to VS Code 1.52.1 2021-02-09 16:08:37 +00:00
.cachesalt chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
.gitattributes Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
.moduleignore Update to VS Code 1.52.1 2021-02-09 16:08:37 +00:00
.webignore Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
eslint.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
ext.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
filters.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.compile.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.editor.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.extensions.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.hygiene.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.reh.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.vscode.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.vscode.linux.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
gulpfile.vscode.web.js Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
gulpfile.vscode.win32.js Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
hygiene.js chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
jsconfig.json Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
package.json chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00
tsconfig.build.json Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
tsconfig.json Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode' 2020-12-15 15:52:33 -07:00
yarn.lock chore(vscode): update to 1.53.2 2021-02-25 11:27:27 -07:00