aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/user/README.md3
-rw-r--r--editors/code/.gitignore1
-rw-r--r--editors/code/.vscodeignore6
-rw-r--r--editors/code/package-lock.json190
-rw-r--r--editors/code/package.json12
-rw-r--r--editors/code/rollup.config.js27
6 files changed, 216 insertions, 23 deletions
diff --git a/docs/user/README.md b/docs/user/README.md
index 6d92359e2..9d03cad1c 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -76,7 +76,8 @@ See [microsoft/vscode#72308](https://github.com/microsoft/vscode/issues/72308) f
76 This is not very intuitive and a limitation of a current implementation. 76 This is not very intuitive and a limitation of a current implementation.
77* `rust-analyzer.useClientWatching`: use client provided file watching instead 77* `rust-analyzer.useClientWatching`: use client provided file watching instead
78 of notify watching. 78 of notify watching.
79* `rust-analyzer.cargo-watch.check-arguments`: cargo-watch check arguments. 79* `rust-analyzer.cargo-watch.command`: `cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )
80* `rust-analyzer.cargo-watch.arguments`: cargo-watch check arguments.
80 (e.g: `--features="shumway,pdf"` will run as `cargo watch -x "check --features="shumway,pdf""` ) 81 (e.g: `--features="shumway,pdf"` will run as `cargo watch -x "check --features="shumway,pdf""` )
81* `rust-analyzer.trace.server`: enables internal logging 82* `rust-analyzer.trace.server`: enables internal logging
82* `rust-analyzer.trace.cargo-watch`: enables cargo-watch logging 83* `rust-analyzer.trace.cargo-watch`: enables cargo-watch logging
diff --git a/editors/code/.gitignore b/editors/code/.gitignore
index 5fe00fea8..d8a45ea82 100644
--- a/editors/code/.gitignore
+++ b/editors/code/.gitignore
@@ -2,3 +2,4 @@ out
2node_modules 2node_modules
3.vscode-test/ 3.vscode-test/
4*.vsix 4*.vsix
5bundle
diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
index 855717896..f9e72b668 100644
--- a/editors/code/.vscodeignore
+++ b/editors/code/.vscodeignore
@@ -1,9 +1,9 @@
1.vscode/** 1.vscode/**
2.vscode-test/** 2.vscode-test/**
3out/test/** 3out/**
4out/**/*.map
5src/** 4src/**
6.gitignore 5.gitignore
7tsconfig.json 6tsconfig.json
8vsc-extension-quickstart.md 7vsc-extension-quickstart.md
9tslint.json \ No newline at end of file 8tslint.json
9node_modules/**
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 5ffd8b0bd..e4b706ce6 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -24,6 +24,12 @@
24 "js-tokens": "^4.0.0" 24 "js-tokens": "^4.0.0"
25 } 25 }
26 }, 26 },
27 "@types/estree": {
28 "version": "0.0.39",
29 "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
30 "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
31 "dev": true
32 },
27 "@types/events": { 33 "@types/events": {
28 "version": "3.0.0", 34 "version": "3.0.0",
29 "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", 35 "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -59,6 +65,15 @@
59 "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==", 65 "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==",
60 "dev": true 66 "dev": true
61 }, 67 },
68 "@types/resolve": {
69 "version": "0.0.8",
70 "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
71 "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
72 "dev": true,
73 "requires": {
74 "@types/node": "*"
75 }
76 },
62 "@types/seedrandom": { 77 "@types/seedrandom": {
63 "version": "2.4.28", 78 "version": "2.4.28",
64 "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.28.tgz", 79 "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.28.tgz",
@@ -71,6 +86,12 @@
71 "integrity": "sha512-PRfeuqYuzk3vjf+puzxltIUWC+AhEGYpFX29/37w30DQSQnpf5AgMVf7GDBAdmTbWTBou+EMFz/Ne6XCM/KxzQ==", 86 "integrity": "sha512-PRfeuqYuzk3vjf+puzxltIUWC+AhEGYpFX29/37w30DQSQnpf5AgMVf7GDBAdmTbWTBou+EMFz/Ne6XCM/KxzQ==",
72 "dev": true 87 "dev": true
73 }, 88 },
89 "acorn": {
90 "version": "7.0.0",
91 "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
92 "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
93 "dev": true
94 },
74 "agent-base": { 95 "agent-base": {
75 "version": "4.3.0", 96 "version": "4.3.0",
76 "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", 97 "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
@@ -424,6 +445,12 @@
424 "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", 445 "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
425 "dev": true 446 "dev": true
426 }, 447 },
448 "estree-walker": {
449 "version": "0.6.1",
450 "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
451 "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
452 "dev": true
453 },
427 "esutils": { 454 "esutils": {
428 "version": "2.0.2", 455 "version": "2.0.2",
429 "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", 456 "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
@@ -632,6 +659,21 @@
632 "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", 659 "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
633 "dev": true 660 "dev": true
634 }, 661 },
662 "is-module": {
663 "version": "1.0.0",
664 "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
665 "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
666 "dev": true
667 },
668 "is-reference": {
669 "version": "1.1.3",
670 "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.3.tgz",
671 "integrity": "sha512-W1iHHv/oyBb2pPxkBxtaewxa1BC58Pn5J0hogyCdefwUIvb6R+TGbAcIa4qPNYLqLhb3EnOgUf2MQkkF76BcKw==",
672 "dev": true,
673 "requires": {
674 "@types/estree": "0.0.39"
675 }
676 },
635 "is-regex": { 677 "is-regex": {
636 "version": "1.0.4", 678 "version": "1.0.4",
637 "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", 679 "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -721,6 +763,15 @@
721 "chalk": "^2.0.1" 763 "chalk": "^2.0.1"
722 } 764 }
723 }, 765 },
766 "magic-string": {
767 "version": "0.25.3",
768 "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
769 "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
770 "dev": true,
771 "requires": {
772 "sourcemap-codec": "^1.4.4"
773 }
774 },
724 "map-age-cleaner": { 775 "map-age-cleaner": {
725 "version": "0.1.3", 776 "version": "0.1.3",
726 "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", 777 "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -1160,6 +1211,109 @@
1160 "glob": "^7.1.3" 1211 "glob": "^7.1.3"
1161 } 1212 }
1162 }, 1213 },
1214 "rollup": {
1215 "version": "1.21.4",
1216 "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.21.4.tgz",
1217 "integrity": "sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==",
1218 "dev": true,
1219 "requires": {
1220 "@types/estree": "0.0.39",
1221 "@types/node": "^12.7.5",
1222 "acorn": "^7.0.0"
1223 },
1224 "dependencies": {
1225 "@types/node": {
1226 "version": "12.7.5",
1227 "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
1228 "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==",
1229 "dev": true
1230 }
1231 }
1232 },
1233 "rollup-plugin-commonjs": {
1234 "version": "10.1.0",
1235 "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
1236 "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
1237 "dev": true,
1238 "requires": {
1239 "estree-walker": "^0.6.1",
1240 "is-reference": "^1.1.2",
1241 "magic-string": "^0.25.2",
1242 "resolve": "^1.11.0",
1243 "rollup-pluginutils": "^2.8.1"
1244 },
1245 "dependencies": {
1246 "resolve": {
1247 "version": "1.12.0",
1248 "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
1249 "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
1250 "dev": true,
1251 "requires": {
1252 "path-parse": "^1.0.6"
1253 }
1254 }
1255 }
1256 },
1257 "rollup-plugin-node-resolve": {
1258 "version": "5.2.0",
1259 "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
1260 "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
1261 "dev": true,
1262 "requires": {
1263 "@types/resolve": "0.0.8",
1264 "builtin-modules": "^3.1.0",
1265 "is-module": "^1.0.0",
1266 "resolve": "^1.11.1",
1267 "rollup-pluginutils": "^2.8.1"
1268 },
1269 "dependencies": {
1270 "builtin-modules": {
1271 "version": "3.1.0",
1272 "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
1273 "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
1274 "dev": true
1275 },
1276 "resolve": {
1277 "version": "1.12.0",
1278 "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
1279 "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
1280 "dev": true,
1281 "requires": {
1282 "path-parse": "^1.0.6"
1283 }
1284 }
1285 }
1286 },
1287 "rollup-plugin-typescript": {
1288 "version": "1.0.1",
1289 "resolved": "https://registry.npmjs.org/rollup-plugin-typescript/-/rollup-plugin-typescript-1.0.1.tgz",
1290 "integrity": "sha512-rwJDNn9jv/NsKZuyBb/h0jsclP4CJ58qbvZt2Q9zDIGILF2LtdtvCqMOL+Gq9IVq5MTrTlHZNrn8h7VjQgd8tw==",
1291 "dev": true,
1292 "requires": {
1293 "resolve": "^1.10.0",
1294 "rollup-pluginutils": "^2.5.0"
1295 },
1296 "dependencies": {
1297 "resolve": {
1298 "version": "1.12.0",
1299 "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
1300 "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
1301 "dev": true,
1302 "requires": {
1303 "path-parse": "^1.0.6"
1304 }
1305 }
1306 }
1307 },
1308 "rollup-pluginutils": {
1309 "version": "2.8.2",
1310 "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
1311 "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
1312 "dev": true,
1313 "requires": {
1314 "estree-walker": "^0.6.1"
1315 }
1316 },
1163 "safe-buffer": { 1317 "safe-buffer": {
1164 "version": "5.1.2", 1318 "version": "5.1.2",
1165 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", 1319 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -1233,6 +1387,12 @@
1233 "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", 1387 "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
1234 "dev": true 1388 "dev": true
1235 }, 1389 },
1390 "sourcemap-codec": {
1391 "version": "1.4.6",
1392 "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
1393 "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
1394 "dev": true
1395 },
1236 "sprintf-js": { 1396 "sprintf-js": {
1237 "version": "1.0.3", 1397 "version": "1.0.3",
1238 "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", 1398 "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -1414,32 +1574,32 @@
1414 } 1574 }
1415 }, 1575 },
1416 "vscode-jsonrpc": { 1576 "vscode-jsonrpc": {
1417 "version": "4.1.0-next.2", 1577 "version": "4.1.0-next.3",
1418 "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz", 1578 "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz",
1419 "integrity": "sha512-GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg==" 1579 "integrity": "sha512-Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg=="
1420 }, 1580 },
1421 "vscode-languageclient": { 1581 "vscode-languageclient": {
1422 "version": "5.3.0-next.6", 1582 "version": "5.3.0-next.4",
1423 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.6.tgz", 1583 "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.4.tgz",
1424 "integrity": "sha512-DxT8+gkenjCjJV6ArcP75/AQfx6HP6m6kHIbacPCpffMeoE1YMLKj6ZixA9J87yr0fMtBmqumLmDeGe7MIF2bw==", 1584 "integrity": "sha512-RODuzXErVpJRSgHv+Xei8fwQtZ/iZOWPCqlLl07NTtkzgTAepJf9r4EioZVuTviGJ5DEJ9xs0bjrit8shKtW6Q==",
1425 "requires": { 1585 "requires": {
1426 "semver": "^5.5.0", 1586 "semver": "^5.5.0",
1427 "vscode-languageserver-protocol": "^3.15.0-next.6" 1587 "vscode-languageserver-protocol": "3.15.0-next.4"
1428 } 1588 }
1429 }, 1589 },
1430 "vscode-languageserver-protocol": { 1590 "vscode-languageserver-protocol": {
1431 "version": "3.15.0-next.6", 1591 "version": "3.15.0-next.4",
1432 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz", 1592 "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.4.tgz",
1433 "integrity": "sha512-/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ==", 1593 "integrity": "sha512-4AgisQ8GWa3irdRu3/UNr3brcSSm0oobmoV1eSOnV7JM32lYyXDnSKB7RuTTXvaAjD/0xQJLEGhkyGHS5gbywA==",
1434 "requires": { 1594 "requires": {
1435 "vscode-jsonrpc": "^4.1.0-next.2", 1595 "vscode-jsonrpc": "^4.1.0-next.1",
1436 "vscode-languageserver-types": "^3.15.0-next.2" 1596 "vscode-languageserver-types": "3.15.0-next.1"
1437 } 1597 }
1438 }, 1598 },
1439 "vscode-languageserver-types": { 1599 "vscode-languageserver-types": {
1440 "version": "3.15.0-next.2", 1600 "version": "3.15.0-next.1",
1441 "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz", 1601 "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.1.tgz",
1442 "integrity": "sha512-2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ==" 1602 "integrity": "sha512-R0kzmaI8gOGEoU7b9huYQAzgZzRQ/5Q8HKjsIUdfz0MjXcBZ4tr1ik1So1p1O5kGrI1VTCd22Fw/wI7ECGoIPw=="
1443 }, 1603 },
1444 "vscode-test": { 1604 "vscode-test": {
1445 "version": "1.2.0", 1605 "version": "1.2.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index 38824acb4..b9982c624 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -18,12 +18,12 @@
18 "scripts": { 18 "scripts": {
19 "vscode:prepublish": "npm run compile", 19 "vscode:prepublish": "npm run compile",
20 "package": "vsce package", 20 "package": "vsce package",
21 "compile": "tsc -p ./ && shx cp src/utils/terminateProcess.sh out/utils/terminateProcess.sh", 21 "compile": "rollup -c && shx cp src/utils/terminateProcess.sh bundle/terminateProcess.sh",
22 "watch": "tsc -watch -p ./", 22 "watch": "tsc -watch -p ./",
23 "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix", 23 "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix",
24 "lint": "tslint --project .", 24 "lint": "tslint --project .",
25 "prettier": "prettier **/*.{json,ts}", 25 "prettier": "prettier **/*.{json,ts}",
26 "test": "node ./out/test/runTest.js", 26 "test": "tsc -p . && node ./out/test/runTest.js",
27 "travis": "npm run compile && npm run test && npm run lint && npm run prettier -- --write && git diff --exit-code" 27 "travis": "npm run compile && npm run test && npm run lint && npm run prettier -- --write && git diff --exit-code"
28 }, 28 },
29 "prettier": { 29 "prettier": {
@@ -35,14 +35,18 @@
35 "vscode-languageclient": "^5.3.0-next.4" 35 "vscode-languageclient": "^5.3.0-next.4"
36 }, 36 },
37 "devDependencies": { 37 "devDependencies": {
38 "@types/glob": "^7.1.1",
38 "@types/mocha": "^5.2.7", 39 "@types/mocha": "^5.2.7",
39 "@types/node": "^10.14.13", 40 "@types/node": "^10.14.13",
40 "@types/seedrandom": "^2.4.28", 41 "@types/seedrandom": "^2.4.28",
41 "@types/glob": "^7.1.1",
42 "@types/vscode": "^1.36.0", 42 "@types/vscode": "^1.36.0",
43 "glob": "^7.1.4", 43 "glob": "^7.1.4",
44 "mocha": "^6.2.0", 44 "mocha": "^6.2.0",
45 "prettier": "^1.18.2", 45 "prettier": "^1.18.2",
46 "rollup": "^1.21.4",
47 "rollup-plugin-commonjs": "^10.1.0",
48 "rollup-plugin-node-resolve": "^5.2.0",
49 "rollup-plugin-typescript": "^1.0.1",
46 "shx": "^0.3.1", 50 "shx": "^0.3.1",
47 "tslint": "^5.18.0", 51 "tslint": "^5.18.0",
48 "tslint-config-prettier": "^1.18.0", 52 "tslint-config-prettier": "^1.18.0",
@@ -56,7 +60,7 @@
56 "onCommand:rust-analyzer.collectGarbage", 60 "onCommand:rust-analyzer.collectGarbage",
57 "workspaceContains:**/Cargo.toml" 61 "workspaceContains:**/Cargo.toml"
58 ], 62 ],
59 "main": "./out/extension", 63 "main": "./bundle/extension",
60 "contributes": { 64 "contributes": {
61 "taskDefinitions": [ 65 "taskDefinitions": [
62 { 66 {
diff --git a/editors/code/rollup.config.js b/editors/code/rollup.config.js
new file mode 100644
index 000000000..a023b8c3f
--- /dev/null
+++ b/editors/code/rollup.config.js
@@ -0,0 +1,27 @@
1import typescript from 'rollup-plugin-typescript';
2import resolve from 'rollup-plugin-node-resolve';
3import commonjs from 'rollup-plugin-commonjs';
4import nodeBuiltins from 'builtin-modules';
5
6export default {
7 input: './src/extension.ts',
8 plugins: [
9 typescript(),
10 resolve(),
11 commonjs({
12 namedExports: {
13 // squelch missing import warnings
14 'vscode-languageclient': [ 'CreateFile', 'RenameFile' ]
15 }
16 }),
17 ],
18 // keep these as require() calls, bundle the rest
19 external: [
20 ...nodeBuiltins,
21 'vscode',
22 ],
23 output: {
24 file: './bundle/extension.js',
25 format: 'cjs',
26 }
27};