Skip to content

Commit 170f8e7

Browse files
chore: resolve merge conflicts
Made-with: Cursor
1 parent 05f48d5 commit 170f8e7

File tree

10 files changed

+14435
-23
lines changed

10 files changed

+14435
-23
lines changed

.github/workflows/publish-sdks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
options:
1515
- all
1616
- connector
17-
- devtools
17+
- connector-debugger
1818

1919
permissions:
2020
contents: read
@@ -66,8 +66,8 @@ jobs:
6666
working-directory: packages/connector
6767
run: npm publish --access public
6868

69-
- name: Publish @solana/devtools
70-
if: ${{ startsWith(github.ref, 'refs/tags/') || github.event.inputs.package == 'all' || github.event.inputs.package == 'devtools' }}
69+
- name: Publish @solana/connector-debugger
70+
if: ${{ startsWith(github.ref, 'refs/tags/') || github.event.inputs.package == 'all' || github.event.inputs.package == 'connector-debugger' }}
7171
working-directory: packages/devtools
7272
run: npm publish --access public
7373

@@ -95,16 +95,16 @@ jobs:
9595
- Version: ${{ github.ref_name }}
9696
- Registry: npm
9797
98-
### @solana/devtools
99-
- Package: `@solana/devtools`
98+
### @solana/connector-debugger
99+
- Package: `@solana/connector-debugger`
100100
- Version: ${{ github.ref_name }}
101101
- Registry: npm
102102
103103
## Installation
104104
105105
```bash
106106
npm install @solana/connector@${{ github.ref_name }}
107-
npm install @solana/devtools@${{ github.ref_name }}
107+
npm install @solana/connector-debugger@${{ github.ref_name }}
108108
```
109109
draft: false
110110
prerelease: ${{ contains(github.ref_name, '-') }}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Production-ready Solana wallet infrastructure. A headless, framework-agnostic wa
1010
| Package | Description |
1111
| ----------------------------------------- | ---------------------------------------------------------- |
1212
| [@solana/connector](./packages/connector) | Core wallet connector with React hooks and headless client |
13-
| [@solana/devtools](./packages/devtools) | Framework-agnostic devtools with transaction tracking |
13+
| [@solana/connector-debugger](./packages/devtools) | Framework-agnostic devtools with transaction tracking |
1414

1515
## Why ConnectorKit?
1616

@@ -77,11 +77,11 @@ See the [connector package docs](./packages/connector/README.md) for full API re
7777
Framework-agnostic devtools that work with any web framework via the imperative DOM API.
7878

7979
```bash
80-
npm install @solana/devtools
80+
npm install @solana/connector-debugger
8181
```
8282

8383
```typescript
84-
import { ConnectorDevtools } from '@solana/devtools';
84+
import { ConnectorDevtools } from '@solana/connector-debugger';
8585

8686
// Create devtools (auto-detects window.__connectorClient from ConnectorProvider)
8787
const devtools = new ConnectorDevtools({
@@ -114,7 +114,7 @@ export function DevtoolsLoader() {
114114
let devtools: any;
115115
let container: HTMLDivElement;
116116

117-
import('@solana/devtools').then(({ ConnectorDevtools }) => {
117+
import('@solana/connector-debugger').then(({ ConnectorDevtools }) => {
118118
container = document.createElement('div');
119119
document.body.appendChild(container);
120120
devtools = new ConnectorDevtools();

connectorkit/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Details (provider configs + protocol types + security) live in `references/remot
285285

286286
### Devtools (Development Only)
287287

288-
ConnectorKit also ships devtools (`@solana/devtools`) that can be dynamically mounted in development.
288+
ConnectorKit also ships devtools (`@solana/connector-debugger`) that can be dynamically mounted in development.
289289

