Skip to content

Commit

Permalink
revert back to pnpm because bun does not handle peer dependency confl…
Browse files Browse the repository at this point in the history
…icts well
  • Loading branch information
JorrinKievit committed Aug 13, 2024
1 parent 764d8fa commit a40c5f9
Show file tree
Hide file tree
Showing 11 changed files with 17,809 additions and 89 deletions.
38 changes: 27 additions & 11 deletions .github/workflows/build-mobile-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@ jobs:
with:
ref: ${{ steps.comment-branch.outputs.head_ref }}

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
bun-version: latest
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 21
cache: "pnpm"

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand All @@ -38,16 +46,16 @@ jobs:
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: corepack enable && pnpm install

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build Android app
run: cd apps/expo && bun apk
run: cd apps/expo && pnpm apk

- name: Upload movie-web.apk as artifact
uses: actions/upload-artifact@v4
Expand All @@ -67,27 +75,35 @@ jobs:
with:
ref: ${{ steps.comment-branch.outputs.head_ref }}

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
bun-version: latest
node-version: 21
cache: "pnpm"

- name: Cache Node Modules
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: pnpm install

- name: Cache Pods
uses: actions/cache@v4
with:
path: apps/expo/ios
key: ${{ runner.os }}-pods-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pods-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Build iOS app
run: cd apps/expo && bun ipa
run: cd apps/expo && pnpm ipa

- name: Upload movie-web.ipa as artifact
uses: actions/upload-artifact@v4
Expand Down
42 changes: 29 additions & 13 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
bun-version: latest
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 21
cache: "pnpm"

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand All @@ -34,19 +42,19 @@ jobs:
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: corepack enable && pnpm install

- name: Build dependencies
run: bun run build
run: pnpm run build

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build Android app
run: cd apps/expo && bun apk
run: cd apps/expo && pnpm apk

- name: Upload movie-web.apk as artifact
uses: actions/upload-artifact@v3
Expand All @@ -62,30 +70,38 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
bun-version: latest
node-version: 21
cache: "pnpm"

- name: Cache Node Modules
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: pnpm install

- name: Build dependencies
run: bun run build
run: pnpm run build

- name: Cache Pods
uses: actions/cache@v4
with:
path: apps/expo/ios
key: ${{ runner.os }}-pods-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pods-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Build iOS app
run: cd apps/expo && bun ipa
run: cd apps/expo && pnpm ipa

- name: Upload movie-web.ipa as artifact
uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: ./tooling/github/setup

- name: Lint
run: bun lint && bun lint:ws
run: pnpm lint && pnpm lint:ws

format:
runs-on: ubuntu-latest
Expand All @@ -39,7 +39,7 @@ jobs:
uses: ./tooling/github/setup

- name: Format
run: bun format
run: pnpm format

typecheck:
runs-on: ubuntu-latest
Expand All @@ -50,4 +50,4 @@ jobs:
uses: ./tooling/github/setup

- name: Typecheck
run: bun typecheck
run: pnpm typecheck
38 changes: 27 additions & 11 deletions .github/workflows/release-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,17 @@ jobs:
- name: Pull version bump
run: git pull --all

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
bun-version: latest
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 21
cache: "pnpm"

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand All @@ -56,16 +64,16 @@ jobs:
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: corepack enable && pnpm install

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build Android app
run: cd apps/expo && bun apk
run: cd apps/expo && pnpm apk

- name: Upload movie-web.apk as artifact
uses: actions/upload-artifact@v4
Expand All @@ -84,27 +92,35 @@ jobs:
- name: Pull version bump
run: git pull --all

- uses: oven-sh/setup-bun@v1
- uses: pnpm/action-setup@v3
name: Install pnpm
with:
version: 9
run_install: false

- name: Install Node.js
uses: actions/setup-node@v4
with:
bun-version: latest
node-version: 21
cache: "pnpm"

- name: Cache Node Modules
uses: actions/cache@v4
with:
path: "**/node_modules"
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Install dependencies
run: bun install
run: pnpm install

- name: Cache Pods
uses: actions/cache@v4
with:
path: apps/expo/ios
key: ${{ runner.os }}-pods-${{ hashFiles('**/bun.lockb') }}
key: ${{ runner.os }}-pods-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Build iOS app
run: cd apps/expo && bun ipa
run: cd apps/expo && pnpm ipa

