build: use subpath patterns

Agoric · May 2, 2024 · 3c59ca0 · 3c59ca0
1 parent a2c6d29
commit 3c59ca0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 29 deletions.
diff --git a/packages/boot/test/bootstrapTests/test-vat-orchestration.ts b/packages/boot/test/bootstrapTests/test-vat-orchestration.ts
@@ -6,7 +6,7 @@ import {
   MsgDelegate,
   MsgDelegateResponse,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import type { ChainAccount, OrchestrationService } from '@agoric/orchestration';
 import { decodeBase64 } from '@endo/base64';
 import { M, matches } from '@endo/patterns';

diff --git a/packages/cosmic-proto/package.json b/packages/cosmic-proto/package.json
@@ -24,21 +24,21 @@
       "default": "./dist/vatsafe.js"
     },
     "./package.json": "./package.json",
-    "./cosmos": {
-      "types": "./dist/codegen/cosmos/bundle.d.ts",
-      "default": "./dist/codegen/cosmos/bundle.js"
+    "./agoric/*.js": {
+      "types": "./dist/codegen/agoric/*.d.ts",
+      "default": "./dist/codegen/agoric/*.js"
     },
-    "./cosmos/staking/v1beta1/tx": {
-      "types": "./dist/codegen/cosmos/staking/v1beta1/tx.d.ts",
-      "default": "./dist/codegen/cosmos/staking/v1beta1/tx.js"
+    "./cosmos/*.js": {
+      "types": "./dist/codegen/cosmos/*.d.ts",
+      "default": "./dist/codegen/cosmos/*.js"
     },
-    "./ibc/applications/transfer/v1/tx.js": {
-      "types": "./dist/codegen/ibc/applications/transfer/v1/tx.d.ts",
-      "default": "./dist/codegen/ibc/applications/transfer/v1/tx.js"
+    "./google/*.js": {
+      "types": "./dist/codegen/google/*.d.ts",
+      "default": "./dist/codegen/google/*.js"
     },
-    "./google/protobuf/any": {
-      "types": "./dist/codegen/google/protobuf/any.d.ts",
-      "default": "./dist/codegen/google/protobuf/any.js"
+    "./ibc/*.js": {
+      "types": "./dist/codegen/ibc/*.d.ts",
+      "default": "./dist/codegen/ibc/*.js"
     },
     "./swingset/msgs.js": {
       "types": "./dist/codegen/agoric/swingset/msgs.d.ts",
@@ -55,18 +55,6 @@
     "./vstorage/query.js": {
       "types": "./dist/codegen/agoric/vstorage/query.d.ts",
       "default": "./dist/codegen/agoric/vstorage/query.js"
-    },
-    "./cosmos/tx/v1beta1/tx.js": {
-      "types": "./dist/codegen/cosmos/tx/v1beta1/tx.d.ts",
-      "default": "./dist/codegen/cosmos/tx/v1beta1/tx.js"
-    },
-    "./cosmos/staking/v1beta1/staking.js": {
-      "types": "./dist/codegen/cosmos/staking/v1beta1/staking.d.ts",
-      "default": "./dist/codegen/cosmos/staking/v1beta1/staking.js"
-    },
-    "./cosmos/staking/v1beta1/tx.js": {
-      "types": "./dist/codegen/cosmos/staking/v1beta1/tx.d.ts",
-      "default": "./dist/codegen/cosmos/staking/v1beta1/tx.js"
     }
   },
   "main": "dist/index.js",

diff --git a/packages/cosmic-proto/test/test-vatsafe.js b/packages/cosmic-proto/test/test-vatsafe.js
@@ -3,7 +3,7 @@
 import test from '@endo/ses-ava/prepare-endo.js';
 import { cosmos } from '@agoric/cosmic-proto';
 
-import { MsgDelegate } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx';
+import { MsgDelegate } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
 
 // @ts-expect-error
 cosmos.staking.v1beta1.MsgDelegate.missing;

diff --git a/packages/orchestration/src/exos/stakingAccountKit.js b/packages/orchestration/src/exos/stakingAccountKit.js
@@ -11,7 +11,7 @@ import { M, prepareExoClassKit } from '@agoric/vat-data';
 import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import { decodeBase64 } from '@endo/base64';
 import { E } from '@endo/far';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 
 /**
  * @import { ChainAccount, ChainAddress } from '../types.js';

diff --git a/packages/orchestration/src/utils/tx.js b/packages/orchestration/src/utils/tx.js
@@ -1,7 +1,7 @@
 // @ts-check
 import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
 import { encodeBase64 } from '@endo/base64';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 
 /**
  * Makes an IBC packet from an array of messages. Expects the `value` of each message

diff --git a/packages/orchestration/test/utils/tx.test.js b/packages/orchestration/test/utils/tx.test.js
@@ -1,5 +1,5 @@
 import test from '@endo/ses-ava/prepare-endo.js';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
 import { makeTxPacket, parsePacketAck } from '../../src/utils/tx.js';
 
 test('makeTxPacket', t => {