Skip to content

build(deps): update package.json to lerna@8 #11503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelfig merged 8 commits into from
Jul 23, 2025
Merged

build(deps): update package.json to lerna@8 #11503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e89ffe8
build(deps): update `package.json` to `lerna@8`
michaelfig Jun 17, 2025
f02303a
ci(after-merge): fail `dev-canary` on publish error
michaelfig Jun 17, 2025
0708d81
chore(client-utils): fix `scripts.prepack`
michaelfig Jun 17, 2025
59f4b7e
fix(pack): use `yarn` for packing `"workspace:*"` dep versions
michaelfig Jun 18, 2025
3a7318b
build(deps): use `"workspace:*"` versions when possible
michaelfig Jun 18, 2025
fd6131f
build(deps): regenerate `yarn.lock`
michaelfig Jun 17, 2025
461b050
chore(fast-usdc): add missing types
michaelfig Jul 22, 2025
e5dbd25
ci(lint-primary): increase timeout
michaelfig Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/after-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
run: npm whoami
- name: publish to NPM tag
run: |
set -e
case $GITHUB_REF_NAME in
release-*)
# A pre-release.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-all-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
##################
# Lint tests
lint-primary:
timeout-minutes: 25 # Since Node 22, it's sometimes longer than 20min
timeout-minutes: 45 # Since Node 22, it's sometimes longer than 20min
needs: build
runs-on: ubuntu-latest
steps:
Expand Down
20 changes: 0 additions & 20 deletions .yarn/patches/@lerna-conventional-commits-npm-5.6.2-a373ba4bc0.patch
View file
Open in desktop
Copy link
Copy Markdown
Member

@mhofman mhofman Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the behavior of the new lerna regarding pre-releases? We are using pre-releases tags currently both for dev packages and for our "release" versions.

Copy link
Copy Markdown
Member

@kriskowal kriskowal Jul 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do have a test that verifies that npm pack works. That test switched to using yarn pack in this change, which probably accounts for the difference in requirements. Presumably, lerna drives yarn pack.

Copy link
Copy Markdown
Member

@mhofman mhofman Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think what pack command we uses changes anything to my question, which was specifically how lerna generated the new version depending on whether it was a pre-release or not. Seeing #11655, in lerna 8, the semantics of bumping version for 0.x were dependent on whether it was a pre-release or not, which seems misguided.

This file was deleted.

33 changes: 0 additions & 33 deletions .yarn/patches/@lerna-version-npm-5.6.2-ce2d9cb2f5.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@
"packages/wallet/*"
],
"rejectCycles": true,
"useWorkspaces": true,
"version": "independent"
}
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"eslint-plugin-jsdoc": "^50.6.3",
"eslint-plugin-prettier": "^5.2.6",
"eslint-plugin-require-extensions": "^0.1.3",
"lerna": "^5.6.2",
"lerna": "^8.2.2",
"npm-run-all": "^4.1.5",
"prettier": "^3.5.3",
"prettier-plugin-jsdoc": "^1.3.2",
Expand All @@ -47,8 +47,6 @@
"@cosmjs/stargate@npm:0.32.3": "npm:0.34.0",
"@cosmology/telescope@npm:^1.12.8": "patch:@cosmology/telescope@npm%3A1.12.8#~/.yarn/patches/@cosmology-telescope-npm-1.12.8-7446d2080c.patch",
"@endo/import-bundle@npm:^1.4.0": "patch:@endo/import-bundle@npm%3A1.4.0#~/.yarn/patches/@endo+import-bundle+1.4.0.patch",
"@lerna/conventional-commits@npm:5.6.2": "patch:@lerna/conventional-commits@npm%3A5.6.2#~/.yarn/patches/@lerna-conventional-commits-npm-5.6.2-a373ba4bc0.patch",
"@lerna/version@npm:5.6.2": "patch:@lerna/version@npm%3A5.6.2#~/.yarn/patches/@lerna-version-npm-5.6.2-ce2d9cb2f5.patch",
"ava@npm:^5.3.0": "patch:ava@npm%3A5.3.1#~/.yarn/patches/ava-npm-5.3.1-d83c0bdc77.patch",
"ava@npm:5.3.1": "patch:ava@npm%3A5.3.1#~/.yarn/patches/ava-npm-5.3.1-e4c2e237f7.patch",
"depd@npm:^2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
Expand Down
2 changes: 1 addition & 1 deletion packages/client-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"scripts": {
"build": "exit 0",
"prepack": "tsc --build tsconfig.build.json",
"prepack": "yarn run -T tsc --build tsconfig.build.json",
"postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
"test": "ava",
"test:c8": "c8 --all $C8_OPTIONS ava",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-dapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"c8": "^10.1.3"
},
"dependencies": {
"agoric": "^0.21.1"
"agoric": "workspace:*"
},
"keywords": [],
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/fast-usdc/src/utils/fees.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { FeeConfigShape } from '../type-guards.js';
const { add, isGTE, subtract, makeEmpty } = AmountMath;

