Fix #2460

vuejs · Dec 8, 2020 · 6f17207 · 6f17207 · fisker · Dec 8, 2020
1 parent e46f29c
commit 6f17207
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/server/src/services/dependencyService.ts b/server/src/services/dependencyService.ts
@@ -95,13 +95,24 @@ export interface DependencyService {
   workspacePath: string;
   init(workspacePath: string, useWorkspaceDependencies: boolean, tsSDKPath?: string): Promise<void>;
   get<L extends keyof RuntimeLibrary>(lib: L, filePath?: string): Dependency<RuntimeLibrary[L]>;
+  getBundled<L extends keyof RuntimeLibrary>(lib: L): Dependency<RuntimeLibrary[L]>;
 }
 
 export const createDependencyService = () => {
   let useWorkspaceDeps: boolean;
   let rootPath: string;
   let loaded: { [K in keyof RuntimeLibrary]: Dependency<RuntimeLibrary[K]>[] };
 
+  const bundledModules = {
+    typescript: ts,
+    prettier: prettier,
+    '@starptech/prettyhtml': prettyHTML,
+    'prettier-eslint': prettierEslint,
+    'prettier-tslint': prettierTslint,
+    'stylus-supremacy': stylusSupremacy,
+    '@prettier/plugin-pug': prettierPluginPug
+  };
+
   async function init(workspacePath: string, useWorkspaceDependencies: boolean, tsSDKPath?: string) {
     const nodeModulesPaths = useWorkspaceDependencies ? await createNodeModulesPaths(workspacePath) : [];
 
@@ -200,12 +211,12 @@ export const createDependencyService = () => {
     rootPath = workspacePath;
     loaded = {
       typescript: await loadTypeScript(),
-      prettier: await loadCommonDep('prettier', prettier),
-      '@starptech/prettyhtml': await loadCommonDep('@starptech/prettyhtml', prettyHTML),
-      'prettier-eslint': await loadCommonDep('prettier-eslint', prettierEslint),
-      'prettier-tslint': await loadCommonDep('prettier-tslint', prettierTslint),
-      'stylus-supremacy': await loadCommonDep('stylus-supremacy', stylusSupremacy),
-      '@prettier/plugin-pug': await loadCommonDep('@prettier/plugin-pug', prettierPluginPug)
+      prettier: await loadCommonDep('prettier', bundledModules['prettier']),
+      '@starptech/prettyhtml': await loadCommonDep('@starptech/prettyhtml', bundledModules['@starptech/prettyhtml']),
+      'prettier-eslint': await loadCommonDep('prettier-eslint', bundledModules['prettier-eslint']),
+      'prettier-tslint': await loadCommonDep('prettier-tslint', bundledModules['prettier-tslint']),
+      'stylus-supremacy': await loadCommonDep('stylus-supremacy', bundledModules['stylus-supremacy']),
+      '@prettier/plugin-pug': await loadCommonDep('@prettier/plugin-pug', bundledModules['@prettier/plugin-pug'])
     };
   }
 
@@ -235,6 +246,15 @@ export const createDependencyService = () => {
     return result ?? deps[0];
   };
 
+  const getBundled = <L extends keyof RuntimeLibrary>(lib: L): Dependency<RuntimeLibrary[L]> => {
+    return {
+      dir: '',
+      version: '',
+      bundled: true,
+      module: bundledModules[lib]
+    };
+  };
+
   return {
     get useWorkspaceDependencies() {
       return useWorkspaceDeps;
@@ -243,6 +263,7 @@ export const createDependencyService = () => {
       return rootPath;
     },
     init,
-    get
+    get,
+    getBundled
   };
 };
diff --git a/server/src/utils/prettier/index.ts b/server/src/utils/prettier/index.ts
@@ -113,7 +113,10 @@ export function prettierPluginPugify(
   initialIndent: boolean
 ): TextEdit[] {
   try {
-    const prettier = dependencyService.get('prettier', fileFsPath).module;
+    let prettier = dependencyService.get('prettier', fileFsPath).module;
+    if (prettier.version.startsWith('1')) {
+      prettier = dependencyService.getBundled('prettier').module;
+    }
     const prettierPluginPug = dependencyService.get('@prettier/plugin-pug', fileFsPath).module;
     const prettierOptions = getPrettierOptions(dependencyService, prettier, fileFsPath, parser, vlsFormatConfig);
     prettierOptions.pluginSearchDirs = [];