Skip to content

Commit b901043

Browse files
committed
Target a recent commit for VS Code
This is so we can try out the web worker extension host.
1 parent 624a4c0 commit b901043

File tree

12 files changed

+442
-579
lines changed

12 files changed

+442
-579
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ matrix:
88
- os: linux
99
dist: trusty
1010
env:
11-
- VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
11+
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
1212
- os: linux
1313
dist: trusty
1414
env:
15-
- VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
15+
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
1616
- os: osx
1717
env:
18-
- VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
18+
- VSCODE_VERSION="20dd80d91a76cbe80fb1d1979c3a9f02d94ba161" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
1919
before_install:
2020
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
2121
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi

README.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ data collected to improve code-server.
8181
```shell
8282
git clone https://github.com/microsoft/vscode
8383
cd vscode
84-
git checkout 1.37.0
84+
git checkout <see travis.yml for the VS Code version to use here>
8585
git clone https://github.com/cdr/code-server src/vs/server
8686
cd src/vs/server
8787
yarn patch:apply
@@ -98,30 +98,28 @@ If you run into issues about a different version of Node being used, try running
9898
`vscode-ripgrep`.
9999

100100
### Upgrading VS Code
101-
We have to patch VS Code to provide and fix some functionality. As the web
102-
portion of VS Code matures, we'll be able to shrink and maybe even entirely
103-
eliminate our patch. In the meantime, however, upgrading the VS Code version
104-
requires ensuring that the patch still applies and has the intended effects.
101+
We patch VS Code to provide and fix some functionality. As the web portion of VS
102+
Code matures, we'll be able to shrink and maybe even entirely eliminate our
103+
patch. In the meantime, however, upgrading the VS Code version requires ensuring
104+
that the patch still applies and has the intended effects.
105105

106106
To generate a new patch, **stage all the changes** you want to be included in
107107
the patch in the VS Code source, then run `yarn patch:generate` in this
108108
directory.
109109

110110
Our changes include:
111-
- Add a `code-server` schema.
111+
- Change the remote schema to `code-server`.
112112
- Allow multiple extension directories (both user and built-in).
113113
- Modify the loader, websocket, webview, service worker, and asset requests to
114114
use the URL of the page as a base (and TLS if necessary for the websocket).
115-
- Send client-side telemetry through the server.
116-
- Add a file prefix to ignore for temporary files created during upload.
117-
- Insert our upload service for use in editor windows and explorer.
118-
- Modify the log level to get its initial setting from the server.
119-
- Change a regular expression used for mnemonics so it works on Firefox.
115+
- Send client-side telemetry through the server and get the initial log level
116+
from the server.
117+
- Add an upload service for use in editor windows and the explorer along with a
118+
file prefix to ignore for temporary files created during upload.
119+
- Make changing the display language work.
120+
- Make hiding or toggling the menu bar possible.
120121
- Make it possible for us to load code on the client.
121122
- Modify the build process to include our code.
122-
- Fix a CSP issue within webviews.
123-
- Fix an issue displaying extension contributions.
124-
- Make changing the display language work.
125123

126124
## License
127125
[MIT](LICENSE)

scripts/tasks.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function build-task() {
133133
mkdir -p "${stagingPath}"
134134
if [[ ! -d "${sourcePath}" ]] ; then
135135
if ! download-pre-built "vscode-${vscodeVersion}.tar.gz" ; then
136-
git clone https://github.com/microsoft/vscode --quiet \
136+
git clone https://github.com/microsoft/vscode --quiet \
137137
--branch "${vscodeVersion}" --single-branch --depth=1 \
138138
"${sourcePath}"
139139
fi

0 commit comments

Comments
 (0)