Skip to content

chore: remove smart wallet check from cli prompt #2287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abcrane123 merged 2 commits into from
Apr 21, 2025
Merged

chore: remove smart wallet check from cli prompt #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bddc1
remove smart wallet check from cli prompt
abcrane123 Apr 16, 2025
33ffa1f
remove NEXT_PUBLIC_ONCHAINKIT_WALLET_CONFIG
abcrane123 Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 63 additions & 44 deletions packages/create-onchain/src/onchainkit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import { describe, it, expect, beforeEach, afterEach, vi, type Mock } from 'vitest';
import {
describe,
it,
expect,
beforeEach,
afterEach,
vi,
type Mock,
} from 'vitest';
import fs from 'fs';
import path from 'path';
import prompts from 'prompts';
Expand All @@ -13,19 +21,19 @@ vi.mock('./utils.js', () => ({
toValidPackageName: vi.fn().mockImplementation((name) => name),
}));
vi.mock('ora', () => ({
default: vi.fn()
default: vi.fn(),
}));
vi.mock('http', () => ({
default: {
createServer: vi.fn(() => ({
listen: vi.fn().mockImplementation((_, callback) => callback()),
close: vi.fn()
}))
}
close: vi.fn(),
})),
},
}));
vi.mock('open', () => ({ default: vi.fn() }));
vi.mock('prompts', () => ({
default: vi.fn()
default: vi.fn(),
}));
vi.mock('fs', async () => {
const actual = await vi.importActual<typeof import('fs')>('fs');
Expand All @@ -43,8 +51,8 @@ vi.mock('fs', async () => {
mkdir: vi.fn().mockResolvedValue(undefined),
readdir: vi.fn().mockResolvedValue([]),
readFile: vi.fn().mockResolvedValue('{}'),
}
}
},
},
};
});
vi.mock('path', async () => {
Expand All @@ -53,18 +61,22 @@ vi.mock('path', async () => {
default: {
...actual,
resolve: vi.fn((...args) => {
if (args.some(arg => typeof arg === 'string' && arg.includes('templates'))) {
if (
args.some(
(arg) => typeof arg === 'string' && arg.includes('templates'),
)
) {
return actual.resolve(__dirname, '..', 'templates', 'minikit');
}
return actual.resolve(...args);
})
}
}),
},
};
});
vi.mock('url', () => ({
default: {
fileURLToPath: () => path.join(__dirname, '..', 'src', 'cli.ts')
}
fileURLToPath: () => path.join(__dirname, '..', 'src', 'cli.ts'),
},
}));

