Merge pull request #651 from kristof-mattei/update-from-upstream

update from upstream

Author: kristof-mattei

.vscode/settings.json

@@ -5,7 +5,7 @@
     "lldb.launch.preRunCommands": [
         "command script import ${workspaceFolder}/.vscode/rust_prettifier_for_lldb.py"
     ],
-    "prettier.configPath": "./.prettierrc.cjs",
+    "prettier.configPath": "./prettier.config.mjs",
     "rust-analyzer.runnables.extraEnv": {
         "RUST_LOG": "DEBUG,hyper_unix_socket=TRACE"
     }

.prettierrc.cjs prettier.config.mjs.prettierrc.cjs renamed to prettier.config.mjs

@@ -1,36 +1,26 @@
-/**
- * @type { import("prettier").Config }
- */
-const prettierConfig = {
+/** @type {import("prettier").Config} */
+export default {
     arrowParens: "always",
     bracketSpacing: true,
-    printWidth: 80,
+    printWidth: 120,
     quoteProps: "as-needed",
     semi: true,
     singleQuote: false,
-    useTabs: false,
     tabWidth: 4,
     trailingComma: "all",
+    useTabs: false,
     overrides: [
         {
-            files: ["*.ts", "*.tsx"],
+            files: ["**/*.ts", "**/*.tsx"],
             options: {
                 parser: "typescript",
             },
         },
-        {
-            files: ["*.cjs"],
-        },
-        {
-            files: ["**/*.json"],
-            options: {
-                trailingComma: "none",
-            },
-        },
         {
             files: ["**/*.json"],
             options: {
                 trailingComma: "none",
+                printWidth: 80,
             },
         },
         {
@@ -48,5 +38,3 @@ const prettierConfig = {
     ],
     plugins: ["prettier-plugin-sh"],
 };
-
-module.exports = prettierConfig;