Merge branch 'develop' into feature/131-inventory-other

This commit is contained in:
Ethan Lane 2024-02-14 10:35:32 +00:00
commit 13c32a6e14
2 changed files with 20 additions and 33 deletions

51
package-lock.json generated
View file

@ -25,7 +25,7 @@
"minimatch": "9.0.3",
"mysql": "^2.18.1",
"ts-jest": "^29.0.0",
"typeorm": "0.3.19"
"typeorm": "0.3.20"
},
"devDependencies": {
"@types/node": "^20.0.0",
@ -1854,9 +1854,9 @@
}
},
"node_modules/@types/jest": {
"version": "29.5.11",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz",
"integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==",
"version": "29.5.12",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
"integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
"dependencies": {
"expect": "^29.0.0",
"pretty-format": "^29.0.0"
@ -1881,9 +1881,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "20.11.10",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz",
"integrity": "sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==",
"version": "20.11.17",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
"integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
"dependencies": {
"undici-types": "~5.26.4"
}
@ -9914,8 +9914,9 @@
"license": "MIT"
},
"node_modules/reflect-metadata": {
"version": "0.1.13",
"license": "Apache-2.0"
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
"integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="
},
"node_modules/registry-auth-token": {
"version": "4.2.2",
@ -10974,8 +10975,9 @@
}
},
"node_modules/ts-jest": {
"version": "29.1.1",
"license": "MIT",
"version": "29.1.2",
"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
"integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
"dependencies": {
"bs-logger": "0.x",
"fast-json-stable-stringify": "2.x",
@ -10990,7 +10992,7 @@
"ts-jest": "cli.js"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
"node": "^16.10.0 || ^18.0.0 || >=20.0.0"
},
"peerDependencies": {
"@babel/core": ">=7.0.0-beta.0 <8",
@ -11014,21 +11016,6 @@
}
}
},
"node_modules/ts-jest/node_modules/jest-util": {
"version": "29.6.2",
"license": "MIT",
"dependencies": {
"@jest/types": "^29.6.1",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
"graceful-fs": "^4.2.9",
"picomatch": "^2.2.3"
},
"engines": {
"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
}
},
"node_modules/ts-mixer": {
"version": "6.0.3",
"license": "MIT"
@ -11087,9 +11074,9 @@
}
},
"node_modules/typeorm": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.19.tgz",
"integrity": "sha512-OGelrY5qEoAU80mR1iyvmUHiKCPUydL6xp6bebXzS7jyv/X70Gp/jBWRAfF4qGOfy2A7orMiGRfwsBUNbEL65g==",
"version": "0.3.20",
"resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz",
"integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==",
"dependencies": {
"@sqltools/formatter": "^1.2.5",
"app-root-path": "^3.1.0",
@ -11101,7 +11088,7 @@
"dotenv": "^16.0.3",
"glob": "^10.3.10",
"mkdirp": "^2.1.3",
"reflect-metadata": "^0.1.13",
"reflect-metadata": "^0.2.1",
"sha.js": "^2.4.11",
"tslib": "^2.5.0",
"uuid": "^9.0.0",
@ -11113,7 +11100,7 @@
"typeorm-ts-node-esm": "cli-ts-node-esm.js"
},
"engines": {
"node": ">= 12.9.0"
"node": ">=16.13.0"
},
"funding": {
"url": "https://opencollective.com/typeorm"

View file

@ -41,7 +41,7 @@
"minimatch": "9.0.3",
"mysql": "^2.18.1",
"ts-jest": "^29.0.0",
"typeorm": "0.3.19"
"typeorm": "0.3.20"
},
"resolutions": {},
"devDependencies": {