Skip to content

Commit 964c6b5

Browse files
committed
Merge branch 'main' into feat/cli-and-rework
2 parents 948eac6 + a4da8e1 commit 964c6b5

246 files changed

Lines changed: 29692 additions & 16056 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.

.github/actions/setup/action.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Setup
2+
description: Setup Node.js and install dependencies
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Setup Node.js
8+
uses: actions/setup-node@v4
9+
with:
10+
node-version: 'lts/*'
11+
cache: 'yarn'
12+
13+
- name: Install dependencies
14+
run: yarn install
15+
shell: bash

.github/workflows/build.yml

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ jobs:
1111
name: Build Android RN App & brownfield AAR
1212
runs-on: ubuntu-latest
1313

14-
env:
15-
SKIP_YARN_COREPACK_CHECK: 0
16-
1714
steps:
1815
- uses: actions/checkout@v4
1916

@@ -29,28 +26,25 @@ jobs:
2926
node-version: 'lts/*'
3027
cache: 'yarn'
3128

32-
- name: Install root dependencies
29+
- name: Install dependencies
3330
run: yarn install
3431

35-
- name: Install example dependencies
36-
run: |
37-
cd example
38-
yarn install
39-
cd ..
32+
- name: Build package
33+
run: yarn build
4034

4135
- name: Build Android RN app
4236
run: |
43-
cd example/RNApp/android
37+
cd apps/tester-from-source/kotlin
4438
./gradlew assembleDebug
4539
4640
- name: Package AAR with the Brownfield CLI
4741
run: |
48-
cd example/RNApp
42+
cd apps/RNApp
4943
npx tsx ../../src/cli/index.ts package:android --module-name :BrownfieldLib --variant release
5044
5145
- name: Publish AAR artifact to Maven Local
5246
run: |
53-
cd example/RNApp/android/BrownfieldLib
47+
cd apps/RNApp/android/BrownfieldLib
5448
npx tsx ../../src/cli/index.ts publish:android --module-name :BrownfieldLib
5549
5650
- name: Verify debug AAR exists in Maven Local
@@ -61,21 +55,20 @@ jobs:
6155

6256
- name: Build Brownfield Android native app
6357
run: |
64-
cd example/AndroidApp
58+
cd apps/AndroidApp
6559
./gradlew assembleDebug
6660
6761
rn-ios:
6862
name: Build iOS App
6963
runs-on: macos-latest
7064

71-
env:
72-
SKIP_YARN_COREPACK_CHECK: 0
73-
7465
steps:
7566
- uses: actions/checkout@v4
7667

77-
- name: Select Xcode 16.4
78-
run: sudo xcode-select -s /Applications/Xcode_16.4.app
68+
- name: Use appropriate Xcode version
69+
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
70+
with:
71+
xcode-version: '16'
7972

8073
- name: Setup Node.js
8174
uses: actions/setup-node@v4
@@ -89,31 +82,28 @@ jobs:
8982
ruby-version: '3.2'
9083
bundler-cache: true
9184

92-
- name: Install root dependencies
85+
- name: Install dependencies
9386
run: yarn install
9487

95-
- name: Install example dependencies
96-
run: |
97-
cd example
98-
yarn install
99-
cd ..
88+
- name: Build package
89+
run: yarn build
10090

10191
- name: Install pods
10292
run: |
103-
cd example/RNApp/ios
93+
cd apps/tester-from-source/swift
10494
pod install
10595
10696
- name: Build iOS RN app
10797
run: |
108-
cd example/RNApp/ios
98+
cd apps/RNApp/ios
10999
xcodebuild -workspace RNApp.xcworkspace -scheme RNApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16' build CODE_SIGNING_ALLOWED=NO
110100
111101
- name: Package iOS Framework with the Brownfield CLI
112102
run: |
113-
cd example/RNApp
103+
cd apps/RNApp
114104
npx tsx ../../src/cli/index.ts package:ios --workspace RNApp --scheme BrownfieldLib
115105
116106
- name: Build Brownfield iOS native app
117107
run: |
118-
cd example/iOSApp
108+
cd apps/iOSApp
119109
xcodebuild -workspace iOSApp.xcworkspace -scheme iOSApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16' build CODE_SIGNING_ALLOWED=NO