- name: Upload movie-web.ipa as artifact
uses: actions/upload-artifact@v4
Expand Down
74 changes: 37 additions & 37 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"browserify-sign": "4.2.2"
},
"dependencies": {
"@expo/metro-config": "~0.17.1",
"@expo/metro-config": "~0.18.11",
"@movie-web/api": "workspace:*",
"@movie-web/colors": "workspace:*",
"@movie-web/provider-utils": "workspace:*",
Expand All @@ -30,58 +30,58 @@
"@react-native-anywhere/polyfill-base64": "0.0.1-alpha.0",
"@react-navigation/native": "^6.1.18",
"@salihgun/react-native-video-processor": "^0.3.1",
"@tamagui/animations-moti": "1.94.0",
"@tamagui/babel-plugin": "1.94.0",
"@tamagui/config": "1.94.0",
"@tamagui/metro-plugin": "1.94.0",
"@tamagui/toast": "1.94.0",
"@tamagui/animations-moti": "1.108.3",
"@tamagui/babel-plugin": "1.108.3",
"@tamagui/config": "1.108.3",
"@tamagui/metro-plugin": "1.108.3",
"@tamagui/toast": "1.108.3",
"@tanstack/react-query": "^5.51.23",
"ajv": "^8.17.1",
"burnt": "^0.12.2",
"class-variance-authority": "^0.7.0",
"expo": "~50.0.20",
"expo": "~51.0.26",
"expo-alternate-app-icons": "^0.1.9",
"expo-application": "~5.8.3",
"expo-av": "~13.10.5",
"expo-brightness": "~11.8.0",
"expo-build-properties": "~0.11.1",
"expo-clipboard": "~5.0.1",
"expo-constants": "~15.4.5",
"expo-file-system": "~16.0.8",
"expo-haptics": "~12.8.1",
"expo-keep-awake": "~12.8.2",
"expo-linear-gradient": "~12.7.2",
"expo-linking": "~6.2.2",
"expo-media-library": "~15.9.1",
"expo-navigation-bar": "~2.8.1",
"expo-network": "~5.8.0",
"expo-application": "~5.9.1",
"expo-av": "~14.0.6",
"expo-brightness": "~12.0.1",
"expo-build-properties": "~0.12.5",
"expo-clipboard": "~6.0.3",
"expo-constants": "~16.0.2",
"expo-file-system": "~17.0.1",
"expo-haptics": "~13.0.1",
"expo-keep-awake": "~13.0.2",
"expo-linear-gradient": "~13.0.2",
"expo-linking": "~6.3.1",
"expo-media-library": "~16.0.4",
"expo-navigation-bar": "~3.0.7",
"expo-network": "~6.0.1",
"expo-pod-pinner": "^1.0.1",
"expo-router": "~3.4.10",
"expo-screen-orientation": "~6.4.1",
"expo-splash-screen": "~0.26.5",
"expo-status-bar": "~1.11.1",
"expo-system-ui": "~2.9.3",
"expo-router": "~3.5.21",
"expo-screen-orientation": "~7.0.5",
"expo-splash-screen": "~0.27.5",
"expo-status-bar": "~1.12.1",
"expo-system-ui": "~3.0.7",
"expo-video": "~1.2.4",
"expo-web-browser": "~12.8.2",
"expo-web-browser": "~13.0.3",
"ffmpeg-kit-react-native": "^6.0.2",
"immer": "^10.1.1",
"iso-639-1": "^3.1.2",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"react-native": "0.73.6",
"react-native-gesture-handler": "~2.14.1",
"react": "~18.3.1",
"react-dom": "~18.3.1",
"react-native": "0.74.5",
"react-native-gesture-handler": "~2.18.1",
"react-native-markdown-display": "^7.0.2",
"react-native-mmkv": "^2.12.2",
"react-native-modal": "^13.0.1",
"react-native-quick-base64": "^2.1.2",
"react-native-quick-crypto": "^0.7.3",
"react-native-reanimated": "~3.6.2",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-svg": "14.1.0",
"react-native-reanimated": "~3.15.0",
"react-native-safe-area-context": "4.10.8",
"react-native-screens": "3.34.0",
"react-native-svg": "15.5.0",
"react-native-web": "^0.19.12",
"subsrt-ts": "^2.1.2",
"tamagui": "1.94.0",
"tamagui": "1.108.3",
"text-encoding-polyfill": "^0.6.7",
"zustand": "^4.5.4"
},
Expand All @@ -94,7 +94,7 @@
"@movie-web/tsconfig": "workspace:^0.1.0",
"@tanstack/eslint-plugin-query": "^5.51.15",
"@types/babel__core": "^7.20.5",
"@types/react": "~18.2.0",
"@types/react": "~18.3.3",
"babel-plugin-module-resolver": "^5.0.2",
"eslint": "^8.57.0",
"prettier": "^3.2.5",
Expand Down
Binary file removed bun.lockb
Binary file not shown.
Loading

0 comments on commit a40c5f9

Please sign in to comment.