Merge pull request #8392 from Agoric/mhofman/fix-solo-wallet-ui

fix: solo lookup of wallet UI
Agoric · Sep 28, 2023 · bf2e680 · bf2e680
2 parents 4ffd2ad + 1ac063e
commit bf2e680
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/solo/src/start.js b/packages/solo/src/start.js
@@ -485,8 +485,14 @@ const start = async (basedir, argv) => {
   const { 'agoric-wallet': { htmlBasedir = 'ui/build', deploy = [] } = {} } =
     JSON.parse(fs.readFileSync(pjs, 'utf-8'));
 
+  const htmlBasePath = String(htmlBasedir).replace(
+    /^\.\.\/\.\.\/node_modules\//,
+    '',
+  );
+
   const agWallet = path.dirname(pjs);
-  const agWalletHtml = path.resolve(agWallet, htmlBasedir);
+  const agWalletHtmlUrl = await importMetaResolve(htmlBasePath, packageUrl);
+  const agWalletHtml = new URL(agWalletHtmlUrl).pathname;
 
   let hostport;
   await Promise.all(

diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "author": "Agoric",
   "agoric-wallet": {
-    "htmlBasedir": "../../node_modules/@agoric/wallet-ui/build",
+    "htmlBasedir": "@agoric/wallet-ui/build",
     "deploy": [
       "./api/deploy.js"
     ]