Merge branch 'main' into develop/beta

scriptscat · Dec 4, 2022 · 4b286a9 · 4b286a9
2 parents 22925cb + ee34161
commit 4b286a9
Show file tree

Hide file tree

Showing 23 changed files with 5,263 additions and 2,025 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -15,5 +15,6 @@
   "tabWidth": 2,
   "trailingComma": "es5",
   "useTabs": false,
-  "vueIndentScriptAndStyle": false
+  "vueIndentScriptAndStyle": false,
+  "endOfLine": "auto"
 }
diff --git a/jest.config.js b/jest.config.js
@@ -13,4 +13,6 @@ module.exports = {
   },
   transformIgnorePatterns: ["node_modules/(?!(uuid|dexi|yaml))"],
   setupFiles: ["./pkg/chrome-extension-mock/index.ts"],
+  moduleDirectories: ["node_modules", "src"],
+  watch: false,
 };