Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
daria-github authored Mar 1, 2024
2 parents 5a531c4 + 53a570c commit f6d34ef
Show file tree
Hide file tree
Showing 16 changed files with 1,239 additions and 1,446 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
"root": true,
"extends": ["xmtp-web"],
"parserOptions": {
"project": "./tsconfig.eslint.json"
"project": "./tsconfig.json"
},
"rules": {
"no-plusplus": "off",
"jsx-a11y/media-has-caption": "off",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-misused-promises": [
"error",
{
Expand Down
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": false
"useTabs": false,
"plugins": ["prettier-plugin-packagejson"]
}
2 changes: 1 addition & 1 deletion cypress/support/component-index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html class="h-screen w-screen bg-white" lang="en">
<head>
<meta name="description" content="Chat via XMTP" />
Expand Down
Loading

0 comments on commit f6d34ef

Please sign in to comment.