[C-4289] Make verify call lint instead of lint:fix

.circleci/config.yml

@@ -72,6 +72,7 @@ jobs:
  key: cache-{{ checksum "package-lock.json" }}-{{ checksum "combined-patch-file.txt" }}
  paths:
  - ./node_modules
+ - ./protocol-dashboard/node_modules
  - ./packages/web/node_modules
  - ./packages/mobile/node_modules
  - ./packages/embed/node_modules

.circleci/src/jobs/@protocol-dashboard-jobs.yml

@@ -28,6 +28,7 @@ protocol-dashboard-init:
  root: ./
  paths:
  - node_modules
+ - protocol-dashboard/node_modules
  - packages/harmony/node_modules
  - packages/common/node_modules
  - packages/libs/node_modules

.circleci/src/workflows/root.yml

@@ -3,4 +3,4 @@ jobs:
  context: Audius Client
  filters:
  branches:
- only: /(^release.*)$/
+ only: /(^release-client.*)$/

.vscode/settings.json

@@ -26,7 +26,10 @@
  "editor.defaultFormatter": "ms-python.black-formatter"
  },
  "editor.find.addExtraSpaceOnTop": false,
- "eslint.workingDirectories": [{ "pattern": "./packages/*/" }],
+ "eslint.workingDirectories": [
+ { "pattern": "./packages/*/" },
+ { "pattern": "./protocol-dashboard" }
+ ],
  "editor.codeActionsOnSave": {
  "source.fixAll": "explicit"
  },

package.json

@@ -17,7 +17,7 @@
  "build": "turbo run build",
  "changeset": "changeset",
  "check-secrets": "sh ./scripts/check_secrets.sh",
- "clean:modules": "rm -rf node_modules && rm -rf packages/*/node_modules",
+ "clean:modules": "rm -rf node_modules && rm -rf protocol-dashboard/node_modules && rm -rf packages/*/node_modules",
  "clean:dist": "rm -rf packages/*/dist",
  "install-hooks": "mookme init --only-hook --skip-types-selection",
  "lint:fix": "turbo run lint:fix",

packages/common/package.json

@@ -28,7 +28,7 @@
  "lint:fix": "npm run lint -- --fix",
  "test": "vitest",
  "typecheck": "tsc --noEmit",
