Use eslint to run prettier (#1463)

* sort packages

* consolidate prettier under eslint fix

* lint and lock files

app/Gemfile.lock

@@ -14,16 +14,16 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1184.0)
-    aws-sdk-core (3.237.0)
+    aws-partitions (1.1190.0)
+    aws-sdk-core (3.239.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -31,10 +31,10 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.117.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.203.1)
+    aws-sdk-s3 (1.206.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -87,7 +87,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
@@ -231,7 +231,7 @@ GEM
     mini_portile2 (2.8.9)
     minitest (5.26.2)
     molinillo (0.8.0)
-    multi_json (1.17.0)
+    multi_json (1.18.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
@@ -311,4 +311,4 @@ RUBY VERSION
    ruby 3.2.7p253
 
 BUNDLED WITH
-   2.4.19
+   2.6.9

app/ios/Podfile.lock

@@ -2201,7 +2201,7 @@ DEPENDENCIES:
   - lottie-ios
   - lottie-react-native (from `../node_modules/lottie-react-native`)
   - Mixpanel-swift (~> 5.0.0)
-  - NFCPassportReader (from `https://github.com/selfxyz/NFCPassportReader.git`, commit `9eff7c4e3a9037fdc1e03301584e0d5dcf14d76b`)
+  - "NFCPassportReader (from `git@github.com:selfxyz/NFCPassportReader.git`, commit `9eff7c4e3a9037fdc1e03301584e0d5dcf14d76b`)"
   - QKMRZScanner
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -2340,7 +2340,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/lottie-react-native"
   NFCPassportReader:
     :commit: 9eff7c4e3a9037fdc1e03301584e0d5dcf14d76b
-    :git: https://github.com/selfxyz/NFCPassportReader.git
+    :git: "git@github.com:selfxyz/NFCPassportReader.git"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTDeprecation:
@@ -2517,15 +2517,15 @@ EXTERNAL SOURCES:
 CHECKOUT OPTIONS:
   NFCPassportReader:
     :commit: 9eff7c4e3a9037fdc1e03301584e0d5dcf14d76b
-    :git: https://github.com/selfxyz/NFCPassportReader.git
+    :git: "git@github.com:selfxyz/NFCPassportReader.git"
   SwiftQRScanner:
     :commit: c71ff91297640a944de4bca61434155c3f9b0979
     :git: https://github.com/vinodiOS/SwiftQRScanner
 
 SPEC CHECKSUMS:
   AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
-  boost: 4cb898d0bf20404aab1850c656dcea009429d6c1
-  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  boost: 1dca942403ed9342f98334bf4c3621f011aa7946
+  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 7605ea4810e0e10ae4815292433c09bf4324ba45
   Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
@@ -2540,7 +2540,7 @@ SPEC CHECKSUMS:
   FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
   FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
   fmt: 01b82d4ca6470831d1cc0852a1af644be019e8f6
-  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
+  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15

app/package.json

@@ -29,11 +29,13 @@
     "format": "yarn nice",
     "ia": "yarn install-app",
     "imports:fix": "node ./scripts/alias-imports.cjs",
+    "postinstall": "npx patch-package --patch-dir ../patches || true",
     "install-app": "yarn install-app:setup && yarn clean:xcode-env-local",
     "install-app:mobile-deploy": "yarn install && yarn build:deps && yarn clean:xcode-env-local",
     "install-app:setup": "yarn install && yarn build:deps && yarn setup:android-deps && cd ios && bundle install && scripts/pod-install-with-cache-fix.sh && cd ..",
     "ios": "yarn build:deps && node scripts/run-ios-simulator.cjs",
     "ios:fastlane-debug": "yarn reinstall && bundle exec fastlane --verbose ios internal_test",
+    "jest:run": "node ./node_modules/jest/bin/jest.js",
     "lint": "eslint . --cache --cache-location .eslintcache",
     "lint:fix": "eslint --fix . --cache --cache-location .eslintcache",
     "mobile-deploy": "node scripts/mobile-deploy-confirm.cjs both",
@@ -42,8 +44,7 @@
     "mobile-local-deploy": "FORCE_UPLOAD_LOCAL_DEV=true node scripts/mobile-deploy-confirm.cjs both",
     "mobile-local-deploy:android": "FORCE_UPLOAD_LOCAL_DEV=true node scripts/mobile-deploy-confirm.cjs android",
     "mobile-local-deploy:ios": "FORCE_UPLOAD_LOCAL_DEV=true node scripts/mobile-deploy-confirm.cjs ios",
-    "nice": "sh -c 'if [ -z \"$SKIP_BUILD_DEPS\" ]; then yarn build:deps; fi; yarn imports:fix && yarn lint:fix && yarn fmt:fix'",
-    "postinstall": "npx patch-package --patch-dir ../patches || true",
+    "nice": "sh -c 'if [ -z \"$SKIP_BUILD_DEPS\" ]; then yarn build:deps; fi; yarn imports:fix && yarn lint:fix'",
     "reinstall": "yarn --top-level run reinstall-app",
     "release": "./scripts/release.sh",
     "release:major": "./scripts/release.sh major",
@@ -67,7 +68,6 @@
     "test:tree-shaking": "node ./scripts/test-tree-shaking.cjs",
     "test:web-build": "yarn jest:run tests/web-build-render.test.ts --testTimeout=180000",
     "types": "tsc --noEmit",
-    "jest:run": "node ./node_modules/jest/bin/jest.js",
     "watch:sdk": "yarn workspace @selfxyz/mobile-sdk-alpha watch",
     "web": "vite",
     "web:build": "yarn build:deps && vite build",

app/src/services/points/utils.ts

@@ -8,10 +8,7 @@ import { SelfAppBuilder } from '@selfxyz/common/utils/appType';
 
 import { selfLogoReverseUrl } from '@/consts/links';
 import { getOrGeneratePointsAddress } from '@/providers/authProvider';
-import {
-  POINTS_API_BASE_URL,
-  POINTS_TOKEN_CONTRACT_ADDRESS,
-} from '@/services/points/constants';
+import { POINTS_API_BASE_URL } from '@/services/points/constants';
 import type { IncomingPoints } from '@/services/points/types';
 
 export type WhitelistedContract = {

circuits/package.json

@@ -19,13 +19,13 @@
     "nice": "prettier --write .",
     "test": "yarn test-base 'tests/**/*.test.ts' --exit",
     "test-base": "yarn ts-mocha -n import=tsx --max-old-space-size=8192 --paths -p tsconfig.json",
-    "test-gcp-jwt-verifier": "yarn test-base 'tests/gcp_jwt_verifier/gcp_jwt_verifier.test.ts' --exit",
     "test-custom-hasher": "yarn test-base 'tests/other_circuits/custom_hasher.test.ts' --exit",
     "test-disclose": "yarn test-base 'tests/disclose/vc_and_disclose.test.ts' --exit",
     "test-disclose-aadhaar": "yarn test-base 'tests/disclose/vc_and_disclose_aadhaar.test.ts' --exit",
     "test-disclose-id": "yarn test-base 'tests/disclose/vc_and_disclose_id.test.ts' --exit",
     "test-dsc": "yarn test-base --max-old-space-size=51200 'tests/dsc/dsc.test.ts' --exit",
     "test-ecdsa": "yarn test-base 'tests/utils/ecdsa.test.ts' --exit",
+    "test-gcp-jwt-verifier": "yarn test-base 'tests/gcp_jwt_verifier/gcp_jwt_verifier.test.ts' --exit",
     "test-is-older-than": "yarn test-base 'tests/other_circuits/is_older_than.test.ts' --exit",
     "test-is-valid": "yarn test-base 'tests/other_circuits/is_valid.test.ts' --exit",
     "test-not-in-list": "yarn test-base 'tests/other_circuits/prove_country_is_not_in_list.test.ts' --exit",

packages/mobile-sdk-alpha/package.json

@@ -134,10 +134,10 @@
     "build:ts-only": "tsup && yarn postbuild",
     "fmt": "prettier --check .",
     "fmt:fix": "prettier --write .",
-    "format": "sh -c 'if [ -z \"$SKIP_BUILD_DEPS\" ]; then yarn nice; else yarn fmt:fix; fi'",
+    "format": "yarn nice",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "nice": "yarn lint:fix && yarn fmt:fix",
+    "nice": "yarn lint:fix",
     "prepublishOnly": "npm run build && npm run typecheck && npm run validate:exports && npm run validate:pkg",
     "report:exports": "node ./scripts/report-exports.mjs",
     "test": "vitest run",

packages/mobile-sdk-demo/package.json

@@ -12,14 +12,14 @@
     "prebuild": "yarn workspace @selfxyz/mobile-sdk-alpha build",
     "build": "yarn prebuild && tsc -p tsconfig.json --noEmit --pretty false",
     "clean": "rm -rf ios/build android/app/build android/build && cd android && ./gradlew clean && cd ..",
-    "format": "prettier --write .",
+    "format": "yarn nice",
     "ia": "yarn install-app",
     "install-app": "yarn install && yarn prebuild && cd ios && pod install && cd ..",
     "preios": "yarn prebuild",
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
-    "nice": "yarn lint:fix && yarn format",
+    "nice": "yarn lint:fix",
     "reinstall": "yarn clean && yarn install && yarn prebuild && cd ios && pod install && cd ..",
     "start": "react-native start",
     "test": "vitest run",

sdk/sdk-common/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@selfxyz/sdk-common",
-  "type": "module",
   "version": "1.0.0",
   "description": "",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/esm/index.d.ts",
+  "keywords": [],
+  "license": "ISC",
+  "author": "",
+  "type": "module",
   "exports": {
     ".": {
       "import": {
@@ -18,20 +18,20 @@
       }
     }
   },
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
   "files": [
     "./dist/**/*"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "typescript": "^5.9.2"
+    "build": "tsc -p tsconfig.json && tsc -p tsconfig.cjs.json",
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
     "uuid": "^13.0.0"
+  },
+  "devDependencies": {
+    "typescript": "^5.9.2"
   }
 }