From 9fffbaff252c94c8771be48e020f6a0d85602c13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 15:24:30 +0000 Subject: [PATCH 1/4] chore(deps): bump fs-extra and @types/fs-extra Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) and [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra). These dependencies needed to be updated together. Updates `fs-extra` from 11.1.0 to 11.2.0 - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/compare/11.1.0...11.2.0) Updates `@types/fs-extra` from 9.0.13 to 11.0.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra) --- updated-dependencies: - dependency-name: fs-extra dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/fs-extra" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/commons/package.json | 4 +- packages/copy-config/package.json | 4 +- packages/license-collector/package.json | 4 +- packages/store-engine-fs/package.json | 4 +- yarn.lock | 53 ++++++++++++------------- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/packages/commons/package.json b/packages/commons/package.json index 79ac0be9ec..00df2dddea 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -13,14 +13,14 @@ ], "dependencies": { "ansi-regex": "5.0.1", - "fs-extra": "11.1.0", + "fs-extra": "11.2.0", "logdown": "3.3.1", "platform": "1.3.6" }, "devDependencies": { "@swc/core": "^1.3.10", "@swc/jest": "^0.2.23", - "@types/fs-extra": "9.0.13", + "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/platform": "1.3.6", "@types/rimraf": "4.0.5", diff --git a/packages/copy-config/package.json b/packages/copy-config/package.json index ba51f00a4e..581e5d9ab0 100644 --- a/packages/copy-config/package.json +++ b/packages/copy-config/package.json @@ -12,7 +12,7 @@ "axios": "1.6.8", "copy": "0.3.2", "cosmiconfig": "9.0.0", - "fs-extra": "11.1.0", + "fs-extra": "11.2.0", "jszip": "3.10.1", "logdown": "3.3.1", "rimraf": "5.0.7" @@ -22,7 +22,7 @@ "@swc/jest": "^0.2.23", "@types/axios": "^0.14.0", "@types/copy": "0.3.5", - "@types/fs-extra": "9.0.13", + "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/rimraf": "4.0.5", "jest": "^29.2.1", diff --git a/packages/license-collector/package.json b/packages/license-collector/package.json index 57a70b8706..a8ee2a38c0 100644 --- a/packages/license-collector/package.json +++ b/packages/license-collector/package.json @@ -11,13 +11,13 @@ "collect-licenses": "src/cli.js" }, "dependencies": { - "fs-extra": "11.1.0", + "fs-extra": "11.2.0", "logdown": "3.3.1", "npm-license-crawler": "0.2.1", "npm-registry-package-info": "1.0.5" }, "devDependencies": { - "@types/fs-extra": "9.0.13", + "@types/fs-extra": "11.0.4", "@types/license-checker": "^25", "@types/npm-registry-package-info": "1.0.4", "@types/rimraf": "4.0.5", diff --git a/packages/store-engine-fs/package.json b/packages/store-engine-fs/package.json index 3f0d98deaa..8b89b8c964 100644 --- a/packages/store-engine-fs/package.json +++ b/packages/store-engine-fs/package.json @@ -11,12 +11,12 @@ "@wireapp/store-engine": "5.x.x" }, "dependencies": { - "fs-extra": "11.1.0" + "fs-extra": "11.2.0" }, "devDependencies": { "@swc/core": "^1.3.10", "@swc/jest": "^0.2.23", - "@types/fs-extra": "9.0.13", + "@types/fs-extra": "11.0.4", "@types/jest": "^29.2.0", "@types/node": "^20.1.0", "@types/rimraf": "4.0.5", diff --git a/yarn.lock b/yarn.lock index d724b43126..5479ed8699 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3787,12 +3787,13 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:9.0.13": - version: 9.0.13 - resolution: "@types/fs-extra@npm:9.0.13" +"@types/fs-extra@npm:11.0.4": + version: 11.0.4 + resolution: "@types/fs-extra@npm:11.0.4" dependencies: + "@types/jsonfile": "*" "@types/node": "*" - checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3 + checksum: 242cb84157631f057f76495c8220707541882c00a00195b603d937fb55e471afecebcb089bab50233ed3a59c69fd68bf65c1f69dd7fafe2347e139cc15b9b0e5 languageName: node linkType: hard @@ -3891,6 +3892,15 @@ __metadata: languageName: node linkType: hard +"@types/jsonfile@npm:*": + version: 6.1.4 + resolution: "@types/jsonfile@npm:6.1.4" + dependencies: + "@types/node": "*" + checksum: 309fda20eb5f1cf68f2df28931afdf189c5e7e6bec64ac783ce737bb98908d57f6f58757ad5da9be37b815645a6f914e2d4f3ac66c574b8fe1ba6616284d0e97 + languageName: node + linkType: hard + "@types/jsrsasign@npm:10.5.14": version: 10.5.14 resolution: "@types/jsrsasign@npm:10.5.14" @@ -4742,12 +4752,12 @@ __metadata: dependencies: "@swc/core": ^1.3.10 "@swc/jest": ^0.2.23 - "@types/fs-extra": 9.0.13 + "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/platform": 1.3.6 "@types/rimraf": 4.0.5 ansi-regex: 5.0.1 - fs-extra: 11.1.0 + fs-extra: 11.2.0 jest: ^29.2.1 logdown: 3.3.1 platform: 1.3.6 @@ -4764,13 +4774,13 @@ __metadata: "@swc/jest": ^0.2.23 "@types/axios": ^0.14.0 "@types/copy": 0.3.5 - "@types/fs-extra": 9.0.13 + "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/rimraf": 4.0.5 axios: 1.6.8 copy: 0.3.2 cosmiconfig: 9.0.0 - fs-extra: 11.1.0 + fs-extra: 11.2.0 jest: ^29.2.1 jszip: 3.10.1 logdown: 3.3.1 @@ -4881,11 +4891,11 @@ __metadata: version: 0.0.0-use.local resolution: "@wireapp/license-collector@workspace:packages/license-collector" dependencies: - "@types/fs-extra": 9.0.13 + "@types/fs-extra": 11.0.4 "@types/license-checker": ^25 "@types/npm-registry-package-info": 1.0.4 "@types/rimraf": 4.0.5 - fs-extra: 11.1.0 + fs-extra: 11.2.0 license-checker: ^25.0.1 logdown: 3.3.1 npm-license-crawler: 0.2.1 @@ -5058,12 +5068,12 @@ __metadata: dependencies: "@swc/core": ^1.3.10 "@swc/jest": ^0.2.23 - "@types/fs-extra": 9.0.13 + "@types/fs-extra": 11.0.4 "@types/jest": ^29.2.0 "@types/node": ^20.1.0 "@types/rimraf": 4.0.5 "@wireapp/store-engine": "workspace:^" - fs-extra: 11.1.0 + fs-extra: 11.2.0 jest: ^29.2.1 rimraf: 5.0.7 ts-node: 10.9.2 @@ -9543,14 +9553,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.1.0": - version: 11.1.0 - resolution: "fs-extra@npm:11.1.0" +"fs-extra@npm:11.2.0, fs-extra@npm:^11.2.0": + version: 11.2.0 + resolution: "fs-extra@npm:11.2.0" dependencies: graceful-fs: ^4.2.0 jsonfile: ^6.0.1 universalify: ^2.0.0 - checksum: 5ca476103fa1f5ff4a9b3c4f331548f8a3c1881edaae323a4415d3153b5dc11dc6a981c8d1dd93eec8367ceee27b53f8bd27eecbbf66ffcdd04927510c171e7f + checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8 languageName: node linkType: hard @@ -9565,17 +9575,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.2.0": - version: 11.2.0 - resolution: "fs-extra@npm:11.2.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8 - languageName: node - linkType: hard - "fs-extra@npm:^9.0.0": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" From 73b2c66471bbb3c9975f5fcca77bdb93caf30e92 Mon Sep 17 00:00:00 2001 From: Roma Koval Date: Fri, 17 May 2024 21:42:47 +0200 Subject: [PATCH 2/4] Fix different versions of fs-extra and fix usage of fs.copy() --- packages/archive/cli-client/package.json | 4 ++-- packages/copy-config/src/CopyConfig.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/archive/cli-client/package.json b/packages/archive/cli-client/package.json index a2aee9dcef..61ef066412 100644 --- a/packages/archive/cli-client/package.json +++ b/packages/archive/cli-client/package.json @@ -17,10 +17,10 @@ "commander": "10.0.0", "dotenv": "16.0.3", "fake-indexeddb": "^4.0.1", - "fs-extra": "11.1.0" + "fs-extra": "11.2.0" }, "devDependencies": { - "@types/fs-extra": "9.0.13", + "@types/fs-extra": "11.0.4", "@types/rimraf": "4.0.5", "rimraf": "^3.0.2", "ts-node": "^10.9.1", diff --git a/packages/copy-config/src/CopyConfig.ts b/packages/copy-config/src/CopyConfig.ts index 132f724400..1b8021e933 100644 --- a/packages/copy-config/src/CopyConfig.ts +++ b/packages/copy-config/src/CopyConfig.ts @@ -152,7 +152,8 @@ export class CopyConfig { // Info: "fs.copy" creates all sub-folders which are needed along the way: // see https://github.com/jprichardson/node-fs-extra/blob/7.0.1/lib/copy/copy.js#L43 - await fs.copy(source, destination, {filter, overwrite: true, recursive: true}); + // by default, fs.copy() copies folders recursively + await fs.copy(source, destination, {filter, overwrite: true}); return [destination]; } From 3aaa2b1325744b53f89401f5ac2e715cb0ab336e Mon Sep 17 00:00:00 2001 From: Roma Koval Date: Tue, 21 May 2024 14:00:57 +0200 Subject: [PATCH 3/4] Fix `fs.writeFile` usage --- packages/store-engine-fs/src/index.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/store-engine-fs/src/index.ts b/packages/store-engine-fs/src/index.ts index c0f067c0d6..605b9088ec 100644 --- a/packages/store-engine-fs/src/index.ts +++ b/packages/store-engine-fs/src/index.ts @@ -106,11 +106,7 @@ export class FileEngine implements CRUDEngine { } const filePath = this.resolvePath(tableName, primaryKey); - let newEntity: EntityType | string = entity; - - if (typeof entity === 'object') { - newEntity = JSON.stringify(entity); - } + const newEntity: string = JSON.stringify(entity); try { await fs.writeFile(filePath, newEntity, {flag: 'wx'}); From 1366d7e16534a77d280c112a7b394589027b64ed Mon Sep 17 00:00:00 2001 From: Roma Koval Date: Tue, 21 May 2024 16:50:11 +0200 Subject: [PATCH 4/4] Fix the way `newEntity` for `fs.writeFile` in `store-engine-fs` is calculated to fix the types --- packages/store-engine-fs/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/store-engine-fs/src/index.ts b/packages/store-engine-fs/src/index.ts index 605b9088ec..e53ed23372 100644 --- a/packages/store-engine-fs/src/index.ts +++ b/packages/store-engine-fs/src/index.ts @@ -106,7 +106,7 @@ export class FileEngine implements CRUDEngine { } const filePath = this.resolvePath(tableName, primaryKey); - const newEntity: string = JSON.stringify(entity); + const newEntity: string = typeof entity === 'object' ? JSON.stringify(entity) : entity.toString(); try { await fs.writeFile(filePath, newEntity, {flag: 'wx'});