Skip to content

Commit 476bd36

Browse files
devin-ai-integration[bot]thebrubaker
devin-ai-integration[bot]
and
thebrubaker
committed
Merge main and resolve conflicts in icons
Co-Authored-By: joel <joel@onlook.com>
2 parents b7e022d + a242be5 commit 476bd36

2,116 files changed

Lines changed: 188830 additions & 49502 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.

‎.dockerignore‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
node_modules
2+
.git
3+
.gitignore
4+
README.md
5+
.env
6+
.env.local
7+
.env.*.local
8+
npm-debug.log*
9+
yarn-debug.log*
10+
yarn-error.log*
11+
.next
12+
.vercel
13+
*.tsbuildinfo
14+
.DS_Store
15+
coverage
16+
.nyc_output
17+
dist
18+
build
19+
.vscode
20+
.idea
21+
*.log
22+
.next
23+
24+
# Parts of the app that does not need to be deployed
25+
apps/web/backend
26+
assets

‎.github/PULL_REQUEST_TEMPLATE.md‎

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

‎.github/pull_request_template.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
## Description
2+
3+
<!-- Provide a clear and concise description of your changes -->
4+
5+
## Related Issues
6+
7+
<!-- Link any related issues using GitHub keywords (e.g., "closes #123", "fixes #456", "related to #789") -->
8+
9+
## Type of Change
10+
11+
<!-- Put an `x` in the boxes that apply -->
12+
13+
- [ ] Bug fix
14+
- [ ] New feature
15+
- [ ] Documentation
16+
- [ ] Refactor
17+
- [ ] Other (please describe):
18+
19+
## Testing
20+
21+
<!-- Describe the tests you ran or the steps to verify your changes -->
22+
23+
## Screenshots (if applicable)
24+
25+
<!-- Add screenshots to help explain your changes -->
26+
27+
## Additional Notes
28+
29+
<!-- Add any other context about the PR here -->

‎.github/workflows/build.yml‎

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

‎.github/workflows/chromatic.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Chromatic
2+
3+
on: push
4+
5+
jobs:
6+
chromatic:
7+
name: Run Chromatic
8+
runs-on: ubuntu-latest
9+
env:
10+
SKIP_ENV_VALIDATION: true
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
with:
15+
fetch-depth: 0
16+
17+
- name: Setup Bun
18+
uses: oven-sh/setup-bun@v2
19+
with:
20+
bun-version: 1.3.1
21+
22+
- name: Install dependencies
23+
run: bun install --frozen-lockfile
24+
25+
- name: Run Chromatic
26+
uses: chromaui/action@latest
27+
with:
28+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
29+
workingDir: apps/web/client
30+
buildScriptName: build-storybook

‎.github/workflows/ci.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
8+
jobs:
9+
# TODO: Enable lint job after applying lint fixes and setting appropriate warning limits
10+
# Will be handled in follow-up PR to avoid blocking CI setup / bloating this PR
11+
# lint:
12+
# name: Lint
13+
# runs-on: ubuntu-latest
14+
15+
# steps:
16+
# - uses: actions/checkout@v4
17+
18+
# - uses: oven-sh/setup-bun@v1
19+
# with:
20+
# bun-version: 1.3.1
21+
# - name: Cache dependencies
22+
# uses: actions/cache@v4
23+
# with:
24+
# path: |
25+
# ~/.bun/install/cache
26+
# key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
27+
28+
# - name: Install dependencies
29+
# run: bun install --frozen
30+
31+
# - name: Run linter
32+
# run: bun lint
33+
34+
typecheck:
35+
name: Typecheck
36+
runs-on: ubuntu-latest
37+
38+
steps:
39+
- uses: actions/checkout@v4
40+
41+
- uses: oven-sh/setup-bun@v1
42+
with:
43+
bun-version: 1.3.1
44+
45+
- name: Cache dependencies
46+
uses: actions/cache@v4
47+
with:
48+
path: |
49+
~/.bun/install/cache
50+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
51+
52+
- name: Install dependencies
53+
run: bun install --frozen
54+
55+
- name: Run type checking
56+
run: bun typecheck
57+
58+
test:
59+
name: Unit Test
60+
runs-on: ubuntu-latest
61+
62+
steps:
63+
- uses: actions/checkout@v4
64+
65+
- uses: oven-sh/setup-bun@v1
66+
with:
67+
bun-version: 1.3.1
68+
69+
- name: Cache dependencies
70+
uses: actions/cache@v4
71+
with:
72+
path: |
73+
~/.bun/install/cache
74+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
75+
76+
- name: Install dependencies
77+
run: bun install --frozen
78+
79+
- name: Run tests
80+
run: bun test --timeout 30000 --coverage

‎.github/workflows/supabase-push-staging.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Push Supabase Drizzle Schema to Staging Environment
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
migrate:
8+
runs-on: ubuntu-latest
9+
env:
10+
SUPABASE_DATABASE_URL: ${{ secrets.STAGING_SUPABASE_DATABASE_URL }}
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- uses: oven-sh/setup-bun@v1
16+
with:
17+
bun-version: latest
18+
19+
- name: Install dependencies
20+
run: bun install
21+
22+
- name: Run migrations
23+
run: bun run db:push

‎.gitignore‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,16 @@ yarn.lock
3434
/playwright/.cache/
3535

3636
# Env variables
37-
.env
37+
.env
38+
.env.production
39+
.env.development
40+
.env.test
41+
.env.local
42+
.env.development.local
43+
.env.test.local
44+
.env.production.local
45+
46+
mise.toml
47+
48+
# Temporary files
49+
.tmp/

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "apps/admin"]
2+
path = apps/admin
3+
url = https://github.com/onlook-dev/admin.git

‎.husky/pre-commit‎

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

0 commit comments

Comments
 (0)