Revert "Remove Extension class and rename InternalExtension to MagicExtension…" (#882)

Ethella · web-flow · commit 8b01b7758f1c · 2025-04-23T16:44:18.000Z
This reverts commit d3d0911.
diff --git a/packages/@magic-ext/algorand/src/index.ts b/packages/@magic-ext/algorand/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { AlgorandConfig, AlgorandPayloadMethod } from './types';
 
-export class AlgorandExtension extends MagicExtension<'algod', any> {
+export class AlgorandExtension extends Extension.Internal<'algod', any> {
   name = 'algod' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/aptos/src/index.ts b/packages/@magic-ext/aptos/src/index.ts
@@ -1,4 +1,4 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 
 // @ts-ignore
 import { AptosClient, BCS, TxnBuilderTypes, Types, getAddressFromAccountOrAddress } from 'aptos';
@@ -7,7 +7,7 @@ import { AptosConfig, AptosPayloadMethod } from './type';
 import { APTOS_PAYLOAD_TYPE } from './constants';
 
 export { MagicAptosWallet } from './MagicAptosWallet';
-export class AptosExtension extends MagicExtension<'aptos', any> {
+export class AptosExtension extends Extension.Internal<'aptos', any> {
   name = 'aptos' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/avalanche/src/index.ts b/packages/@magic-ext/avalanche/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { AvaxConfig } from './types';
 
-export class AvalancheExtension extends MagicExtension<'avax', any> {
+export class AvalancheExtension extends Extension.Internal<'avax', any> {
   name = 'avax' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/bitcoin/src/index.ts b/packages/@magic-ext/bitcoin/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { BitcoinConfig, BitcoinPayloadMethod } from './types';
 
-export class BitcoinExtension extends MagicExtension<'bitcoin', any> {
+export class BitcoinExtension extends Extension.Internal<'bitcoin', any> {
   name = 'bitcoin' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/conflux/src/index.ts b/packages/@magic-ext/conflux/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { ConfluxPayloadMethod, ConfluxConfig } from './types';
 
-export class ConfluxExtension extends MagicExtension<'conflux', any> {
+export class ConfluxExtension extends Extension.Internal<'conflux', any> {
   name = 'conflux' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/cosmos/src/index.ts b/packages/@magic-ext/cosmos/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { CosmosConfig, CosmosPayloadMethod } from './type';
 
-export class CosmosExtension extends MagicExtension<'cosmos', any> {
+export class CosmosExtension extends Extension.Internal<'cosmos', any> {
   name = 'cosmos' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/ed25519/src/index.ts b/packages/@magic-ext/ed25519/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { Ed25519PayloadMethod } from './types';
 
-export class Ed25519Extension extends MagicExtension<'ed', any> {
+export class Ed25519Extension extends Extension.Internal<'ed', any> {
   name = 'ed' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/farcaster/src/index.ts b/packages/@magic-ext/farcaster/src/index.ts
@@ -1,4 +1,4 @@
-import {MagicExtension, FarcasterLoginEventEmit} from '@magic-sdk/commons';
+import {Extension, FarcasterLoginEventEmit} from '@magic-sdk/commons';
 import { FarcasterPayloadMethod } from './types';
 import { isMainFrame, isMobile } from './utils';
 
@@ -71,7 +71,7 @@ type FarcasterLoginEventHandlers = {
   [FarcasterLoginEventEmit.Cancel]: () => void;
 };
 
-export class FarcasterExtension extends MagicExtension<'farcaster'> {
+export class FarcasterExtension extends Extension.Internal<'farcaster'> {
   name = 'farcaster' as const;
   config = {};
 
diff --git a/packages/@magic-ext/flow/src/index.ts b/packages/@magic-ext/flow/src/index.ts
@@ -1,10 +1,10 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 
 // @ts-ignore
 import * as fcl from '@onflow/fcl';
 import { FlowConfig, FlowPayloadMethod } from './type';
 
-export class FlowExtension extends MagicExtension<'flow', any> {
+export class FlowExtension extends Extension.Internal<'flow', any> {
   name = 'flow' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/gdkms/src/index.ts b/packages/@magic-ext/gdkms/src/index.ts
@@ -1,6 +1,6 @@
-import { MagicExtension, MagicPayloadMethod } from '@magic-sdk/commons';
+import { Extension, MagicPayloadMethod } from '@magic-sdk/commons';
 
-export class GDKMSExtension extends MagicExtension<'gdkms', any> {
+export class GDKMSExtension extends Extension.Internal<'gdkms', any> {
   name = 'gdkms' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/harmony/src/index.ts b/packages/@magic-ext/harmony/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { HarmonyPayloadMethod, HarmonyConfig } from './types';
 
-export class HarmonyExtension extends MagicExtension<'harmony', any> {
+export class HarmonyExtension extends Extension.Internal<'harmony', any> {
   name = 'harmony' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/hedera/src/index.ts b/packages/@magic-ext/hedera/src/index.ts
@@ -1,9 +1,9 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { HederaConfig, HederaPayloadMethod } from './types';
 
 export * from './utils';
 
-export class HederaExtension extends MagicExtension<'hedera', any> {
+export class HederaExtension extends Extension.Internal<'hedera', any> {
   name = 'hedera' as const;
   config: any = {};
   network: string;
diff --git a/packages/@magic-ext/icon/src/index.ts b/packages/@magic-ext/icon/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { IconConfig, ConfigType } from './type';
 
-export class IconExtension extends MagicExtension<'icon', IconConfig> {
+export class IconExtension extends Extension.Internal<'icon', IconConfig> {
   name = 'icon' as const;
 
   config: ConfigType;
diff --git a/packages/@magic-ext/kadena/src/index.ts b/packages/@magic-ext/kadena/src/index.ts
@@ -1,4 +1,4 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import {
   UnsignedCommand,
   KadenaConfig,
@@ -10,7 +10,7 @@ import {
   OptimalTransactionsAccount,
 } from './types';
 
-export class KadenaExtension extends MagicExtension<'kadena'> {
+export class KadenaExtension extends Extension.Internal<'kadena'> {
   name = 'kadena' as const;
   config = {};
 
diff --git a/packages/@magic-ext/near/src/index.ts b/packages/@magic-ext/near/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { NearPayloadMethod, NearConfig } from './types';
 
-export class NearExtension extends MagicExtension<'near', any> {
+export class NearExtension extends Extension.Internal<'near', any> {
   name = 'near' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/oauth/src/index.ts b/packages/@magic-ext/oauth/src/index.ts
@@ -1,4 +1,4 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import {
   OAuthErrorData,
   OAuthPayloadMethods,
@@ -8,7 +8,7 @@ import {
 } from './types';
 import { createCryptoChallenge } from './crypto';
 
-export class OAuthExtension extends MagicExtension<'oauth'> {
+export class OAuthExtension extends Extension.Internal<'oauth'> {
   name = 'oauth' as const;
   config = {};
   compat = {
diff --git a/packages/@magic-ext/oauth2/src/index.ts b/packages/@magic-ext/oauth2/src/index.ts
@@ -1,4 +1,4 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import {
   OAuthErrorData,
   OAuthRedirectError,
@@ -20,7 +20,7 @@ declare global {
   }
 }
 
-export class OAuthExtension extends MagicExtension<'oauth2'> {
+export class OAuthExtension extends Extension.Internal<'oauth2'> {
   name = 'oauth2' as const;
   config = {};
   compat = {
diff --git a/packages/@magic-ext/oidc/src/index.ts b/packages/@magic-ext/oidc/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { MagicOpenIdConnectPayloadMethod, LoginWithOpenIdParams } from './types';
 
-export class OpenIdExtension extends MagicExtension<'openid', any> {
+export class OpenIdExtension extends Extension.Internal<'openid', any> {
   name = 'openid' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/polkadot/src/index.ts b/packages/@magic-ext/polkadot/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { PolkadotConfig, ConfigType } from './type';
 
-export class PolkadotExtension extends MagicExtension<'polkadot', PolkadotConfig> {
+export class PolkadotExtension extends Extension.Internal<'polkadot', PolkadotConfig> {
   name = 'polkadot' as const;
 
   config: ConfigType;
diff --git a/packages/@magic-ext/react-native-bare-oauth/src/index.ts b/packages/@magic-ext/react-native-bare-oauth/src/index.ts
@@ -1,5 +1,5 @@
 import { InAppBrowser } from 'react-native-inappbrowser-reborn';
-import { MagicExtension } from '@magic-sdk/react-native-bare';
+import { Extension } from '@magic-sdk/react-native-bare';
 import { getBundleId } from 'react-native-device-info';
 import { createCryptoChallenge } from './crypto';
 import {
@@ -10,7 +10,7 @@ import {
   OAuthRedirectResult,
 } from './types';
 
-export class OAuthExtension extends MagicExtension<'oauth'> {
+export class OAuthExtension extends Extension.Internal<'oauth'> {
   name = 'oauth' as const;
   config = {};
   compat = {
diff --git a/packages/@magic-ext/react-native-expo-oauth/src/index.ts b/packages/@magic-ext/react-native-expo-oauth/src/index.ts
@@ -1,5 +1,5 @@
 import * as WebBrowser from 'expo-web-browser';
-import { MagicExtension } from '@magic-sdk/react-native-expo';
+import { Extension } from '@magic-sdk/react-native-expo';
 import * as Application from 'expo-application';
 import { createCryptoChallenge } from './crypto';
 import {
@@ -10,7 +10,7 @@ import {
   OAuthRedirectResult,
 } from './types';
 
-export class OAuthExtension extends MagicExtension<'oauth'> {
+export class OAuthExtension extends Extension.Internal<'oauth'> {
   name = 'oauth' as const;
   config = {};
   compat = {
diff --git a/packages/@magic-ext/solana/src/index.ts b/packages/@magic-ext/solana/src/index.ts
@@ -1,10 +1,10 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 
 import { SerializeConfig, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { SolanaConfig } from './type';
 import { SOLANA_PAYLOAD_METHODS } from './constants';
 
-export class SolanaExtension extends MagicExtension<'solana', any> {
+export class SolanaExtension extends Extension.Internal<'solana', any> {
   name = 'solana' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/sui/src/index.ts b/packages/@magic-ext/sui/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { SuiConfig, SuiPayloadMethod } from './types';
 
-export class SuiExtension extends MagicExtension<'sui', any> {
+export class SuiExtension extends Extension.Internal<'sui', any> {
   name = 'sui' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/taquito/src/index.ts b/packages/@magic-ext/taquito/src/index.ts
@@ -1,8 +1,8 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { TaquitoConfig, TaquitoPayloadMethod } from './type';
 import { MagicSigner } from './MagicSinger';
 
-export class TaquitoExtension extends MagicExtension<'taquito', any> {
+export class TaquitoExtension extends Extension.Internal<'taquito', any> {
   name = 'taquito' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/terra/src/index.ts b/packages/@magic-ext/terra/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { TerraPayloadMethod, TerraConfig } from './types';
 
-export class TerraExtension extends MagicExtension<'terra', any> {
+export class TerraExtension extends Extension.Internal<'terra', any> {
   name = 'terra' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/tezos/src/index.ts b/packages/@magic-ext/tezos/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { TezosConfig, ConfigType } from './type';
 
-export class TezosExtension extends MagicExtension<'tezos', TezosConfig> {
+export class TezosExtension extends Extension.Internal<'tezos', TezosConfig> {
   name = 'tezos' as const;
 
   config: ConfigType;
diff --git a/packages/@magic-ext/web3modal-ethers5/src/index.ts b/packages/@magic-ext/web3modal-ethers5/src/index.ts
@@ -1,9 +1,9 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { Web3Modal, createWeb3Modal, defaultConfig } from '@web3modal/ethers5';
 import { LocalStorageKeys, ThirdPartyWalletEvents } from '@magic-sdk/types';
 import { Web3ModalExtensionOptions } from './types';
 
-export class Web3ModalExtension extends MagicExtension<'web3modal'> {
+export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
   name = 'web3modal' as const;
   config = {};
   modal: Web3Modal;
diff --git a/packages/@magic-ext/webauthn/src/index.ts b/packages/@magic-ext/webauthn/src/index.ts
@@ -1,4 +1,4 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import {
   RegisterNewUserConfiguration,
   LoginWithWebAuthnConfiguration,
@@ -8,7 +8,7 @@ import {
 } from './types';
 import { transformAssertionForServer, transformNewAssertionForServer } from './utils/webauthn.js';
 
-export class WebAuthnExtension extends MagicExtension<'webauthn', any> {
+export class WebAuthnExtension extends Extension.Internal<'webauthn', any> {
   name = 'webauthn' as const;
   config: any = {};
 
diff --git a/packages/@magic-ext/zilliqa/src/index.ts b/packages/@magic-ext/zilliqa/src/index.ts
@@ -1,7 +1,7 @@
-import { MagicExtension } from '@magic-sdk/commons';
+import { Extension } from '@magic-sdk/commons';
 import { ZilliqaConfig, ConfigType } from './type';
 
-export class ZilliqaExtension extends MagicExtension<'zilliqa', ZilliqaConfig> {
+export class ZilliqaExtension extends Extension.Internal<'zilliqa', ZilliqaConfig> {
   name = 'zilliqa' as const;
 
   config: ConfigType;
diff --git a/packages/@magic-sdk/commons/src/index.ts b/packages/@magic-sdk/commons/src/index.ts
@@ -2,7 +2,7 @@
 // for the public API from this file.
 
 export {
-  MagicExtension,
+  Extension,
   MagicSDKError as SDKError,
   MagicExtensionError as ExtensionError,
   MagicExtensionWarning as ExtensionWarning,
diff --git a/packages/@magic-sdk/pnp/src/pnp-extension.ts b/packages/@magic-sdk/pnp/src/pnp-extension.ts
@@ -1,7 +1,6 @@
 import type { MagicUserMetadata } from '@magic-sdk/types';
-import { MagicExtension } from '@magic-sdk/commons';
 
-export class PlugNPlayExtension extends MagicExtension<'pnp', { isPnP: boolean }> {
+export class PlugNPlayExtension extends window.Magic.Extension.Internal<'pnp', { isPnP: boolean }> {
   config = { isPnP: true };
   name = 'pnp' as const;
 
@@ -10,7 +9,7 @@ export class PlugNPlayExtension extends MagicExtension<'pnp', { isPnP: boolean }
   };
 
   public getLoginMethod(options: { debug?: boolean; termsOfServiceURI?: string; privacyPolicyURI?: string }) {
-    return this.utils.createPromiEvent<[string, string | undefined]>(async resolve => {
+    return this.utils.createPromiEvent<[string, string | undefined]>(async (resolve) => {
       const lastUsedProvider = await this.utils.storage.getItem<string | undefined>(
         PlugNPlayExtension.storageKeys.lastUsedProvider,
       );
diff --git a/packages/@magic-sdk/provider/src/core/sdk.ts b/packages/@magic-sdk/provider/src/core/sdk.ts
diff --git a/packages/@magic-sdk/provider/src/index.ts b/packages/@magic-sdk/provider/src/index.ts
diff --git a/packages/@magic-sdk/provider/src/modules/base-extension.ts b/packages/@magic-sdk/provider/src/modules/base-extension.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/error-factories.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/error-factories.spec.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-error/constructor.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-error/constructor.spec.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-warning/constructor.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-warning/constructor.spec.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-warning/log.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-extension-warning/log.spec.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk/constructor.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk/constructor.spec.ts
diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk/overlay.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk/overlay.spec.ts
diff --git a/scripts/bin/scaffold/template/hybrid/src/index.ts b/scripts/bin/scaffold/template/hybrid/src/index.ts
diff --git a/scripts/bin/scaffold/template/react-native/src/index.ts b/scripts/bin/scaffold/template/react-native/src/index.ts
diff --git a/scripts/bin/scaffold/template/web/src/index.ts b/scripts/bin/scaffold/template/web/src/index.ts
diff --git a/yarn.lock b/yarn.lock
