Skip to content

Commit 1a58a75

Browse files
anultravioletauroraanultravioletaurora
committed
Merge branch 'main' of github.com:anultravioletaurora/Jellify into 64-support-react-natives-new-architecture
2 parents 42d431b + f420eb7 commit 1a58a75

248 files changed

Lines changed: 27301 additions & 27169 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
module.exports = {
2-
root: true,
3-
extends: '@react-native',
4-
};
2+
root: true,
3+
extends: [
4+
'eslint:recommended',
5+
'plugin:react/recommended',
6+
'plugin:@typescript-eslint/recommended',
7+
],
8+
parser: '@typescript-eslint/parser',
9+
plugins: ['@typescript-eslint', 'react'],
10+
env: {
11+
browser: true,
12+
node: true,
13+
jest: true,
14+
},
15+
rules: {
16+
'react/react-in-jsx-scope': 'off',
17+
'@typescript-eslint/no-unused-vars': 'off',
18+
'@typescript-eslint/no-require-imports': 'off',
19+
'@typescript-eslint/no-empty-object-type': 'off',
20+
'react/prop-types': 'off',
21+
'@typescript-eslint/no-explicit-any': 'error', // Disallow usage of any
22+
'no-mixed-spaces-and-tabs': 'off', // refer https://github.com/prettier/prettier/issues/4199
23+
semi: ['error', 'never'],
24+
},
25+
settings: {
26+
react: {
27+
version: 'detect',
28+
},
29+
},
30+
}

‎.github/pull_request_template.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
### What is the change
2+
3+
4+
### What does this address
5+
6+
7+
### Issue number / link
8+
9+
10+
### Tag reviewers
11+
@anultravioletaurora

‎.github/workflows/build-android.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: build-android
1+
name: Build Android APK
22
on:
33
pull_request:
44
jobs:
55
build-android:
6-
runs-on: macos-latest
6+
runs-on: macos-15
77
steps:
88
- name: 🛒 Checkout
99
uses: actions/checkout@v4
@@ -16,8 +16,8 @@ jobs:
1616
- name: 💬 Echo package.json version to Github ENV
1717
run: echo VERSION_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV
1818

19-
- name: 🟢 Run npm run init
20-
run: npm run init
19+
- name: 🧵 Run yarn install
20+
run: yarn install
2121

2222
- name: 🚀 Run fastlane build
23-
run: npm run fastlane:android:build
23+
run: yarn fastlane:android:build

‎.github/workflows/build-ios.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: build-ios
1+
name: Build iOS IPA
22
on:
33
pull_request:
44

55
jobs:
66
build-ios:
7-
runs-on: macos-latest
7+
runs-on: macos-15
88
steps:
99
- name: 🛒 Checkout
1010
uses: actions/checkout@v4
@@ -17,11 +17,14 @@ jobs:
1717
- name: 💬 Echo package.json version to Github ENV
1818
run: echo VERSION_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV
1919

20-
- name: 🟢 Run npm run init
21-
run: npm run init:new-arch
20+
- name: 🍎 Run yarn init:ios
21+
run: yarn init:ios
2222

23+
- name: 🍫 Install CocoaPods
24+
run: yarn pod:install
25+
2326
- name: 🚀 Run fastlane build
24-
run: npm run fastlane:ios:build
27+
run: yarn fastlane:ios:build
2528
env:
2629
# FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
2730
APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}

‎.github/workflows/publish-beta.yml‎

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: publish-beta
1+
name: Publish Android APK and TestFlight Betas
22
on:
33
push:
44
branches:
55
- 'main'
66
jobs:
7-
publish-ios-beta:
8-
runs-on: macos-latest
7+
publish-beta:
8+
runs-on: macos-15
99
steps:
1010
- name: 🛒 Checkout
1111
uses: actions/checkout@v4
@@ -16,40 +16,82 @@ jobs:
1616
uses: actions/setup-node@v4
1717
with:
1818
node-version: 20
19+
20+
- name: 🧵 Run yarn install
21+
run: yarn install
1922

20-
- name: 💬 Echo package.json version to Github ENV
21-
run: echo VERSION_NUMBER=$(npm version minor --tag-version-prefix="" --no-commit-hooks) >> $GITHUB_ENV
23+
- name: 🍫 Install CocoaPods
24+
run: yarn pod:install
25+
26+
- name: ➕ Version Up
27+
run: yarn react-native bump-version --type patch
2228

23-
- name: 🟢 Run npm run init
24-
run: npm run init:new-arch
29+
30+
- name: 💬 Echo package.json version to Github ENV
31+
run: echo VERSION_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV
2532

2633
- name: 🤫 Output App Store Connect API Key JSON to Fastlane
2734
run: echo -e '${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}' > appstore_connect_api_key.json
2835
working-directory: ./ios/fastlane
2936

