Skip to content

Commit

Permalink
Merge pull request #152 from xmtp/rygine/upgrade-deps
Browse files Browse the repository at this point in the history
Upgrade dependencies, optimize TypeScript configs
  • Loading branch information
rygine authored Jan 8, 2024
2 parents 18bf088 + 680c14b commit e98a943
Show file tree
Hide file tree
Showing 15 changed files with 1,874 additions and 1,112 deletions.
16 changes: 8 additions & 8 deletions apps/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
"format:base": "prettier --ignore-path ../../.gitignore",
"format:check": "yarn format:base -c .",
"format": "yarn format:base -w .",
"typecheck": "tsc --noEmit"
"typecheck": "tsc"
},
"dependencies": {
"@heroicons/react": "^2.0.18",
"@rainbow-me/rainbowkit": "^1.3.0",
"@heroicons/react": "^2.1.1",
"@rainbow-me/rainbowkit": "^1.3.3",
"@xmtp/content-type-reaction": "^1.1.3",
"@xmtp/content-type-read-receipt": "^1.1.5",
"@xmtp/content-type-remote-attachment": "^1.1.4",
"@xmtp/content-type-reply": "^1.1.5",
"@xmtp/react-sdk": "workspace:*",
"date-fns": "^3.0.6",
"date-fns": "^3.1.0",
"react": "^18.2.0",
"react-18-blockies": "^1.0.6",
"wagmi": "^1.4.7"
"wagmi": "^1.4.13"
},
"devDependencies": {
"@types/react": "^18.2.38",
"@types/react": "^18.2.47",
"@xmtp/tsconfig": "workspace:*",
"eslint": "^8.54.0",
"eslint": "^8.56.0",
"eslint-config-xmtp-web": "workspace:*",
"prettier": "^3.1.1",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
}
}
3 changes: 0 additions & 3 deletions apps/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"extends": "@xmtp/tsconfig/react-app.json",
"compilerOptions": {
"moduleResolution": "bundler"
},
"include": ["src/**/*"]
}
20 changes: 10 additions & 10 deletions examples/react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@
"format:check": "yarn format:base -c .",
"format": "yarn format:base -w .",
"quickstart": "yarn dev",
"typecheck": "tsc --noEmit"
"typecheck": "tsc"
},
"dependencies": {
"@rainbow-me/rainbowkit": "^1.3.0",
"@rainbow-me/rainbowkit": "^1.3.3",
"@xmtp/react-app": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"wagmi": "^1.4.7"
"wagmi": "^1.4.13"
},
"devDependencies": {
"@types/react": "^18.2.38",
"@types/react-dom": "^18.2.16",
"@vitejs/plugin-react": "^4.2.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.2.1",
"@xmtp/tsconfig": "workspace:*",
"autoprefixer": "^10.4.16",
"eslint": "^8.54.0",
"eslint": "^8.56.0",
"eslint-config-xmtp-web": "workspace:*",
"postcss": "^8.4.31",
"postcss": "^8.4.33",
"postcss-preset-env": "^9.3.0",
"typescript": "^5.3.2",
"vite": "^4.5.0"
"typescript": "^5.3.3",
"vite": "^5.0.11"
}
}
10 changes: 10 additions & 0 deletions examples/react-vite/src/globals.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,13 @@ interface ImportMeta {
VITE_INFURA_ID: string;
};
}

declare module "*.module.css" {
const classes: { [key: string]: string };
export default classes;
}

