diff --git a/package.json b/package.json index 7c85de87577..3acbcf6cb42 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "mobile:example:upload": "cd packages/mobile/examples/upload && npx expo start", "EMBED======================================": "", "embed:prod": "npm run start:prod -w embed", - "embed:stage": "npm run start:stage -w embed", "embed:dev": "npm run start:dev -w embed", "HARMONY====================================": "", "harmony": "turbo run start --filter=@audius/harmony", diff --git a/packages/common/src/api/tan-query/events/index.ts b/packages/common/src/api/tan-query/events/index.ts index 02b651d0aa3..02343128438 100644 --- a/packages/common/src/api/tan-query/events/index.ts +++ b/packages/common/src/api/tan-query/events/index.ts @@ -10,7 +10,6 @@ export * from './useFollowEvent' export * from './useRemixContest' export * from './useRemixContestWinners' export * from './useUserHasRemixContest' -export * from './useUserRemixContests' // Mutations export * from './useCreateEvent' diff --git a/packages/common/src/api/tan-query/events/useAllRemixContests.ts b/packages/common/src/api/tan-query/events/useAllRemixContests.ts index 4cb17807356..f7973d18985 100644 --- a/packages/common/src/api/tan-query/events/useAllRemixContests.ts +++ b/packages/common/src/api/tan-query/events/useAllRemixContests.ts @@ -7,11 +7,6 @@ import { } from '@audius/sdk' import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' -import { QUERY_KEYS } from '../queryKeys' -import { QueryKey, QueryOptions } from '../types' - -import { getEventIdsByEntityIdQueryKey, getEventQueryKey } from './utils' - import { eventMetadataFromSDK } from '~/adapters/event' import { getRemixesCountQueryKey } from '~/api/tan-query/remixes/useRemixes' import { useQueryContext } from '~/api/tan-query/utils' @@ -19,6 +14,11 @@ import { primeRelatedData } from '~/api/tan-query/utils/primeRelatedData' import { ID } from '~/models' import { removeNullable } from '~/utils' +import { QUERY_KEYS } from '../queryKeys' +import { QueryKey, QueryOptions } from '../types' + +import { getEventIdsByEntityIdQueryKey, getEventQueryKey } from './utils' + const DEFAULT_PAGE_SIZE = 25 export type RemixContestStatus = GetRemixContestsStatusEnum diff --git a/packages/common/src/api/tan-query/notifications/useNotifications.ts b/packages/common/src/api/tan-query/notifications/useNotifications.ts index 42bb24a8388..0b24c22e041 100644 --- a/packages/common/src/api/tan-query/notifications/useNotifications.ts +++ b/packages/common/src/api/tan-query/notifications/useNotifications.ts @@ -14,10 +14,7 @@ import { useRemoteVar } from '~/hooks' import { ChallengeRewardID } from '~/models' import { ID } from '~/models/Identifiers' import { StringKeys } from '~/services' -import { - NotificationType, - Notification -} from '~/store/notifications/types' +import { NotificationType, Notification } from '~/store/notifications/types' import { QUERY_KEYS } from '../queryKeys' import { QueryKey, QueryOptions } from '../types' diff --git a/packages/common/src/api/tan-query/remixes/useRemixes.ts b/packages/common/src/api/tan-query/remixes/useRemixes.ts index 8c91855203f..ba836b076e0 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixes.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixes.ts @@ -12,6 +12,10 @@ import { } from '@tanstack/react-query' import { useDispatch } from 'react-redux' +import { transformAndCleanList, userTrackMetadataFromSDK } from '~/adapters' +import { useQueryContext } from '~/api/tan-query/utils' +import { remixesPageActions } from '~/store/pages' + import { QUERY_KEYS } from '../queryKeys' import { getTrackQueryKey } from '../tracks/useTrack' import { LineupData, QueryKey, QueryOptions } from '../types' @@ -19,10 +23,6 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' import { getUserQueryKey } from '../users/useUser' import { primeTrackData } from '../utils/primeTrackData' -import { transformAndCleanList, userTrackMetadataFromSDK } from '~/adapters' -import { useQueryContext } from '~/api/tan-query/utils' -import { remixesPageActions } from '~/store/pages' - const DEFAULT_PAGE_SIZE = 10 export type UseRemixesArgs = { diff --git a/packages/common/src/api/tan-query/remixes/useRemixesLineup.ts b/packages/common/src/api/tan-query/remixes/useRemixesLineup.ts index a8a0b27b628..f95268bfa0d 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixesLineup.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixesLineup.ts @@ -3,6 +3,10 @@ import { useEffect, useMemo } from 'react' import { EntityType } from '@audius/sdk' import { useDispatch } from 'react-redux' +import { useRemixContestWinners } from '~/api/tan-query/events/useRemixContestWinners' +import { ID } from '~/models' +import { remixesPageActions } from '~/store/pages' + import { LineupData, QueryOptions } from '../types' import { makeLoadNextPage } from '../utils/infiniteQueryLoadNextPage' @@ -13,10 +17,6 @@ import { getRemixesQueryKey } from './useRemixes' -import { useRemixContestWinners } from '~/api/tan-query/events/useRemixContestWinners' -import { ID } from '~/models' -import { remixesPageActions } from '~/store/pages' - const DEFAULT_PAGE_SIZE = 10 export const useRemixesLineup = ( diff --git a/packages/common/src/store/playback/slice.test.ts b/packages/common/src/store/playback/slice.test.ts index 74c387ae4e2..7fb90a4bb76 100644 --- a/packages/common/src/store/playback/slice.test.ts +++ b/packages/common/src/store/playback/slice.test.ts @@ -182,8 +182,9 @@ describe('playback slice', () => { actions.removeFromQueue({ index: 1 }) ) expect(afterRemove.queue).toHaveLength(3) - expect(afterRemove.queue.find((t) => t.trackId === removedTrack.trackId)) - .toBeUndefined() + expect( + afterRemove.queue.find((t) => t.trackId === removedTrack.trackId) + ).toBeUndefined() expect(afterRemove.shuffleOriginalQueue).toHaveLength(3) expect( afterRemove.shuffleOriginalQueue.find( diff --git a/packages/embed/.env.dev b/packages/embed/.env.dev index 64ff4943a5c..9ba9b8bcdb8 100644 --- a/packages/embed/.env.dev +++ b/packages/embed/.env.dev @@ -4,6 +4,6 @@ VITE_API_KEY=2dc52ec9a4c31790cab6653de0c637f680faa993 VITE_APP_NAME=audius-embed VITE_AUDIUS_SCHEME=http VITE_ENVIRONMENT=development -VITE_HOSTNAME_REDIRECT=redirect.staging.audius.co -VITE_IDENTITY_ENDPOINT=https://identityservice.staging.audius.co +VITE_HOSTNAME_REDIRECT=audius.co +VITE_IDENTITY_ENDPOINT=http://audius-identity-service-1 VITE_SOLANA_RPC_ENDPOINT=https://carolina-8qh733-fast-mainnet.helius-rpc.com diff --git a/packages/embed/.env.stage b/packages/embed/.env.stage deleted file mode 100644 index e7918d69c8e..00000000000 --- a/packages/embed/.env.stage +++ /dev/null @@ -1,10 +0,0 @@ -VITE_AMPLITUDE_API_PROXY=gain.audius.co -VITE_AMPLITUDE_KEY=72a58ce4ad1f9bafcba0b92bedb6c33d -VITE_API_KEY=2dc52ec9a4c31790cab6653de0c637f680faa993 -VITE_APP_NAME=audius-embed -VITE_AUDIUS_SCHEME=https -VITE_ENVIRONMENT=staging -VITE_HOSTNAME=staging.audius.co -VITE_HOSTNAME_REDIRECT=staging.audius.co -VITE_IDENTITY_ENDPOINT=https://identityservice.staging.audius.co -VITE_SOLANA_RPC_ENDPOINT=https://carolina-8qh733-fast-mainnet.helius-rpc.com diff --git a/packages/embed/.eslintignore b/packages/embed/.eslintignore index 15b3fa1dff6..08e3c2a2f79 100644 --- a/packages/embed/.eslintignore +++ b/packages/embed/.eslintignore @@ -2,5 +2,4 @@ **/assets/* build/* dist/* -build-staging/* build-production/* \ No newline at end of file diff --git a/packages/embed/.gitignore b/packages/embed/.gitignore index 79941b8da78..8e72a161857 100644 --- a/packages/embed/.gitignore +++ b/packages/embed/.gitignore @@ -4,5 +4,4 @@ node_modules /*.DS_Store build dist -build-staging build-production \ No newline at end of file diff --git a/packages/embed/README.md b/packages/embed/README.md index 2398cec3f88..09d7a680f79 100644 --- a/packages/embed/README.md +++ b/packages/embed/README.md @@ -11,7 +11,3 @@ npm run start:prod ## Deploying Deployed via CI - -``` -npx wrangler publish --env staging -``` diff --git a/packages/web/bundlesize.stage.config.json b/packages/web/bundlesize.stage.config.json deleted file mode 100644 index 8ee035b64c9..00000000000 --- a/packages/web/bundlesize.stage.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "files": [ - { - "path": "./build-ssr-staging/server/chunks/chunk-*.js", - "maxSize": "30 kB" - } - ] -} diff --git a/packages/web/env/.env.stage b/packages/web/env/.env.stage deleted file mode 100644 index 0ecb481060c..00000000000 --- a/packages/web/env/.env.stage +++ /dev/null @@ -1,2 +0,0 @@ -VITE_ENVIRONMENT=staging -VITE_PORT=3001 diff --git a/packages/web/scripts/dist.js b/packages/web/scripts/dist.js index 733575bd4c5..755fbb4615a 100644 --- a/packages/web/scripts/dist.js +++ b/packages/web/scripts/dist.js @@ -109,8 +109,6 @@ const makeBuildParams = (isProduction) => { // Inject data into package.json // https://www.electron.build/configuration/configuration extraMetadata: { - // We set prod & stage to separate values to ensure that - // the app's app-data does not collide (in addition to a different `scheme`). // `productName` controls the app-data location on most platforms. // https://github.com/electron-userland/electron-builder/issues/3429#issuecomment-434024379 productName, diff --git a/packages/web/src/ssr/contest/+onBeforeRender.tsx b/packages/web/src/ssr/contest/+onBeforeRender.tsx index eb05656b78b..b5d0d1eefd7 100644 --- a/packages/web/src/ssr/contest/+onBeforeRender.tsx +++ b/packages/web/src/ssr/contest/+onBeforeRender.tsx @@ -6,8 +6,6 @@ const getApiUrl = () => { switch (env) { case 'production': return 'https://api.audius.co' - case 'staging': - return 'https://api.staging.audius.co' case 'development': default: return process.env.VITE_API_URL || 'http://audius-api' diff --git a/packages/web/src/ssr/metaTags.ts b/packages/web/src/ssr/metaTags.ts index 7067e415166..cbdd0293df5 100644 --- a/packages/web/src/ssr/metaTags.ts +++ b/packages/web/src/ssr/metaTags.ts @@ -43,8 +43,6 @@ export const getPublicUrl = (): string => { switch (env) { case 'production': return 'https://audius.co' - case 'staging': - return 'https://staging.audius.co' default: return 'http://localhost:3000' } diff --git a/packages/web/src/ssr/remixes/+onBeforeRender.tsx b/packages/web/src/ssr/remixes/+onBeforeRender.tsx index 755b3b2acfe..3c37f6eee36 100644 --- a/packages/web/src/ssr/remixes/+onBeforeRender.tsx +++ b/packages/web/src/ssr/remixes/+onBeforeRender.tsx @@ -6,8 +6,6 @@ const getApiUrl = () => { switch (env) { case 'production': return 'https://api.audius.co' - case 'staging': - return 'https://api.staging.audius.co' case 'development': default: return process.env.VITE_API_URL || 'http://audius-api'