Skip to content

Commit bdd11f7

Browse files
committed
Update to 1.39.2
Also too the opportunity to rewrite the build script since there was a change in the build steps (mainly how the product JSON is inserted) and to get the build changes out of the patch. It also no longer relies on external caching (we'll want to do this within CI instead).
1 parent 56ce780 commit bdd11f7

25 files changed

+1121
-1319
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules
22
build
33
release
4+
binaries

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66

77
before_install:
88
- export MAJOR_VERSION="2"
9-
- export VSCODE_VERSION="1.38.1"
9+
- export VSCODE_VERSION="1.39.2"
1010
- export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
1111
- export TAG="$VERSION-vsc$VSCODE_VERSION"
1212
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi

package.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
{
22
"license": "MIT",
33
"scripts": {
4-
"ensure-in-vscode": "bash ./scripts/tasks.bash ensure-in-vscode",
5-
"preinstall": "yarn ensure-in-vscode && cd ../../../ && yarn || true",
4+
"runner": "cd ./scripts && node --max-old-space-size=32384 -r ts-node/register ./build.ts",
5+
"preinstall": "yarn runner ensure-in-vscode && cd ../../../ && yarn || true",
66
"postinstall": "rm -rf node_modules/@types/node",
7-
"start": "yarn ensure-in-vscode && nodemon --watch ../../../out --verbose ../../../out/vs/server/main.js",
8-
"watch": "yarn ensure-in-vscode && cd ../../../ && yarn watch",
9-
"build": "bash ./scripts/tasks.bash build",
10-
"package": "bash ./scripts/tasks.bash package",
11-
"package-prebuilt": "bash ./scripts/tasks.bash package-prebuilt",
12-
"binary": "bash ./scripts/tasks.bash binary",
13-
"patch:generate": "yarn ensure-in-vscode && cd ../../../ && git diff --staged > ./src/vs/server/scripts/vscode.patch",
14-
"patch:apply": "yarn ensure-in-vscode && cd ../../../ && git apply ./src/vs/server/scripts/vscode.patch"
7+
"start": "yarn runner ensure-in-vscode && nodemon --watch ../../../out --verbose ../../../out/vs/server/main.js",
8+
"watch": "yarn runner ensure-in-vscode && cd ../../../ && yarn watch",
9+
"build": "yarn runner build",
10+
"package": "yarn runner package",
11+
"binary": "yarn runner binary",
12+
"patch:generate": "yarn runner ensure-in-vscode && cd ../../../ && git diff --staged > ./src/vs/server/scripts/vscode.patch",
13+
"patch:apply": "yarn runner ensure-in-vscode && cd ../../../ && git apply ./src/vs/server/scripts/vscode.patch"
1514
},
1615
"devDependencies": {
1716
"@coder/nbin": "^1.2.2",
17+
"@types/fs-extra": "^8.0.1",
1818
"@types/pem": "^1.9.5",
1919
"@types/safe-compare": "^1.1.0",
2020
"@types/tar-fs": "^1.16.1",
2121
"@types/tar-stream": "^1.6.1",
22-
"nodemon": "^1.19.1"
22+
"fs-extra": "^8.1.0",
23+
"nodemon": "^1.19.1",
24+
"ts-node": "^8.4.1"
2325
},
2426
"resolutions": {
2527
"@types/node": "^10.12.12",
2628
"safe-buffer": "^5.1.1"
2729
},
2830
"dependencies": {
2931
"@coder/logger": "^1.1.8",
30-
"@coder/node-browser": "^1.0.5",
32+
"@coder/node-browser": "^1.0.6",
3133
"@coder/requirefs": "^1.0.6",
3234
"httpolyglot": "^0.1.2",
3335
"pem": "^1.14.2",

scripts/build-json.js

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)