diff --git a/package.json b/package.json index bd6f1984d..60ab3794a 100644 --- a/package.json +++ b/package.json @@ -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" @@ -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", diff --git a/snippets/test-intro-zoe.js b/snippets/test-intro-zoe.js index 6fc123139..afa005b40 100644 --- a/snippets/test-intro-zoe.js +++ b/snippets/test-intro-zoe.js @@ -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, ); @@ -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, ); diff --git a/snippets/tools/setupZcfTest.js b/snippets/tools/setupZcfTest.js index 53e638de4..fd716d0df 100644 --- a/snippets/tools/setupZcfTest.js +++ b/snippets/tools/setupZcfTest.js @@ -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, ); diff --git a/snippets/zoe/contracts/test-callSpread.js b/snippets/zoe/contracts/test-callSpread.js index bddbff94a..19a54a2f8 100644 --- a/snippets/zoe/contracts/test-callSpread.js +++ b/snippets/zoe/contracts/test-callSpread.js @@ -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, ); @@ -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, ); diff --git a/snippets/zoe/contracts/test-loan.js b/snippets/zoe/contracts/test-loan.js index c1c3d8596..d57f776ce 100644 --- a/snippets/zoe/contracts/test-loan.js +++ b/snippets/zoe/contracts/test-loan.js @@ -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, ); @@ -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, ); diff --git a/snippets/zoe/contracts/test-oracle.js b/snippets/zoe/contracts/test-oracle.js index 1208f8ca0..99142de49 100644 --- a/snippets/zoe/contracts/test-oracle.js +++ b/snippets/zoe/contracts/test-oracle.js @@ -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, ); diff --git a/yarn.lock b/yarn.lock index d2d82143e..ecca49be9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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": 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"