Skip to content

Commit 4f066e8

Browse files
committed
Update prettier and format
1 parent e6c5c46 commit 4f066e8

File tree

19 files changed

+161
-93
lines changed

19 files changed

+161
-93
lines changed

.prettierignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CODEOWNERS
22
.yarn
3-
3+
.changeset/**/*.md

.prettierrc

-19
This file was deleted.

.prettierrc.cjs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
module.exports = {
2+
arrowParens: "always",
3+
bracketSameLine: true,
4+
bracketSpacing: true,
5+
embeddedLanguageFormatting: "auto",
6+
endOfLine: "lf",
7+
htmlWhitespaceSensitivity: "css",
8+
jsxSingleQuote: false,
9+
printWidth: 80,
10+
proseWrap: "preserve",
11+
quoteProps: "as-needed",
12+
semi: true,
13+
singleAttributePerLine: false,
14+
singleQuote: false,
15+
tabWidth: 2,
16+
trailingComma: "all",
17+
useTabs: false,
18+
plugins: [
19+
"prettier-plugin-packagejson",
20+
"@ianvs/prettier-plugin-sort-imports",
21+
],
22+
importOrder: [
23+
"<BUILTIN_MODULES>",
24+
"<THIRD_PARTY_MODULES>",
25+
"^@(/.*)$",
26+
"^@test(/.*)$",
27+
"^@bench(/.*)$",
28+
"^[.]",
29+
],
30+
importOrderTypeScriptVersion: "5.6.3",
31+
};

examples/express/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { XMTP, xmtpClient } from "@xmtp/agent-starter";
12
import express from "express";
23
import fetch from "node-fetch";
3-
import { xmtpClient, XMTP } from "@xmtp/agent-starter";
44

55
async function createServer(port: number, agent: XMTP) {
66
const app = express();

examples/gated-group/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Client, Message, XMTP, xmtpClient } from "@xmtp/agent-starter";
2-
import express from "express";
32
import { Alchemy, Network } from "alchemy-sdk";
3+
import express from "express";
44

