Skip to content

Commit

Permalink
don't upgrade @bufbuild/protobuf
Browse files Browse the repository at this point in the history
  • Loading branch information
turbocrime committed Sep 6, 2024
1 parent 92cc3ee commit f4b0986
Show file tree
Hide file tree
Showing 10 changed files with 1,341 additions and 3,249 deletions.
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
auto-install-peers = true
enable-pre-post-scripts=true # Enable pre/post scripts (for postui:add)
@buf:registry=https://buf.build/gen/npm/v1/
16 changes: 12 additions & 4 deletions .syncpackrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@
}
],
"versionGroups": [
{
"label": "Ensure @bufbuild and @connectrpc don't upgrade yet",
"packages": [
"**"
],
"dependencies": [
"@bufbuild/**",
"@connectrpc/**"
],
"pinVersion": "^1.x"
},
{
"label": "Use workspace protocol for local packages",
"dependencies": [
Expand All @@ -51,13 +62,10 @@
"isBanned": true
},
{
"label": "Require @buf registry packages remain in root or in apps",
"label": "Ban BSR packages",
"dependencies": [
"@buf/*"
],
"packages": [
"@penumbra-zone/**"
],
"isBanned": true
}
]
Expand Down
6 changes: 3 additions & 3 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"test": "vitest run"
},
"dependencies": {
"@bufbuild/protobuf": "^2.0.0",
"@connectrpc/connect": "^1.4.0",
"@connectrpc/connect-web": "^1.4.0",
"@bufbuild/protobuf": "^1.x",
"@connectrpc/connect": "^1.x",
"@connectrpc/connect-web": "^1.x",
"@penumbra-labs/registry": "11.1.0",
"@penumbra-zone/bech32m": "^7.0.0",
"@penumbra-zone/client": "^18.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { LocalStorageState } from '../types';
import { localV0Migration, V0LocalStorageState, V0LocalStorageVersion } from './local-v1-migration';
import { ChainRegistryClient } from '@penumbra-labs/registry';
import { sample } from 'lodash';
import { AppParameters } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/app/v1/app_pb';
import { AppParameters } from '@penumbra-zone/protobuf/penumbra/core/app/v1/app_pb';
import { UserChoice } from '@penumbra-zone/types/user-choice';

const bech32FVK =
Expand Down
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,12 @@
"watch-and-repack": "./scripts/watch-and-repack.sh"
},
"dependencies": {
"@bufbuild/protobuf": "^2.0.0",
"@connectrpc/connect": "^1.4.0",
"@connectrpc/connect-web": "^1.4.0",
"@bufbuild/protobuf": "^1.x",
"@connectrpc/connect": "^1.x",
"@connectrpc/connect-web": "^1.x",
"tsx": "^4.19.0"
},
"devDependencies": {
"@buf/connectrpc_eliza.bufbuild_es": "2.0.0-20230913231627-233fca715f49.2",
"@buf/connectrpc_eliza.connectrpc_es": "1.4.0-20230913231627-233fca715f49.3",
"@buf/penumbra-zone_penumbra.bufbuild_es": "2.0.0-20240905181058-9eac98eca7b5.2",
"@changesets/cli": "^2.27.8",
"@repo/eslint-config": "workspace:*",
"@repo/tailwind-config": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
".": "./src/index.ts"
},
"peerDependencies": {
"@bufbuild/protobuf": "^2.0.0",
"@bufbuild/protobuf": "^1.x",
"@penumbra-labs/registry": "11.1.0",
"@penumbra-zone/bech32m": "^7.0.0",
"@penumbra-zone/crypto-web": "^24.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/context/src/genesis.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, test, expect } from 'vitest';
import { CompactBlock } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/compact_block/v1/compact_block_pb';
import { CompactBlock } from '@penumbra-zone/protobuf/penumbra/core/component/compact_block/v1/compact_block_pb';
import { join } from 'path';
import { readFileSync } from 'fs';

Expand Down
2 changes: 1 addition & 1 deletion packages/context/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { FullViewingKey, WalletId } from '@penumbra-zone/protobuf/penumbra/core/
import { ChainRegistryClient } from '@penumbra-labs/registry';
import { AppParameters } from '@penumbra-zone/protobuf/penumbra/core/app/v1/app_pb';
import { AssetId } from '@penumbra-zone/protobuf/penumbra/core/asset/v1/asset_pb';
import { CompactBlock } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/component/compact_block/v1/compact_block_pb';
import { CompactBlock } from '@penumbra-zone/protobuf/penumbra/core/component/compact_block/v1/compact_block_pb';

export interface ServicesConfig {
readonly chainId: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"tinycolor2": "^1.6.0"
},
"devDependencies": {
"@bufbuild/protobuf": "^2.0.0",
"@bufbuild/protobuf": "^1.x",
"@storybook/addon-essentials": "^8.1.1",
"@storybook/addon-interactions": "^8.1.1",
"@storybook/addon-links": "^8.1.1",
Expand Down
4,548 changes: 1,318 additions & 3,230 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit f4b0986

Please sign in to comment.