Skip to content

Commit 02a1af3

Browse files
authored
Merge pull request #37 from AutoMaker-Org/refactor/monorepo-restructure
Refactor/monorepo restructure
2 parents 7cb5a6a + 2c4a977 commit 02a1af3

165 files changed

Lines changed: 13321 additions & 14711 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/workflows/pr-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
with:
2323
node-version: "20"
2424
cache: "npm"
25-
cache-dependency-path: app/package-lock.json
25+
cache-dependency-path: package-lock.json
2626

2727
- name: Install dependencies
28-
working-directory: ./app
29-
run: npm ci
28+
# Use npm install instead of npm ci to correctly resolve platform-specific
29+
# optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
30+
run: npm install
3031

3132
- name: Run build:electron
32-
working-directory: ./app
3333
run: npm run build:electron

.github/workflows/release.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: Build and Release Electron App
33
on:
44
push:
55
tags:
6-
- 'v*.*.*' # Triggers on version tags like v1.0.0
7-
workflow_dispatch: # Allows manual triggering
6+
- "v*.*.*" # Triggers on version tags like v1.0.0
7+
workflow_dispatch: # Allows manual triggering
88
inputs:
99
version:
10-
description: 'Version to release (e.g., v1.0.0)'
10+
description: "Version to release (e.g., v1.0.0)"
1111
required: true
12-
default: 'v0.1.0'
12+
default: "v0.1.0"
1313

1414
jobs:
1515
build-and-release:
@@ -36,31 +36,29 @@ jobs:
3636
- name: Setup Node.js
3737
uses: actions/setup-node@v4
3838
with:
39-
node-version: '20'
40-
cache: 'npm'
41-
cache-dependency-path: app/package-lock.json
39+
node-version: "20"
40+
cache: "npm"
41+
cache-dependency-path: package-lock.json
4242

4343
- name: Install dependencies
44-
working-directory: ./app
45-
run: npm ci
44+
# Use npm install instead of npm ci to correctly resolve platform-specific
45+
# optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
46+
run: npm install
4647

4748
- name: Build Electron App (macOS)
4849
if: matrix.os == 'macos-latest'
49-
working-directory: ./app
5050
env:
5151
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
run: npm run build:electron -- --mac --x64 --arm64
5353

5454
- name: Build Electron App (Windows)
5555
if: matrix.os == 'windows-latest'
56-
working-directory: ./app
5756
env:
5857
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5958
run: npm run build:electron -- --win --x64
6059

6160
- name: Build Electron App (Linux)
6261
if: matrix.os == 'ubuntu-latest'
63-
working-directory: ./app
6462
env:
6563
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6664
run: npm run build:electron -- --linux --x64
@@ -70,12 +68,12 @@ jobs:
7068
with:
7169
tag_name: ${{ github.event.inputs.version || github.ref_name }}
7270
files: |
73-
app/dist/*.exe
74-
app/dist/*.dmg
75-
app/dist/*.AppImage
76-
app/dist/*.zip
77-
app/dist/*.deb
78-
app/dist/*.rpm
71+
apps/app/dist/*.exe
72+
apps/app/dist/*.dmg
73+
apps/app/dist/*.AppImage
74+
apps/app/dist/*.zip
75+
apps/app/dist/*.deb
76+
apps/app/dist/*.rpm
7977
draft: false
8078
prerelease: false
8179
env:

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
#added by trueheads > will remove once supercombo adds multi-os support
1+
#added by trueheads > will remove once supercombo adds multi-os support
22
launch.sh
3+
4+
# Dependencies
5+
node_modules/
6+
7+
# Build outputs
8+
dist/
9+
.next/

.npmrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Cross-platform compatibility for Tailwind CSS v4 and lightningcss
2+
# These packages use platform-specific optional dependencies that npm
3+
# automatically resolves based on your OS (macOS, Linux, Windows, WSL)
4+
#
5+
# IMPORTANT: When switching platforms or getting platform mismatch errors:
6+
# 1. Delete node_modules: rm -rf node_modules apps/*/node_modules
7+
# 2. Run: npm install
8+
#
9+
# In CI/CD: Use "npm install" instead of "npm ci" to allow npm to resolve
10+
# the correct platform-specific binaries at install time.

0 commit comments

Comments
 (0)