Skip to content

Commit

Permalink
Merge pull request #1563 from merico-dev/1562-dependency-packagejson-…
Browse files Browse the repository at this point in the history
…update

1562 dependency packagejson update
  • Loading branch information
GerilLeto authored Oct 29, 2024
2 parents c2a59f8 + 07cb749 commit e6f1fc7
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 30 deletions.
4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/api",
"version": "13.43.1",
"version": "13.43.3",
"description": "",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -35,7 +35,7 @@
"license": "Apache-2.0",
"dependencies": {
"argparse": "^2.0.1",
"axios": "^1.6.2",
"axios": "^1.7.7",
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
"class-transformer": "^0.5.1",
Expand Down
8 changes: 6 additions & 2 deletions dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/dashboard",
"version": "13.43.1",
"version": "13.43.3",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
Expand All @@ -24,6 +24,10 @@
"./dist/version.json": {
"import": "./dist/version.json",
"require": "./dist/version.json"
},
"./dist/index.d.ts": {
"import": "./dist/index.d.ts",
"require": "./dist/index.d.ts"
}
},
"scripts": {
Expand Down Expand Up @@ -78,7 +82,7 @@
"@tiptap/starter-kit": "2.8.0",
"@types/chroma-js": "^2.1.4",
"ahooks": "^3.3.11",
"axios": "^0.27.2",
"axios": "^1.7.7",
"chroma-js": "^2.4.2",
"constrained-editor-plugin": "^1.3.0",
"crypto-js": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/root",
"version": "13.43.1",
"version": "13.43.3",
"private": true,
"workspaces": [
"api",
Expand Down
8 changes: 6 additions & 2 deletions settings-form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtable/settings-form",
"version": "13.43.1",
"version": "13.43.3",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
Expand All @@ -24,6 +24,10 @@
"./dist/version.json": {
"import": "./dist/version.json",
"require": "./dist/version.json"
},
"./dist/index.d.ts": {
"import": "./dist/index.d.ts",
"require": "./dist/index.d.ts"
}
},
"scripts": {
Expand Down Expand Up @@ -63,7 +67,7 @@
},
"peerDependencies": {
"ahooks": "^3.3.11",
"axios": "^0.27.2",
"axios": "^1.7.7",
"crypto-js": "^4.1.1",
"lodash": "^4.17.21",
"react": "^18.2.0",
Expand Down
3 changes: 2 additions & 1 deletion shared/src/api-client/default-api-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export class DefaultApiClient implements IAPIClient {
if (axios.isCancel(err)) {
return Promise.reject(err);
}
const msg = _.get(err, 'response.data.detail.message', err.message);
const error = err as Error;
const msg = _.get(error, 'response.data.detail.message', error.message);
return Promise.reject(new Error(msg));
}) as Promise<T>;
};
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@devtable/website",
"private": true,
"license": "Apache-2.0",
"version": "13.43.1",
"version": "13.43.3",
"scripts": {
"dev": "vite",
"preview": "vite preview"
Expand Down Expand Up @@ -50,7 +50,7 @@
"@zeeko/power-accessor": "0.2.2",
"ahooks": "^3.3.11",
"ajv": "8.12.0",
"axios": "^0.27.2",
"axios": "^1.7.7",
"chroma-js": "^2.4.2",
"compare-versions": "6.1.0",
"crypto-js": "^4.1.1",
Expand Down
40 changes: 20 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1595,7 +1595,7 @@ __metadata:
"@types/pg": ^8.10.9
"@types/supertest": ^2.0.16
argparse: ^2.0.1
axios: ^1.6.2
axios: ^1.7.7
bcrypt: ^5.1.1
body-parser: ^1.20.2
class-transformer: ^0.5.1
Expand Down Expand Up @@ -1700,7 +1700,7 @@ __metadata:
"@types/react-grid-layout": ^1.3.2
"@types/uuid": 9.0.5
ahooks: ^3.3.11
axios: ^0.27.2
axios: ^1.7.7
chroma-js: ^2.4.2
constrained-editor-plugin: ^1.3.0
crypto-js: ^4.1.1
Expand Down Expand Up @@ -1830,7 +1830,7 @@ __metadata:
vite-plugin-static-copy: ^0.17.0
peerDependencies:
ahooks: ^3.3.11
axios: ^0.27.2
axios: ^1.7.7
crypto-js: ^4.1.1
lodash: ^4.17.21
react: ^18.2.0
Expand Down Expand Up @@ -1888,7 +1888,7 @@ __metadata:
"@zeeko/power-accessor": 0.2.2
ahooks: ^3.3.11
ajv: 8.12.0
axios: ^0.27.2
axios: ^1.7.7
chroma-js: ^2.4.2
compare-versions: 6.1.0
crypto-js: ^4.1.1
Expand Down Expand Up @@ -6735,16 +6735,6 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^0.27.2":
version: 0.27.2
resolution: "axios@npm:0.27.2"
dependencies:
follow-redirects: ^1.14.9
form-data: ^4.0.0
checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
languageName: node
linkType: hard

"axios@npm:^1.0.0":
version: 1.4.0
resolution: "axios@npm:1.4.0"
Expand All @@ -6756,14 +6746,14 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^1.6.2":
version: 1.6.2
resolution: "axios@npm:1.6.2"
"axios@npm:^1.7.7":
version: 1.7.7
resolution: "axios@npm:1.7.7"
dependencies:
follow-redirects: ^1.15.0
follow-redirects: ^1.15.6
form-data: ^4.0.0
proxy-from-env: ^1.1.0
checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8
checksum: 882d4fe0ec694a07c7f5c1f68205eb6dc5a62aecdb632cc7a4a3d0985188ce3030e0b277e1a8260ac3f194d314ae342117660a151fabffdc5081ca0b5a8b47fe
languageName: node
linkType: hard

Expand Down Expand Up @@ -9980,7 +9970,7 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
"follow-redirects@npm:^1.15.0":
version: 1.15.2
resolution: "follow-redirects@npm:1.15.2"
peerDependenciesMeta:
Expand All @@ -9990,6 +9980,16 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.15.6":
version: 1.15.9
resolution: "follow-redirects@npm:1.15.9"
peerDependenciesMeta:
debug:
optional: true
checksum: 859e2bacc7a54506f2bf9aacb10d165df78c8c1b0ceb8023f966621b233717dab56e8d08baadc3ad3b9db58af290413d585c999694b7c146aaf2616340c3d2a6
languageName: node
linkType: hard

"for-each@npm:^0.3.3":
version: 0.3.3
resolution: "for-each@npm:0.3.3"
Expand Down

0 comments on commit e6f1fc7

Please sign in to comment.