diff --git a/.circleci/config.yml b/.circleci/config.yml index 379fdf66e59..a16c3e5b224 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -333,7 +333,7 @@ jobs: CLIENT_DIRS=$(bash ./scripts/get-release-dirs.sh client) CHANGELOG=$(git log --pretty=format:"[%h] %s %an" --date=short client-v${PREV_VERSION}..HEAD -- ${CLIENT_DIRS}) npm i --ignore-scripts - npm version patch -w @audius/web -w audius-mobile-client --include-workspace-root --no-git-tag-version + npm version patch -w @audius/web -w @audius/mobile --include-workspace-root --no-git-tag-version git add . VERSION=$(jq -r .version ./package.json) MESSAGE="Audius Client (Web and Mobile) v${VERSION} diff --git a/.circleci/src/commands/@mobile-commands.yml b/.circleci/src/commands/@mobile-commands.yml index 4675a46d94c..27b43e97be5 100644 --- a/.circleci/src/commands/@mobile-commands.yml +++ b/.circleci/src/commands/@mobile-commands.yml @@ -69,7 +69,7 @@ mobile-prepare-ios: echo export SENTRY_BINARY=/usr/local/bin/sentry-cli >> "$BASH_ENV" - run: name: Build dependencies - command: npx turbo run build --filter=audius-mobile-client + command: npx turbo run build --filter=@audius/mobile - run: name: create bundle command: cd packages/mobile && npx turbo run bundle:ios @@ -176,7 +176,7 @@ mobile-prepare-android: command: cd packages/mobile/android && sudo bundle update fastlane - run: name: Build dependencies - command: npx turbo run build --filter=audius-mobile-client + command: npx turbo run build --filter=@audius/mobile - run: name: fetch app fastlane json config to upload to play store command: | @@ -296,7 +296,7 @@ mobile-release-saga-dapp-store: pnpm install - run: name: Build dependencies - command: npx turbo run build --filter=audius-mobile-client + command: npx turbo run build --filter=@audius/mobile - run: name: Install solana command: | diff --git a/.circleci/src/jobs/@mobile-jobs.yml b/.circleci/src/jobs/@mobile-jobs.yml index 60e6ab3e231..cd998ff9589 100644 --- a/.circleci/src/jobs/@mobile-jobs.yml +++ b/.circleci/src/jobs/@mobile-jobs.yml @@ -25,7 +25,7 @@ mobile-init: - run: name: lint & typecheck command: | - npx turbo run verify --filter=audius-mobile-client + npx turbo run verify --filter=@audius/mobile - persist_to_workspace: root: ./ diff --git a/package-lock.json b/package-lock.json index 9af95a1c227..a1b32460d6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -897,6 +897,10 @@ "resolved": "packages/harmony", "link": true }, + "node_modules/@audius/mobile": { + "resolved": "packages/mobile", + "link": true + }, "node_modules/@audius/sdk": { "resolved": "packages/libs", "link": true @@ -50416,10 +50420,6 @@ "hasInstallScript": true, "license": "MIT" }, - "node_modules/audius-mobile-client": { - "resolved": "packages/mobile", - "link": true - }, "node_modules/audius-protocol-dashboard": { "resolved": "protocol-dashboard", "link": true @@ -137030,7 +137030,7 @@ } }, "packages/mobile": { - "name": "audius-mobile-client", + "name": "@audius/mobile", "version": "1.5.77", "dependencies": { "@amplitude/react-native": "2.17.2", diff --git a/package.json b/package.json index 3c9b9533f96..f2be1511e18 100644 --- a/package.json +++ b/package.json @@ -40,15 +40,15 @@ "desktop:prod": "concurrently -k 'BROWSER=none npm run start:prod -w @audius/web' 'wait-on http://0.0.0.0:3002 && npm run electron:localhost -w @audius/web -- 3002'", "desktop:stage": "concurrently -k 'BROWSER=none npm run start:stage -w @audius/web' 'wait-on http://0.0.0.0:3001 && npm run electron:localhost -w @audius/web -- 3001'", "MOBILE=====================================": "", - "android:dev": "npm run android:dev -w audius-mobile-client", - "android:prod": "npm run android:prod -w audius-mobile-client", - "android:stage": "npm run android:stage -w audius-mobile-client", - "ios:dev": "npm run ios:dev -w audius-mobile-client", - "ios:prod": "npm run ios:prod -w audius-mobile-client", - "ios:stage": "npm run ios:stage -w audius-mobile-client", - "mobile": "npm run start -w audius-mobile-client", - "mobile:clean": "npm run clean:auto -w audius-mobile-client && npm run clean:modules", - "mobile:clear-cache": "watchman watch-del-all && npm run start -w audius-mobile-client -- --reset-cache", + "android:dev": "npm run android:dev -w @audius/mobile", + "android:prod": "npm run android:prod -w @audius/mobile", + "android:stage": "npm run android:stage -w @audius/mobile", + "ios:dev": "npm run ios:dev -w @audius/mobile", + "ios:prod": "npm run ios:prod -w @audius/mobile", + "ios:stage": "npm run ios:stage -w @audius/mobile", + "mobile": "npm run start -w @audius/mobile", + "mobile:clean": "npm run clean:auto -w @audius/mobile && npm run clean:modules", + "mobile:clear-cache": "watchman watch-del-all && npm run start -w @audius/mobile -- --reset-cache", "EMBED======================================": "", "embed:prod": "npm run start:prod -w embed", "embed:stage": "npm run start:stage -w embed", diff --git a/packages/mobile/.hooks/pre-push.json b/packages/mobile/.hooks/pre-push.json index 75e10774c92..a7b3746d55d 100644 --- a/packages/mobile/.hooks/pre-push.json +++ b/packages/mobile/.hooks/pre-push.json @@ -2,11 +2,11 @@ "steps": [ { "name": "typecheck", - "command": "npm run typecheck -w audius-mobile-client" + "command": "npm run typecheck -w @audius/mobile" }, { "name": "lint", - "command": "npm run lint -w audius-mobile-client" + "command": "npm run lint -w @audius/mobile" } ] } diff --git a/packages/mobile/README.md b/packages/mobile/README.md index 40eb21bd959..14fe4ec41a2 100644 --- a/packages/mobile/README.md +++ b/packages/mobile/README.md @@ -60,11 +60,11 @@ To debug the app follow the instructions [here](https://reactnative.dev/docs/deb You can also start react and redux devtools with ``` -npm run react-devtools -w audius-mobile-client +npm run react-devtools -w @audius/mobile ``` ``` -npm run redux-devtools -w audius-mobile-client +npm run redux-devtools -w @audius/mobile ``` On Android, you can use the adb Android Studio tool or diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 705664331c6..406add39211 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,5 +1,5 @@ { - "name": "audius-mobile-client", + "name": "@audius/mobile", "version": "1.5.77", "private": true, "scripts": { diff --git a/packages/mobile/src/types/declarations.d.ts b/packages/mobile/src/types/declarations.d.ts index 078a53258b2..dd36193dc99 100644 --- a/packages/mobile/src/types/declarations.d.ts +++ b/packages/mobile/src/types/declarations.d.ts @@ -40,7 +40,7 @@ declare module '@react-native-masked-view/masked-view' { export default class MaskedViewComponent extends React.Component {} } -// Remove everything below when audius-mobile-client is no longer dependent on @audius/web +// Remove everything below when @audius/mobile is no longer dependent on @audius/web // These are needed because we currently have to include @audius/web in the typechecking declare module '*.module.css' { const value: any