Skip to content

Commit

Permalink
Merge pull request #34 from Agoric/npm-resolutions
Browse files Browse the repository at this point in the history
fix: contract bundles have duplicate dependencies
  • Loading branch information
0xpatrickdev authored Jan 4, 2024
2 parents 5a65fd0 + b5b1439 commit 2754328
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 247 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ jobs:
run: yarn
- name: yarn lint
run: yarn lint
- name: yarn build
run: yarn build
- name: yarn test
run: yarn test
6 changes: 1 addition & 5 deletions contract/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"docker:make": "docker compose exec agd make -C /workspace/contract",
"make:help": "make list",
"start": "yarn docker:make clean start-contract print-key",
"build": "exit 0",
"build": "agoric run scripts/build-game1-start.js",
"test": "ava --verbose",
"lint": "eslint '**/*.js'",
"lint:fix": "eslint --fix '**/*.js'"
Expand Down Expand Up @@ -44,10 +44,6 @@
"type-coverage": "^2.26.3",
"typescript": "~5.2.2"
},
"resolutions": {
"@babel/code-frame": "7.18.6",
"@babel/highlight": "7.22.5"
},
"dependencies": {
"@agoric/zoe": "^0.26.3-u12.0",
"@agoric/ertp": "^0.16.3-u12.0",
Expand Down
23 changes: 23 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,30 @@
"contract",
"ui"
],
"resolutions-note": "work-around for https://github.com/Agoric/agoric-sdk/issues/8621",
"resolutions": {
"ses": "0.18.4",
"@endo/bundle-source": "2.5.2-upstream-rollup",
"@endo/captp": "3.1.1",
"@endo/compartment-mapper": "0.8.4",
"@endo/far": "0.2.18",
"@endo/init": "0.5.56",
"@endo/marshal": "0.8.5",
"@endo/nat": "4.1.27",
"@endo/promise-kit": "0.2.56",
"@endo/lockdown": "0.1.28",
"@endo/import-bundle": "0.3.4",
"@endo/base64": "0.2.31",
"@endo/zip": "0.2.31",
"@endo/eventual-send": "0.17.2",
"@endo/patterns": "0.2.2",
"@endo/stream": "0.3.25",
"@endo/exo": "0.2.2",
"@endo/pass-style": "0.1.3",
"@endo/check-bundle": "0.2.18",
"@endo/ses-ava": "0.2.40",
"@endo/netstring": "0.3.26",
"@endo/stream-node": "0.2.26",
"@babel/code-frame": "7.18.6",
"@babel/highlight": "7.22.5"
},
Expand Down
Loading

0 comments on commit 2754328

Please sign in to comment.