55
const settings = {
66
apiKey: process.env.ALCHEMY_API_KEY, // Replace with your Alchemy API key

package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"clean": "turbo run clean && yarn cache clean && find examples -name '.data' -type d -exec rm -rf {} +",
1414
"dev": "cd packages/agent-starter && yarn build:watch",
1515
"examples": "node scripts/examples.js",
16-
"format": "turbo run format",
16+
"format": "prettier -w .",
17+
"format:check": "prettier -c .",
1718
"publish": "yarn build && changeset publish",
1819
"test": "FORCE_COLOR=1 turbo run test",
1920
"typecheck": "FORCE_COLOR=1 turbo run typecheck"
@@ -26,6 +27,7 @@
2627
"readline-sync": "^1.4.10"
2728
},
2829
"devDependencies": {
30+
"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
2931
"prettier": "^3.4.2",
3032
"prettier-plugin-packagejson": "^2.5.8",
3133
"turbo": "^2.3.4",

packages/agent-starter/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"@vitest/coverage-v8": "^2.1.8",
4141
"dotenv": "^16.4.7",
4242
"node-fetch": "^3.3.2",
43-
"prettier": "^3.4.2",
4443
"rollup": "^4.31.0",
4544
"rollup-plugin-dts": "^6.1.1",
4645
"ts-node": "^10.9.2",

packages/agent-starter/src/content-types/agent-message.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { ContentTypeId } from "@xmtp/content-type-primitives";
2-
import type {
3-
ContentCodec,
4-
EncodedContent,
1+
import {
2+
ContentTypeId,
3+
type ContentCodec,
4+
type EncodedContent,
55
} from "@xmtp/content-type-primitives";
66

77
// Create a unique identifier for your content type

packages/agent-starter/src/lib/types.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { privateKeyToAccount } from "viem/accounts";
1+
import { Client, ClientOptions } from "@xmtp/node-sdk";
22
import { createWalletClient } from "viem";
3-
import { ClientOptions, Client } from "@xmtp/node-sdk";
3+
import { privateKeyToAccount } from "viem/accounts";
4+
45
export type { Client };
56
export type { ClientOptions };
67

packages/agent-starter/src/lib/xmtp.ts

+23-24
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
1-
import dotenv from "dotenv";
2-
dotenv.config();
3-
import {
4-
DecodedMessage,
5-
Client,
6-
ClientOptions,
7-
XmtpEnv,
8-
Conversation,
9-
} from "@xmtp/node-sdk";
10-
import { ContentTypeReply, Reply, ReplyCodec } from "@xmtp/content-type-reply";
1+
import crypto, { getRandomValues } from "crypto";
2+
import * as fs from "fs";
3+
import { readFile } from "fs/promises";
4+
import path from "path";
115
import {
126
ContentTypeReaction,
137
Reaction,
148
ReactionCodec,
159
} from "@xmtp/content-type-reaction";
16-
import { ContentTypeText, TextCodec } from "@xmtp/content-type-text";
10+
import {
11+
ContentTypeReadReceipt,
12+
ReadReceiptCodec,
13+
} from "@xmtp/content-type-read-receipt";
1714
import {
1815
Attachment,
1916
AttachmentCodec,
2017
ContentTypeRemoteAttachment,
2118
RemoteAttachmentCodec,
2219
} from "@xmtp/content-type-remote-attachment";
20+
import { ContentTypeReply, Reply, ReplyCodec } from "@xmtp/content-type-reply";
21+
import { ContentTypeText, TextCodec } from "@xmtp/content-type-text";
2322
import {
24-
ContentTypeReadReceipt,
25-
ReadReceiptCodec,
26-
} from "@xmtp/content-type-read-receipt";
23+
Client,
24+
ClientOptions,
25+
Conversation,
26+
DecodedMessage,
27+
XmtpEnv,
28+
} from "@xmtp/node-sdk";
29+
import dotenv from "dotenv";
30+
import fetch from "node-fetch";
31+
import { createWalletClient, http, isAddress, toBytes, toHex } from "viem";
32+
import { privateKeyToAccount } from "viem/accounts";
33+
import { mainnet } from "viem/chains";
2734
import {
2835
AgentMessage,
2936
AgentMessageCodec,
3037
ContentTypeAgentMessage,
3138
} from "../content-types/agent-message.js";
32-
import { createWalletClient, http, isAddress, toBytes, toHex } from "viem";
33-
import { privateKeyToAccount } from "viem/accounts";
34-
import { mainnet } from "viem/chains";
39+
import { Agent, agentMessage, Message, User, UserReturnType } from "./types.js";
3540

36-
import { getRandomValues } from "crypto";
37-
import path from "path";
38-
import { Message, agentMessage, UserReturnType, User, Agent } from "./types.js";
39-
import { readFile } from "fs/promises";
40-
import * as fs from "fs";
41-
import fetch from "node-fetch";
42-
import crypto from "crypto";
41+
dotenv.config();
4342

4443
export async function xmtpClient(agent?: Agent): Promise<XMTP> {
4544
let xmtp: XMTP | null = null; // Ensure a single instance

packages/agent-starter/tests/Client.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { describe, test, expect } from "vitest";
1+
import { createUser, XMTP, xmtpClient } from "@xmtp/agent-starter";
22
import { generatePrivateKey } from "viem/accounts";
3-
import { XMTP, createUser, xmtpClient } from "@xmtp/agent-starter";
3+
import { describe, expect, test } from "vitest";
44

55
describe("Client Private Key Configuration Tests", () => {
66
test("creates a client with a random generated key", async () => {

packages/agent-starter/tests/Encryption.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, test, expect } from "vitest";
1+
import { describe, expect, test } from "vitest";
22
import { xmtpClient } from "../src/lib/xmtp";
33

44
describe("Encryption Tests", () => {

packages/lookup/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@types/node": "^22.10.9",
3333
"@vitest/coverage-v8": "^2.1.8",
3434
"dotenv": "^16.4.7",
35-
"prettier": "^3.4.2",
3635
"rollup": "^4.31.0",
3736
"rollup-plugin-dts": "^6.1.1",
3837
"ts-node": "^10.9.2",

packages/lookup/src/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { isAddress } from "viem";
21
import dns from "dns";
2+
import { isAddress } from "viem";
3+
34
export const converseEndpointURL = "https://converse.xyz/profile/";
45

56
export type InfoCache = Map<string, UserInfo>;

packages/lookup/tests/Lookup.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, test, expect } from "vitest";
1+
import { describe, expect, test } from "vitest";
22
import { lookup } from "../src/index";
33

44
describe("Client Private Key Configuration Tests", () => {

scripts/examples.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { execSync } from "child_process";
2+
import fs from "fs";
23
import path from "node:path";
34
import { fileURLToPath } from "node:url";
4-
import fs from "fs";
55
import { select } from "@clack/prompts";
66

77
const __filename = fileURLToPath(import.meta.url);

shared/tsconfig/package.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
"base.json"
66
],
77
"scripts": {
8-
"clean": "rm -rf .turbo && rm -rf node_modules",
9-
"format": "yarn format:base -w .",
10-
"format:base": "prettier --ignore-path ../../.gitignore",
11-
"format:check": "yarn format:base -c ."
12-
},
13-
"devDependencies": {
14-
"prettier": "^3.4.2"
8+
"clean": "rm -rf .turbo && rm -rf node_modules"
159
},
1610
"engines": {
1711
"node": ">=22"

turbo.json

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
{
22
"$schema": "https://turbo.build/schema.json",
3-
"globalEnv": [
4-
"\\*\\*/.env.\\*local"
5-
],
3+
"globalEnv": ["\\*\\*/.env.\\*local"],
64
"tasks": {
75
"build": {
8-
"dependsOn": [
9-
"^build"
10-
],
11-
"outputs": [
12-
"dist/**"
13-
]
6+
"dependsOn": ["^build"],
7+
"outputs": ["dist/**"]
148
},
159
"clean": {
1610
"outputs": []
@@ -20,14 +14,10 @@
2014
},
2115
"test": {
2216
"outputs": [],
23-
"dependsOn": [
24-
"^build"
25-
]
17+
"dependsOn": ["^build"]
2618
},
2719
"typecheck": {
28-
"dependsOn": [
29-
"^build"
30-
],
20+
"dependsOn": ["^build"],
3121
"outputs": []
3222
}
3323
}

0 commit comments

Comments
 (0)