Skip to content

Commit

Permalink
remove @buf/penumbra-zone_penumbra deps, remove root package deps
Browse files Browse the repository at this point in the history
  • Loading branch information
turbocrime committed Aug 22, 2024
1 parent 9891bf7 commit ca45dfc
Show file tree
Hide file tree
Showing 17 changed files with 56 additions and 184 deletions.
9 changes: 8 additions & 1 deletion .syncpackrc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@
"isBanned": true
},
{
"label": "Require @buf registry packages remain in root or in apps",
"label": "Use @penumbra-zone/protobuf instead of a BSR dependency",
"dependencies": [
"@buf/penumbra-zone_penumbra.*"
],
"isBanned": true
},
{
"label": "Don't depend on BSR in published packages",
"dependencies": [
"@buf/*"
],
Expand Down
3 changes: 2 additions & 1 deletion apps/minifront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
},
"dependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@connectrpc/connect": "^1.4.0",
"@cosmjs/proto-signing": "^0.32.4",
"@cosmjs/stargate": "^0.32.4",
"@cosmos-kit/core": "^2.13.1",
"@cosmos-kit/react": "^2.18.0",
"@interchain-ui/react": "^1.23.29",
"@penumbra-labs/registry": "11.0.0",
"@penumbra-labs/registry": "11.1.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/client": "workspace:*",
"@penumbra-zone/crypto-web": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SegmentedControl } from '@repo/ui/SegmentedControl';
import { TextInput } from '@repo/ui/TextInput';
import { AllSlices } from '../../../../state';
import { sendValidationErrors } from '../../../../state/send';
import { FeeTier_Tier } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/fee/v1/fee_pb';
import { FeeTier_Tier } from '@penumbra-zone/protobuf/penumbra/core/component/fee/v1/fee_pb';
import { Button } from '@repo/ui/Button';
import { ArrowUpFromDot } from 'lucide-react';
import { useMemo } from 'react';
Expand Down
6 changes: 3 additions & 3 deletions apps/node-status/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
"preview": "vite preview"
},
"dependencies": {
"@connectrpc/connect": "^1.4.0",
"@connectrpc/connect-web": "^1.4.0",
"@penumbra-zone/crypto-web": "workspace:*",
"@penumbra-zone/protobuf": "workspace:*",
"@penumbra-zone/types": "workspace:*",
"@repo/ui": "workspace:*",
"date-fns": "^3.6.0",
"react": "^18.3.1",
Expand All @@ -25,9 +28,6 @@
"tailwindcss": "^3.4.3"
},
"devDependencies": {
"@buf/tendermint_tendermint.bufbuild_es": "1.10.0-20231117195010-33ed361a9051.1",
"@penumbra-zone/crypto-web": "workspace:*",
"@penumbra-zone/types": "workspace:*",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0"
}
Expand Down
6 changes: 3 additions & 3 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ export default tseslint.config(
'error',
{
pathGroups: [
{ pattern: '@penumbra-labs/**', group: 'external', position: 'after' },
{ pattern: '@buf/**', group: 'external', position: 'after' },
{ pattern: '@penumbra-zone/**', group: 'internal', position: 'before' },
{ pattern: '@buf/penumbra-zone_penumbra.*', group: 'internal', position: 'before' },
{ pattern: '@repo/**', group: 'internal', position: 'after' },

{ pattern: '@buf/**', group: 'external', position: 'after' },
{ pattern: '@penumbra-labs/**', group: 'external', position: 'after' },
],
pathGroupsExcludedImportTypes: [],
distinctGroup: true,
Expand Down
6 changes: 0 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,9 @@
"typescript": "5.5.3"
}
},
"dependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@connectrpc/connect": "^1.4.0",
"@connectrpc/connect-web": "^1.4.0"
},
"devDependencies": {
"@buf/connectrpc_eliza.bufbuild_es": "1.10.0-20230913231627-233fca715f49.1",
"@buf/connectrpc_eliza.connectrpc_es": "1.4.0-20230913231627-233fca715f49.3",
"@buf/penumbra-zone_penumbra.bufbuild_es": "1.10.0-20240703080008-312294d02bf9.1",
"@changesets/cli": "^2.27.3",
"@eslint/compat": "^1.1.0",
"@eslint/js": "^9.6.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@
}
},
"devDependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@connectrpc/connect": "^1.4.0",
"@penumbra-zone/protobuf": "workspace:*",
"@penumbra-zone/transport-dom": "workspace:*",
"@types/chrome": "^0.0.268"
},
"peerDependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@connectrpc/connect": "^1.4.0",
"@penumbra-zone/protobuf": "workspace:*",
"@penumbra-zone/transport-dom": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ServiceType } from '@bufbuild/protobuf';
import type { ServiceType } from '@bufbuild/protobuf';
import { createPromiseClient, PromiseClient, Transport } from '@connectrpc/connect';
import { jsonOptions } from '@penumbra-zone/protobuf';
import {
Expand Down
2 changes: 2 additions & 0 deletions packages/perspective/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@
}
},
"devDependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/getters": "workspace:*",
"@penumbra-zone/protobuf": "workspace:*",
"@penumbra-zone/wasm": "workspace:*"
},
"peerDependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/getters": "workspace:*",
"@penumbra-zone/protobuf": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective/src/plan/view-action-plan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
ActionDutchAuctionWithdrawPlan,
ActionDutchAuctionWithdrawView,
} from '@penumbra-zone/protobuf/penumbra/core/component/auction/v1/auction_pb';
import { PartialMessage } from '@bufbuild/protobuf';
import type { PartialMessage } from '@bufbuild/protobuf';
import {
DelegatorVotePlan,
DelegatorVoteView,
Expand Down
4 changes: 2 additions & 2 deletions packages/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
},
"dependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@penumbra-labs/registry": "11.0.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/getters": "workspace:*",
"@penumbra-zone/types": "workspace:*",
"@penumbra-zone/wasm": "workspace:*",
"idb": "^8.0.0"
},
"devDependencies": {
"@penumbra-labs/registry": "11.1.0",
"@penumbra-zone/protobuf": "workspace:*",
"fetch-mock": "^10.0.7"
},
"peerDependencies": {
"@bufbuild/protobuf": "^1.10.0",
"@penumbra-labs/registry": "11.0.0",
"@penumbra-labs/registry": "11.1.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/getters": "workspace:*",
"@penumbra-zone/protobuf": "workspace:*",
Expand Down
1 change: 0 additions & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@penumbra-labs/registry": "11.0.0",
"@penumbra-zone/bech32m": "workspace:*",
"@penumbra-zone/perspective": "workspace:*",
"@penumbra-zone/types": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/AccountSelector/AccountSelectorAddress.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
import type { Address } from '@penumbra-zone/protobuf/penumbra/core/keys/v1/keys_pb';
import { bech32mAddress } from '@penumbra-zone/bech32m/penumbra';
import styled, { DefaultTheme } from 'styled-components';
import { useDensity } from '../hooks/useDensity';
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/AccountSelector/index.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Meta, StoryObj } from '@storybook/react';

import { AccountSelector } from '.';
import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
import { Address } from '@penumbra-zone/protobuf/penumbra/core/keys/v1/keys_pb';
import { Text } from '../Text';
import styled from 'styled-components';

Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/AccountSelector/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
import type { Address } from '@penumbra-zone/protobuf/penumbra/core/keys/v1/keys_pb';
import { TextInput } from '../TextInput';
import styled from 'styled-components';
import { body } from '../utils/typography';
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/AccountSelector/useAccountSelector.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useMemo, useRef, useState } from 'react';
import type { AccountSelectorProps } from '.';
import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
import type { Address } from '@penumbra-zone/protobuf/penumbra/core/keys/v1/keys_pb';

const MAX_INDEX = 2 ** 32;

Expand Down
Loading

0 comments on commit ca45dfc

Please sign in to comment.