Skip to content

Commit

Permalink
Merge branch 'main' into remove-common-logic-from-react
Browse files Browse the repository at this point in the history
  • Loading branch information
darrenvechain committed Oct 26, 2023
2 parents 1e492ff + ba76aa1 commit 9c9a9eb
Show file tree
Hide file tree
Showing 27 changed files with 2,173 additions and 2,232 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["custom/library"],
};
const Config = require('@vechain/repo-config');

module.exports = Config.EslintLibrary;
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

6 changes: 4 additions & 2 deletions apps/sample-react-app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const Config = require('@vechain/repo-config');

module.exports = {
extends: ["custom/react"],
ignorePatterns: ["src/hardhat/**/*"],
...Config.EslintReact,
ignorePatterns: [...Config.EslintReact.ignorePatterns, 'src/hardhat/**/*'],
};
2 changes: 1 addition & 1 deletion apps/sample-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@types/testing-library__jest-dom": "^5.14.5",
"@vechain/repo-config": "https://github.com/vechainfoundation/repo-config#v0.0.1",
"chai": "^4.2.0",
"copy-webpack-plugin": "^11.0.0",
"customize-cra": "^1.0.0",
"eslint-config-custom": "*",
"ethers": "^6.4.0",
"filemanager-webpack-plugin": "^8.0.0",
"hardhat": "^2.18.2",
Expand Down
4 changes: 2 additions & 2 deletions apps/sample-react-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "tsconfig/react-app.json",
"include": ["src"]
"extends": "@vechain/repo-config/src/tsconfig/react.json",
"include": ["src"]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
]
},
"devDependencies": {
"@azz/prettier-config": "https://github.com/azz/prettier-config",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@commitlint/config-conventional": "^18.0.0",
"@vechain/repo-config": "https://github.com/vechainfoundation/repo-config#v0.0.1",
"commitlint": "^18.0.0",
"eslint": "^8.4.1",
"eslint-config-custom": "*",
"eslint-plugin-prefer-arrow": "1.2.3",
"husky": "^8.0.0",
"lint-staged": "^15.0.2",
Expand Down
3 changes: 0 additions & 3 deletions packages/eslint-config-custom/README.md

This file was deleted.

38 changes: 0 additions & 38 deletions packages/eslint-config-custom/library.js

This file was deleted.

10 changes: 0 additions & 10 deletions packages/eslint-config-custom/package.json

This file was deleted.

50 changes: 0 additions & 50 deletions packages/eslint-config-custom/react.js

This file was deleted.

6 changes: 3 additions & 3 deletions packages/react-wallet-kit/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["custom/react"],
};
const Config = require('@vechain/repo-config');

module.exports = Config.EslintReact;
60 changes: 30 additions & 30 deletions packages/react-wallet-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"name": "@vechain/react-wallet-kit",
"version": "0.0.0",
"private": true,
"license": "MIT",
"sideEffects": false,
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"scripts": {
"build": "tsup src/index.tsx --format cjs --dts --external react",
"clean": "rm -rf dist node_modules .turbo",
"dev": "tsup src/index.tsx --format cjs --watch --dts --external react",
"lint": "eslint src --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@vechain/connex": "2.1.0",
"@vechain/connex-framework": "2.1.0",
"@vechain/wallet-connect": "*",
"@vechain/wallet-kit": "*",
"thor-devkit": "^2.0.9"
},
"devDependencies": {
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"eslint": "^8.4.1",
"eslint-config-custom": "*",
"react": "^18.2.0",
"tsconfig": "*",
"tsup": "^5.10.1",
"typescript": "4.9.5"
}
"name": "@vechain/react-wallet-kit",
"version": "0.0.0",
"private": true,
"license": "MIT",
"sideEffects": false,
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"scripts": {
"build": "tsup src/index.tsx --format cjs --dts --external react",
"clean": "rm -rf dist node_modules .turbo",
"dev": "tsup src/index.tsx --format cjs --watch --dts --external react",
"lint": "eslint src --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@vechain/connex": "2.1.0",
"@vechain/connex-framework": "2.1.0",
"@vechain/wallet-connect": "*",
"@vechain/wallet-kit": "*",
"thor-devkit": "^2.0.9"
},
"devDependencies": {
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@vechain/repo-config": "https://github.com/vechainfoundation/repo-config#v0.0.1",
"eslint": "^8.4.1",
"react": "^18.2.0",
"tsconfig": "*",
"tsup": "^5.10.1",
"typescript": "4.9.5"
}
}
6 changes: 3 additions & 3 deletions packages/react-wallet-kit/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/react-library.json",
"include": ["."],
"exclude": ["dist", "node_modules"]
"extends": "@vechain/repo-config/src/tsconfig/library.json",
"include": ["."],
"exclude": ["dist", "node_modules"]
}
3 changes: 0 additions & 3 deletions packages/tsconfig/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions packages/tsconfig/base.json

This file was deleted.

14 changes: 0 additions & 14 deletions packages/tsconfig/package.json

This file was deleted.

17 changes: 0 additions & 17 deletions packages/tsconfig/react-app.json

This file was deleted.

12 changes: 0 additions & 12 deletions packages/tsconfig/react-library.json

This file was deleted.

6 changes: 3 additions & 3 deletions packages/wallet-connect/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["custom/library"],
};
const Config = require('@vechain/repo-config');

module.exports = Config.EslintLibrary;
52 changes: 26 additions & 26 deletions packages/wallet-connect/package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "@vechain/wallet-connect",
"version": "0.0.0",
"private": true,
"license": "MIT",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"scripts": {
"build": "tsup src/index.ts --format cjs --dts",
"clean": "rm -rf dist node_modules .turbo",
"dev": "tsup src/index.ts --format cjs --watch --dts",
"lint": "eslint src --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@walletconnect/modal": "2.6.2",
"@walletconnect/sign-client": "2.10.2",
"@walletconnect/utils": "2.10.2"
},
"devDependencies": {
"@vechain/connex-types": "2.1.0",
"@walletconnect/types": "2.10.2",
"eslint": "^8.4.1",
"eslint-config-custom": "*",
"tsconfig": "*",
"tsup": "^5.10.1",
"typescript": "4.9.5"
}
"name": "@vechain/wallet-connect",
"version": "0.0.0",
"private": true,
"license": "MIT",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"scripts": {
"build": "tsup src/index.ts --format cjs --dts",
"clean": "rm -rf dist node_modules .turbo",
"dev": "tsup src/index.ts --format cjs --watch --dts",
"lint": "eslint src --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@walletconnect/modal": "2.6.2",
"@walletconnect/sign-client": "2.10.2",
"@walletconnect/utils": "2.10.2"
},
"devDependencies": {
"@vechain/connex-types": "2.1.0",
"@vechain/repo-config": "https://github.com/vechainfoundation/repo-config#v0.0.1",
"@walletconnect/types": "2.10.2",
"eslint": "^8.4.1",
"tsconfig": "*",
"tsup": "^5.10.1",
"typescript": "4.9.5"
}
}
6 changes: 3 additions & 3 deletions packages/wallet-connect/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/base.json",
"include": ["."],
"exclude": ["dist", "node_modules"]
"extends": "@vechain/repo-config/src/tsconfig/base.json",
"include": ["."],
"exclude": ["dist", "node_modules"]
}
6 changes: 3 additions & 3 deletions packages/wallet-kit/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["custom/library"],
};
const Config = require('@vechain/repo-config');

module.exports = Config.EslintLibrary;
Loading

0 comments on commit 9c9a9eb

Please sign in to comment.