Skip to content

Commit 1d681c8

Browse files
authored
adopt workspace: protocol (#11397)
refs: #451 ## Description Now that we're past Yarn 1, we can use more modern package management features like `workspace:` protocol. It's also supported by NPM v7+, but for some reason xsnap install balks at it so [b4d4f51](b4d4f51) reverts it for that one package. cc @kriskowal for ideas to solve that ### Security Considerations Marginal benefit to prevent NPM fetch if a dep mismatches local version. ### Scaling Considerations n/a ### Documentation Considerations n/a ### Testing Considerations Here's how I made the change: find: "@agoric/(.+)": "\^.*" replace: "@agoric/$1": "workspace:*" ### Upgrade Considerations n/a
2 parents bf2d699 + 57e542d commit 1d681c8

File tree

45 files changed

+873
-873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+873
-873
lines changed

a3p-integration/proposals/z:acceptance/yarn.lock

Lines changed: 113 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ __metadata:
99
version: 0.0.0-use.local
1010
resolution: "@agoric/access-token@portal:../../agoric-sdk/packages/access-token::locator=root-workspace-0b6124%40workspace%3A."
1111
dependencies:
12-
"@agoric/internal": "npm:^0.3.2"
12+
"@agoric/internal": "workspace:*"
1313
n-readlines: "npm:^1.0.0"
1414
proper-lockfile: "npm:^4.1.2"
1515
tmp: "npm:^0.2.1"
@@ -20,7 +20,7 @@ __metadata:
2020
version: 0.0.0-use.local
2121
resolution: "@agoric/base-zone@portal:../../agoric-sdk/packages/base-zone::locator=root-workspace-0b6124%40workspace%3A."
2222
dependencies:
23-
"@agoric/store": "npm:^0.9.2"
23+
"@agoric/store": "workspace:*"
2424
"@endo/common": "npm:^1.2.10"
2525
"@endo/errors": "npm:^1.2.10"
2626
"@endo/exo": "npm:^1.5.9"
@@ -34,10 +34,10 @@ __metadata:
3434
version: 0.0.0-use.local
3535
resolution: "@agoric/cache@portal:../../agoric-sdk/packages/cache::locator=root-workspace-0b6124%40workspace%3A."
3636
dependencies:
37-
"@agoric/internal": "npm:^0.3.2"
38-
"@agoric/notifier": "npm:^0.6.2"
39-
"@agoric/store": "npm:^0.9.2"
40-
"@agoric/vat-data": "npm:^0.5.2"
37+
"@agoric/internal": "workspace:*"
38+
"@agoric/notifier": "workspace:*"
39+
"@agoric/store": "workspace:*"
40+
"@agoric/vat-data": "workspace:*"
4141
"@endo/far": "npm:^1.1.11"
4242
"@endo/marshal": "npm:^1.6.4"
4343
languageName: node
@@ -47,9 +47,9 @@ __metadata:
4747
version: 0.0.0-use.local
4848
resolution: "@agoric/casting@portal:../../agoric-sdk/packages/casting::locator=root-workspace-0b6124%40workspace%3A."
4949
dependencies:
50-
"@agoric/internal": "npm:^0.3.2"
51-
"@agoric/notifier": "npm:^0.6.2"
52-
"@agoric/store": "npm:^0.9.2"
50+
"@agoric/internal": "workspace:*"
51+
"@agoric/notifier": "workspace:*"
52+
"@agoric/store": "workspace:*"
5353
"@cosmjs/encoding": "npm:^0.33.0"
5454
"@cosmjs/proto-signing": "npm:^0.33.0"
5555
"@cosmjs/stargate": "npm:^0.33.0"
@@ -67,12 +67,12 @@ __metadata:
6767
version: 0.0.0-use.local
6868
resolution: "@agoric/client-utils@portal:../../agoric-sdk/packages/client-utils::locator=root-workspace-0b6124%40workspace%3A."
6969
dependencies:
70-
"@agoric/casting": "npm:^0.4.2"
71-
"@agoric/cosmic-proto": "npm:^0.4.0"
72-
"@agoric/ertp": "npm:^0.16.2"
73-
"@agoric/internal": "npm:^0.3.2"
74-
"@agoric/smart-wallet": "npm:^0.5.3"
75-
"@agoric/vats": "npm:^0.15.1"
70+
"@agoric/casting": "workspace:*"
71+
"@agoric/cosmic-proto": "workspace:*"
72+
"@agoric/ertp": "workspace:*"
73+
"@agoric/internal": "workspace:*"
74+
"@agoric/smart-wallet": "workspace:*"
75+
"@agoric/vats": "workspace:*"
7676
"@cosmjs/stargate": "npm:^0.33.0"
7777
"@cosmjs/tendermint-rpc": "npm:^0.33.0"
7878
"@endo/base64": "npm:^1.0.9"
@@ -100,10 +100,10 @@ __metadata:
100100
version: 0.0.0-use.local
101101
resolution: "@agoric/ertp@portal:../../agoric-sdk/packages/ERTP::locator=root-workspace-0b6124%40workspace%3A."
102102
dependencies:
103-
"@agoric/notifier": "npm:^0.6.2"
104-
"@agoric/store": "npm:^0.9.2"
105-
"@agoric/vat-data": "npm:^0.5.2"
106-
"@agoric/zone": "npm:^0.2.2"
103+
"@agoric/notifier": "workspace:*"
104+
"@agoric/store": "workspace:*"
105+
"@agoric/vat-data": "workspace:*"
106+
"@agoric/zone": "workspace:*"
107107
"@endo/errors": "npm:^1.2.10"
108108
"@endo/eventual-send": "npm:^1.3.1"
109109
"@endo/far": "npm:^1.1.11"
@@ -118,13 +118,13 @@ __metadata:
118118
version: 0.0.0-use.local
119119
resolution: "@agoric/governance@portal:../../agoric-sdk/packages/governance::locator=root-workspace-0b6124%40workspace%3A."
120120
dependencies:
121-
"@agoric/ertp": "npm:^0.16.2"
122-
"@agoric/internal": "npm:^0.3.2"
123-
"@agoric/notifier": "npm:^0.6.2"
124-
"@agoric/store": "npm:^0.9.2"
125-
"@agoric/time": "npm:^0.3.2"
126-
"@agoric/vat-data": "npm:^0.5.2"
127-
"@agoric/zoe": "npm:^0.26.2"
121+
"@agoric/ertp": "workspace:*"
122+
"@agoric/internal": "workspace:*"
123+
"@agoric/notifier": "workspace:*"
124+
"@agoric/store": "workspace:*"
125+
"@agoric/time": "workspace:*"
126+
"@agoric/vat-data": "workspace:*"
127+
"@agoric/zoe": "workspace:*"
128128
"@endo/bundle-source": "npm:^4.0.0"
129129
"@endo/captp": "npm:^4.4.5"
130130
"@endo/errors": "npm:^1.2.10"
@@ -141,16 +141,16 @@ __metadata:
141141
version: 0.0.0-use.local
142142
resolution: "@agoric/inter-protocol@portal:../../agoric-sdk/packages/inter-protocol::locator=root-workspace-0b6124%40workspace%3A."
143143
dependencies:
144-
"@agoric/ertp": "npm:^0.16.2"
145-
"@agoric/governance": "npm:^0.10.3"
146-
"@agoric/internal": "npm:^0.3.2"
147-
"@agoric/notifier": "npm:^0.6.2"
148-
"@agoric/store": "npm:^0.9.2"
149-
"@agoric/time": "npm:^0.3.2"
150-
"@agoric/vat-data": "npm:^0.5.2"
151-
"@agoric/vats": "npm:^0.15.1"
152-
"@agoric/zoe": "npm:^0.26.2"
153-
"@agoric/zone": "npm:^0.2.2"
144+
"@agoric/ertp": "workspace:*"
145+
"@agoric/governance": "workspace:*"
146+
"@agoric/internal": "workspace:*"
147+
"@agoric/notifier": "workspace:*"
148+
"@agoric/store": "workspace:*"
149+
"@agoric/time": "workspace:*"
150+
"@agoric/vat-data": "workspace:*"
151+
"@agoric/vats": "workspace:*"
152+
"@agoric/zoe": "workspace:*"
153+
"@agoric/zone": "workspace:*"
154154
"@endo/captp": "npm:^4.4.5"
155155
"@endo/errors": "npm:^1.2.10"
156156
"@endo/eventual-send": "npm:^1.3.1"
@@ -166,7 +166,7 @@ __metadata:
166166
version: 0.0.0-use.local
167167
resolution: "@agoric/internal@portal:../../agoric-sdk/packages/internal::locator=root-workspace-0b6124%40workspace%3A."
168168
dependencies:
169-
"@agoric/base-zone": "npm:^0.1.0"
169+
"@agoric/base-zone": "workspace:*"
170170
"@endo/common": "npm:^1.2.10"
171171
"@endo/compartment-mapper": "npm:^1.6.0"
172172
"@endo/errors": "npm:^1.2.10"
@@ -198,9 +198,9 @@ __metadata:
198198
version: 0.0.0-use.local
199199
resolution: "@agoric/network@portal:../../agoric-sdk/packages/network::locator=root-workspace-0b6124%40workspace%3A."
200200
dependencies:
201-
"@agoric/internal": "npm:^0.3.2"
202-
"@agoric/store": "npm:^0.9.2"
203-
"@agoric/vat-data": "npm:^0.5.2"
201+
"@agoric/internal": "workspace:*"
202+
"@agoric/store": "workspace:*"
203+
"@agoric/vat-data": "workspace:*"
204204
"@endo/base64": "npm:^1.0.9"
205205
"@endo/errors": "npm:^1.2.10"
206206
"@endo/far": "npm:^1.1.11"
@@ -214,8 +214,8 @@ __metadata:
214214
version: 0.0.0-use.local
215215
resolution: "@agoric/notifier@portal:../../agoric-sdk/packages/notifier::locator=root-workspace-0b6124%40workspace%3A."
216216
dependencies:
217-
"@agoric/internal": "npm:^0.3.2"
218-
"@agoric/vat-data": "npm:^0.5.2"
217+
"@agoric/internal": "workspace:*"
218+
"@agoric/vat-data": "workspace:*"
219219
"@endo/errors": "npm:^1.2.10"
220220
"@endo/far": "npm:^1.1.11"
221221
"@endo/marshal": "npm:^1.6.4"
@@ -228,15 +228,15 @@ __metadata:
228228
version: 0.0.0-use.local
229229
resolution: "@agoric/smart-wallet@portal:../../agoric-sdk/packages/smart-wallet::locator=root-workspace-0b6124%40workspace%3A."
230230
dependencies:
231-
"@agoric/ertp": "npm:^0.16.2"
232-
"@agoric/internal": "npm:^0.3.2"
233-
"@agoric/notifier": "npm:^0.6.2"
234-
"@agoric/store": "npm:^0.9.2"
235-
"@agoric/vat-data": "npm:^0.5.2"
236-
"@agoric/vats": "npm:^0.15.1"
237-
"@agoric/vow": "npm:^0.1.0"
238-
"@agoric/zoe": "npm:^0.26.2"
239-
"@agoric/zone": "npm:^0.2.2"
231+
"@agoric/ertp": "workspace:*"
232+
"@agoric/internal": "workspace:*"
233+
"@agoric/notifier": "workspace:*"
234+
"@agoric/store": "workspace:*"
235+
"@agoric/vat-data": "workspace:*"
236+
"@agoric/vats": "workspace:*"
237+
"@agoric/vow": "workspace:*"
238+
"@agoric/zoe": "workspace:*"
239+
"@agoric/zone": "workspace:*"
240240
"@endo/errors": "npm:^1.2.10"
241241
"@endo/eventual-send": "npm:^1.3.1"
242242
"@endo/far": "npm:^1.1.11"
@@ -262,7 +262,7 @@ __metadata:
262262
version: 0.0.0-use.local
263263
resolution: "@agoric/swing-store@portal:../../agoric-sdk/packages/swing-store::locator=root-workspace-0b6124%40workspace%3A."
264264
dependencies:
265-
"@agoric/internal": "npm:^0.3.2"
265+
"@agoric/internal": "workspace:*"
266266
"@endo/base64": "npm:^1.0.9"
267267
"@endo/bundle-source": "npm:^4.0.0"
268268
"@endo/check-bundle": "npm:^1.0.14"
@@ -276,8 +276,8 @@ __metadata:
276276
version: 0.0.0-use.local
277277
resolution: "@agoric/swingset-liveslots@portal:../../agoric-sdk/packages/swingset-liveslots::locator=root-workspace-0b6124%40workspace%3A."
278278
dependencies:
279-
"@agoric/internal": "npm:^0.3.2"
280-
"@agoric/store": "npm:^0.9.2"
279+
"@agoric/internal": "workspace:*"
280+
"@agoric/store": "workspace:*"
281281
"@endo/env-options": "npm:^1.1.8"
282282
"@endo/errors": "npm:^1.2.10"
283283
"@endo/eventual-send": "npm:^1.3.1"
@@ -296,15 +296,15 @@ __metadata:
296296
version: 0.0.0-use.local
297297
resolution: "@agoric/swingset-vat@portal:../../agoric-sdk/packages/SwingSet::locator=root-workspace-0b6124%40workspace%3A."
298298
dependencies:
299-
"@agoric/internal": "npm:^0.3.2"
300-
"@agoric/kmarshal": "npm:^0.1.0"
301-
"@agoric/store": "npm:^0.9.2"
302-
"@agoric/swing-store": "npm:^0.9.1"
303-
"@agoric/swingset-liveslots": "npm:^0.10.2"
304-
"@agoric/swingset-xsnap-supervisor": "npm:^0.10.2"
305-
"@agoric/time": "npm:^0.3.2"
306-
"@agoric/vat-data": "npm:^0.5.2"
307-
"@agoric/xsnap-lockdown": "npm:^0.14.0"
299+
"@agoric/internal": "workspace:*"
300+
"@agoric/kmarshal": "workspace:*"
301+
"@agoric/store": "workspace:*"
302+
"@agoric/swing-store": "workspace:*"
303+
"@agoric/swingset-liveslots": "workspace:*"
304+
"@agoric/swingset-xsnap-supervisor": "workspace:*"
305+
"@agoric/time": "workspace:*"
306+
"@agoric/vat-data": "workspace:*"
307+
"@agoric/xsnap-lockdown": "workspace:*"
308308
"@endo/base64": "npm:^1.0.9"
309309
"@endo/bundle-source": "npm:^4.0.0"
310310
"@endo/captp": "npm:^4.4.5"
@@ -332,7 +332,7 @@ __metadata:
332332
tmp: "npm:^0.2.1"
333333
yargs-parser: "npm:^21.1.1"
334334
peerDependencies:
335-
"@agoric/xsnap": ^0.14.2
335+
"@agoric/xsnap": "workspace:*"
336336
ava: ^5.3.0
337337
bin:
338338
vat: bin/vat
@@ -343,7 +343,7 @@ __metadata:
343343
version: 0.0.0-use.local
344344
resolution: "@agoric/swingset-xsnap-supervisor@portal:../../agoric-sdk/packages/swingset-xsnap-supervisor::locator=root-workspace-0b6124%40workspace%3A."
345345
peerDependencies:
346-
"@agoric/swingset-liveslots": ^0.10.2
346+
"@agoric/swingset-liveslots": "workspace:*"
347347
"@endo/errors": ^1.2.10
348348
"@endo/import-bundle": ^1.4.0
349349
"@endo/promise-kit": ^1.1.10
@@ -388,7 +388,7 @@ __metadata:
388388
version: 0.0.0-use.local
389389
resolution: "@agoric/time@portal:../../agoric-sdk/packages/time::locator=root-workspace-0b6124%40workspace%3A."
390390
dependencies:
391-
"@agoric/store": "npm:^0.9.2"
391+
"@agoric/store": "workspace:*"
392392
"@endo/errors": "npm:^1.2.10"
393393
"@endo/nat": "npm:^5.1.0"
394394
"@endo/patterns": "npm:^1.5.0"
@@ -399,9 +399,9 @@ __metadata:
399399
version: 0.0.0-use.local
400400
resolution: "@agoric/vat-data@portal:../../agoric-sdk/packages/vat-data::locator=root-workspace-0b6124%40workspace%3A."
401401
dependencies:
402-
"@agoric/base-zone": "npm:^0.1.0"
403-
"@agoric/store": "npm:^0.9.2"
404-
"@agoric/swingset-liveslots": "npm:^0.10.2"
402+
"@agoric/base-zone": "workspace:*"
403+
"@agoric/store": "workspace:*"
404+
"@agoric/swingset-liveslots": "workspace:*"
405405
"@endo/errors": "npm:^1.2.10"
406406
"@endo/exo": "npm:^1.5.9"
407407
"@endo/patterns": "npm:^1.5.0"
@@ -412,19 +412,19 @@ __metadata:
412412
version: 0.0.0-use.local
413413
resolution: "@agoric/vats@portal:../../agoric-sdk/packages/vats::locator=root-workspace-0b6124%40workspace%3A."
414414
dependencies:
415-
"@agoric/cosmic-proto": "npm:^0.4.0"
416-
"@agoric/ertp": "npm:^0.16.2"
417-
"@agoric/governance": "npm:^0.10.3"
418-
"@agoric/internal": "npm:^0.3.2"
419-
"@agoric/network": "npm:^0.1.0"
420-
"@agoric/notifier": "npm:^0.6.2"
421-
"@agoric/store": "npm:^0.9.2"
422-
"@agoric/swingset-vat": "npm:^0.32.2"
423-
"@agoric/time": "npm:^0.3.2"
424-
"@agoric/vat-data": "npm:^0.5.2"
425-
"@agoric/vow": "npm:^0.1.0"
426-
"@agoric/zoe": "npm:^0.26.2"
427-
"@agoric/zone": "npm:^0.2.2"
415+
"@agoric/cosmic-proto": "workspace:*"
416+
"@agoric/ertp": "workspace:*"
417+
"@agoric/governance": "workspace:*"
418+
"@agoric/internal": "workspace:*"
419+
"@agoric/network": "workspace:*"
420+
"@agoric/notifier": "workspace:*"
421+
"@agoric/store": "workspace:*"
422+
"@agoric/swingset-vat": "workspace:*"
423+
"@agoric/time": "workspace:*"
424+
"@agoric/vat-data": "workspace:*"
425+
"@agoric/vow": "workspace:*"
426+
"@agoric/zoe": "workspace:*"
427+
"@agoric/zone": "workspace:*"
428428
"@endo/errors": "npm:^1.2.10"
429429
"@endo/far": "npm:^1.1.11"
430430
"@endo/import-bundle": "npm:^1.4.0"
@@ -442,8 +442,8 @@ __metadata:
442442
version: 0.0.0-use.local
443443
resolution: "@agoric/vow@portal:../../agoric-sdk/packages/vow::locator=root-workspace-0b6124%40workspace%3A."
444444
dependencies:
445-
"@agoric/base-zone": "npm:^0.1.0"
446-
"@agoric/internal": "npm:^0.3.2"
445+
"@agoric/base-zone": "workspace:*"
446+
"@agoric/internal": "workspace:*"
447447
"@endo/env-options": "npm:^1.1.8"
448448
"@endo/errors": "npm:^1.2.10"
449449
"@endo/eventual-send": "npm:^1.3.1"
@@ -463,17 +463,17 @@ __metadata:
463463
version: 0.0.0-use.local
464464
resolution: "@agoric/zoe@portal:../../agoric-sdk/packages/zoe::locator=root-workspace-0b6124%40workspace%3A."
465465
dependencies:
466-
"@agoric/base-zone": "npm:^0.1.0"
467-
"@agoric/ertp": "npm:^0.16.2"
468-
"@agoric/internal": "npm:^0.3.2"
469-
"@agoric/notifier": "npm:^0.6.2"
470-
"@agoric/store": "npm:^0.9.2"
471-
"@agoric/swingset-liveslots": "npm:^0.10.2"
472-
"@agoric/swingset-vat": "npm:^0.32.2"
473-
"@agoric/time": "npm:^0.3.2"
474-
"@agoric/vat-data": "npm:^0.5.2"
475-
"@agoric/vow": "npm:^0.1.0"
476-
"@agoric/zone": "npm:^0.2.2"
466+
"@agoric/base-zone": "workspace:*"
467+
"@agoric/ertp": "workspace:*"
468+
"@agoric/internal": "workspace:*"
469+
"@agoric/notifier": "workspace:*"
470+
"@agoric/store": "workspace:*"
471+
"@agoric/swingset-liveslots": "workspace:*"
472+
"@agoric/swingset-vat": "workspace:*"
473+
"@agoric/time": "workspace:*"
474+
"@agoric/vat-data": "workspace:*"
475+
"@agoric/vow": "workspace:*"
476+
"@agoric/zone": "workspace:*"
477477
"@endo/bundle-source": "npm:^4.0.0"
478478
"@endo/captp": "npm:^4.4.5"
479479
"@endo/common": "npm:^1.2.10"
@@ -495,8 +495,8 @@ __metadata:
495495
version: 0.0.0-use.local
496496
resolution: "@agoric/zone@portal:../../agoric-sdk/packages/zone::locator=root-workspace-0b6124%40workspace%3A."
497497
dependencies:
498-
"@agoric/base-zone": "npm:^0.1.0"
499-
"@agoric/vat-data": "npm:^0.5.2"
498+
"@agoric/base-zone": "workspace:*"
499+
"@agoric/vat-data": "workspace:*"
500500
"@endo/errors": "npm:^1.2.10"
501501
"@endo/far": "npm:^1.1.11"
502502
"@endo/pass-style": "npm:^1.5.0"
@@ -1385,22 +1385,22 @@ __metadata:
13851385
version: 0.0.0-use.local
13861386
resolution: "agoric@portal:../../agoric-sdk/packages/agoric-cli::locator=root-workspace-0b6124%40workspace%3A."
13871387
dependencies:
1388-
"@agoric/access-token": "npm:^0.4.21"
1389-
"@agoric/cache": "npm:^0.3.2"
1390-
"@agoric/casting": "npm:^0.4.2"
1391-
"@agoric/client-utils": "npm:^0.1.0"
1392-
"@agoric/cosmic-proto": "npm:^0.4.0"
1393-
"@agoric/ertp": "npm:^0.16.2"
1394-
"@agoric/governance": "npm:^0.10.3"
1395-
"@agoric/inter-protocol": "npm:^0.16.1"
1396-
"@agoric/internal": "npm:^0.3.2"
1397-
"@agoric/network": "npm:^0.1.0"
1398-
"@agoric/smart-wallet": "npm:^0.5.3"
1399-
"@agoric/store": "npm:^0.9.2"
1400-
"@agoric/swingset-vat": "npm:^0.32.2"
1401-
"@agoric/vats": "npm:^0.15.1"
1402-
"@agoric/zoe": "npm:^0.26.2"
1403-
"@agoric/zone": "npm:^0.2.2"
1388+
"@agoric/access-token": "workspace:*"
1389+
"@agoric/cache": "workspace:*"
1390+
"@agoric/casting": "workspace:*"
1391+
"@agoric/client-utils": "workspace:*"
1392+
"@agoric/cosmic-proto": "workspace:*"
1393+
"@agoric/ertp": "workspace:*"
1394+
"@agoric/governance": "workspace:*"
1395+
"@agoric/inter-protocol": "workspace:*"
1396+
"@agoric/internal": "workspace:*"
1397+
"@agoric/network": "workspace:*"
1398+
"@agoric/smart-wallet": "workspace:*"
1399+
"@agoric/store": "workspace:*"
1400+
"@agoric/swingset-vat": "workspace:*"
1401+
"@agoric/vats": "workspace:*"
1402+
"@agoric/zoe": "workspace:*"
1403+
"@agoric/zone": "workspace:*"
14041404
"@cosmjs/crypto": "npm:^0.33.0"
14051405
"@cosmjs/encoding": "npm:^0.33.0"
14061406
"@cosmjs/math": "npm:^0.33.0"

0 commit comments

Comments
 (0)