volar-service-prettier 0.0.30 → 0.0.31-patch.1

package/index.d.ts

@@ -41,5 +41,9 @@ export declare function create(options?: {
      */
     prettier?: typeof import('prettier') | undefined;
     getPrettier?: (serviceEnv: ServiceEnvironment) => typeof import('prettier') | undefined;
+    /**
+     * If true, the plugin will not throw an error if it can't load Prettier either through the `prettier`, or `getPrettier` properties or through a normal `import('prettier')`.
+     */
+    allowImportError?: boolean;
 }, getPrettierConfig?: (filePath: string, prettier: typeof import('prettier'), config?: ResolveConfigOptions) => Promise<Options>): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -8,16 +8,28 @@ function create(options = {}, getPrettierConfig = async (filePath, prettier, con
     return {
         name: 'prettier',
         create(context) {
-            let prettier;
+            const languages = options.languages ?? ['html', 'css', 'scss', 'typescript', 'javascript'];
+            let _prettier = options.prettier;
             try {
-                prettier = options.prettier
-                    ?? options.getPrettier?.(context.env)
-                    ?? require('prettier');
+                if (!_prettier) {
+                    if (options.getPrettier) {
+                        _prettier = options.getPrettier(context.env);
+                    }
+                    else {
+                        _prettier = require('prettier');
+                    }
+                }
             }
-            catch (e) {
-                throw new Error("Could not load Prettier: " + e);
+            catch (error) {
+                if (!options.allowImportError) {
+                    throw new Error("Could not load Prettier: ");
+                }
+                ;
             }
-            const languages = options.languages ?? ['html', 'css', 'scss', 'typescript', 'javascript'];
+            if (!_prettier) {
+                return {};
+            }
+            const prettier = _prettier;
             return {
                 async provideDocumentFormattingEdits(document, _, formatOptions) {
                     if (!languages.includes(document.languageId)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-prettier",
-	"version": "0.0.30",
+	"version": "0.0.31-patch.1",
 	"description": "Integrate Prettier into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/prettier",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -32,7 +32,7 @@
 		"prettier": "^3.0.3"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.0.1",
+		"@volar/language-service": "~2.1.0",
 		"prettier": "^2.2 || ^3.0"
 	},
 	"peerDependenciesMeta": {
@@ -42,6 +42,5 @@
 		"@volar/language-service": {
 			"optional": true
 		}
-	},
-	"gitHead": "30c3cc3c76e90f75f14fe0c2fa4fd33b7ff06507"
+	}
 }

package/sample/README.md

@@ -0,0 +1 @@
+Copy from `*.vue.html` to `*.vue` and `Format Document With Volar` (or simply save in Visual Studio Code) to see the differences.