Merge remote-tracking branch 'origin/master' into devin/1744245477-implement-login-with-popup-v2

Author: Ethella

eslint.config.mjs

@@ -15,7 +15,9 @@ export default [
       '**/dist',
       '**/jest.config.ts',
       'scripts/bin/scaffold/template/**/*',
-      '.prettierrc.js',
+      '**/.prettierrc.js',
+      '**/README.md',
+      '**/babel.config.js',
     ],
   },
   {
@@ -41,6 +43,7 @@ export default [
     files: ['**/*.ts', '**/*.tsx'],
 
     rules: {
+      'no-undef': 0,
       'no-alert': 'off',
       'no-dupe-class-members': 'off',
       'no-underscore-dangle': 'off',
@@ -72,4 +75,13 @@ export default [
       },
     },
   },
+  {
+    files: ['**/*.spec.*'],
+
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/naming-convention': 'off',
+      '@typescript-eslint/use-unknown-in-catch-callback-variable': 'off',
+    },
+  },
 ];

jest.config.ts

@@ -7,6 +7,7 @@ const config: Config.InitialOptions = {
   collectCoverageFrom: ['./src/**/*.{ts,tsx,}'],
   collectCoverage: true,
   testTimeout: 30000, // 30s
+  testEnvironment: 'jsdom',
   coverageThreshold: {
     global: {
       lines: 99,

lerna.json

@@ -1,5 +1,4 @@
 {
   "version": "independent",
-  "command": {
-  }
+  "command": {}
 }

package.json

@@ -14,60 +14,57 @@
     "postinstall": "husky install"
   },
   "devDependencies": {
+    "@babel/core": "^7.26.10",
     "@babel/plugin-transform-modules-commonjs": "^7.26.3",
+    "@babel/runtime": "^7.27.0",
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
-    "@ikscodes/browser-env": "~0.3.1",
     "@istanbuljs/nyc-config-typescript": "~0.1.3",
+    "@peculiar/webcrypto": "^1.5.0",
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.1.1",
     "@types/is-ci": "^3.0.0",
-    "@types/jest": "^27.0.0",
+    "@types/jest": "^29.5.12",
     "@types/jsdom": "~12.2.4",
     "@types/lodash": "^4.14.172",
-    "@types/react": "^18.0.26",
-    "@types/react-native": "^0.70.5",
+    "@types/react": "^19.1.0",
     "@types/rimraf": "^3.0.2",
     "@types/tsc-watch": "^4.2.0",
     "@types/whatwg-url": "^6.4.0",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "7.12.0",
+    "@typescript-eslint/eslint-plugin": "^8.29.1",
+    "@typescript-eslint/parser": "^8.29.1",
     "auto": "^11.1.2",
-    "babel-jest": "^27.0.6",
+    "babel-jest": "^29.7.0",
     "brotli-size": "^4.0.0",
     "chalk": "~4.1.2",
     "enquirer": "^2.3.6",
-    "esbuild": "^0.14.13",
-    "eslint": "9.14.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "esbuild": "0.25.2",
+    "eslint": "^9.24.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-prettier": "^5.2.6",
     "execa": "~5.1.1",
     "fs-extra": "^10.0.0",
     "globals": "^15.12.0",
     "gzip-size": "^6.0.0",
     "husky": "^7.0.1",
     "inquirer": "^8.1.2",
     "is-ci": "^3.0.0",
-    "jest": "^27.0.6",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "lerna": "8.0.2",
     "lint-staged": "^10.0.7",
+    "localforage-driver-memory": "^1.0.5",
     "lodash": "^4.17.21",
     "meow": "9.0.0",
     "npm-run-all": "^4.1.5",
     "nyc": "13.1.0",
     "ora": "~5.4.1",
     "p-limit": "^3.1.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.5.3",
     "pretty-bytes": "^5.6.0",
-    "react": "^16.13.1",
-    "react-native": "^0.62.2",
-    "regenerator-runtime": "0.13.9",
+    "react": "^19.1.0",
     "replace-in-file": "^6.1.0",
     "rimraf": "~3.0.2",
     "ts-jest": "^29.3.0",
@@ -86,8 +83,7 @@
     ]
   },
   "resolutions": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "eslint": "9.14.0"
+    "@rollup/plugin-commonjs": "^17.0.0"
   },
   "repository": "magiclabs/magic-js",
   "author": "Magic Labs <[email protected]>",

packages/@magic-ext/aptos/test/setup.ts

@@ -1,9 +1,6 @@
 // NOTE: This module is automatically included at the top of each test file.
-import browserEnv from '@ikscodes/browser-env';
 import { mockConsole } from '../../../../scripts/utils/mock-console';
 
-browserEnv();
-
 beforeEach(() => {
   mockConsole();
 });

packages/@magic-ext/aptos/test/spec/aptos-extension.spec.ts

@@ -1,8 +1,8 @@
-import browserEnv from '@ikscodes/browser-env';
 import { BCS, TxnBuilderTypes } from 'aptos';
 import { createMagicSDKWithExtension } from '../../../../@magic-sdk/provider/test/factories';
 import { AptosExtension } from '../../src';
 import { AptosPayloadMethod } from '../../src/type';
+import { TextEncoder, TextDecoder } from 'util';
 
 const APTOS_NODE_URL = 'https://fullnode.testnet.aptoslabs.com';
 
@@ -31,8 +31,12 @@ const MESSAGE_PAYLOAD = {
   nonce: 'random-nonce',
 };
 
+beforeAll(() => {
+  Object.assign(global, { TextEncoder, TextDecoder });
+})
+
 beforeEach(() => {
-  browserEnv.restore();
+  jest.resetAllMocks();
 });
 
 test('Construct GetAccount request with `aptos_getAccount`', async () => {

packages/@magic-ext/aptos/test/spec/magic-aptos-wallet.spec.ts

@@ -1,4 +1,3 @@
-import browserEnv from '@ikscodes/browser-env';
 import { BCS, TxnBuilderTypes } from 'aptos';
 import { createMagicSDKWithExtension } from '../../../../@magic-sdk/provider/test/factories';
 import { AptosExtension, MagicAptosWallet } from '../../src';
@@ -33,7 +32,7 @@ const MOCK_ACCOUTN_INFO = {
 };
 
 beforeEach(() => {
-  browserEnv.restore();
+  jest.resetAllMocks();
 });
 
 test('Call connect()', async () => {

packages/@magic-ext/aptos/test/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "../../../../tsconfig.settings.test.json",
+  "extends": "../../../../tsconfig.settings.test.json"
 }

packages/@magic-ext/gdkms/package.json

@@ -30,7 +30,6 @@
   },
   "devDependencies": {
     "@magic-sdk/commons": "^25.0.5",
-    "@magic-sdk/types": "^24.18.1",
-    "@peculiar/webcrypto": "^1.4.3"
+    "@magic-sdk/types": "^24.18.1"
   }
 }

packages/@magic-ext/gdkms/test/setup.ts

@@ -1,9 +1,7 @@
 // NOTE: This module is automatically included at the top of each test file.
-import browserEnv from '@ikscodes/browser-env';
 import { Crypto } from '@peculiar/webcrypto';
 import { mockConsole } from '../../../../scripts/utils/mock-console';
 
-browserEnv();
 (window as any).crypto = new Crypto();
 
 beforeEach(() => {