diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2020-09-22 13:59:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 13:59:08 +0900 |
| commit | edf6282d2e6211b2fdb4043c382366e5bbeb161e (patch) | |
| tree | 6213156f74076febddd63521a6393630c36244df | |
| parent | 65cfdf60eb931ae98f83d66c8adea6b190e27f48 (diff) | |
| parent | d555c64e5ce12d716925786d914510415c19a0db (diff) | |
Merge pull request #835 from ueokande/dependabot/npm_and_yarn/typescript-4.0.3
Bump typescript from 3.9.7 to 4.0.3
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/shared/SettingData.ts | 5 | ||||
| -rw-r--r-- | yarn.lock | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/package.json b/package.json index 4432685..14da1c7 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "ts-loader": "^8.0.2", "ts-node": "^9.0.0", "tsyringe": "4.3.0", - "typescript": "3.9.7", + "typescript": "4.0.3", "web-ext-types": "^3.2.1", "webextensions-api-fake": "^0.9.1", "webpack": "4.44.1", diff --git a/src/shared/SettingData.ts b/src/shared/SettingData.ts index a7bdf80..0d72874 100644 --- a/src/shared/SettingData.ts +++ b/src/shared/SettingData.ts @@ -51,10 +51,9 @@ export class FormKeymaps { const data: { [op: string]: string } = {}; for (const key of Object.keys(json)) { const op = json[key]; - const args = { ...op }; - delete args.type; + const { type, ...args } = op; - let name = op.type; + let name = type; if (Object.keys(args).length > 0) { name += "?" + JSON.stringify(args); } @@ -6337,7 +6337,12 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.9.7, typescript@^3.9.3: +typescript@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5" + integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg== + +typescript@^3.9.3: version "3.9.7" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa" integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw== |