37+
- name: 🚀 Run Android fastlane build
38+
run: yarn fastlane:android:build
39+
3040
- name: 🚀 Run iOS fastlane build and publish to TestFlight
31-
run: npm run fastlane:ios:beta
41+
run: yarn fastlane:ios:beta
3242
env:
3343
APPSTORE_CONNECT_API_KEY_JSON: ${{ secrets.APPSTORE_CONNECT_API_KEY_JSON }}
3444
FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
3545
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
3646
MATCH_REPO_PAT: "anultravioletaurora:${{ secrets.SIGNING_REPO_PAT }}"
3747

38-
- name: 🚀 Run Android fastlane build
39-
run: npm run fastlane:android:build
40-
4148
# Commit Fastlane Xcode build number increment
42-
- name: 🔢 Commit Xcode build number increment
43-
uses: stefanzweifel/git-auto-commit-action@v5
44-
with:
45-
commit_message: "[skip actions]"
46-
file_pattern: "ios/Jellify.xcodeproj/project.pbxproj"
47-
49+
- name: 🔢 Commit changes for version increment
50+
run: |
51+
git config --global user.email "jellify@cosmonautical.com"
52+
git config --global user.name "anultravioletaurora"
53+
git add package.json
54+
git add ios/Jellify.xcodeproj/project.pbxproj
55+
git add android/app/build.gradle
56+
git commit -m "[skip actions]"
57+
git push origin main
58+
59+
- name: 🔢 Set artifact version numbers
60+
run: |
61+
# Create artifacts folder for uploading to release
62+
mkdir artifacts
63+
64+
# Move the iOS IPA
65+
mv ./ios/Jellify.ipa ./artifacts/Jellify-${{ env.VERSION_NUMBER }}.ipa
66+
67+
# Move and rename all android release APKs
68+
for apk in ./android/app/build/outputs/apk/release/*.apk; do
69+
filename=$(basename "$apk")
70+
newname="Jellify-${{ env.VERSION_NUMBER }}-${filename}"
71+
cp "$apk" "./artifacts/$newname"
72+
done
73+
4874
- name: 🎉 Create Github release
4975
uses: ncipollo/release-action@v1
76+
id: githubRelease
5077
with:
51-
artifacts: "ios/Jellify.ipa,android/app/build/outputs/apk/release/app-release.apk"
78+
artifacts: "./artifacts/*"
5279
name: ${{ env.VERSION_NUMBER }}
80+
generateReleaseNotes: true
5381
prerelease: true
5482
tag: ${{ env.VERSION_NUMBER }}
5583
token: ${{ secrets.SIGNING_REPO_PAT }}
84+
85+
86+
87+
88+
- name: 🗣️ Notify on Discord
89+
run: |
90+
cd ios
91+
bundle exec fastlane notifyOnDiscord
92+
cd ..
93+
94+
env:
95+
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
96+
APP_VERSION: ${{ env.VERSION_NUMBER }}
97+
release_url: ${{ steps.githubRelease.outputs.html_url }}

‎.github/workflows/run-jest-test-suite.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Run Jest Unit Tests
2+
on:
3+
push:
4+
branches-ignore:
5+
- "main"
6+
7+
jobs:
8+
run-jest-test-suite:
9+
runs-on: macos-15
10+
steps:
11+
- name: 🛒 Checkout
12+
uses: actions/checkout@v4
13+
14+
- name: 🖥 Setup Node 20
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: 20
18+
19+
- name: 💬 Echo package.json version to Github ENV
20+
run: echo VERSION_NUMBER=$(node -p -e "require('./package.json').version") >> $GITHUB_ENV
21+
22+
- name: 🟢 Run yarn init:ios
23+
run: yarn init:ios
24+
25+
- name: 🧪 Run npm test
26+
run: yarn test
27+
28+
- name: 🦋 Check Styling
29+
run: yarn format:check

‎.husky/pre-commit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarn lint-staged

‎.prettierignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
node_modules/
2+
3+
# Ignore YAML files
4+
*.yml
5+
*.yaml
6+
7+
# Ignore Markdown files
8+
*.md

‎.prettierrc.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
module.exports = {
2-
arrowParens: 'avoid',
3-
bracketSameLine: true,
4-
bracketSpacing: false,
5-
singleQuote: true,
6-
trailingComma: 'all',
7-
};
2+
arrowParens: 'always',
3+
bracketSpacing: true,
4+
jsxBracketSameLine: true,
5+
jsxSingleQuote: true,
6+
singleQuote: true,
7+
semi: false,
8+
printWidth: 100,
9+
useTabs: true,
10+
tabWidth: 4,
11+
arrowParens: 'always',
12+
endOfLine: 'lf',
13+
trailingComma: 'all',
14+
}

0 commit comments

Comments
 (0)