External typescript libs

vuejs · Nov 26, 2020 · 14822aa · 14822aa
1 parent a111708
commit 14822aa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -11,6 +11,11 @@ vti
 dist-test/
 server/dist-test/
 
+server/node_modules/typescript/lib/tsc.js
+server/node_modules/typescript/lib/tsserver.js
+server/node_modules/typescript/lib/tsserverlibrary.js
+server/node_modules/typescript/lib/typescriptServices.js
+
 .**
 
 **/*.map

diff --git a/build/rollup-plugins.js b/build/rollup-plugins.js
@@ -105,7 +105,11 @@ function bundleVlsWithEsbuild() {
           /**
            * prettier-tslint need it.
            */
-          'tslint'
+          'tslint',
+          /**
+           * tslint need it.
+           */
+          'typescript'
         ],
         format: 'cjs',
         tsconfig: getServerPath('tsconfig.json'),

diff --git a/server/package.json b/server/package.json
@@ -25,7 +25,11 @@
     "eslint": "^7.13.0",
     "eslint-plugin-vue": "^7.1.0",
     "prettier": "^2.1.2",
-    "tslint": "5.18.0"
+    "tslint": "5.18.0",
+    "typescript": "^4.0.5"
+  },
+  "resolutions": {
+    "typescript": "^4.0.5"
   },
   "devDependencies": {
     "@prettier/plugin-pug": "^1.10.1",
@@ -61,7 +65,6 @@
     "source-map-support": "^0.5.19",
     "stylus": "^0.54.8",
     "stylus-supremacy": "^2.14.5",
-    "typescript": "^4.0.5",
     "vscode-css-languageservice": "4.3.5",
     "vscode-emmet-helper": "^2.0.9",
     "vscode-languageserver": "7.0.0-next.7",

diff --git a/server/rollup.config.js b/server/rollup.config.js
@@ -56,7 +56,7 @@ module.exports = [
       generateTypingsVls(),
       bundleVlsWithEsbuild(),
       copySnippets(),
-      copyTSDefaultLibs(),
+      // copyTSDefaultLibs(),
       linkVlsInCLI(),
       ...createPlugins(getVLSPath('tsconfig.json'))
     ]

diff --git a/server/yarn.lock b/server/yarn.lock
@@ -4523,11 +4523,7 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^3.6.3, typescript@^3.9.3:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-
-typescript@^4.0.5:
+typescript@^3.6.3, typescript@^3.9.3, typescript@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
   integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==