Skip to content

Commit 146d826

Browse files
Merge branch 'main' into am/deploy
2 parents 4163e6c + bdec5a5 commit 146d826

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

.changeset/twenty-garlics-fold.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Fix "Invalid Project name" when a project with a capital letter is entered

packages/cli/src/create/command.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ export async function twCreate(options: any) {
9090
name: "path",
9191
message: CREATE_MESSAGES.projectName,
9292
initial: options.template || defaultName,
93-
validate: (name) => {
94-
const validation = validateNpmName(path.basename(path.resolve(name)));
93+
format: (name: string) => name.toLowerCase(),
94+
validate: (name: string) => {
95+
const validation = validateNpmName(
96+
path.basename(path.resolve(name.toLowerCase())),
97+
);
9598
if (validation.valid) {
9699
return true;
97100
}

packages/sdk/.eslintrc.cjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
module.exports = {
22
root: true,
33
extends: ["thirdweb"],
4+
rules: {
5+
"import/no-cycle": "off",
6+
},
47
// allow all imports from within tests
58
overrides: [
69
{

packages/sdk/src/contracts/prebuilt-implementations/nft-drop.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ import {
3838
import { UploadProgressEvent } from "../../types/events";
3939
import type { DropERC721 } from "@thirdweb-dev/contracts-js";
4040
import type ABI from "@thirdweb-dev/contracts-js/dist/abis/DropERC721.json";
41-
import {
42-
TokensClaimedEvent,
43-
TokensLazyMintedEvent,
44-
} from "@thirdweb-dev/contracts-js/dist/declarations/src/DropERC721";
41+
import { TokensLazyMintedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/DropERC721";
4542
import { ThirdwebStorage } from "@thirdweb-dev/storage";
4643
import {
4744
BigNumber,

packages/sdk/src/core/types.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import type { CONTRACTS_MAP, PREBUILT_CONTRACTS_MAP } from "../contracts";
22
import type { SmartContract } from "../contracts/smart-contract";
3-
import {
4-
BigNumber,
5-
BytesLike,
6-
CallOverrides,
7-
Signer,
8-
providers,
9-
BigNumberish,
10-
} from "ethers";
3+
import { BigNumber, BytesLike, CallOverrides, Signer, providers } from "ethers";
114

125
// --- utility types extracted from from ts-toolbelt --- //
136

packages/sdk/test/custom.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ describe("Custom Contracts", async () => {
418418
});
419419

420420
it("should detect feature: erc20 signature mintable", async () => {
421-
const c = await sdk.getContractFromAbi(
421+
const c = sdk.getContractFromAbi(
422422
tokenContractAddress,
423423
TokenERC20__factory.abi,
424424
);

0 commit comments

Comments
 (0)