diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-08 06:15:40 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-08 06:15:40 +0000 |
| commit | 021e97ea03cf67ad7785ab39580e04bc69506b8c (patch) | |
| tree | a728e4e0ff7c402466dac864168add49798b9b66 /editors/code | |
| parent | dfd0626dbfea6816d38e6f72ce84f567877603e7 (diff) | |
| parent | e65cd07e488e3a7bd50061f6dc33b333583654ae (diff) | |
Merge #6759
6759: Remove workaround & fix fetch$1 is not a function r=lnicola a=kafji
Remove workaround for https://github.com/rollup/plugins/issues/491
because it's fixed in 15.0
https://github.com/rollup/plugins/blob/master/packages/commonjs/CHANGELOG.md#v1500.
Also fix fetch$1 is not a function error
https://github.com/rust-analyzer/rust-analyzer/issues/6757.
Co-authored-by: Kafji <[email protected]>
Diffstat (limited to 'editors/code')
| -rw-r--r-- | editors/code/src/net.ts | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/editors/code/src/net.ts b/editors/code/src/net.ts index 9ba17b7b5..1ab21e726 100644 --- a/editors/code/src/net.ts +++ b/editors/code/src/net.ts | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | // Replace with `import fetch from "node-fetch"` once this is fixed in rollup: | 1 | import fetch from "node-fetch"; |
| 2 | // https://github.com/rollup/plugins/issues/491 | ||
| 3 | const fetch = require("node-fetch") as typeof import("node-fetch")["default"]; | ||
| 4 | |||
| 5 | import * as vscode from "vscode"; | 2 | import * as vscode from "vscode"; |
| 6 | import * as stream from "stream"; | 3 | import * as stream from "stream"; |
| 7 | import * as crypto from "crypto"; | 4 | import * as crypto from "crypto"; |