Merge branch 'master' into share-sample-logic

sveltejs · Mar 9, 2021 · 8db7186 · 8db7186
2 parents 047d94f + 51ceb0c
commit 8db7186
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/packages/svelte-vscode/package-json-schema.json b/packages/svelte-vscode/package-json-schema.json
@@ -3,7 +3,7 @@
     "properties": {
         "prettier": {
             "description": "Prettier-Plugin-Svelte configuration",
-            "$ref": "./prettier-options-schema.json"
+            "$ref": "./prettier-options.json"
         }
     }
 }
diff --git a/packages/svelte-vscode/prettier-options-schema.json b/packages/svelte-vscode/prettier-options-schema.json
@@ -32,13 +32,7 @@
                         "styles-scripts-options-markup",
                         "styles-scripts-markup-options",
                         "styles-markup-options-scripts",
-                        "styles-markup-scripts-options",
-                        "scripts-markup-styles",
-                        "scripts-styles-markup",
-                        "markup-styles-scripts",
-                        "markup-scripts-styles",
-                        "styles-markup-scripts",
-                        "styles-scripts-markup"
+                        "styles-markup-scripts-options"
                     ]
                 },
                 "svelteStrictMode": {