vi.spyOn(process, 'exit').mockImplementation((code) => {
Expand All @@ -81,11 +93,13 @@ describe('CLI', () => {

(fs.promises.mkdir as Mock).mockResolvedValue(true);
(fs.promises.readdir as Mock)
.mockResolvedValueOnce(
[{ name: 'test-file', isDirectory: vi.fn().mockReturnValue(true) }]
).mockResolvedValueOnce(
[{ name: 'test-file-2', isDirectory: vi.fn().mockReturnValue(false) }]
).mockResolvedValue([]);
.mockResolvedValueOnce([
{ name: 'test-file', isDirectory: vi.fn().mockReturnValue(true) },
])
.mockResolvedValueOnce([
{ name: 'test-file-2', isDirectory: vi.fn().mockReturnValue(false) },
])
.mockResolvedValue([]);
(fs.promises.copyFile as Mock).mockResolvedValue(undefined);
(fs.promises.readFile as Mock).mockResolvedValue(JSON.stringify({}));
(fs.existsSync as Mock).mockResolvedValue(false);
Expand All @@ -102,7 +116,7 @@ describe('CLI', () => {
process.argv = originalGetArgs;
vi.resetAllMocks();
vi.resetModules();
})
});

it('creates a new OnchainKit project with smart wallet enabled', async () => {
(prompts as unknown as Mock).mockResolvedValue({
Expand All @@ -113,23 +127,39 @@ describe('CLI', () => {

await createOnchainKitTemplate();

expect(fs.promises.writeFile).toHaveBeenCalledWith(expect.any(String), expect.stringContaining('NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=test-project\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=test-key\nNEXT_PUBLIC_ONCHAINKIT_WALLET_CONFIG=smartWalletOnly'));
expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('Created new OnchainKit project in'));
expect(fs.promises.writeFile).toHaveBeenCalledWith(
expect.any(String),
expect.stringContaining(
'NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=test-project\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=test-key',
),
);
expect(logSpy).toHaveBeenCalledWith(
expect.stringContaining('Created new OnchainKit project in'),
);
});

it('creates a new OnchainKit project with analytics', async () => {
(prompts as unknown as Mock).mockResolvedValueOnce({
projectName: 'test-project',
clientKey: 'test-key',
smartWallet: true,
}).mockResolvedValueOnce({
analytics: true,
});
(prompts as unknown as Mock)
.mockResolvedValueOnce({
projectName: 'test-project',
clientKey: 'test-key',
smartWallet: true,
})
.mockResolvedValueOnce({
analytics: true,
});

await createOnchainKitTemplate();

expect(fs.promises.writeFile).toHaveBeenCalledWith(expect.any(String), expect.stringContaining('NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=test-project\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=test-key\nNEXT_PUBLIC_ONCHAINKIT_WALLET_CONFIG=smartWalletOnly'));
expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('Created new OnchainKit project in'));
expect(fs.promises.writeFile).toHaveBeenCalledWith(
expect.any(String),
expect.stringContaining(
'NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=test-project\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=test-key',
),
);
expect(logSpy).toHaveBeenCalledWith(
expect.stringContaining('Created new OnchainKit project in'),
);
});

it('validates the directory', async () => {
Expand All @@ -153,20 +183,9 @@ describe('CLI', () => {
await expect(createOnchainKitTemplate()).rejects.toThrow('1');

expect(logSpy).toHaveBeenCalledWith(
expect.stringContaining('Directory already exists and is not empty. Please choose a different name.')
expect.stringContaining(
'Directory already exists and is not empty. Please choose a different name.',
),
);
});

it('creates a new OnchainKit project with smart wallet not enabled', async () => {
(prompts as unknown as Mock).mockResolvedValue({
projectName: 'test-project',
clientKey: 'test-key',
smartWallet: false,
});

await createOnchainKitTemplate();

expect(fs.promises.writeFile).toHaveBeenCalledWith(expect.any(String), expect.stringContaining('NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=test-project\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=test-key\nNEXT_PUBLIC_ONCHAINKIT_WALLET_CONFIG=all'));
expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('Created new OnchainKit project in'));
});
});
36 changes: 13 additions & 23 deletions packages/create-onchain/src/onchainkit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import path from "path";
import prompts from "prompts";
import path from 'path';
import prompts from 'prompts';
import pc from 'picocolors';
import ora from 'ora';
import fs from 'fs';
import { isValidPackageName, toValidPackageName, createClickableLink, copyDir } from "./utils.js";
import {
isValidPackageName,
toValidPackageName,
createClickableLink,
copyDir,
} from './utils.js';
import { fileURLToPath } from 'url';
import { analyticsPrompt } from "./analytics.js";
import { analyticsPrompt } from './analytics.js';

export async function createOnchainKitTemplate() {
console.log(
Expand All @@ -25,9 +30,7 @@ export async function createOnchainKitTemplate() {

const defaultProjectName = 'my-onchainkit-app';

let result: prompts.Answers<
'projectName' | 'packageName' | 'clientKey' | 'smartWallet'
>;
let result: prompts.Answers<'projectName' | 'packageName' | 'clientKey'>;

try {
result = await prompts(
Expand Down Expand Up @@ -71,14 +74,6 @@ export async function createOnchainKitTemplate() {
)} (optional)`,
),
},
{
type: 'toggle',
name: 'smartWallet',
message: pc.reset('Use Coinbase Smart Wallet? (recommended)'),
initial: true,
active: 'yes',
inactive: 'no',
},
],
{
onCancel: () => {
Expand All @@ -92,7 +87,7 @@ export async function createOnchainKitTemplate() {
process.exit(1);
}

const { projectName, packageName, clientKey, smartWallet } = result;
const { projectName, packageName, clientKey } = result;
const root = path.join(process.cwd(), projectName);

await analyticsPrompt('onchainkit');
Expand All @@ -114,18 +109,13 @@ export async function createOnchainKitTemplate() {
const envPath = path.join(root, '.env');
await fs.promises.writeFile(
envPath,
`NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=${projectName}\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=${clientKey}\nNEXT_PUBLIC_ONCHAINKIT_WALLET_CONFIG=${
smartWallet ? 'smartWalletOnly' : 'all'
}`,
`NEXT_PUBLIC_ONCHAINKIT_PROJECT_NAME=${projectName}\nNEXT_PUBLIC_ONCHAINKIT_API_KEY=${clientKey}`,
);

spinner.succeed();
console.log(`\n${pc.magenta(`Created new OnchainKit project in ${root}`)}`);

console.log(`\nIntegrations:`);
if (smartWallet) {
console.log(`${pc.greenBright('\u2713')} ${pc.blueBright(`Smart Wallet`)}`);
}
console.log(`${pc.greenBright('\u2713')} ${pc.blueBright(`Base`)}`);
if (clientKey) {
console.log(
Expand Down Expand Up @@ -153,4 +143,4 @@ export async function createOnchainKitTemplate() {
}
console.log(' - npm install');
console.log(' - npm run dev');
}
}