diff --git a/ci/build/build-code-server.sh b/ci/build/build-code-server.sh index c1772539..fc4eb04b 100755 --- a/ci/build/build-code-server.sh +++ b/ci/build/build-code-server.sh @@ -15,6 +15,7 @@ main() { chmod +x out/node/entry.js fi + mkdir -p ./lib if ! [ -f ./lib/coder-cloud-agent ]; then echo "Downloading the cloud agent..." diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh index faddf46e..b655899f 100755 --- a/ci/build/build-vscode.sh +++ b/ci/build/build-vscode.sh @@ -8,7 +8,7 @@ MINIFY=${MINIFY-true} main() { cd "$(dirname "${0}")/../.." - cd lib/vscode + cd node_modules/code-oss-dev yarn gulp compile-build compile-extensions-build yarn gulp optimize --gulpfile ./coder.js diff --git a/ci/build/clean.sh b/ci/build/clean.sh index a3180215..08a87cb2 100755 --- a/ci/build/clean.sh +++ b/ci/build/clean.sh @@ -7,9 +7,9 @@ main() { git clean -Xffd - pushd lib/vscode - git clean -xffd - popd + # pushd lib/vscode + # git clean -xffd + # popd } main "$@" diff --git a/ci/dev/fmt.sh b/ci/dev/fmt.sh index 3d389aa1..63deb565 100755 --- a/ci/dev/fmt.sh +++ b/ci/dev/fmt.sh @@ -19,7 +19,7 @@ main() { "*.sh" ) prettier --write --loglevel=warn $( - git ls-files "${prettierExts[@]}" | grep -v "lib/vscode" | grep -v 'helm-chart' + git ls-files "${prettierExts[@]}" | grep -v 'helm-chart' ) doctoc --title '# FAQ' docs/FAQ.md > /dev/null diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh index 9ba576e0..490b1eb4 100755 --- a/ci/dev/lint.sh +++ b/ci/dev/lint.sh @@ -4,10 +4,10 @@ set -euo pipefail main() { cd "$(dirname "$0")/../.." - eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js" | grep -v "lib/vscode") - stylelint $(git ls-files "*.css" | grep -v "lib/vscode") + eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js") + stylelint $(git ls-files "*.css") tsc --noEmit --skipLibCheck - shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh" | grep -v "lib/vscode") + shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090,SC2002 $(git ls-files "*.sh") if command -v helm && helm kubeval --help > /dev/null; then helm kubeval ci/helm-chart fi diff --git a/ci/dev/postinstall.sh b/ci/dev/postinstall.sh index 0ffa772f..59c518c2 100755 --- a/ci/dev/postinstall.sh +++ b/ci/dev/postinstall.sh @@ -10,10 +10,10 @@ main() { yarn cd .. - cd lib/vscode - yarn ${CI+--frozen-lockfile} + # cd lib/vscode + # yarn ${CI+--frozen-lockfile} - symlink_asar + # symlink_asar } main "$@" diff --git a/ci/dev/watch.ts b/ci/dev/watch.ts index 1503256c..cd46229b 100644 --- a/ci/dev/watch.ts +++ b/ci/dev/watch.ts @@ -16,7 +16,7 @@ async function main(): Promise { class Watcher { private readonly rootPath = path.resolve(__dirname, "../..") - private readonly vscodeSourcePath = path.join(this.rootPath, "lib/vscode") + private readonly vscodeSourcePath = path.join(this.rootPath, "node_modules/code-oss-dev") private static log(message: string, skipNewline = false): void { process.stdout.write(message) diff --git a/ci/lib.sh b/ci/lib.sh index 5021f99e..24b1ee53 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -14,7 +14,7 @@ pkg_json_version() { } vscode_version() { - jq -r .version lib/vscode/package.json + jq -r .version node_modules/code-oss-dev/package.json } os() { diff --git a/package.json b/package.json index 560a46f0..8eee2911 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "@coder/logger": "1.1.16", "argon2": "^0.28.0", "body-parser": "^1.19.0", + "code-oss-dev": "../vscode", "compression": "^1.7.4", "cookie-parser": "^1.4.5", "env-paths": "^2.2.0", diff --git a/src/browser/pages/vscode.html b/src/browser/pages/vscode.html index aaae0f69..9824278a 100644 --- a/src/browser/pages/vscode.html +++ b/src/browser/pages/vscode.html @@ -27,7 +27,7 @@ @@ -40,13 +40,13 @@ - +