From afc1b1fcabd54ffb6a2df2a38c296820f9cf6a30 Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Mon, 29 Jul 2024 19:04:52 -0600 Subject: [PATCH] Fix linting, update package version to 5.0.0 --- CHANGELOG.md | 11 ++++++++++ core/utils/templateMappings.ts | 21 ++++++++++++------- package.json | 2 +- scaffolds/nextjs-dedicated-wallet/scaffold.ts | 2 +- .../nextjs-flow-dedicated-wallet/scaffold.ts | 2 +- .../scaffold.ts | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a32413b..860c8a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# v5.0.0 (Mon Jul 29 2024) + +#### 💥 Breaking Change + +- Removes Universal support with associated flags, prompts, and templates +- Adds architectural updates to EVM templates + +#### Authors: 1 + +- pbillingsby ([@PBillingsby](https://github.com/PBillingsby)) + # v4.13.0 (Fri Apr 12 2024) #### 🚀 Enhancement diff --git a/core/utils/templateMappings.ts b/core/utils/templateMappings.ts index 353c394..4127482 100644 --- a/core/utils/templateMappings.ts +++ b/core/utils/templateMappings.ts @@ -19,10 +19,7 @@ import SolanaDedicatedScaffold, { import { Timer } from './timer'; export type Chain = 'evm' | 'solana' | 'flow'; -export type Template = - | 'nextjs-dedicated-wallet' - | 'nextjs-solana-dedicated-wallet' - | 'nextjs-flow-dedicated-wallet'; +export type Template = 'nextjs-dedicated-wallet' | 'nextjs-solana-dedicated-wallet' | 'nextjs-flow-dedicated-wallet'; type ConfigType = CreateMagicAppConfig & { chain: Chain | undefined; @@ -152,9 +149,20 @@ export const buildTemplate = async (appConfig: ConfigType): Promise case 'evm': config.network = await BlockchainNetworkPrompt.evmNetworkPrompt(); break; + default: + config.network = await BlockchainNetworkPrompt.evmNetworkPrompt(); + break; } } else { - const evmNetworks = ['ethereum', 'ethereum-sepolia', 'polygon', 'polygon-amoy', 'etherlink-testnet', 'zksync', 'zksync-sepolia']; + const evmNetworks = [ + 'ethereum', + 'ethereum-sepolia', + 'polygon', + 'polygon-amoy', + 'etherlink-testnet', + 'zksync', + 'zksync-sepolia', + ]; const solanaNetworks = ['solana-devnet', 'solana-mainnet']; if (evmNetworks.includes(config.network)) { @@ -166,8 +174,7 @@ export const buildTemplate = async (appConfig: ConfigType): Promise } } - config.template = config.chain === 'flow' ? - 'nextjs-flow-dedicated-wallet' : 'nextjs-dedicated-wallet'; + config.template = config.chain === 'flow' ? 'nextjs-flow-dedicated-wallet' : 'nextjs-dedicated-wallet'; config.isChosenTemplateValid = true; return config; diff --git a/package.json b/package.json index 9927d05..ef029d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "make-magic", - "version": "4.13.0", + "version": "5.0.0", "description": "A tool for quickly scaffolding an app with Magic authentication baked-in!", "repository": "magiclabs/create-magic-app", "license": "MIT", diff --git a/scaffolds/nextjs-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-dedicated-wallet/scaffold.ts index c1aa68a..7ca8365 100644 --- a/scaffolds/nextjs-dedicated-wallet/scaffold.ts +++ b/scaffolds/nextjs-dedicated-wallet/scaffold.ts @@ -1,6 +1,6 @@ import { Flags } from '../../core/flags'; import BaseScaffold, { ExecaCommand } from '../../core/types/BaseScaffold'; -import { AuthTypePrompt, BlockchainNetworkPrompt, PublishableApiKeyPrompt } from '../../scaffolds/prompts'; +import { AuthTypePrompt, BlockchainNetworkPrompt, PublishableApiKeyPrompt } from '../prompts'; export type Data = BlockchainNetworkPrompt.Data & PublishableApiKeyPrompt.Data & AuthTypePrompt.Data; diff --git a/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts index 2cf5614..3422379 100644 --- a/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts +++ b/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts @@ -1,6 +1,6 @@ import { Flags } from '../../core/flags'; import BaseScaffold, { ExecaCommand } from '../../core/types/BaseScaffold'; -import { AuthTypePrompt, NpmClientPrompt, PublishableApiKeyPrompt } from '../../scaffolds/prompts'; +import { AuthTypePrompt, NpmClientPrompt, PublishableApiKeyPrompt } from '../prompts'; export type Data = NpmClientPrompt.Data & PublishableApiKeyPrompt.Data & AuthTypePrompt.Data; diff --git a/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts index 91daf9e..b9423db 100644 --- a/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts +++ b/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts @@ -1,6 +1,6 @@ import { Flags } from '../../core/flags'; import BaseScaffold, { ExecaCommand } from '../../core/types/BaseScaffold'; -import { AuthTypePrompt, NpmClientPrompt, PublishableApiKeyPrompt } from '../../scaffolds/prompts'; +import { AuthTypePrompt, NpmClientPrompt, PublishableApiKeyPrompt } from '../prompts'; export type Data = NpmClientPrompt.Data & PublishableApiKeyPrompt.Data & AuthTypePrompt.Data;