Skip to content

Commit 22fb477

Browse files
GirlBossRushGirlBossRush
committed
Flesh out protocol clean up. WIP
1 parent 137eb0b commit 22fb477

File tree

85 files changed

+2406
-2246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2406
-2246
lines changed

‎ci/build/build-vscode.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ main() {
1010
cd "$(dirname "${0}")/../.."
1111
cd lib/vscode
1212

13-
yarn gulp compile-build compile-extensions-build
13+
yarn gulp compile-build compile-web compile-extensions-build
1414
yarn gulp optimize --gulpfile ./coder.js
1515
if [[ $MINIFY ]]; then
1616
yarn gulp minify --gulpfile ./coder.js

‎ci/dev/watch.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ async function main(): Promise<void> {
88
try {
99
const watcher = new Watcher()
1010
await watcher.watch()
11-
} catch (error) {
11+
} catch (error: any) {
1212
console.error(error.message)
1313
process.exit(1)
1414
}
@@ -38,6 +38,9 @@ class Watcher {
3838
}
3939

4040
const vscode = cp.spawn("yarn", ["watch"], { cwd: this.vscodeSourcePath })
41+
42+
const vscodeWebExtensions = cp.spawn("yarn", ["watch-web"], { cwd: this.vscodeSourcePath })
43+
4144
const tsc = cp.spawn("tsc", ["--watch", "--pretty", "--preserveWatchOutput"], { cwd: this.rootPath })
4245
const plugin = process.env.PLUGIN_DIR
4346
? cp.spawn("yarn", ["build", "--watch"], { cwd: process.env.PLUGIN_DIR })
@@ -48,6 +51,10 @@ class Watcher {
4851
vscode.removeAllListeners()
4952
vscode.kill()
5053

54+
Watcher.log("killing vs code web extension watcher")
55+
vscodeWebExtensions.removeAllListeners()
56+
vscodeWebExtensions.kill()
57+
5158
Watcher.log("killing tsc")
5259
tsc.removeAllListeners()
5360
tsc.kill()
@@ -75,19 +82,28 @@ class Watcher {
7582
Watcher.log("vs code watcher terminated unexpectedly")
7683
cleanup(code)
7784
})
85+
86+
vscodeWebExtensions.on("exit", (code) => {
87+
Watcher.log("vs code extension watcher terminated unexpectedly")
88+
cleanup(code)
89+
})
90+
7891
tsc.on("exit", (code) => {
7992
Watcher.log("tsc terminated unexpectedly")
8093
cleanup(code)
8194
})
95+
8296
if (plugin) {
8397
plugin.on("exit", (code) => {
8498
Watcher.log("plugin terminated unexpectedly")
8599
cleanup(code)
86100
})
87101
}
88102

103+
vscodeWebExtensions.stderr.on("data", (d) => process.stderr.write(d))
89104
vscode.stderr.on("data", (d) => process.stderr.write(d))
90105
tsc.stderr.on("data", (d) => process.stderr.write(d))
106+
91107
if (plugin) {
92108
plugin.stderr.on("data", (d) => process.stderr.write(d))
93109
}

‎lib/vscode/build/lib/watch/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ fsevents@~2.3.1:
148148
integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
149149

150150
glob-parent@^5.1.1, glob-parent@~5.1.0:
151-
version "5.1.1"
152-
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
153-
integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
151+
version "5.1.2"
152+
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
153+
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
154154
dependencies:
155155
is-glob "^4.0.1"
156156

@@ -397,4 +397,4 @@ vscode-gulp-watch@^5.0.3:
397397
plugin-error "1.0.1"
398398
readable-stream "^3.6.0"
399399
vinyl "^2.2.0"
400-
vinyl-file "^3.0.0"
400+
vinyl-file "^3.0.0"

‎lib/vscode/build/yarn.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,9 @@ entities@~2.0.0:
749749
integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
750750

751751
esbuild@^0.12.6:
752-
version "0.12.21"
753-
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.21.tgz#7ff32a9ac73ce4310f9cb61ea4c3da9756570d46"
754-
integrity sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==
752+
version "0.12.6"
753+
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.6.tgz#85bc755c7cf3005d4f34b4f10f98049ce0ee67ce"
754+
integrity sha512-RDvVLvAjsq/kIZJoneMiUOH7EE7t2QaW7T3Q7EdQij14+bZbDq5sndb0tTanmHIFSqZVMBMMyqzVHkS3dJobeA==
755755

756756
escape-string-regexp@^1.0.5:
757757
version "1.0.5"
@@ -1085,9 +1085,9 @@ mute-stream@~0.0.4:
10851085
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
10861086

10871087
normalize-url@^4.1.0:
1088-
version "4.5.0"
1089-
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
1090-
integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
1088+
version "4.5.1"
1089+
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
1090+
integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
10911091

10921092
nth-check@~1.0.1:
10931093
version "1.0.2"
@@ -1097,9 +1097,9 @@ nth-check@~1.0.1:
10971097
boolbase "~1.0.0"
10981098

10991099
object-inspect@^1.9.0:
1100-
version "1.11.0"
1101-
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
1102-
integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
1100+
version "1.10.3"
1101+
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
1102+
integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
11031103

11041104
once@^1.3.0, once@^1.3.1, once@^1.4.0:
11051105
version "1.4.0"
@@ -1307,9 +1307,9 @@ tunnel@0.0.6:
13071307
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
13081308

13091309
typed-rest-client@^1.8.4:
1310-
version "1.8.5"
1311-
resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.5.tgz#3d331f2761c2be0103bda71a7d19ab08533f3b5a"
1312-
integrity sha512-952/Aegu3lTqUAI1anbDLbewojnF/gh8at9iy1CIrfS1h/+MtNjB1Y9z6ZF5n2kZd+97em56lZ9uu7Zz3y/pwg==
1310+
version "1.8.4"
1311+
resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.4.tgz#ba3fb788e5b9322547406392533f12d660a5ced6"
1312+
integrity sha512-MyfKKYzk3I6/QQp6e1T50py4qg+c+9BzOEl2rBmQIpStwNUoqQ73An+Tkfy9YuV7O+o2mpVVJpe+fH//POZkbg==
13131313
dependencies:
13141314
qs "^6.9.1"
13151315
tunnel "0.0.6"

‎lib/vscode/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
"yazl": "^2.4.3"
9292
},
9393
"devDependencies": {
94-
"7zip": "0.0.6",
95-
"@types/proxy-from-env": "^1.0.1",
96-
"@types/tar-stream": "^2.2.1",
9794
"@types/applicationinsights": "0.20.0",
9895
"@types/chokidar": "2.1.3",
9996
"@types/cookie": "^0.3.3",
@@ -107,7 +104,9 @@
107104
"@types/minimist": "^1.2.1",
108105
"@types/mocha": "^8.2.0",
109106
"@types/node": "14.x",
107+
"@types/proxy-from-env": "^1.0.1",
110108
"@types/sinon": "^1.16.36",
109+
"@types/tar-stream": "^2.2.1",
111110
"@types/trusted-types": "^1.0.6",
112111
"@types/vscode-windows-registry": "^1.0.0",
113112
"@types/webpack": "^4.41.25",
@@ -120,6 +119,7 @@
120119
"@types/yazl": "^2.4.2",
121120
"@typescript-eslint/eslint-plugin": "3.2.0",
122121
"@typescript-eslint/parser": "^3.3.0",
122+
"7zip": "0.0.6",
123123
"ansi-colors": "^3.2.3",
124124
"asar": "^3.0.3",
125125
"chromium-pickle-js": "^0.2.0",
@@ -129,14 +129,13 @@
129129
"cssnano": "^5.0.2",
130130
"debounce": "^1.0.0",
131131
"deemon": "^1.4.0",
132-
"eslint": "6.8.0",
133132
"eslint-plugin-jsdoc": "^19.1.0",
133+
"eslint": "6.8.0",
134134
"event-stream": "3.3.4",
135135
"fancy-log": "^1.3.3",
136136
"fast-plist": "0.1.2",
137137
"file-loader": "^4.2.0",
138138
"glob": "^5.0.13",
139-
"gulp": "^4.0.0",
140139
"gulp-bom": "^3.0.0",
141140
"gulp-buffer": "0.0.2",
142141
"gulp-concat": "^2.6.1",
@@ -155,6 +154,7 @@
155154
"gulp-sourcemaps": "^3.0.0",
156155
"gulp-tsb": "4.0.6",
157156
"gulp-vinyl-zip": "^2.1.2",
157+
"gulp": "^4.0.0",
158158
"husky": "^0.13.1",
159159
"innosetup": "6.0.5",
160160
"is": "^3.1.0",
@@ -170,9 +170,9 @@
170170
"minimatch": "^3.0.4",
171171
"minimist": "^1.2.5",
172172
"mkdirp": "^1.0.4",
173-
"mocha": "^8.2.1",
174173
"mocha-junit-reporter": "^2.0.0",
175174
"mocha-multi-reporters": "^1.5.1",
175+
"mocha": "^8.2.1",
176176
"npm-run-all": "^4.1.5",
177177
"opn": "^6.0.0",
178178
"optimist": "0.3.5",
@@ -184,22 +184,22 @@
184184
"rcedit": "^1.1.0",
185185
"request": "^2.85.0",
186186
"sinon": "^1.17.2",
187-
"source-map": "0.6.1",
188187
"source-map-support": "^0.3.2",
188+
"source-map": "0.6.1",
189189
"style-loader": "^1.0.0",
190190
"ts-loader": "^6.2.1",
191191
"tsec": "0.1.4",
192-
"typescript": "^4.4.0-dev.20210528",
193192
"typescript-formatter": "7.1.0",
193+
"typescript": "^4.4.0-dev.20210528",
194194
"underscore": "^1.12.1",
195-
"vinyl": "^2.0.0",
196195
"vinyl-fs": "^3.0.0",
196+
"vinyl": "^2.0.0",
197197
"vscode-debugprotocol": "1.47.0",
198198
"vscode-nls-dev": "^3.3.1",
199199
"vscode-telemetry-extractor": "^1.7.0",
200-
"webpack": "^4.43.0",
201200
"webpack-cli": "^3.3.12",
202201
"webpack-stream": "^5.2.1",
202+
"webpack": "^4.43.0",
203203
"xml2js": "^0.4.17",
204204
"yaserver": "^0.2.0"
205205
},

‎lib/vscode/resources/web/code-web.d.ts‎

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

0 commit comments

Comments
 (0)