resolve conflict

.deepsource.toml

@@ -4,4 +4,8 @@ version = 1
 name = "secrets"
 
 [[analyzers]]
-name = "javascript"
+name = "javascript"
+
+[[analyzers]]
+name = "secrets"
+enabled = true

.prettierrc.js

@@ -1 +1,10 @@
-module.exports = require('@ikscodes/prettier-config');
+/**
+ * @type {import("prettier").Config}
+ */
+const config = {
+  arrowParens: 'avoid',
+  printWidth: 120,
+  singleQuote: true,
+};
+
+module.exports = config;

BUILD_SYSTEM.md

@@ -4,7 +4,7 @@ This monorepo implements a custom build system using a combination of tools:
 
 - [Yarn](https://yarnpkg.com) (for dependency management)
 - [`wsrun`](https://github.com/hfour/wsrun) (for running workspace scripts)
-- [ESBuild](https://esbuild.github.io) (for transpilation, minifaction, and bundling of source codes)
+- [ESBuild](https://esbuild.github.io) (for transpilation, minification, and bundling of source codes)
 - [TypeScript](https://www.typescriptlang.org) (for static typing)
 - [ESLint](https://eslint.org) (for TypeScript/JavaScript linting)
 

CHANGELOG.md

@@ -1,3 +1,146 @@
+# (Mon Nov 25 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-ext/[email protected]`, `@magic-sdk/[email protected]`
+  - feat: implement OAuth login with Popup [#828](https://github.com/magiclabs/magic-js/pull/828) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov))
+
+#### Authors: 1
+
+- [@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov)
+
+---
+
+# (Fri Nov 15 2024)
+
+#### 🐛 Bug Fix
+
+- `@magic-ext/[email protected]`
+  - feat: add customData property to OAuthRedirectConfiguration [#837](https://github.com/magiclabs/magic-js/pull/837) ([@romin-halltari](https://github.com/romin-halltari))
+
+#### Authors: 1
+
+- [@romin-halltari](https://github.com/romin-halltari)
+
+---
+
+# (Fri Nov 15 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`, `@magic-sdk/[email protected]`
+  - feat: implement transition from recover account to update email flow … [#833](https://github.com/magiclabs/magic-js/pull/833) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov))
+  - Pdeexp 1544 implement magic auth recover account provider [#832](https://github.com/magiclabs/magic-js/pull/832) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov))
+
+#### Authors: 1
+
+- [@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov)
+
+---
+
+# (Fri Oct 25 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`, `@magic-sdk/[email protected]`
+  - Pdeexp 1951 lost device event does not emit whitelabel mfa provider [#826](https://github.com/magiclabs/magic-js/pull/826) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov) [@Ethella](https://github.com/Ethella))
+
+#### 🐛 Bug Fix
+
+- `@magic-sdk/[email protected]`
+  - feat: add invalid-recovery-code type to loginWithEmailOtp [#827](https://github.com/magiclabs/magic-js/pull/827) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov))
+  - Pdeexp 1951 lost device event does not emit whitelabel mfa [#825](https://github.com/magiclabs/magic-js/pull/825) ([@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov))
+
+#### Authors: 2
+
+- [@sherzod-bakhodirov](https://github.com/sherzod-bakhodirov)
+- Jerry Liu ([@Ethella](https://github.com/Ethella))
+
+---
+
+# (Fri Oct 25 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`, `@magic-sdk/[email protected]`
+  - fix: cancel event for recovery factor [#829](https://github.com/magiclabs/magic-js/pull/829) ([@sukhrobbekodilov](https://github.com/sukhrobbekodilov))
+
+#### Authors: 1
+
+- [@sukhrobbekodilov](https://github.com/sukhrobbekodilov)
+
+---
+
+# (Tue Oct 22 2024)
+
+#### 🚀 Enhancement
+
+- `[email protected]`
+  - feat: add iframe heartbeat implementation. [#816](https://github.com/magiclabs/magic-js/pull/816) ([@khamdam-magic](https://github.com/khamdam-magic))
+
+#### Authors: 1
+
+- [@khamdam-magic](https://github.com/khamdam-magic)
+
+---
+
+# (Fri Oct 18 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`
+  - feat: a new type for malformed phone number [#821](https://github.com/magiclabs/magic-js/pull/821) ([@sukhrobbekodilov](https://github.com/sukhrobbekodilov))
+
+#### Authors: 1
+
+- [@sukhrobbekodilov](https://github.com/sukhrobbekodilov)
+
+---
+
+# (Fri Oct 18 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`, `@magic-sdk/[email protected]`
+  - feat: recovery facto whitelabeling [#818](https://github.com/magiclabs/magic-js/pull/818) ([@sukhrobbekodilov](https://github.com/sukhrobbekodilov))
+
+#### 🐛 Bug Fix
+
+- Update .deepsource.toml [#804](https://github.com/magiclabs/magic-js/pull/804) ([@Magic-Brandan](https://github.com/Magic-Brandan))
+
+#### Authors: 2
+
+- [@Magic-Brandan](https://github.com/Magic-Brandan)
+- [@sukhrobbekodilov](https://github.com/sukhrobbekodilov)
+
+---
+
+# (Thu Oct 10 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-ext/[email protected]`
+  - kadena [#813](https://github.com/magiclabs/magic-js/pull/813) ([@hcote](https://github.com/hcote))
+
+#### Authors: 1
+
+- Hunter Cote ([@hcote](https://github.com/hcote))
+
+---
+
+# (Thu Oct 10 2024)
+
+#### 🚀 Enhancement
+
+- `@magic-sdk/[email protected]`
+  - feat: add ping pong types for heartbeat [#815](https://github.com/magiclabs/magic-js/pull/815) ([@khamdam-magic](https://github.com/khamdam-magic))
+
+#### Authors: 1
+
+- [@khamdam-magic](https://github.com/khamdam-magic)
+
+---
+
 # (Wed Sep 25 2024)
 
 #### 🚀 Enhancement

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Please note we have a **code of conduct**, please follow it in all your interact
 
 ## Setting up for local development
 
-1. Fork this repostiory.
+1. Fork this repository.
 2. Clone your fork.
 3. Create a new branch in your local repository with the following pattern:
 
@@ -44,10 +44,10 @@ To ensure ESLint is able to properly lint source files in your VS Code developme
 | NPM Script | Usage | Description |
 | ---------- | ----- | ----------- |
 | `wsrun` | `PKG=$PACKAGE_TARGET yarn wsrun` | Execute arbitrary scripts via `wsrun` for the specified package, or interactively select a package if `$PKG` is omitted. |
-| `wsrun:all` | `yarn wsrun` | Execute arbitrary scripts via `wsrun` for the all packages in the monorepo (same as `PKG=* yarn wsrun ...`). |
+| `wsrun:all` | `yarn wsrun` | Execute arbitrary scripts via `wsrun` for all packages in the monorepo (same as `PKG=* yarn wsrun ...`). |
 | `dev` | `PKG=$PACKAGE_TARGET yarn dev` | Build the specified package with a hot-reloading dev server, or interactively select a package if `$PKG` is omitted. |
 | `build` | `PKG=$PACKAGE_TARGET yarn build` | Build the specified package for production, or interactively select a package if `$PKG` is omitted. |
-| `clean` | `PKG=$PACKAGE_TARGET yarn clean` | Run cleaning scripts for the specified package,or interactively select a package if `$PKG` is omitted. Available flags: (`--cache`, `--test-artifacts`, `--deps`) |
+| `clean` | `PKG=$PACKAGE_TARGET yarn clean` | Run cleaning scripts for the specified package, or interactively select a package if `$PKG` is omitted. Available flags: (`--cache`, `--test-artifacts`, `--deps`) |
 | `lint` | `PKG=$PACKAGE_TARGET yarn lint` | Run the linter for the specified package, or interactively select a package if `$PKG` is omitted. |
 | `test` | `PKG=$PACKAGE_TARGET yarn test` | Run tests for the specified package, or interactively select a package if `$PKG` is omitted. |
 
@@ -59,7 +59,7 @@ To ensure ESLint is able to properly lint source files in your VS Code developme
 
 ## Cutting a release
 
-We use [`auto`](https://github.com/intuit/auto) as our continous delivery tool. Cutting a release is just a matter of merging to `master`. For pre-releases, you can create a `next` branch as the base for your experimental/W.I.P. feature. Please familiarize yourself with the [documentation for `auto`](https://intuit.github.io/auto/docs) if you are in a position to cut a release.
+We use [`auto`](https://github.com/intuit/auto) as our continuous delivery tool. Cutting a release is just a matter of merging to `master`. For pre-releases, you can create a `next` branch as the base for your experimental/W.I.P. feature. Please familiarize yourself with the [documentation for `auto`](https://intuit.github.io/auto/docs) if you are in a position to cut a release.
 
 ---
 

eslint.config.mjs

@@ -0,0 +1,75 @@
+import tsLint from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+import globals from 'globals';
+import jsxA11Y from 'eslint-plugin-jsx-a11y';
+import prettier from 'eslint-plugin-prettier';
+import importPlugin from 'eslint-plugin-import';
+import js from '@eslint/js';
+
+export default [
+  js.configs.recommended,
+  {
+    ignores: [
+      '**/node_modules',
+      '**/coverage',
+      '**/dist',
+      '**/jest.config.ts',
+      'scripts/bin/scaffold/template/**/*',
+      '.prettierrc.js',
+    ],
+  },
+  {
+    plugins: {
+      '@typescript-eslint': tsLint,
+      'jsx-a11y': jsxA11Y,
+      prettier,
+      importPlugin,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+      },
+
+      parser: tsParser,
+      ecmaVersion: 12,
+      sourceType: 'module',
+    },
+
+    files: ['**/*.ts', '**/*.tsx'],
+
+    rules: {
+      'no-alert': 'off',
+      'no-dupe-class-members': 'off',
+      'no-underscore-dangle': 'off',
+      'no-useless-constructor': 'off',
+      'no-unused-vars': 'off',
+      'no-redeclare': 'off',
+      'class-methods-use-this': 'off',
+      'importPlugin/extensions': 'off',
+      'importPlugin/no-extraneous-dependencies': 'off',
+      '@typescript-eslint/ban-types': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/await-thenable': 'off',
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-floating-promises': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-useless-constructor': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/restrict-template-expressions': 'off',
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+    },
+
+    settings: {
+      'importPlugin/resolver': {
+        typescript: {
+          directory: ['**/tsconfig.json'],
+        },
+      },
+    },
+  },
+];