Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 00:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #3003

Browse source 
3003: Remove rollup-typescript r=matklad a=matklad

It seems like just calling typescript directly is simpler and more reliable?


@Veetaha what do you think about this approach?

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-02-03 17:11:36 +00:00 committed by GitHub
commit b090ee5a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editors/code/package-lock.json generated
View file

@ -61,16 +61,6 @@
} }
} }
}, },
"@rollup/plugin-typescript": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
"integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.0.0",
"resolve": "^1.13.1"
}
},
"@rollup/pluginutils": { "@rollup/pluginutils": {
"version": "3.0.8", "version": "3.0.8",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",

5
editors/code/package.json
View file

@ -18,9 +18,9 @@
"vscode": "^1.41.0" "vscode": "^1.41.0"
}, },
"scripts": { "scripts": {
"vscode:prepublish": "rollup -c", "vscode:prepublish": "tsc && rollup -c",
"package": "vsce package", "package": "vsce package",
"watch": "tsc -watch -p ./", "watch": "tsc --watch",
"fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix" "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix"
}, },
"dependencies": { "dependencies": {
@ -30,7 +30,6 @@
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-commonjs": "^11.0.2",
"@rollup/plugin-node-resolve": "^7.1.1", "@rollup/plugin-node-resolve": "^7.1.1",
"@rollup/plugin-typescript": "^2.0.0",
"@types/node": "^12.12.25", "@types/node": "^12.12.25",
"@types/vscode": "^1.41.0", "@types/vscode": "^1.41.0",
"rollup": "^1.31.0", "rollup": "^1.31.0",

4
editors/code/rollup.config.js
View file

@ -1,12 +1,10 @@
import typescript from '@rollup/plugin-typescript';
import resolve from '@rollup/plugin-node-resolve'; import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs'; import commonjs from '@rollup/plugin-commonjs';
import nodeBuiltins from 'builtin-modules'; import nodeBuiltins from 'builtin-modules';
export default { export default {
input: 'src/main.ts', input: 'out/main.js',
plugins: [ plugins: [
typescript(),
resolve({ resolve({
preferBuiltins: true preferBuiltins: true
}), }),