diff options
author | Aleksey Kladov <[email protected]> | 2020-02-03 13:57:14 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-02-03 14:25:29 +0000 |
commit | 30f7e6590a37ef76ac53df665b54dade9aeece7d (patch) | |
tree | 6585ba6bb714341e16c7e409a27280d29cad3830 | |
parent | 834fcecd3152b34efc3c194ee0af530e588e0560 (diff) |
Remove recent improvements to the build script
tslib as a dev dependency and commonjs modules are definitely *wrong*
in the ideal world, **but** in the real world that's the only
combination that works. See
https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Problems.20with.20TypeScript.20build
-rw-r--r-- | editors/code/package-lock.json | 15 | ||||
-rw-r--r-- | editors/code/package.json | 8 | ||||
-rw-r--r-- | editors/code/tsconfig.json | 6 |
3 files changed, 14 insertions, 15 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 4096255ac..712153c34 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json | |||
@@ -51,13 +51,13 @@ | |||
51 | } | 51 | } |
52 | }, | 52 | }, |
53 | "@rollup/plugin-typescript": { | 53 | "@rollup/plugin-typescript": { |
54 | "version": "3.0.0", | 54 | "version": "2.1.0", |
55 | "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-3.0.0.tgz", | 55 | "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz", |
56 | "integrity": "sha512-O6915Ril3+Q0B4P898PULAcPFZfPuatEB/4nox7bnK48ekGrmamMYhMB5tOqWjihEWrw4oz/NL+c+/kS3Fk95g==", | 56 | "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==", |
57 | "dev": true, | 57 | "dev": true, |
58 | "requires": { | 58 | "requires": { |
59 | "@rollup/pluginutils": "^3.0.1", | 59 | "@rollup/pluginutils": "^3.0.0", |
60 | "resolve": "^1.14.1" | 60 | "resolve": "^1.13.1" |
61 | } | 61 | } |
62 | }, | 62 | }, |
63 | "@rollup/pluginutils": { | 63 | "@rollup/pluginutils": { |
@@ -749,7 +749,8 @@ | |||
749 | "tslib": { | 749 | "tslib": { |
750 | "version": "1.10.0", | 750 | "version": "1.10.0", |
751 | "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", | 751 | "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", |
752 | "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" | 752 | "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", |
753 | "dev": true | ||
753 | }, | 754 | }, |
754 | "tslint": { | 755 | "tslint": { |
755 | "version": "5.20.1", | 756 | "version": "5.20.1", |
@@ -895,7 +896,7 @@ | |||
895 | "vscode-languageclient": { | 896 | "vscode-languageclient": { |
896 | "version": "6.1.0", | 897 | "version": "6.1.0", |
897 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.0.tgz", | 898 | "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.0.tgz", |
898 | "integrity": "sha1-7mfAt4GMQs4CgVctBcia38xPWjg=", | 899 | "integrity": "sha512-Tcp0VoOaa0YzxL4nEfK9tsmcy76Eo8jNLvFQZwh2c8oMm02luL8uGYPLQNAiZ3XGgegfcwiQFZMqbW7DNV0vxA==", |
899 | "requires": { | 900 | "requires": { |
900 | "semver": "^6.3.0", | 901 | "semver": "^6.3.0", |
901 | "vscode-languageserver-protocol": "^3.15.2" | 902 | "vscode-languageserver-protocol": "^3.15.2" |
diff --git a/editors/code/package.json b/editors/code/package.json index e733ee2b4..06aa747fe 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -26,20 +26,20 @@ | |||
26 | "dependencies": { | 26 | "dependencies": { |
27 | "jsonc-parser": "^2.1.0", | 27 | "jsonc-parser": "^2.1.0", |
28 | "seedrandom": "^3.0.5", | 28 | "seedrandom": "^3.0.5", |
29 | "vscode-languageclient": "^6.1.0", | 29 | "vscode-languageclient": "^6.1.0" |
30 | "tslib": "^1.10.0" | ||
31 | }, | 30 | }, |
32 | "devDependencies": { | 31 | "devDependencies": { |
33 | "@rollup/plugin-commonjs": "^11.0.1", | 32 | "@rollup/plugin-commonjs": "^11.0.1", |
34 | "@rollup/plugin-node-resolve": "^6.1.0", | 33 | "@rollup/plugin-node-resolve": "^6.1.0", |
35 | "@rollup/plugin-typescript": "^3.0.0", | 34 | "@rollup/plugin-typescript": "^2.0.0", |
36 | "@types/node": "^12.12.25", | 35 | "@types/node": "^12.12.25", |
37 | "@types/seedrandom": "^2.4.28", | 36 | "@types/seedrandom": "^2.4.28", |
38 | "@types/vscode": "^1.41.0", | 37 | "@types/vscode": "^1.41.0", |
39 | "rollup": "^1.30.1", | 38 | "rollup": "^1.30.1", |
39 | "tslib": "^1.10.0", | ||
40 | "tslint": "^5.20.1", | 40 | "tslint": "^5.20.1", |
41 | "typescript": "^3.7.5", | ||
42 | "typescript-formatter": "^7.2.2", | 41 | "typescript-formatter": "^7.2.2", |
42 | "typescript": "^3.7.5", | ||
43 | "vsce": "^1.71.0" | 43 | "vsce": "^1.71.0" |
44 | }, | 44 | }, |
45 | "activationEvents": [ | 45 | "activationEvents": [ |
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json index 42130c5e1..d74169c29 100644 --- a/editors/code/tsconfig.json +++ b/editors/code/tsconfig.json | |||
@@ -1,7 +1,6 @@ | |||
1 | { | 1 | { |
2 | "compilerOptions": { | 2 | "compilerOptions": { |
3 | "moduleResolution": "node", | 3 | "module": "commonjs", |
4 | "module": "es2015", | ||
5 | "target": "es2018", | 4 | "target": "es2018", |
6 | "outDir": "out", | 5 | "outDir": "out", |
7 | "lib": [ | 6 | "lib": [ |
@@ -15,8 +14,7 @@ | |||
15 | "noImplicitReturns": true, | 14 | "noImplicitReturns": true, |
16 | "noFallthroughCasesInSwitch": true, | 15 | "noFallthroughCasesInSwitch": true, |
17 | "newLine": "LF", | 16 | "newLine": "LF", |
18 | "esModuleInterop": true, | 17 | "esModuleInterop": true |
19 | "importHelpers": true | ||
20 | }, | 18 | }, |
21 | "exclude": [ | 19 | "exclude": [ |
22 | "node_modules" | 20 | "node_modules" |