From 2e2daacba885a441a39c01872f99f6a1108d72ca Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Thu, 31 Mar 2022 09:26:07 -0700 Subject: [PATCH 1/6] fix: npm run version upgrades root package.json also resets minor and patch versions to zero for higher-level upgrades --- bin/version.ts | 21 ++++++++------------- package.json | 3 ++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/bin/version.ts b/bin/version.ts index d5742e473..5f7569e5c 100644 --- a/bin/version.ts +++ b/bin/version.ts @@ -34,8 +34,11 @@ const newVersion = (() => { patch = Number(patch) + 1; } else if (argv._.includes('minor')) { minor = Number(minor) + 1; + patch = 0; } else if (argv._.includes('major')) { major = Number(major) + 1; + minor = 0; + patch = 0; } else { // else use the first argument return argv._[0].toString(); @@ -53,8 +56,12 @@ const packages = workspaces .filter(workspace => workspace.includes('packages')) .map(packagePath => packagePath.replace('packages', '@dfinity')); +// Update version in root package.json +workspaces.push('.'); + workspaces.forEach(async workspace => { const packagePath = path.resolve(__dirname, '..', workspace, 'package.json'); + console.log(packagePath); const json = JSON.parse(fs.readFileSync(packagePath).toString()); // Set version for package @@ -74,6 +81,7 @@ workspaces.forEach(async workspace => { // Write file fs.writeFileSync(packagePath, JSON.stringify(json)); }); + function updateDeps(dependencies: Record) { for (const dep in dependencies) { if (Object.prototype.hasOwnProperty.call(dependencies, dep)) { @@ -84,16 +92,3 @@ function updateDeps(dependencies: Record) { } return dependencies; } -// Update version in root package.json -fs.writeFileSync(path.resolve(__dirname, '..', 'package.json'), JSON.stringify(rootPackage)); - -// Prettier format the modified package.json files -exec(`npm run prettier:format`, error => { - if (error) { - throw new Error(JSON.stringify(error)); - } - - // wrap up - console.log('success!'); - console.timeEnd('script duration'); -}); diff --git a/package.json b/package.json index c946d63ac..f60bd1c73 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "prepare": "husky install", "prettier:check": "npx -p prettier -p pretty-quick pretty-quick --check", "prettier:format": "npx -p prettier -p pretty-quick pretty-quick", - "version": "ts-node bin/version.ts" + "version": "ts-node bin/version.ts", + "postversion": "npm run prettier:format" }, "repository": { "type": "git", From 4159828ae979eab0cab50b976e4a65c52e574bf3 Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Thu, 31 Mar 2022 09:27:45 -0700 Subject: [PATCH 2/6] changelog --- docs/generated/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generated/changelog.html b/docs/generated/changelog.html index 6b3ead8fd..6ba85a463 100644 --- a/docs/generated/changelog.html +++ b/docs/generated/changelog.html @@ -22,6 +22,7 @@

Version 0.10.5

of logging the user out and prompting re-authentication. See the @dfinity/auth-client Readme for more details +
  • Fix for versioning tool

    • Version 0.10.3

      From c5e0c37361d144972d14612dd016b1361f5bccef Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Fri, 1 Apr 2022 09:33:32 -0700 Subject: [PATCH 3/6] Update docs/generated/changelog.html Co-authored-by: Eric Swanson <64809312+ericswanson-dfinity@users.noreply.github.com> --- docs/generated/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generated/changelog.html b/docs/generated/changelog.html index 6ba85a463..d5bc1cf7f 100644 --- a/docs/generated/changelog.html +++ b/docs/generated/changelog.html @@ -22,7 +22,7 @@

      Version 0.10.5

      of logging the user out and prompting re-authentication. See the @dfinity/auth-client Readme for more details -
    • Fix for versioning tool
      • +
    • Versioning tool now sets patch version to 0 for minor version updates, or patch and minor versions to 0 for major version updates

    Version 0.10.3

      From 858095e7c4a4246f392af216b9206b54a57bc7e7 Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Thu, 31 Mar 2022 09:26:07 -0700 Subject: [PATCH 4/6] fix: npm run version upgrades root package.json also resets minor and patch versions to zero for higher-level upgrades --- bin/version.ts | 21 ++++++++------------- package.json | 3 ++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/bin/version.ts b/bin/version.ts index d5742e473..5f7569e5c 100644 --- a/bin/version.ts +++ b/bin/version.ts @@ -34,8 +34,11 @@ const newVersion = (() => { patch = Number(patch) + 1; } else if (argv._.includes('minor')) { minor = Number(minor) + 1; + patch = 0; } else if (argv._.includes('major')) { major = Number(major) + 1; + minor = 0; + patch = 0; } else { // else use the first argument return argv._[0].toString(); @@ -53,8 +56,12 @@ const packages = workspaces .filter(workspace => workspace.includes('packages')) .map(packagePath => packagePath.replace('packages', '@dfinity')); +// Update version in root package.json +workspaces.push('.'); + workspaces.forEach(async workspace => { const packagePath = path.resolve(__dirname, '..', workspace, 'package.json'); + console.log(packagePath); const json = JSON.parse(fs.readFileSync(packagePath).toString()); // Set version for package @@ -74,6 +81,7 @@ workspaces.forEach(async workspace => { // Write file fs.writeFileSync(packagePath, JSON.stringify(json)); }); + function updateDeps(dependencies: Record) { for (const dep in dependencies) { if (Object.prototype.hasOwnProperty.call(dependencies, dep)) { @@ -84,16 +92,3 @@ function updateDeps(dependencies: Record) { } return dependencies; } -// Update version in root package.json -fs.writeFileSync(path.resolve(__dirname, '..', 'package.json'), JSON.stringify(rootPackage)); - -// Prettier format the modified package.json files -exec(`npm run prettier:format`, error => { - if (error) { - throw new Error(JSON.stringify(error)); - } - - // wrap up - console.log('success!'); - console.timeEnd('script duration'); -}); diff --git a/package.json b/package.json index c946d63ac..f60bd1c73 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "prepare": "husky install", "prettier:check": "npx -p prettier -p pretty-quick pretty-quick --check", "prettier:format": "npx -p prettier -p pretty-quick pretty-quick", - "version": "ts-node bin/version.ts" + "version": "ts-node bin/version.ts", + "postversion": "npm run prettier:format" }, "repository": { "type": "git", From abaee91bfebf567f6a22eb0bf2a901dc75a50e87 Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Thu, 31 Mar 2022 09:27:45 -0700 Subject: [PATCH 5/6] changelog --- docs/generated/changelog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generated/changelog.html b/docs/generated/changelog.html index 138919cb3..f25ab0530 100644 --- a/docs/generated/changelog.html +++ b/docs/generated/changelog.html @@ -23,6 +23,7 @@

      Version 0.10.5

      Readme for more details
    • Reduces the maxTimeToLive default setting from 24 hours to 8
      • +
    • Fix for versioning tool

    Version 0.10.3

      From 9aa0742d2d6fd5bdf7de606d4ae0562aa0295b7d Mon Sep 17 00:00:00 2001 From: Kyle Peacock Date: Fri, 1 Apr 2022 14:15:51 -0700 Subject: [PATCH 6/6] updating types --- package-lock.json | 465 ++++++++++------------------------------------ package.json | 3 +- 2 files changed, 103 insertions(+), 365 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34abe9f45..c74cea466 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.10.4", "license": "Apache-2.0", "dependencies": { - "@types/jest": "^26.0.22", "jest": "^27.3.1", "jest-cli": "^27.3.1", "ts-jest": "^27.0.7" @@ -17,7 +16,7 @@ "devDependencies": { "@babel/preset-env": "^7.13.12", "@babel/preset-typescript": "^7.13.0", - "@jest/types": "^26.6.2", + "@types/jest": "^27.4.1", "@types/node": "^14.14.37", "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2", @@ -119,6 +118,15 @@ "whatwg-fetch": "^3.0.0" } }, + "e2e/node/node_modules/@types/jest": { + "version": "26.0.24", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz", + "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==", + "dependencies": { + "jest-diff": "^26.0.0", + "pretty-format": "^26.0.0" + } + }, "e2e/node/node_modules/@types/node": { "version": "13.13.52", "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz", @@ -2869,12 +2877,39 @@ } }, "node_modules/@types/jest": { - "version": "26.0.23", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz", - "integrity": "sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==", + "version": "27.4.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", + "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", + "devOptional": true, "dependencies": { - "jest-diff": "^26.0.0", - "pretty-format": "^26.0.0" + "jest-matcher-utils": "^27.0.0", + "pretty-format": "^27.0.0" + } + }, + "node_modules/@types/jest/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "devOptional": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@types/jest/node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "devOptional": true, + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/@types/json-schema": { @@ -7717,9 +7752,9 @@ } }, "node_modules/jest-diff/node_modules/chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -13709,6 +13744,16 @@ "@dfinity/principal": "^0.10.4" } }, + "packages/agent/node_modules/@types/jest": { + "version": "26.0.24", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz", + "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==", + "dev": true, + "dependencies": { + "jest-diff": "^26.0.0", + "pretty-format": "^26.0.0" + } + }, "packages/agent/node_modules/typescript": { "version": "3.9.10", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", @@ -13750,42 +13795,6 @@ "@dfinity/principal": "^0.10.4" } }, - "packages/auth-client/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "packages/auth-client/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/auth-client/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, "packages/authentication": { "name": "@dfinity/authentication", "version": "0.10.4", @@ -13813,42 +13822,6 @@ "@dfinity/principal": "^0.10.4" } }, - "packages/authentication/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "packages/authentication/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/authentication/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, "packages/candid": { "name": "@dfinity/candid", "version": "0.10.4", @@ -13872,16 +13845,6 @@ "whatwg-fetch": "^3.0.0" } }, - "packages/candid/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, "packages/candid/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -14078,78 +14041,6 @@ "@dfinity/principal": "^0.10.4" } }, - "packages/identity-ledgerhq/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "packages/identity-ledgerhq/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/identity-ledgerhq/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "packages/identity/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "packages/identity/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/identity/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, "packages/principal": { "name": "@dfinity/principal", "version": "0.10.4", @@ -14170,42 +14061,6 @@ "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" } - }, - "packages/principal/node_modules/@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "dependencies": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "packages/principal/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/principal/node_modules/pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } } }, "dependencies": { @@ -15262,6 +15117,16 @@ "whatwg-fetch": "^3.0.0" }, "dependencies": { + "@types/jest": { + "version": "26.0.24", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz", + "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==", + "dev": true, + "requires": { + "jest-diff": "^26.0.0", + "pretty-format": "^26.0.0" + } + }, "typescript": { "version": "3.9.10", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", @@ -15288,35 +15153,6 @@ "typedoc": "^0.22.11", "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - } - } } }, "@dfinity/authentication": { @@ -15337,35 +15173,6 @@ "typedoc": "^0.22.11", "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - } - } } }, "@dfinity/candid": { @@ -15389,16 +15196,6 @@ "whatwg-fetch": "^3.0.0" }, "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -15516,35 +15313,6 @@ "typedoc": "^0.22.11", "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - } - } } }, "@dfinity/identity-ledgerhq": { @@ -15570,35 +15338,6 @@ "typedoc": "^0.22.11", "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - } - } } }, "@dfinity/principal": { @@ -15618,35 +15357,6 @@ "typedoc": "^0.22.11", "typescript": "^4.2.3", "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "@types/jest": { - "version": "27.4.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", - "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", - "dev": true, - "requires": { - "jest-matcher-utils": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - }, - "pretty-format": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", - "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - } - } } }, "@discoveryjs/json-ext": { @@ -15679,6 +15389,15 @@ "whatwg-fetch": "^3.0.0" }, "dependencies": { + "@types/jest": { + "version": "26.0.24", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz", + "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==", + "requires": { + "jest-diff": "^26.0.0", + "pretty-format": "^26.0.0" + } + }, "@types/node": { "version": "13.13.52", "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz", @@ -16850,12 +16569,32 @@ } }, "@types/jest": { - "version": "26.0.23", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.23.tgz", - "integrity": "sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==", + "version": "27.4.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz", + "integrity": "sha512-23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw==", + "devOptional": true, "requires": { - "jest-diff": "^26.0.0", - "pretty-format": "^26.0.0" + "jest-matcher-utils": "^27.0.0", + "pretty-format": "^27.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "devOptional": true + }, + "pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "devOptional": true, + "requires": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + } + } } }, "@types/json-schema": { @@ -20486,9 +20225,9 @@ } }, "chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" diff --git a/package.json b/package.json index f60bd1c73..2073f6682 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "private": true, "description": "Use an Agent to interact with the Internet Computer from your JavaScript program.", "dependencies": { - "@types/jest": "^26.0.22", "jest": "^27.3.1", "jest-cli": "^27.3.1", "ts-jest": "^27.0.7" @@ -26,7 +25,7 @@ "devDependencies": { "@babel/preset-env": "^7.13.12", "@babel/preset-typescript": "^7.13.0", - "@jest/types": "^26.6.2", + "@types/jest": "^27.4.1", "@types/node": "^14.14.37", "@typescript-eslint/eslint-plugin": "^4.14.2", "@typescript-eslint/parser": "^4.14.2",