Skip to content

Commit

Permalink
Merge branch 'main' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelBCarter committed Jul 17, 2024
2 parents 17e6b3c + c7bc35e commit 4a8a50b
Show file tree
Hide file tree
Showing 9 changed files with 2,608 additions and 2,536 deletions.
1 change: 0 additions & 1 deletion .depcheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ ignores: [
"jest-mock-extended",
"jest-sorted",
"ts-jest",
"ts-node",
"typescript"
]
4 changes: 0 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"runtimeArgs": [
"--max-old-space-size=8192",
"--experimental-specifier-resolution=node",
"--loader=ts-node/esm"
],
"envFile": "${workspaceFolder}/.env",
"sourceMaps": true,
Expand All @@ -28,8 +26,6 @@
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"runtimeArgs": [
"--max-old-space-size=8192",
"--experimental-specifier-resolution=node",
"--loader=ts-node/esm"
],
"envFile": "${workspaceFolder}/.env",
"sourceMaps": true,
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
".DS_Store": true,
"node_modules": true,
"build": true,
"dist": true,
"dist": false,
".webpack": true,
".serverless": true,
".rollup.cache": true
Expand Down
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"ethersproject",
"Ethgasstation",
"hdnode",
"nodenext",
"pako",
"satoshi",
"Trouw",
Expand Down
17 changes: 5 additions & 12 deletions jest.config.cjs
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
const generateJestConfig = ({ esModules }) => {
const esModulesList = Array.isArray(esModules) ? esModules.join('|') : esModules
return {
coveragePathIgnorePatterns: ['<rootDir>/src/Server'],
coverageThreshold: {
global: {
branches: 50,
functions: 70,
lines: 70,
statements: 70,
},
},
coveragePathIgnorePatterns: ['<rootDir>/(.*)/dist'],
extensionsToTreatAsEsm: ['.ts'],
moduleNameMapper: {
'^(\\.{1,2}/.*)\\.js$': '$1',
},
preset: 'ts-jest/presets/default-esm',
preset: 'ts-jest',
setupFiles: ['dotenv/config'],
setupFilesAfterEnv: [],
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
testTimeout: 15000,
testRegex: String.raw`(/__tests__/.*|(\.|/)(test|spec))\.tsx?$`,
testTimeout: 15_000,
transform: {
[`(${esModulesList}).+\\.js$`]: [
'babel-jest',
Expand Down
2 changes: 1 addition & 1 deletion nodemon.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"env": {
"NODE_ENV": "development"
},
"exec": "node -r ts-node/register ./src/index.ts",
"exec": "node ./dist/node/index.js",
"ext": ".ts",
"ignore": ["**/*.spec.ts"],
"watch": ["./src"]
Expand Down
27 changes: 13 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"author": "Arie Trouw",
"license": "LGPL-3.0",
"dependencies": {
"@aws-sdk/client-secrets-manager": "^3.606.0",
"@xylabs/assert": "^3.5.2",
"@aws-sdk/client-secrets-manager": "^3.614.0",
"@xylabs/assert": "^3.6.4",
"@xylabs/sdk-api-express-ecs": "^2.0.4",
"@xyo-network/automation-witness-server": "^2.88.9",
"@xyo-network/automation-witness-server": "^2.89.1",
"body-parser": "^1.20.2",
"dotenv": "^16.4.5",
"ethers": "6.13.1",
Expand All @@ -48,27 +48,26 @@
"http-status-codes": "^2.3.0",
"node-cache": "^5.1.2",
"rollbar": "^2.26.4",
"winston": "^3.13.0",
"winston-transport": "^4.7.0"
"winston": "^3.13.1",
"winston-transport": "^4.7.1"
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/core": "^7.24.9",
"@babel/preset-env": "^7.24.8",
"@types/jest": "^29.5.12",
"@types/node": "^20.14.9",
"@xylabs/eslint-config": "^3.11.12",
"@xylabs/ts-scripts-yarn3": "^3.11.12",
"@xylabs/tsconfig": "^3.11.12",
"@xylabs/tsconfig-jest": "^3.11.12",
"@types/node": "^20.14.11",
"@xylabs/eslint-config": "^3.12.3",
"@xylabs/ts-scripts-yarn3": "^3.12.3",
"@xylabs/tsconfig": "^3.12.3",
"@xylabs/tsconfig-jest": "^3.12.3",
"babel-jest": "^29.7.0",
"eslint": "^8.57.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"jest-mock-extended": "^3.0.7",
"jest-sorted": "^1.0.15",
"nodemon": "^3.1.4",
"ts-jest": "^29.1.5",
"ts-node": "^10.9.2",
"ts-jest": "^29.2.2",
"typescript": "^5.5.3"
},
"packageManager": "[email protected]",
Expand Down
19 changes: 8 additions & 11 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"compilerOptions": {
"module": "ES2022",
"outDir": "dist",
"emitDecoratorMetadata": true,
"esModuleInterop": true,
"experimentalDecorators": true,
"moduleResolution": "nodenext",
"module": "nodenext",
"typeRoots": [
"./node_modules/@types"
"./node_modules/@types",
"./types",
],
"types": [
"jest",
Expand All @@ -13,12 +17,5 @@
"exclude": [
"dist/**/*"
],
"extends": "@xylabs/tsconfig",
"ts-node": {
"compilerOptions": {
"module": "CommonJS"
},
"files": true,
"transpileOnly": true
}
"extends": "@xylabs/tsconfig"
}
Loading

0 comments on commit 4a8a50b

Please sign in to comment.