/**
* @import {Amount} from '@agoric/ertp';
* @import {Amount, Payment} from '@agoric/ertp';
* @import {AccountId} from '@agoric/orchestration';
* @import {FeeConfig} from '../types.js';
*/
Expand Down
20 changes: 10 additions & 10 deletions packages/wallet/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"ava": "^5.3.0"
},
"dependencies": {
"@agoric/cache": "^0.3.2",
"@agoric/ertp": "^0.16.2",
"@agoric/internal": "^0.3.2",
"@agoric/notifier": "^0.6.2",
"@agoric/smart-wallet": "^0.5.3",
"@agoric/store": "^0.9.2",
"@agoric/time": "^0.3.2",
"@agoric/vat-data": "^0.5.2",
"@agoric/zoe": "^0.26.2",
"@agoric/zone": "^0.2.2",
"@agoric/cache": "workspace:*",
"@agoric/ertp": "workspace:*",
"@agoric/internal": "workspace:*",
"@agoric/notifier": "workspace:*",
"@agoric/smart-wallet": "workspace:*",
"@agoric/store": "workspace:*",
"@agoric/time": "workspace:*",
"@agoric/vat-data": "workspace:*",
"@agoric/zoe": "workspace:*",
"@agoric/zone": "workspace:*",
"@endo/errors": "^1.2.13",
"@endo/eventual-send": "^1.3.4",
"@endo/marshal": "^1.8.0",
Expand Down
20 changes: 10 additions & 10 deletions packages/xsnap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"test:xs": "exit 0"
},
"dependencies": {
"@agoric/internal": "^0.3.2",
"@agoric/xsnap-lockdown": "^0.14.0",
"@agoric/internal": "workspace:*",
"@agoric/xsnap-lockdown": "workspace:*",
"@endo/bundle-source": "^4.1.2",
"@endo/errors": "^1.2.13",
"@endo/eventual-send": "^1.3.4",
Expand All @@ -53,15 +53,15 @@
"LICENSE*",
"api.js",
"build.env",
"moddable/modules/data",
"moddable/xs/includes",
"moddable/xs/makefiles",
"moddable/modules/data/**",
"moddable/xs/includes/**",
"moddable/xs/makefiles/**",
"moddable/xs/sources/**",
Comment on lines +56 to +59
Copy link
Copy Markdown
Member

@kriskowal kriskowal Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. This is apropos of Lerna? Npm pack was forgiving.

Copy link
Copy Markdown
Member Author

@michaelfig michaelfig Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, when testing the viability of the packages, I noticed the missing files from these subtrees. I think this was fixed a few times by other PRs that never merged.

Copy link
Copy Markdown
Member

@mhofman mhofman Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we had some tool / script somewhere allowing us to check if there were any differences in files included in an npm package. I'm really curious why this would now have changed.

"moddable/xs/platforms/*.h",
"moddable/xs/sources",
"scripts",
"src",
"xsnap-native/xsnap/makefiles",
"xsnap-native/xsnap/sources"
"scripts/**",
"src/**",
"xsnap-native/xsnap/makefiles/**",
"xsnap-native/xsnap/sources/**"
],
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/xsnap/test/install.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import test from 'ava';
test('pack and install xsnap', async t => {
const tmp = await mkdtemp(join(tmpdir(), 'xsnap-'));
t.teardown(() => rm(tmp, { recursive: true }));
const { stdout: npmout } = await $`npm pack --json`;
const [{ filename }] = JSON.parse(npmout);
const filename = join(tmp, 'package.tgz');
await $`yarn pack --out ${filename}`;
Copy link
Copy Markdown
Member

@kriskowal kriskowal Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, because yarn will account for the workspace protocol and npm will not. Thanks. Also nice that we can specify and don’t have to parse out the filename.

Copy link
Copy Markdown
Member Author

@michaelfig michaelfig Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

await $({ cwd: tmp })`tar xvf ${resolve(filename)}`;
await $({ cwd: join(tmp, 'package') })`npm install`;
t.pass();
Expand Down
8 changes: 5 additions & 3 deletions scripts/replace-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ DSTDIR=${2-$PWD/node_modules}
# Install and build the source directory.
pushd "$SRCDIR"
yarn install
yarn postinstall
npm run build

npm query .workspace | jq -r '.[].location' | while read -r dir; do
Expand All @@ -23,9 +24,10 @@ npm query .workspace | jq -r '.[].location' | while read -r dir; do
pushd "$dir"
name=$(jq -r .name < package.json)
stem=$(echo "$name" | sed -e 's!^@!!; s!/!-!g;')
rm -f "${stem}"-*.tgz
npm pack
tar -xvf "${stem}"-*.tgz
tarball="${stem}-replace.tgz"
rm -f "$tarball"
yarn pack --out "$tarball"
tar -xvf "$tarball"

# Replace the destination package.
rm -rf "${DSTDIR:?}/$name"
Expand Down
Loading
Loading