Skip to content

Commit

Permalink
Merge branch 'main' into soloseng/update-issue-template
Browse files Browse the repository at this point in the history
  • Loading branch information
soloseng committed Nov 20, 2023
2 parents f15a902 + 744e44b commit 81e2b65
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 64 deletions.
2 changes: 2 additions & 0 deletions .changeset/eighty-glasses-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
9 changes: 4 additions & 5 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
module.exports = {
collectCoverageFrom: ['**/src/**/*.ts?(x)', '!**/*.d.ts'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
testMatch: ['**/?(*.)(spec|test).ts?(x)'],
collectCoverageFrom: ['**/src/**/*.ts', '!**/*.d.ts'],
moduleFileExtensions: ['ts', 'js', 'json', 'node'],
testMatch: ['**/?(*.)(spec|test).ts'],
transform: {
'\\.(ts|tsx)$': 'ts-jest',
'^.+\\.jsx?$': 'babel-jest',
'\\.ts$': 'ts-jest',
},
}
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
"docs/examples"
],
"devDependencies": {
"@babel/core": "^7.23.2",
"@babel/runtime": "^7.23.2",
"@changesets/cli": "^2.26.2",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/recommended": "^1.0.3",
Expand All @@ -45,19 +43,16 @@
"@types/semver": "7.5.4",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"babel-jest": "^29.7.0",
"codecov": "^3.6.5",
"colors": "1.4.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.1",
"husky": "^8.0.0",
"jest": "^29.7.0",
"jest-snapshot": "^29.7.0",
"lint-staged": "^15.0.2",
"patch-package": "^6.2.2",
"prettier": "^3.0.3",
"prettier-plugin-java": "^1.6.2",
"prompt": "1.3.0",
"semver": "7.5.4",
"solc": "0.8.22",
Expand Down
57 changes: 3 additions & 54 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:^7.0.0, @babel/core@npm:^7.13.16, @babel/core@npm:^7.20.0, @babel/core@npm:^7.23.2":
"@babel/core@npm:^7.0.0, @babel/core@npm:^7.13.16, @babel/core@npm:^7.20.0":
version: 7.23.2
resolution: "@babel/core@npm:7.23.2"
dependencies:
Expand Down Expand Up @@ -1513,7 +1513,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.23.2":
"@babel/runtime@npm:^7.0.0":
version: 7.23.2
resolution: "@babel/runtime@npm:7.23.2"
dependencies:
Expand Down Expand Up @@ -8780,15 +8780,6 @@ __metadata:
languageName: node
linkType: hard

"chevrotain@npm:6.5.0":
version: 6.5.0
resolution: "chevrotain@npm:6.5.0"
dependencies:
regexp-to-ast: "npm:0.4.0"
checksum: e98f7cc12bea6732246a0a2c25028bc076d5ed7dda470403599c595e5eece5d60fe808a7cdb187b938ad3364c308c03f9eb603e2743871c861db497186776efb
languageName: node
linkType: hard

"chokidar@npm:^3.0.2":
version: 3.5.3
resolution: "chokidar@npm:3.5.3"
Expand Down Expand Up @@ -14066,16 +14057,6 @@ __metadata:
languageName: node
linkType: hard

"java-parser@npm:2.0.2":
version: 2.0.2
resolution: "java-parser@npm:2.0.2"
dependencies:
chevrotain: "npm:6.5.0"
lodash: "npm:4.17.21"
checksum: 67bc669c6bdaf23fbda9c26c884d67fdab962b9299b3ffa2e86658e9091ba999fd1aacfc8273c05afec332e2bf4eef8adf06f9487488f0429279c3d58d20285b
languageName: node
linkType: hard

"jest-changed-files@npm:^29.7.0":
version: 29.7.0
resolution: "jest-changed-files@npm:29.7.0"
Expand Down Expand Up @@ -15531,7 +15512,7 @@ __metadata:
languageName: node
linkType: hard

"lodash@npm:4.17.21, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.5":
"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.5":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
Expand Down Expand Up @@ -17450,8 +17431,6 @@ __metadata:
version: 0.0.0-use.local
resolution: "odis@workspace:."
dependencies:
"@babel/core": "npm:^7.23.2"
"@babel/runtime": "npm:^7.23.2"
"@changesets/cli": "npm:^2.26.2"
"@tsconfig/node18": "npm:^18.2.2"
"@tsconfig/recommended": "npm:^1.0.3"
Expand All @@ -17461,19 +17440,16 @@ __metadata:
"@types/semver": "npm:7.5.4"
"@typescript-eslint/eslint-plugin": "npm:^6.9.1"
"@typescript-eslint/parser": "npm:^6.9.1"
babel-jest: "npm:^29.7.0"
codecov: "npm:^3.6.5"
colors: "npm:1.4.0"
eslint: "npm:^8.52.0"
eslint-config-prettier: "npm:^9.0.0"
eslint-plugin-prettier: "npm:^5.0.1"
husky: "npm:^8.0.0"
jest: "npm:^29.7.0"
jest-snapshot: "npm:^29.7.0"
lint-staged: "npm:^15.0.2"
patch-package: "npm:^6.2.2"
prettier: "npm:^3.0.3"
prettier-plugin-java: "npm:^1.6.2"
prompt: "npm:1.3.0"
semver: "npm:7.5.4"
solc: "npm:0.8.22"
Expand Down Expand Up @@ -18331,26 +18307,6 @@ __metadata:
languageName: node
linkType: hard

"prettier-plugin-java@npm:^1.6.2":
version: 1.6.2
resolution: "prettier-plugin-java@npm:1.6.2"
dependencies:
java-parser: "npm:2.0.2"
lodash: "npm:4.17.21"
prettier: "npm:2.3.1"
checksum: 7cc490635a6658175b0ef42d4067df7d7e579d3fde8bad654e24b84535042b9cd4a032ae9fac59c41bfedb4c9bdc26d729ab1e185a42dcdc6d6dfdc70279e2fd
languageName: node
linkType: hard

"prettier@npm:2.3.1":
version: 2.3.1
resolution: "prettier@npm:2.3.1"
bin:
prettier: bin-prettier.js
checksum: dae97c14da795b789f89c84f83f86003a10482b572d1fc365b54fea81277721795da1a6a44599a655d1131ff2ea8467bae0c5ecd9def15dca67b7fe740fe2e0e
languageName: node
linkType: hard

"prettier@npm:2.7.1":
version: 2.7.1
resolution: "prettier@npm:2.7.1"
Expand Down Expand Up @@ -19255,13 +19211,6 @@ __metadata:
languageName: node
linkType: hard

"regexp-to-ast@npm:0.4.0":
version: 0.4.0
resolution: "regexp-to-ast@npm:0.4.0"
checksum: 381f57fa4d056056a50d7bc1365ece93434e1eea87bd3d60144ef6fd85bc4875410757908000c06fbe99ef9554c930c9890e695292b8e49756dfc0762890e777
languageName: node
linkType: hard

"regexp.prototype.flags@npm:^1.4.3":
version: 1.5.0
resolution: "regexp.prototype.flags@npm:1.5.0"
Expand Down

0 comments on commit 81e2b65

Please sign in to comment.