- "verify": "concurrently \"npm:lint:fix\""
+ "verify": "concurrently \"npm:lint\""
  },
  "bugs": {
  "url": "https://github.com/AudiusProject/audius-client/issues"

packages/common/src/services/audius-backend/solana.ts

@@ -701,7 +701,11 @@ export const relayTransaction = async (
  transaction,
  skipPreflight,
  useCoinflowRelay
- }: { transaction: Transaction; skipPreflight?: boolean, useCoinflowRelay?: boolean }
+ }: {
+ transaction: Transaction
+ skipPreflight?: boolean
+ useCoinflowRelay?: boolean
+ }
 ) => {
  const libs = await audiusBackendInstance.getAudiusLibsTyped()
  const instructions = transaction.instructions

packages/embed/package.json

@@ -14,7 +14,7 @@
  "lint:fix": "eslint --cache --fix --ext=js,jsx,ts,tsx src",
  "lint": "eslint --cache --ext=js,jsx,ts,tsx src",
  "lint:env": "dotenv-linter",
- "verify": "concurrently \"npm:lint:fix\" \"npm:lint:env\""
+ "verify": "concurrently \"npm:lint\" \"npm:lint:env\""
  },
  "devDependencies": {
  "@audius/dotenv-linter": "*",

packages/harmony/package.json

@@ -23,7 +23,7 @@
  "stylelint:fix": "npm run stylelint -- --fix",
  "test": "concurrently -k -s first \"npx http-server storybook-static --silent --port 6006\" \"npx wait-on http://127.0.0.1:6006 && test-storybook\"",
  "typecheck": "tsc --noEmit",
- "verify": "concurrently \"npm:typecheck\" \"npm:lint:fix\" \"npm:stylelint:fix\""
+ "verify": "concurrently \"npm:typecheck\" \"npm:lint\" \"npm:stylelint\""
  },
  "devDependencies": {
  "@babel/preset-env": "7.22.15",

packages/libs/src/sdk/api/users/UsersApi.test.ts

@@ -23,10 +23,10 @@ import { EntityManager } from '../../services/EntityManager'
 import { Logger } from '../../services/Logger'
 import { Storage } from '../../services/Storage'
 import { StorageNodeSelector } from '../../services/StorageNodeSelector'
+import { getReaction } from '../../utils/reactionsMap'
 import { Configuration } from '../generated/default'
 
 import { UsersApi } from './UsersApi'
-import { getReaction } from '../../utils/reactionsMap'
 
 const pngFile = fs.readFileSync(
  path.resolve(__dirname, '../../test/png-file.png')
@@ -361,7 +361,7 @@ describe('UsersApi', () => {
  const two = getReaction('🔥')
  const three = getReaction('🥳')
  const four = getReaction('🤯')
- //@ts-ignore because type checker only accepts previous four emojis
+ //@ts-ignore because type checker only accepts previous four emojis
  const invalidNumber = getReaction('🦀')
 
  expect(one).toEqual(1)

packages/mobile/package.json

@@ -50,7 +50,7 @@
  "typecheck": "tsc",
  "upgrade": "react-native upgrade",
  "upload:ios": "xcrun altool --upload-app -type ios --file build/AudiusReactNative.ipa --username $APPLE_ID --password $APPLE_ID_PASSWORD",
- "verify": "concurrently \"npm:typecheck\" \"npm:lint:fix\" \"npm:lint:env\""
+ "verify": "concurrently \"npm:typecheck\" \"npm:lint\" \"npm:lint:env\""
  },
  "dependencies": {
  "@amplitude/react-native": "2.17.2",

packages/web/package.json

@@ -38,7 +38,7 @@
  "test": "vitest",
  "typecheck:watch": "tsc --watch",
  "typecheck": "tsc",
- "verify": "concurrently \"npm:typecheck\" \"npm:lint:fix\" \"npm:stylelint:fix\" \"npm:lint:env\"",
+ "verify": "concurrently \"npm:typecheck\" \"npm:lint\" \"npm:stylelint\" \"npm:lint:env\"",
  "worker-ssr:dev": "npx wrangler dev --env test --config ./src/ssr/wrangler.toml",
  "worker:dev": "npx wrangler dev --env test",
  "write-sha": "./scripts/writeSHA.sh",

packages/web/src/pages/upload-page/forms/EditCollectionForm.tsx

@@ -37,7 +37,8 @@ const messages = {
  description: 'Description',
  trackDetails: {
  title: 'Track Details',
- description: 'Set defaults for all tracks in this collection. You can edit your track details after upload.'
+ description:
+ 'Set defaults for all tracks in this collection. You can edit your track details after upload.'
  },
  completeButton: 'Complete Upload'
 }

protocol-dashboard/.eslintrc.cjs

@@ -0,0 +1,5 @@
+module.exports = {
+ root: true,
+ env: { browser: true, es6: true },
+ extends: ['audius']
+}

protocol-dashboard/package.json

@@ -68,23 +68,17 @@
  "build": "NODE_OPTIONS=--max_old_space_size=8192 tsc -p ./tsconfig.node.json && vite build",
  "build:stage": "npm run configure-stage-env && ./node_modules/.bin/env-cmd -f .env.stage.local turbo run build",
  "build:prod": "npm run configure-prod-env && ./node_modules/.bin/env-cmd -f .env.prod.local turbo run build",
- "lint": "npm run prettier:check",
- "lint:fix": "npm run prettier:write",
+ "lint": "eslint --cache --ext=js,jsx,ts,tsx src",
+ "lint:fix": "eslint --cache --fix --ext=js,jsx,ts,tsx src",
  "lint:env": "dotenv-linter",
- "prettier:base": "prettier --parser typescript --single-quote --no-semi",
- "prettier:check": "npm run prettier:base -- --list-different \"src/**/*.{ts,tsx}\"",
- "prettier:write": "npm run prettier:base -- --write \"src/**/*.{ts,tsx}\"",
  "pull-dev-accounts": "node ./scripts/pullDevAccounts.js",
  "typecheck": "tsc",
  "advance-blocks": "node ./scripts/advanceBlocks.js",
  "update-build:dev": "node ./scripts/updateBuild.cjs dev",
  "update-build:stage": "node ./scripts/updateBuild.cjs stage",
  "update-build:prod": "node ./scripts/updateBuild.cjs prod",
  "TODO - ADD TYPECHECK TO VERIFY: =========================": "",
- "verify": "concurrently \"npm:lint:fix\" \"npm:lint:env\""
- },
- "eslintConfig": {
- "extends": "react-app"
+ "verify": "concurrently \"npm:lint\" \"npm:lint:env\""
  },
  "browserslist": {
  "production": [
@@ -128,13 +122,13 @@
  "crypto-browserify": "3.12.0",
  "dotenv": "16.3.1",
  "env-cmd": "9.0.3",
+ "eslint": "8.56.0",
  "https-browserify": "1.0.0",
  "jsdom": "22.1.0",
  "node-fetch": "2.6.1",
  "os-browserify": "0.3.0",
  "path-browserify": "1.0.1",
  "postcss": "8.4.14",
- "prettier": "1.19.1",
  "redux-devtools-extension": "2.13.9",
  "setimmediate": "1.0.5",
  "stream-browserify": "3.0.0",

protocol-dashboard/src/App.tsx

@@ -1,7 +1,10 @@
+import { useEffect, useState } from 'react'
+
 import { ApolloProvider } from '@apollo/client'
+import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
-import { useEffect, useState } from 'react'
+import { useWeb3ModalAccount, useWeb3ModalState } from '@web3modal/ethers/react'
 import { Provider, useSelector } from 'react-redux'
 import {
  Routes,
@@ -12,33 +15,31 @@ import {
  To,
  NavigateProps
 } from 'react-router-dom'
-import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony'
 
 import Header from 'components/Header'
-import Home from 'containers/Home'
+import API from 'containers/API'
+import APILeaderboard from 'containers/APILeaderboard'
+import Analytics from 'containers/Analytics'
+import ContentNodes from 'containers/ContentNodes'
+import DiscoveryProviders from 'containers/DiscoveryProviders'
 import Governance from 'containers/Governance'
-import Services from 'containers/Services'
+import Home from 'containers/Home'
 import Node from 'containers/Node'
-import User from 'containers/User'
-import DiscoveryProviders from 'containers/DiscoveryProviders'
-import ContentNodes from 'containers/ContentNodes'
+import NotFound from 'containers/NotFound'
+import Proposal from 'containers/Proposal'
 import ServiceOperators from 'containers/ServiceOperators'
 import ServiceUsers from 'containers/ServiceUsers'
-import Analytics from 'containers/Analytics'
-import API from 'containers/API'
-import APILeaderboard from 'containers/APILeaderboard'
+import Services from 'containers/Services'
+import UnregisteredNode from 'containers/UnregisteredNode'
+import User from 'containers/User'
+import { getDidGraphError } from 'store/api/hooks'
+import { createStyles } from 'utils/mobile'
 import * as routes from 'utils/routes'
 
-import { client, getBackupClient, createStore } from './store'
 import desktopStyles from './App.module.css'
 import mobileStyles from './AppMobile.module.css'
-import NotFound from 'containers/NotFound'
-import Proposal from 'containers/Proposal'
-import { createStyles } from 'utils/mobile'
-import { getDidGraphError } from 'store/api/hooks'
-import UnregisteredNode from 'containers/UnregisteredNode'
 import { RouteHistoryProvider } from './providers/RouteHistoryContext'
-import { useWeb3ModalAccount, useWeb3ModalState } from '@web3modal/ethers/react'
+import { client, getBackupClient, createStore } from './store'
 
 const styles = createStyles({ desktopStyles, mobileStyles })
 const store = createStore()
@@ -103,7 +104,7 @@ const App = () => {
 
  return (
  <ApolloProvider client={apolloClient}>
- <HarmonyThemeProvider theme="dark">
+ <HarmonyThemeProvider theme='dark'>
  <HashRouter>
  <RouteHistoryProvider>
  <div className={styles.appContainer}>
@@ -128,7 +129,7 @@ const App = () => {
  path={routes.SERVICES_DISCOVERY_PROVIDER_NODE}
  element={
  <NavigateWithParams
- to={params =>
+ to={(params) =>
  routes.NODES_DISCOVERY_NODE.replace(
  ':spID',
  params.spID
@@ -150,7 +151,7 @@ const App = () => {
  path={routes.SERVICES_CONTENT_NODE}
  element={
  <NavigateWithParams
- to={params =>
+ to={(params) =>
  routes.NODES_CONTENT_NODE.replace(
  ':spID',
  params.spID
@@ -169,7 +170,7 @@ const App = () => {
  path={routes.SERVICES_ACCOUNT_USER}
  element={
  <NavigateWithParams
- to={params =>
+ to={(params) =>
  routes.NODES_ACCOUNT_USER.replace(
  ':wallet',
  params.wallet
@@ -186,7 +187,7 @@ const App = () => {
  path={routes.SERVICES_ACCOUNT_OPERATOR}
  element={
  <NavigateWithParams
- to={params =>
+ to={(params) =>
  routes.NODES_ACCOUNT_OPERATOR.replace(
  ':wallet',
  params.wallet
@@ -197,9 +198,10 @@ const App = () => {
  />
  {Object.keys(
  routes.SIMPLE_DEPRECATED_SERVICE_ROUTES_TO_NODES_ROUTES
- ).map(old => (
+ ).map((old) => (
  <Route
  path={old}
+ key={old}
  element={
  <Navigate
  to={
@@ -223,7 +225,7 @@ const App = () => {
  path={routes.API_LEADERBOARD}
  element={<APILeaderboard />}
  />
- <Route path="*" element={<NotFound />} />
+ <Route path='*' element={<NotFound />} />
  </Routes>
  </div>
  </div>

protocol-dashboard/src/components/ApiCallsStat/ApiCallsStat.tsx

@@ -1,16 +1,17 @@
 import React from 'react'
 
+import { TextProps } from '@audius/harmony'
+
 import Stat from 'components/Stat'
 import { useTrailingApiCalls } from 'store/cache/analytics/hooks'
 import { Bucket, MetricError } from 'store/cache/analytics/slice'
 import { formatNumber } from 'utils/format'
-import { TextProps } from '@audius/harmony'
 
 type OwnProps = {}
 
 type ApiCallsStatProps = OwnProps & TextProps
 
-const ApiCallsStat: React.FC<ApiCallsStatProps> = textProps => {
+const ApiCallsStat: React.FC<ApiCallsStatProps> = (textProps) => {
  const { apiCalls } = useTrailingApiCalls(Bucket.MONTH)
  let error, stat
  if (apiCalls === MetricError.ERROR) {