Skip to content
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

bump import-meta-resolve #1270

Merged
merged 3 commits into from
Feb 13, 2025
Merged

bump import-meta-resolve #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a802020
chore: bump Yarn to 4.6
turadg Feb 13, 2025
db3f013
chore(deps): bump import-meta-resolve to 4.4 (spec-compliant)
turadg Feb 13, 2025
651dcff
refactor: await importMetaResolve redundant
turadg Feb 13, 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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"lint:check-links": "node scripts/checkLinks.mjs",
"build": "exit 0"
},
"packageManager": "yarn@4.5.0",
"packageManager": "yarn@4.6.0",
"repository": {
"type": "git",
"url": "git+https://github.com/Agoric/documentation.git"
Expand Down Expand Up @@ -67,7 +67,7 @@
"eslint-plugin-jsdoc": "^35.5.1",
"eslint-plugin-prettier": "^5.2.1",
"glob": "7.1.7",
"import-meta-resolve": "^2.2.2",
"import-meta-resolve": "^4.1.0",
"prettier": "^3.3.3",
"ses": "^1.11.0",
"stylus": "^0.62.0",
Expand Down
4 changes: 2 additions & 2 deletions snippets/test-intro-zoe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test('intro to zoe', async t => {
});

// #region bundle
const atomicSwapUrl = await importMetaResolve(
const atomicSwapUrl = importMetaResolve(
'@agoric/zoe/src/contracts/atomicSwap.js',
import.meta.url,
);
Expand Down Expand Up @@ -132,7 +132,7 @@ test('intro to zoe', async t => {

test('intro to zoe - contract-format', async t => {
const { zoeService: zoe } = makeZoeKit(makeFakeVatAdmin().admin);
const atomicSwapUrl = await importMetaResolve(
const atomicSwapUrl = importMetaResolve(
'./contract-format.js',
import.meta.url,
);
Expand Down
2 changes: 1 addition & 1 deletion snippets/tools/setupZcfTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { makeZoeKit } from '@agoric/zoe';
import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';

export const setupZCFTest = async (issuerKeywordRecord, terms) => {
const contractUrl = await importMetaResolve(
const contractUrl = importMetaResolve(
'./zcfTesterContract.js',
import.meta.url,
);
Expand Down
4 changes: 2 additions & 2 deletions snippets/zoe/contracts/test-callSpread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ test('callSpread, mid-strike', async t => {
zoe,
brands,
} = setup();
const contractUrl = await importMetaResolve(
const contractUrl = importMetaResolve(
'@agoric/zoe/src/contracts/callSpread/fundedCallSpread.js',
import.meta.url,
);
Expand Down Expand Up @@ -163,7 +163,7 @@ test('pricedCallSpread, mid-strike', async t => {
zoe,
brands,
} = setup();
const contractUrl = await importMetaResolve(
const contractUrl = importMetaResolve(
'@agoric/zoe/src/contracts/callSpread/pricedCallSpread.js',
import.meta.url,
);
Expand Down
4 changes: 2 additions & 2 deletions snippets/zoe/contracts/test-loan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import url from 'url';
test('loan contract', async t => {
const { zoeService: zoe } = makeZoeKit(makeFakeVatAdmin().admin);

const contractUrl = await importMetaResolve(
const contractUrl = importMetaResolve(
'@agoric/zoe/src/contracts/loan/index.js',
import.meta.url,
);
Expand All @@ -40,7 +40,7 @@ test('loan contract', async t => {
} = makeIssuerKit('simoleans');

// Create autoswap installation and instance
const autoswapUrl = await importMetaResolve(
const autoswapUrl = importMetaResolve(
'@agoric/zoe/src/contracts/autoswap.js',
import.meta.url,
);
Expand Down
2 changes: 1 addition & 1 deletion snippets/zoe/contracts/test-oracle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test('oracle contract', async t => {
const { zoeService: zoe } = makeZoeKit(makeFakeVatAdmin().admin);

// #region bundle
const contractUrl = await importMetaResolve(
const contractUrl = importMetaResolve(
'@agoric/zoe/src/contracts/oracle.js',
import.meta.url,
);
Expand Down
11 changes: 9 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ __metadata:
eslint-plugin-jsdoc: "npm:^35.5.1"
eslint-plugin-prettier: "npm:^5.2.1"
glob: "npm:7.1.7"
import-meta-resolve: "npm:^2.2.2"
import-meta-resolve: "npm:^4.1.0"
prettier: "npm:^3.3.3"
ses: "npm:^1.11.0"
stylus: "npm:^0.62.0"
Expand Down Expand Up @@ -5455,13 +5455,20 @@ __metadata:
languageName: node
linkType: hard

"import-meta-resolve@npm:^2.2.1, import-meta-resolve@npm:^2.2.2":
"import-meta-resolve@npm:^2.2.1":
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it a problem that something is still getting 2.2.1?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question. yarn why reports it's the deps from agoric-sdk u17, which I think are used for the snippet building. Since that passes CI it's working.

❯ yarn why import-meta-resolve
├─ @agoric/builders@npm:0.2.0-upgrade-17-dev-ec448b0.0
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/cosmic-swingset@npm:0.42.0-u17.1
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/cosmic-swingset@npm:0.42.0-upgrade-17-dev-ec448b0.0
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/documentation@workspace:.
│  └─ import-meta-resolve@npm:4.1.0 (via npm:^4.1.0)
│
├─ @agoric/governance@npm:0.10.4-upgrade-17-dev-ec448b0.0
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/solo@npm:0.11.0-u17.1
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/swingset-vat@npm:0.33.0-upgrade-17-dev-ec448b0.0
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/swingset-vat@npm:0.33.0-upgrade-17-dev-ec448b0.0 [646b4]
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/vats@npm:0.16.0-u17.1
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
├─ @agoric/vats@npm:0.16.0-upgrade-17-dev-ec448b0.0
│  └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)
│
└─ @agoric/wallet@npm:0.19.0-upgrade-17-dev-ec448b0.0
   └─ import-meta-resolve@npm:2.2.2 (via npm:^2.2.1)

version: 2.2.2
resolution: "import-meta-resolve@npm:2.2.2"
checksum: 10c0/80873aebf0d2a66e824e278fb6cbb16a6660f86df49b367404e5de80928720ecb44f643243b46dc5c5fae506abb666ef54d6f281b45ee0f1034951acb2261eb5
languageName: node
linkType: hard

"import-meta-resolve@npm:^4.1.0":
version: 4.1.0
resolution: "import-meta-resolve@npm:4.1.0"
checksum: 10c0/42f3284b0460635ddf105c4ad99c6716099c3ce76702602290ad5cbbcd295700cbc04e4bdf47bacf9e3f1a4cec2e1ff887dabc20458bef398f9de22ddff45ef5
languageName: node
linkType: hard

"imurmurhash@npm:^0.1.4":
version: 0.1.4
resolution: "imurmurhash@npm:0.1.4"
Expand Down
Loading