From 0cce16323f2a1e51f2ef776cea2af835ac9013b8 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Mon, 16 Sep 2024 15:24:05 -0600 Subject: [PATCH 1/4] Add top-level 'update-packages' npm script --- .github/scripts/update-packages.js | 89 +++++++++++++ package-lock.json | 204 +++++++++++++++++++++++++++++ package.json | 13 ++ 3 files changed, 306 insertions(+) create mode 100644 .github/scripts/update-packages.js create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.github/scripts/update-packages.js b/.github/scripts/update-packages.js new file mode 100644 index 000000000..5cc01e1ba --- /dev/null +++ b/.github/scripts/update-packages.js @@ -0,0 +1,89 @@ +// Update agent-js dependencies across all example projects. + +import { readFile, writeFile, readdir, stat } from "fs/promises"; +import { resolve, join } from "path"; +import latestVersion from "latest-version"; + +// Skip updating these packages. +const ignoreList = [ + "@dfinity/internet-identity-vite-plugins", + "@dfinity/internet-identity-vc-api", +]; + +const visitedPackageJsonFiles = []; +const versionPromiseMap = new Map(); + +// Find and cache the latest version of a package. +async function findLatestVersion(pkg) { + if (versionPromiseMap.has(pkg)) { + return versionPromiseMap.get(pkg); + } + const version = latestVersion(pkg); + versionPromiseMap.set(pkg, version); + return version; +} + +// Update all `package.json` files in the repository. +async function updatePackageJson(filePath) { + filePath = resolve(filePath); + if (visitedPackageJsonFiles.includes(filePath)) { + console.log("Already visited package.json file:", filePath); + return; + } + visitedPackageJsonFiles.push(filePath); + + let content = await readFile(filePath, "utf8"); + let updated = false; + + const updateMap = {}; + const packageRegex = /"(@dfinity\/[^"]+)":\s*"([^"]+)"/g; + for (const match of content.matchAll(packageRegex)) { + const pkg = match[1]; + const version = match[2]; + try { + if (ignoreList.includes(pkg)) { + continue; + } + const newVersion = `^${await findLatestVersion(pkg)}`; + if (version !== newVersion) { + const regex = new RegExp(`("${pkg}"\\s*:\\s*")([^"]+)`, "g"); + if (!regex.test(content)) { + throw new Error( + "Bug: missing regex pattern to replace package version" + ); + } + content = content.replace(regex, `$1${newVersion}`); + updated = true; + updateMap[pkg] = newVersion; + } + } catch (error) { + console.error(`Error while updating ${pkg}:`); + throw error; + } + } + + if (updated) { + await writeFile(filePath, content); + console.log(`Updated ${filePath}:`, updateMap); + } +} + +// Recursively search for and update directories with a `package.json` file. +async function searchAndUpdate(directory) { + const files = await readdir(directory); + await Promise.all( + files.map(async (filename) => { + const filePath = join(directory, filename); + if ((await stat(filePath)).isDirectory()) { + if (filename === "node_modules") { + return; + } + await searchAndUpdate(filePath); + } else if (filename === "package.json") { + await updatePackageJson(filePath); + } + }) + ); +} + +searchAndUpdate(process.cwd()).then(() => console.log("Completed")); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..0efd1f185 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,204 @@ +{ + "name": "@dfinity/examples", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@dfinity/examples", + "version": "0.0.0", + "devDependencies": { + "latest-version": "^9.0.0" + } + }, + "node_modules/@pnpm/config.env-replace": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", + "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", + "dev": true, + "engines": { + "node": ">=12.22.0" + } + }, + "node_modules/@pnpm/network.ca-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", + "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", + "dev": true, + "dependencies": { + "graceful-fs": "4.2.10" + }, + "engines": { + "node": ">=12.22.0" + } + }, + "node_modules/@pnpm/npm-conf": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", + "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", + "dev": true, + "dependencies": { + "@pnpm/config.env-replace": "^1.1.0", + "@pnpm/network.ca-file": "^1.0.1", + "config-chain": "^1.1.11" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dev": true, + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/ky": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz", + "integrity": "sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sindresorhus/ky?sponsor=1" + } + }, + "node_modules/latest-version": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-9.0.0.tgz", + "integrity": "sha512-7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==", + "dev": true, + "dependencies": { + "package-json": "^10.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/package-json": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz", + "integrity": "sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==", + "dev": true, + "dependencies": { + "ky": "^1.2.0", + "registry-auth-token": "^5.0.2", + "registry-url": "^6.0.1", + "semver": "^7.6.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "dev": true + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/registry-auth-token": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", + "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", + "dev": true, + "dependencies": { + "@pnpm/npm-conf": "^2.1.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/registry-url": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", + "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", + "dev": true, + "dependencies": { + "rc": "1.2.8" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 000000000..e7d75dbe8 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "name": "@dfinity/examples", + "version": "0.0.0", + "private": true, + "description": "Example applications, microservices, and code samples for the Internet Computer", + "type": "module", + "scripts": { + "update-packages": "node .github/scripts/update-packages.js" + }, + "devDependencies": { + "latest-version": "^9.0.0" + } +} From 93737cc41e53239f20a6b9a4282a9bdde544bae0 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Mon, 16 Sep 2024 15:24:20 -0600 Subject: [PATCH 2/4] Update '@dfinity' package versions --- hosting/photo-storage/package.json | 10 +- motoko/auth_client_demo/package.json | 10 +- motoko/cert-var/package.json | 6 +- motoko/defi/src/frontend/package.json | 12 +- .../encrypted-notes-dapp-vetkd/package.json | 10 +- motoko/encrypted-notes-dapp/package.json | 10 +- motoko/hello/package.json | 6 +- motoko/ic-pos/package.json | 14 +- motoko/icrc2-swap/package.json | 8 +- .../package.json | 10 +- .../ios-notifications/dapp-demo/package.json | 12 +- motoko/life/package.json | 6 +- motoko/minimal-counter-dapp/package.json | 6 +- motoko/phone-book/package.json | 6 +- motoko/random_maze/package-lock.json | 378 ++++-------------- motoko/random_maze/package.json | 6 +- motoko/send_http_get/package.json | 6 +- motoko/send_http_post/package.json | 6 +- motoko/superheroes/package.json | 6 +- motoko/vetkd/package.json | 8 +- .../ii_integration_dapp/package.json | 10 +- .../ii_integration_dapp/package.json | 10 +- .../ii_integration_dapp/package.json | 10 +- rust/defi/src/frontend/package.json | 12 +- rust/hello/package.json | 6 +- rust/image-classification/package.json | 6 +- rust/nft-wallet/frontend/package.json | 10 +- rust/qrcode/package.json | 6 +- rust/send_http_get/package.json | 6 +- rust/send_http_post/package.json | 6 +- rust/vetkd/package.json | 8 +- .../src/frontend/package.json | 10 +- svelte/sveltekit-starter/package.json | 6 +- 33 files changed, 210 insertions(+), 432 deletions(-) diff --git a/hosting/photo-storage/package.json b/hosting/photo-storage/package.json index a4d1f30b4..8b02faed2 100644 --- a/hosting/photo-storage/package.json +++ b/hosting/photo-storage/package.json @@ -3,11 +3,11 @@ "version": "0.1.0", "private": true, "dependencies": { - "@dfinity/agent": "^0.15.0", - "@dfinity/assets": "^0.15.0", - "@dfinity/candid": "^0.15.0", - "@dfinity/identity": "^0.15.0", - "@dfinity/principal": "^0.15.0", + "@dfinity/agent": "^2.1.1", + "@dfinity/assets": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-masonry-css": "^1.0.16", diff --git a/motoko/auth_client_demo/package.json b/motoko/auth_client_demo/package.json index 8f15dafdd..6f05b9744 100644 --- a/motoko/auth_client_demo/package.json +++ b/motoko/auth_client_demo/package.json @@ -47,11 +47,11 @@ "last 2 edge version" ], "dependencies": { - "@dfinity/agent": "^1.4.0", - "@dfinity/auth-client": "^1.4.0", - "@dfinity/candid": "^1.4.0", - "@dfinity/identity": "^1.4.0", - "@dfinity/principal": "^1.4.0", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "lit-html": "^2.4.0", "pinia": "^2.0.36", "react": "^18.2.0", diff --git a/motoko/cert-var/package.json b/motoko/cert-var/package.json index 717ce512a..7e6e15a13 100644 --- a/motoko/cert-var/package.json +++ b/motoko/cert-var/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate cert_var" }, "devDependencies": { - "@dfinity/agent": "^1.4.0", - "@dfinity/candid": "^1.4.0", - "@dfinity/principal": "^1.4.0", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "css-loader": "^6.0.0", diff --git a/motoko/defi/src/frontend/package.json b/motoko/defi/src/frontend/package.json index b877b04d8..d65de3150 100644 --- a/motoko/defi/src/frontend/package.json +++ b/motoko/defi/src/frontend/package.json @@ -22,12 +22,12 @@ "svelte": "^3.49.0" }, "dependencies": { - "@dfinity/agent": "^0.10.4", - "@dfinity/auth-client": "^0.10.4", - "@dfinity/authentication": "^0.10.4", - "@dfinity/candid": "^0.10.4", - "@dfinity/identity": "^0.10.4", - "@dfinity/principal": "0.10.4", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/authentication": "^0.14.2", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-solid-svg-icons": "^5.15.4", "crc": "^4.1.0", diff --git a/motoko/encrypted-notes-dapp-vetkd/package.json b/motoko/encrypted-notes-dapp-vetkd/package.json index 99343285b..dd0506c55 100644 --- a/motoko/encrypted-notes-dapp-vetkd/package.json +++ b/motoko/encrypted-notes-dapp-vetkd/package.json @@ -56,11 +56,11 @@ "typescript": "^4.0.0" }, "dependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/auth-client": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/identity": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "sirv-cli": "^1.0.0", "svelte-icons": "^2.1.0", "svelte-router-spa": "^6.0.3", diff --git a/motoko/encrypted-notes-dapp/package.json b/motoko/encrypted-notes-dapp/package.json index 6944aaed8..1db555401 100644 --- a/motoko/encrypted-notes-dapp/package.json +++ b/motoko/encrypted-notes-dapp/package.json @@ -54,11 +54,11 @@ "typescript": "^4.0.0" }, "dependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/auth-client": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/identity": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "crypto-js": "^4.2.0", "idb": "^7.0.0", "sirv-cli": "^1.0.0", diff --git a/motoko/hello/package.json b/motoko/hello/package.json index 009cc08e7..fd5044ff7 100644 --- a/motoko/hello/package.json +++ b/motoko/hello/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate hello" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "events": "3.3.0", diff --git a/motoko/ic-pos/package.json b/motoko/ic-pos/package.json index ca61a3702..e93283a33 100644 --- a/motoko/ic-pos/package.json +++ b/motoko/ic-pos/package.json @@ -34,11 +34,11 @@ "dfx:generate": "dfx generate" }, "dependencies": { - "@dfinity/agent": "^0.19.2", - "@dfinity/candid": "^0.19.2", - "@dfinity/ledger": "^0.0.15", - "@dfinity/principal": "^0.19.2", - "@dfinity/utils": "^0.0.22", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/ledger": "^1.0.0", + "@dfinity/principal": "^2.1.1", + "@dfinity/utils": "^2.5.0", "@hookform/resolvers": "^3.1.1", "@internet-identity-labs/react-ic-ii-auth": "^0.0.19", "@radix-ui/react-icons": "^1.3.0", @@ -64,8 +64,8 @@ "zod": "^3.22.3" }, "devDependencies": { - "@dfinity/auth-client": "^0.19.2", - "@dfinity/identity": "^0.19.2", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/identity": "^2.1.1", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/typography": "^0.5.9", "@types/node": "^20.6.0", diff --git a/motoko/icrc2-swap/package.json b/motoko/icrc2-swap/package.json index c5ac84a47..0230a79f9 100644 --- a/motoko/icrc2-swap/package.json +++ b/motoko/icrc2-swap/package.json @@ -16,10 +16,10 @@ "fmt": "prettier --write ." }, "dependencies": { - "@dfinity/agent": "^0.19.2", - "@dfinity/candid": "^0.19.2", - "@dfinity/identity": "^0.19.3", - "@dfinity/principal": "^0.19.2" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "@babel/core": "^7.22.20", diff --git a/motoko/internet_identity_integration/package.json b/motoko/internet_identity_integration/package.json index 9907b4353..11acee5e7 100644 --- a/motoko/internet_identity_integration/package.json +++ b/motoko/internet_identity_integration/package.json @@ -16,11 +16,11 @@ "generate": "dfx generate greet_backend" }, "devDependencies": { - "@dfinity/agent": "0.15.3", - "@dfinity/auth-client": "^0.15.3", - "@dfinity/candid": "0.15.3", - "@dfinity/identity": "^0.15.3", - "@dfinity/principal": "0.15.3", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "copy-webpack-plugin": "^11.0.0", diff --git a/motoko/ios-notifications/dapp-demo/package.json b/motoko/ios-notifications/dapp-demo/package.json index cdf617ecc..a5ec12ac8 100644 --- a/motoko/ios-notifications/dapp-demo/package.json +++ b/motoko/ios-notifications/dapp-demo/package.json @@ -34,12 +34,12 @@ "last 2 edge version" ], "dependencies": { - "@dfinity/agent": "0.14.0", - "@dfinity/auth-client": "^0.14.0", - "@dfinity/authentication": "^0.14.0", - "@dfinity/candid": "0.14.0", - "@dfinity/identity": "^0.14.0", - "@dfinity/principal": "0.14.0", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/authentication": "^0.14.2", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "lit-html": "^2.4.0", "ts-loader": "^9.4.1", "typescript": "^4.8.4" diff --git a/motoko/life/package.json b/motoko/life/package.json index 8b353c735..3eb6166ef 100644 --- a/motoko/life/package.json +++ b/motoko/life/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate life" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "css-loader": "^6.0.0", diff --git a/motoko/minimal-counter-dapp/package.json b/motoko/minimal-counter-dapp/package.json index 1c491cc3f..f1f131e3c 100644 --- a/motoko/minimal-counter-dapp/package.json +++ b/motoko/minimal-counter-dapp/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate minimal_dapp" }, "devDependencies": { - "@dfinity/agent": "0.15.1", - "@dfinity/candid": "0.15.1", - "@dfinity/principal": "0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "events": "3.3.0", diff --git a/motoko/phone-book/package.json b/motoko/phone-book/package.json index 9f54b53d7..b05a340e2 100644 --- a/motoko/phone-book/package.json +++ b/motoko/phone-book/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate phone_book" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "css-loader": "^6.0.0", diff --git a/motoko/random_maze/package-lock.json b/motoko/random_maze/package-lock.json index 722e209af..8e4d4b45f 100644 --- a/motoko/random_maze/package-lock.json +++ b/motoko/random_maze/package-lock.json @@ -12,9 +12,9 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "css-loader": "^6.0.0", @@ -31,63 +31,40 @@ "webpack-dev-server": "^4.6.0" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@dfinity/agent": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-0.15.1.tgz", - "integrity": "sha512-Lu/TXdDj3XJgMNZYVdrECyo+zqlOxDR1I1mA7OuO6lsIciildJNbqDnsMQAit7605S4B8QLnvbnK/Okd8c2K1g==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-2.1.1.tgz", + "integrity": "sha512-9+XPFc9PrXM0kmaqZOOVW3eXBGaWzOjnnbEa55J1NBuDA6+X2jAyE51I62zXr1oFwMeKj7ykOEFd5MOmnMEijA==", "dev": true, "dependencies": { + "@noble/curves": "^1.4.0", + "@noble/hashes": "^1.3.1", "base64-arraybuffer": "^0.2.0", - "bignumber.js": "^9.0.0", "borc": "^2.1.1", - "js-sha256": "0.9.0", - "simple-cbor": "^0.4.1", - "ts-node": "^10.8.2" + "buffer": "^6.0.3", + "simple-cbor": "^0.4.1" }, "peerDependencies": { - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1" + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" } }, "node_modules/@dfinity/candid": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-0.15.1.tgz", - "integrity": "sha512-vmMjyfXfMO16X9c4ivKoGS/fNYue2+t55LTmCL0Tv5Nn81LC9Bn2IuPdXcguoRQSXISJzTS59epL3E20ELL+dA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-2.1.1.tgz", + "integrity": "sha512-RVcTKko8wLys2yW84e9Fu/AcJkZOdH7U/Rlm3Pgcx81fnfm74hxKCoecTYD+awbD2HSlVJRB/Uo7NoAoE/N+gQ==", "dev": true, - "dependencies": { - "ts-node": "^10.8.2" + "peerDependencies": { + "@dfinity/principal": "^2.1.1" } }, "node_modules/@dfinity/principal": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-0.15.1.tgz", - "integrity": "sha512-IYODveUhLx6CikhpT+KPuzwNi/czypOlgFj+Jtp+yHb6odUxfg0V/qVwZ4UbQPictNJ1gl7WwGjJeF5ybf+e6w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-2.1.1.tgz", + "integrity": "sha512-XKoQRgL7S7MRPwabY6z2wJ1Mn0WQqe9ZQIMK2wtRq48f5nL1m0rZejf8kR9JsZCNCYK6ss4b09FCRNGC20J8Bg==", "dev": true, "dependencies": { - "js-sha256": "^0.9.0", - "ts-node": "^10.8.2" + "@noble/hashes": "^1.3.1" } }, "node_modules/@discoveryjs/json-ext": { @@ -157,6 +134,33 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@noble/curves": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz", + "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==", + "dev": true, + "dependencies": { + "@noble/hashes": "1.5.0" + }, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@noble/hashes": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz", + "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==", + "dev": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -192,30 +196,6 @@ "node": ">= 8" } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", - "dev": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", - "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", - "dev": true - }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -619,15 +599,6 @@ "acorn": "^8" } }, - "node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -763,12 +734,6 @@ "node": ">= 8" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, "node_modules/array-filter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", @@ -1364,12 +1329,6 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1587,15 +1546,6 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -3117,12 +3067,6 @@ "node": ">= 10.13.0" } }, - "node_modules/js-sha256": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", - "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==", - "dev": true - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3217,12 +3161,6 @@ "node": ">=10" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -4869,49 +4807,6 @@ "webpack": "^5.0.0" } }, - "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dev": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, "node_modules/tslib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", @@ -5029,12 +4924,6 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -5624,15 +5513,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -5647,58 +5527,34 @@ } }, "dependencies": { - "@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "requires": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "dependencies": { - "@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - } - } - }, "@dfinity/agent": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-0.15.1.tgz", - "integrity": "sha512-Lu/TXdDj3XJgMNZYVdrECyo+zqlOxDR1I1mA7OuO6lsIciildJNbqDnsMQAit7605S4B8QLnvbnK/Okd8c2K1g==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-2.1.1.tgz", + "integrity": "sha512-9+XPFc9PrXM0kmaqZOOVW3eXBGaWzOjnnbEa55J1NBuDA6+X2jAyE51I62zXr1oFwMeKj7ykOEFd5MOmnMEijA==", "dev": true, "requires": { + "@noble/curves": "^1.4.0", + "@noble/hashes": "^1.3.1", "base64-arraybuffer": "^0.2.0", - "bignumber.js": "^9.0.0", "borc": "^2.1.1", - "js-sha256": "0.9.0", - "simple-cbor": "^0.4.1", - "ts-node": "^10.8.2" + "buffer": "^6.0.3", + "simple-cbor": "^0.4.1" } }, "@dfinity/candid": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-0.15.1.tgz", - "integrity": "sha512-vmMjyfXfMO16X9c4ivKoGS/fNYue2+t55LTmCL0Tv5Nn81LC9Bn2IuPdXcguoRQSXISJzTS59epL3E20ELL+dA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-2.1.1.tgz", + "integrity": "sha512-RVcTKko8wLys2yW84e9Fu/AcJkZOdH7U/Rlm3Pgcx81fnfm74hxKCoecTYD+awbD2HSlVJRB/Uo7NoAoE/N+gQ==", "dev": true, - "requires": { - "ts-node": "^10.8.2" - } + "requires": {} }, "@dfinity/principal": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-0.15.1.tgz", - "integrity": "sha512-IYODveUhLx6CikhpT+KPuzwNi/czypOlgFj+Jtp+yHb6odUxfg0V/qVwZ4UbQPictNJ1gl7WwGjJeF5ybf+e6w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-2.1.1.tgz", + "integrity": "sha512-XKoQRgL7S7MRPwabY6z2wJ1Mn0WQqe9ZQIMK2wtRq48f5nL1m0rZejf8kR9JsZCNCYK6ss4b09FCRNGC20J8Bg==", "dev": true, "requires": { - "js-sha256": "^0.9.0", - "ts-node": "^10.8.2" + "@noble/hashes": "^1.3.1" } }, "@discoveryjs/json-ext": { @@ -5756,6 +5612,21 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "@noble/curves": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz", + "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==", + "dev": true, + "requires": { + "@noble/hashes": "1.5.0" + } + }, + "@noble/hashes": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz", + "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==", + "dev": true + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5782,30 +5653,6 @@ "fastq": "^1.6.0" } }, - "@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", - "dev": true - }, - "@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true - }, - "@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true - }, - "@tsconfig/node16": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", - "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", - "dev": true - }, "@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -6185,12 +6032,6 @@ "dev": true, "requires": {} }, - "acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "dev": true - }, "aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -6286,12 +6127,6 @@ "picomatch": "^2.0.4" } }, - "arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, "array-filter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", @@ -6749,12 +6584,6 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, - "create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true - }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -6905,12 +6734,6 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -8032,12 +7855,6 @@ "supports-color": "^7.0.0" } }, - "js-sha256": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", - "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==", - "dev": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -8117,12 +7934,6 @@ "yallist": "^4.0.0" } }, - "make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -9337,27 +9148,6 @@ "semver": "^7.3.4" } }, - "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dev": true, - "requires": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - } - }, "tslib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", @@ -9452,12 +9242,6 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -9861,12 +9645,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/motoko/random_maze/package.json b/motoko/random_maze/package.json index 547fb412f..aa00e9ab1 100644 --- a/motoko/random_maze/package.json +++ b/motoko/random_maze/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate random_maze" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "css-loader": "^6.0.0", diff --git a/motoko/send_http_get/package.json b/motoko/send_http_get/package.json index d992bdca7..a2bf4e695 100644 --- a/motoko/send_http_get/package.json +++ b/motoko/send_http_get/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate send_http_get_backend" }, "dependencies": { - "@dfinity/agent": "^0.15.6", - "@dfinity/candid": "^0.15.6", - "@dfinity/principal": "^0.15.6" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/motoko/send_http_post/package.json b/motoko/send_http_post/package.json index 0a00daf7b..bbe614443 100644 --- a/motoko/send_http_post/package.json +++ b/motoko/send_http_post/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate send_http_post_motoko_backend" }, "dependencies": { - "@dfinity/agent": "^0.15.6", - "@dfinity/candid": "^0.15.6", - "@dfinity/principal": "^0.15.6" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/motoko/superheroes/package.json b/motoko/superheroes/package.json index 9fa88408b..9e44f290e 100644 --- a/motoko/superheroes/package.json +++ b/motoko/superheroes/package.json @@ -30,9 +30,9 @@ "generate": "dfx generate superheroes" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "copy-webpack-plugin": "^9.0.1", diff --git a/motoko/vetkd/package.json b/motoko/vetkd/package.json index 66061dec9..b9f0815be 100644 --- a/motoko/vetkd/package.json +++ b/motoko/vetkd/package.json @@ -17,10 +17,10 @@ "generate": "dfx generate app_backend" }, "dependencies": { - "@dfinity/agent": "^0.15.6", - "@dfinity/auth-client": "^0.15.6", - "@dfinity/candid": "^0.15.6", - "@dfinity/principal": "^0.15.6", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "ic-vetkd-utils": "file:ic-vetkd-utils-0.1.0.tgz" }, "devDependencies": { diff --git a/native-apps/unity_ii_applink/ii_integration_dapp/package.json b/native-apps/unity_ii_applink/ii_integration_dapp/package.json index 9907b4353..11acee5e7 100644 --- a/native-apps/unity_ii_applink/ii_integration_dapp/package.json +++ b/native-apps/unity_ii_applink/ii_integration_dapp/package.json @@ -16,11 +16,11 @@ "generate": "dfx generate greet_backend" }, "devDependencies": { - "@dfinity/agent": "0.15.3", - "@dfinity/auth-client": "^0.15.3", - "@dfinity/candid": "0.15.3", - "@dfinity/identity": "^0.15.3", - "@dfinity/principal": "0.15.3", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "copy-webpack-plugin": "^11.0.0", diff --git a/native-apps/unity_ii_deeplink/ii_integration_dapp/package.json b/native-apps/unity_ii_deeplink/ii_integration_dapp/package.json index 9907b4353..11acee5e7 100644 --- a/native-apps/unity_ii_deeplink/ii_integration_dapp/package.json +++ b/native-apps/unity_ii_deeplink/ii_integration_dapp/package.json @@ -16,11 +16,11 @@ "generate": "dfx generate greet_backend" }, "devDependencies": { - "@dfinity/agent": "0.15.3", - "@dfinity/auth-client": "^0.15.3", - "@dfinity/candid": "0.15.3", - "@dfinity/identity": "^0.15.3", - "@dfinity/principal": "0.15.3", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "copy-webpack-plugin": "^11.0.0", diff --git a/native-apps/unity_ii_universallink/ii_integration_dapp/package.json b/native-apps/unity_ii_universallink/ii_integration_dapp/package.json index 9907b4353..11acee5e7 100644 --- a/native-apps/unity_ii_universallink/ii_integration_dapp/package.json +++ b/native-apps/unity_ii_universallink/ii_integration_dapp/package.json @@ -16,11 +16,11 @@ "generate": "dfx generate greet_backend" }, "devDependencies": { - "@dfinity/agent": "0.15.3", - "@dfinity/auth-client": "^0.15.3", - "@dfinity/candid": "0.15.3", - "@dfinity/identity": "^0.15.3", - "@dfinity/principal": "0.15.3", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "copy-webpack-plugin": "^11.0.0", diff --git a/rust/defi/src/frontend/package.json b/rust/defi/src/frontend/package.json index b877b04d8..d65de3150 100644 --- a/rust/defi/src/frontend/package.json +++ b/rust/defi/src/frontend/package.json @@ -22,12 +22,12 @@ "svelte": "^3.49.0" }, "dependencies": { - "@dfinity/agent": "^0.10.4", - "@dfinity/auth-client": "^0.10.4", - "@dfinity/authentication": "^0.10.4", - "@dfinity/candid": "^0.10.4", - "@dfinity/identity": "^0.10.4", - "@dfinity/principal": "0.10.4", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/authentication": "^0.14.2", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1", "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-solid-svg-icons": "^5.15.4", "crc": "^4.1.0", diff --git a/rust/hello/package.json b/rust/hello/package.json index bb59201e7..1c32d8f73 100644 --- a/rust/hello/package.json +++ b/rust/hello/package.json @@ -16,9 +16,9 @@ "generate": "dfx generate hello" }, "devDependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "assert": "2.0.0", "buffer": "6.0.3", "events": "3.3.0", diff --git a/rust/image-classification/package.json b/rust/image-classification/package.json index 82bd21c99..81978d29e 100644 --- a/rust/image-classification/package.json +++ b/rust/image-classification/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate backend" }, "dependencies": { - "@dfinity/agent": "^0.18.1", - "@dfinity/candid": "^0.18.1", - "@dfinity/principal": "^0.18.1" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/rust/nft-wallet/frontend/package.json b/rust/nft-wallet/frontend/package.json index 1b0227774..dae0c346a 100644 --- a/rust/nft-wallet/frontend/package.json +++ b/rust/nft-wallet/frontend/package.json @@ -37,11 +37,11 @@ "typescript": "^4.0.0" }, "dependencies": { - "@dfinity/agent": "^0.15.1", - "@dfinity/candid": "^0.15.1", - "@dfinity/principal": "^0.15.1", - "@dfinity/identity": "^0.15.1", - "@dfinity/auth-client": "^0.15.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", "@smui/button": "^6.0.0-beta.15", "@smui/icon-button": "^6.0.0-beta.15", "@smui/menu-surface": "^6.0.0-beta.15", diff --git a/rust/qrcode/package.json b/rust/qrcode/package.json index beeafe1ac..2ae9a0f54 100644 --- a/rust/qrcode/package.json +++ b/rust/qrcode/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate qrcode_backend" }, "dependencies": { - "@dfinity/agent": "^0.18.1", - "@dfinity/candid": "^0.18.1", - "@dfinity/principal": "^0.18.1" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/rust/send_http_get/package.json b/rust/send_http_get/package.json index d992bdca7..a2bf4e695 100644 --- a/rust/send_http_get/package.json +++ b/rust/send_http_get/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate send_http_get_backend" }, "dependencies": { - "@dfinity/agent": "^0.15.6", - "@dfinity/candid": "^0.15.6", - "@dfinity/principal": "^0.15.6" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/rust/send_http_post/package.json b/rust/send_http_post/package.json index 60ffa2d39..dc1b1536a 100644 --- a/rust/send_http_post/package.json +++ b/rust/send_http_post/package.json @@ -17,9 +17,9 @@ "generate": "dfx generate send_http_post_backend" }, "dependencies": { - "@dfinity/agent": "^0.15.6", - "@dfinity/candid": "^0.15.6", - "@dfinity/principal": "^0.15.6" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" }, "devDependencies": { "assert": "2.0.0", diff --git a/rust/vetkd/package.json b/rust/vetkd/package.json index e378bec05..876e9c152 100644 --- a/rust/vetkd/package.json +++ b/rust/vetkd/package.json @@ -17,10 +17,10 @@ "generate": "dfx generate app_backend" }, "dependencies": { - "@dfinity/agent": "^0.18.1", - "@dfinity/auth-client": "^0.18.1", - "@dfinity/candid": "^0.18.1", - "@dfinity/principal": "^0.18.1", + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1", "ic-vetkd-utils": "file:ic-vetkd-utils-0.1.0.tgz" }, "devDependencies": { diff --git a/svelte/svelte-motoko-starter/src/frontend/package.json b/svelte/svelte-motoko-starter/src/frontend/package.json index 953766168..5c11da1d6 100644 --- a/svelte/svelte-motoko-starter/src/frontend/package.json +++ b/svelte/svelte-motoko-starter/src/frontend/package.json @@ -16,10 +16,10 @@ "vite-plugin-environment": "^1.1.3" }, "dependencies": { - "@dfinity/agent": "^0.20.2", - "@dfinity/auth-client": "^1.0.1", - "@dfinity/candid": "^0.20.2", - "@dfinity/identity": "^1.0.1", - "@dfinity/principal": "^0.20.2" + "@dfinity/agent": "^2.1.1", + "@dfinity/auth-client": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/identity": "^2.1.1", + "@dfinity/principal": "^2.1.1" } } diff --git a/svelte/sveltekit-starter/package.json b/svelte/sveltekit-starter/package.json index a5420f912..d41e7d446 100644 --- a/svelte/sveltekit-starter/package.json +++ b/svelte/sveltekit-starter/package.json @@ -45,8 +45,8 @@ }, "type": "module", "dependencies": { - "@dfinity/agent": "^0.14.1", - "@dfinity/candid": "^0.14.1", - "@dfinity/principal": "^0.14.1" + "@dfinity/agent": "^2.1.1", + "@dfinity/candid": "^2.1.1", + "@dfinity/principal": "^2.1.1" } } From d9c4020515c8dceeadfeafc7a6866f37d1fb1a93 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Mon, 16 Sep 2024 16:30:07 -0600 Subject: [PATCH 3/4] Adjust script to update package-lock.json files --- .github/scripts/update-packages.js | 53 ++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/.github/scripts/update-packages.js b/.github/scripts/update-packages.js index 5cc01e1ba..b378b7ba0 100644 --- a/.github/scripts/update-packages.js +++ b/.github/scripts/update-packages.js @@ -1,16 +1,20 @@ // Update agent-js dependencies across all example projects. -import { readFile, writeFile, readdir, stat } from "fs/promises"; -import { resolve, join } from "path"; +import { $ } from "execa"; +import { readdir, readFile, stat, writeFile } from "fs/promises"; import latestVersion from "latest-version"; +import { join, resolve } from "path"; + +// Skip updating these projects. +const ignoreProjects = ["motoko/ic-pos"]; // Skip updating these packages. -const ignoreList = [ +const ignorePackages = [ "@dfinity/internet-identity-vite-plugins", "@dfinity/internet-identity-vc-api", ]; -const visitedPackageJsonFiles = []; +const projectDirectories = []; const versionPromiseMap = new Map(); // Find and cache the latest version of a package. @@ -25,13 +29,6 @@ async function findLatestVersion(pkg) { // Update all `package.json` files in the repository. async function updatePackageJson(filePath) { - filePath = resolve(filePath); - if (visitedPackageJsonFiles.includes(filePath)) { - console.log("Already visited package.json file:", filePath); - return; - } - visitedPackageJsonFiles.push(filePath); - let content = await readFile(filePath, "utf8"); let updated = false; @@ -41,7 +38,7 @@ async function updatePackageJson(filePath) { const pkg = match[1]; const version = match[2]; try { - if (ignoreList.includes(pkg)) { + if (ignorePackages.includes(pkg)) { continue; } const newVersion = `^${await findLatestVersion(pkg)}`; @@ -68,7 +65,23 @@ async function updatePackageJson(filePath) { } } -// Recursively search for and update directories with a `package.json` file. +// Update the `package-lock.json` file in the given directory. +async function updatePackageLock(directory) { + const packageJsonPath = join(directory, "package.json"); + try { + await $({ + stdio: "inherit", + cwd: directory, + })`npm install --package-lock-only`; + console.log(`Updated lockfile for ${packageJsonPath}`); + } catch (err) { + console.error(err); + throw new Error(`Error while updating lockfile for ${packageJsonPath}`); + } +} + +// Search for and update directories with a `package.json` file. +// Returns a list of directories containing npm projects. async function searchAndUpdate(directory) { const files = await readdir(directory); await Promise.all( @@ -80,10 +93,22 @@ async function searchAndUpdate(directory) { } await searchAndUpdate(filePath); } else if (filename === "package.json") { + if ( + ignoreProjects.some((path) => resolve(directory) === resolve(path)) + ) { + return; + } + projectDirectories.push(directory); await updatePackageJson(filePath); } }) ); } -searchAndUpdate(process.cwd()).then(() => console.log("Completed")); +(async () => { + await searchAndUpdate(process.cwd()); + for (const directory of projectDirectories) { + await updatePackageLock(directory); + } + console.log("Completed"); +})(); From 96d959859bd18f1d3a48c611bfd569f7c078f8e5 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Mon, 16 Sep 2024 16:33:02 -0600 Subject: [PATCH 4/4] Misc --- .github/scripts/update-packages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/update-packages.js b/.github/scripts/update-packages.js index b378b7ba0..cddb54310 100644 --- a/.github/scripts/update-packages.js +++ b/.github/scripts/update-packages.js @@ -70,7 +70,7 @@ async function updatePackageLock(directory) { const packageJsonPath = join(directory, "package.json"); try { await $({ - stdio: "inherit", + stderr: "inherit", cwd: directory, })`npm install --package-lock-only`; console.log(`Updated lockfile for ${packageJsonPath}`);