.github/workflows/ci.yml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Lint & Type Check
1+
name: CI
22

33
on:
44
push:
@@ -7,32 +7,20 @@ on:
77
branches: [main]
88

99
jobs:
10-
analyse:
10+
lint:
1111
runs-on: ubuntu-latest
12-
13-
env:
14-
SKIP_YARN_COREPACK_CHECK: 0
15-
1612
steps:
17-
- uses: actions/checkout@v3
18-
19-
- name: Setup Node.js
20-
uses: actions/setup-node@v3
21-
with:
22-
node-version: 'lts/*'
23-
cache: 'yarn'
13+
- name: Checkout
14+
uses: actions/checkout@v4
2415

25-
- name: Install root dependencies
26-
run: yarn install
16+
- name: Setup
17+
uses: ./.github/actions/setup
2718

28-
- name: Install example dependencies
29-
run: |
30-
cd example
31-
yarn install
32-
cd ..
19+
- name: Build package
20+
run: yarn build
3321

34-
- name: Lint JS Code (ESLint)
35-
run: yarn run lint
22+
- name: Lint files
23+
run: yarn lint
3624

37-
- name: Typescript Type Checking (tsc)
38-
run: yarn run typecheck
25+
- name: Typecheck files
26+
run: yarn typecheck

.github/workflows/deploy-docs.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Deploy Docs
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
concurrency:
15+
group: pages
16+
cancel-in-progress: false
17+
18+
jobs:
19+
# Build job
20+
build:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0 # Not needed if lastUpdated is not enabled
27+
- name: Setup
28+
uses: ./.github/actions/setup
29+
30+
- name: Setup Pages
31+
uses: actions/configure-pages@v5
32+
33+
- name: Install dependencies
34+
working-directory: docs
35+
run: yarn install
36+
37+
- name: Build with Rspress
38+
working-directory: docs
39+
run: |
40+
yarn run build
41+
42+
- name: Upload artifact
43+
uses: actions/upload-pages-artifact@v3
44+
with:
45+
path: docs/doc_build
46+
47+
# Deployment job
48+
deploy:
49+
environment:
50+
name: github-pages
51+
url: ${{ steps.deployment.outputs.page_url }}
52+
needs: build
53+
runs-on: ubuntu-latest
54+
name: Deploy
55+
steps:
56+
- name: Deploy to GitHub Pages
57+
id: deployment
58+
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ build/
3030
.gradle
3131
local.properties
3232
*.iml
33-
*.iml
3433
*.hprof
3534
**/.cxx/
3635
*.keystore
@@ -46,7 +45,6 @@ yarn-error.log
4645
# BUCK
4746
buck-out/
4847
\.buckd/
49-
*.keystore
5048

5149
# fastlane
5250
#
@@ -65,17 +63,19 @@ buck-out/
6563
# CocoaPods
6664
**/Pods
6765

68-
6966
# Yarn
7067
.yarn/*
7168
!.yarn/patches
7269
!.yarn/plugins
7370
!.yarn/releases
7471
!.yarn/sdks
7572
!.yarn/versions
76-
.yarnrc.yml
77-
example/.yarn/*
7873

7974
# generated by bob
8075
lib/
8176

77+
# Turbo
78+
.turbo
79+
80+
# Gradle
81+
secring.gpg

.npmignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.yarn/releases/yarn-4.12.0.cjs

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
15
nodeLinker: node-modules
6+
7+
nmHoistingLimits: workspaces
8+
9+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

0 commit comments

Comments
 (0)