declare module "*.png" {
const src: string;
export default src;
}
17 changes: 1 addition & 16 deletions examples/react-vite/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
{
"extends": "@xmtp/tsconfig/vite.json",
"extends": "@xmtp/tsconfig/react-app.json",
"compilerOptions": {
"target": "ESNext",
"useDefineForClassFields": true,
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"allowJs": false,
"skipLibCheck": true,
"esModuleInterop": false,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"module": "ESNext",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"paths": {
"@/*": ["./src/*"]
}
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@
"typecheck": "FORCE_COLOR=1 turbo run typecheck"
},
"devDependencies": {
"prettier": "^3.1.0",
"turbo": "^1.10.16"
"prettier": "^3.1.1",
"turbo": "^1.11.3"
},
"packageManager": "[email protected]",
"engines": {
"node": ">=18"
},
"dependencies": {
"@changesets/changelog-git": "^0.2.0",
"@changesets/cli": "^2.26.2"
"@changesets/cli": "^2.27.1"
},
"resolutions": {
"@xmtp/xmtp-js": "^11.3.0",
"vite": "^4.4.9"
"@xmtp/xmtp-js": "^11.3.0"
}
}
16 changes: 8 additions & 8 deletions packages/eslint-config-xmtp-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
"xmtp"
],
"dependencies": {
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"eslint": "^8.54.0",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"eslint": "^8.56.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard-with-typescript": "^40.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^43.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-n": "^16.6.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0"
},
"devDependencies": {
"typescript": "^5.3.2"
"typescript": "^5.3.3"
}
}
30 changes: 15 additions & 15 deletions packages/react-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"format": "yarn format:base -w .",
"generate:types": "tsup --dts-only",
"test": "vitest run --passWithNoTests",
"typecheck": "tsc --noEmit",
"typecheck": "tsc",
"typedoc": "typedoc"
},
"dependencies": {
Expand All @@ -78,7 +78,7 @@
"@xmtp/content-type-reply": "^1.1.5",
"@xmtp/xmtp-js": "^11.3.0",
"async-mutex": "^0.4.0",
"date-fns": "^2.30.0",
"date-fns": "^3.1.0",
"dexie": "^3.2.4",
"dexie-react-hooks": "^1.1.7",
"react": "^18.2.0",
Expand All @@ -87,26 +87,26 @@
"zod": "^3.22.4"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/jest-dom": "^6.2.0",
"@testing-library/react": "^14.1.2",
"@types/react": "^18.2.38",
"@types/react-dom": "^18.2.16",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@types/uuid": "^9.0.7",
"@vitejs/plugin-react": "^4.2.0",
"@vitest/coverage-v8": "^0.34.5",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.1.3",
"@xmtp/tsconfig": "workspace:*",
"eslint": "^8.54.0",
"eslint": "^8.56.0",
"eslint-config-xmtp-web": "workspace:*",
"fake-indexeddb": "^5.0.1",
"fake-indexeddb": "^5.0.2",
"happy-dom": "^12.10.3",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-dom": "^18.2.0",
"tsup": "^8.0.1",
"typedoc": "^0.25.3",
"typescript": "^5.3.2",
"vite": "^4.5.0",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "^0.34.2"
"typedoc": "^0.25.7",
"typescript": "^5.3.3",
"vite": "^5.0.11",
"vite-tsconfig-paths": "^4.2.3",
"vitest": "^1.1.3"
},
"peerDependencies": {
"@xmtp/xmtp-js": "^11.3.0",
Expand Down
1 change: 0 additions & 1 deletion packages/react-sdk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@xmtp/tsconfig/react-sdk.json",
"include": ["src", ".eslintrc.cjs", "vitest.setup.ts"],
"compilerOptions": {
"module": "esnext",
"paths": {
"@/*": ["./src/*"]
}
Expand Down
7 changes: 5 additions & 2 deletions shared/tsconfig/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
"$schema": "https://json.schemastore.org/tsconfig",
"display": "Base",
"compilerOptions": {
"allowJs": false,
"composite": false,
"esModuleInterop": true,
"declarationMap": true,
"declaration": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"moduleResolution": "node",
"noEmit": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
}
4 changes: 2 additions & 2 deletions shared/tsconfig/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"files": [
"base.json",
"react-sdk.json",
"vite.json"
"react-app.json",
"react-sdk.json"
]
}
11 changes: 1 addition & 10 deletions shared/tsconfig/react-app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@
"display": "React App",
"extends": "./base.json",
"compilerOptions": {
"allowJs": false,
"declarationMap": true,
"declaration": true,
"esModuleInterop": false,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"jsx": "react-jsx",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "ESNext",
"resolveJsonModule": true,
"noEmit": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "Bundler",
"target": "ESNext"
}
}
6 changes: 2 additions & 4 deletions shared/tsconfig/react-sdk.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
"display": "React SDK",
"extends": "./base.json",
"compilerOptions": {
"allowJs": false,
"declarationMap": true,
"declaration": true,
"jsx": "react-jsx",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"sourceMap": true,
"module": "ESNext",
"moduleResolution": "Bundler",
"target": "ESNext",
"types": ["vitest", "vitest/globals"]
}
Expand Down
15 changes: 0 additions & 15 deletions shared/tsconfig/vite.json

This file was deleted.

Loading

0 comments on commit e98a943

Please sign in to comment.