From 44cac7ff2bc97fff1137b6a4aab29198a3bc92b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 02:54:48 +0000 Subject: [PATCH 1/3] Bump prettier from 2.3.1 to 2.5.1 Bumps [prettier](https://github.com/prettier/prettier) from 2.3.1 to 2.5.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.3.1...2.5.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6911a67478..372f232486 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13486,9 +13486,9 @@ } }, "node_modules/prettier": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz", - "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", + "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -28330,9 +28330,9 @@ "dev": true }, "prettier": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz", - "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", + "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", "dev": true }, "prettier-linter-helpers": { From c67664a21b3055baca1216cc3ccdab7de3148b26 Mon Sep 17 00:00:00 2001 From: Franck Date: Wed, 5 Jan 2022 09:05:07 +1100 Subject: [PATCH 2/3] Debug changed files --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d3ba36adc..0aa4928fc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,9 @@ jobs: - name: Check all protobuf code was committed shell: bash run: | - [ $(git status --short --ignore-submodules|wc -l) -eq 0 ] + res=$(git status --short --ignore-submodules) + echo -n "'$res'" # For debug purposes + [ $(echo -n "$res"|wc -l) -eq 0 ] - name: build run: npm run build From 06d89418aae554b329bb11901f8ba2944f65c93a Mon Sep 17 00:00:00 2001 From: Franck Date: Wed, 5 Jan 2022 11:11:42 +1100 Subject: [PATCH 3/3] Format change --- src/proto/waku/v2/light_push.ts | 7 ++++--- src/proto/waku/v2/message.ts | 7 ++++--- src/proto/waku/v2/store.ts | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/proto/waku/v2/light_push.ts b/src/proto/waku/v2/light_push.ts index dc545a0167..59a44e7fe2 100644 --- a/src/proto/waku/v2/light_push.ts +++ b/src/proto/waku/v2/light_push.ts @@ -279,9 +279,10 @@ export type DeepPartial = T extends Builtin type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P - : P & - { [K in keyof P]: Exact } & - Record>, never>; + : P & { [K in keyof P]: Exact } & Record< + Exclude>, + never + >; if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; diff --git a/src/proto/waku/v2/message.ts b/src/proto/waku/v2/message.ts index c6d6f684b2..361448ee7d 100644 --- a/src/proto/waku/v2/message.ts +++ b/src/proto/waku/v2/message.ts @@ -171,9 +171,10 @@ export type DeepPartial = T extends Builtin type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P - : P & - { [K in keyof P]: Exact } & - Record>, never>; + : P & { [K in keyof P]: Exact } & Record< + Exclude>, + never + >; if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; diff --git a/src/proto/waku/v2/store.ts b/src/proto/waku/v2/store.ts index b501f02a03..71e513e611 100644 --- a/src/proto/waku/v2/store.ts +++ b/src/proto/waku/v2/store.ts @@ -710,9 +710,10 @@ export type DeepPartial = T extends Builtin type KeysOfUnion = T extends T ? keyof T : never; export type Exact = P extends Builtin ? P - : P & - { [K in keyof P]: Exact } & - Record>, never>; + : P & { [K in keyof P]: Exact } & Record< + Exclude>, + never + >; function longToNumber(long: Long): number { if (long.gt(Number.MAX_SAFE_INTEGER)) {