Merge commit 'e7c0781db3bcfd79670191c120974251d3daadf7' into feature/…

…init_with_root # Conflicts: # account-compression/sdk/tests/accounts/concurrentMerkleTreeAccount.test.ts
solana-labs · Aug 22, 2024 · 8f9d3e6 · 8f9d3e6
2 parents 623df91 + e7c0781
commit 8f9d3e6
Show file tree

Hide file tree

Showing 312 changed files with 8,658 additions and 10,642 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,4 @@
-module.exports = { // E: 'module' is not defined.
+module.exports = {
     extends: ['turbo', '@solana/eslint-config-solana', '@solana/eslint-config-solana/jest'],
     root: true,
 };
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,11 @@
+docs
+lib
+test-ledger
+node_modules
+dist
+generated
+.mypy_cache
+*.yml
+*.yaml
+*.md
+*.json
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,9 @@
+{
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "useTabs": false,
+    "tabWidth": 4,
+    "arrowParens": "always",
+    "printWidth": 80
+}