290290
```tsx
291291
'use client';
@@ -299,7 +299,7 @@ export function DevtoolsLoader() {
299299
let devtools: { mount: (el: HTMLElement) => void; unmount: () => void } | undefined;
300300
let container: HTMLDivElement | undefined;
301301

302-
import('@solana/devtools').then(({ ConnectorDevtools }) => {
302+
import('@solana/connector-debugger').then(({ ConnectorDevtools }) => {
303303
container = document.createElement('div');
304304
document.body.appendChild(container);
305305
devtools = new ConnectorDevtools({ config: { position: 'bottom-right', theme: 'dark' } });

examples/next-js/app/providers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export function Providers({ children }: { children: ReactNode }) {
9292
let container: HTMLDivElement | undefined;
9393

9494
// Dynamic import to avoid bundling in production
95-
import('@solana/devtools').then(({ ConnectorDevtools }) => {
95+
import('@solana/connector-debugger').then(({ ConnectorDevtools }) => {
9696
// Create container for devtools
9797
container = document.createElement('div');
9898
container.id = 'connector-devtools-container';

examples/next-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@radix-ui/react-tabs": "^1.1.12",
2121
"@solana-program/system": "^0.7.0",
2222
"@solana/connector": "workspace:*",
23-
"@solana/devtools": "workspace:*",
23+
"@solana/connector-debugger": "workspace:*",
2424
"@solana/keychain": "^0.2.1",
2525
"@solana/kit": "^6.0.0",
2626
"@solana/web3.js": "^1.98.4",

packages/devtools/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @solana/devtools
1+
# @solana/connector-debugger
22

33
Framework-agnostic devtools for `@solana/connector`. Works with any web framework via the imperative DOM API.
44

@@ -16,7 +16,7 @@ Framework-agnostic devtools for `@solana/connector`. Works with any web framewor
1616
## Installation
1717

1818
```bash
19-
npm install @solana/devtools
19+
npm install @solana/connector-debugger
2020
```
2121

2222
## Usage
@@ -26,7 +26,7 @@ npm install @solana/devtools
2626
When using `@solana/connector/react` with `ConnectorProvider`, the client is automatically exposed on `window.__connectorClient`:
2727

2828
```typescript
29-
import { ConnectorDevtools } from '@solana/devtools';
29+
import { ConnectorDevtools } from '@solana/connector-debugger';
3030

3131
// Create devtools instance (auto-detects client from window.__connectorClient)
3232
const devtools = new ConnectorDevtools();
@@ -45,7 +45,7 @@ devtools.unmount();
4545
If you're using the headless API or want explicit control:
4646

4747
```typescript
48-
import { ConnectorDevtools } from '@solana/devtools';
48+
import { ConnectorDevtools } from '@solana/connector-debugger';
4949
import { ConnectorClient } from '@solana/connector/headless';
5050

5151
const client = new ConnectorClient({ debug: true });
@@ -75,7 +75,7 @@ export function DevtoolsLoader() {
7575

7676
let devtools: any;
7777

78-
import('@solana/devtools').then(({ ConnectorDevtools }) => {
78+
import('@solana/connector-debugger').then(({ ConnectorDevtools }) => {
7979
devtools = new ConnectorDevtools();
8080
const container = document.createElement('div');
8181
container.id = 'connector-devtools';

packages/devtools/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
2-
* @solana/devtools
2+
* @solana/connector-debugger
33
*
44
* Framework-agnostic devtools for @solana/connector
55
*
66
* Usage:
77
* ```typescript
8-
* import { ConnectorDevtools } from '@solana/devtools';
8+
* import { ConnectorDevtools } from '@solana/connector-debugger';
99
*
1010
* const devtools = new ConnectorDevtools();
1111
* devtools.mount(document.body);

packages/devtools/src/plugins/idl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* IDL Plugin
33
*
4-
* Goal: Provide an Explorer-like "Interact with IDL" experience inside @solana/devtools,
4+
* Goal: Provide an Explorer-like "Interact with IDL" experience inside @solana/connector-debugger,
55
* but using the currently-connected @solana/connector wallet session.
66
*
77
* Notes:

packages/devtools/src/utils/idl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* IDL utilities for @solana/devtools
2+
* IDL utilities for @solana/connector-debugger
33
*
44
* Chain-first IDL fetch mirrors Solana Explorer's Program Metadata IDL flow:
55
* - Fetch metadata via seeds (authority:null, seed:"idl")

0 commit comments

Comments
 (0)