Skip to content

Commit

Permalink
Cleanup components and refactor (#276)
Browse files Browse the repository at this point in the history
* Cleanup and refactor components

* Add missing files and bun lock file

* Changed light positions and fixed api changes

* Updated bun filoe

* Update dependencies

* Update jsx option

* Update package-lock

* Update lockfile

* Delete unused api folder

* Update lockfile

* Remove dependencies, test out using bun

* Update lockfile

* Set override for typescript

* Update more things

* fix import

* Started using Suspense to prevent early rendering before glb assets are missing

* Remove old netlify redirect file that is no longer used

* check if ommiting setup-node fixes broken action

* Update correct workflow file that was breaking

* Edit workflow
  • Loading branch information
olivia authored Oct 26, 2024
1 parent 6d0bccc commit 1840b11
Show file tree
Hide file tree
Showing 30 changed files with 1,869 additions and 7,918 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-node@v3
with:
node-version: 18
- run: npm ci
# - uses: actions/setup-node@v3
# with:
# node-version: 18
- name: Use Bun
uses: oven-sh/setup-bun@v1
- name: bun install, and start
run: |
bun install
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_PEBBLE_09D5B2410 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: 'upload'
app_build_command: 'npm run build:azure'
app_build_command: 'bun run build:azure'
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: '/' # App source code path
api_location: 'api'
output_location: 'dist' # Built app content directory - optional
###### End of Repository/Build Configurations ######
18 changes: 6 additions & 12 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,15 @@ jobs:
runs-on: ubuntu-latest
name: Build

strategy:
matrix:
node-version: [20.x]

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Build
- name: Use Bun
uses: oven-sh/setup-bun@v1
- name: bun install, and start
run: |
npm ci
npm run build
bun install
bun run refresh-kbs
bun run build
7 changes: 0 additions & 7 deletions api/.funcignore

This file was deleted.

99 changes: 0 additions & 99 deletions api/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions api/GithubOAuth/function.json

This file was deleted.

33 changes: 0 additions & 33 deletions api/GithubOAuth/index.ts

This file was deleted.

3 changes: 0 additions & 3 deletions api/GithubOAuth/sample.dat

This file was deleted.

7 changes: 0 additions & 7 deletions api/host.json

This file was deleted.

117 changes: 0 additions & 117 deletions api/package-lock.json

This file was deleted.

20 changes: 0 additions & 20 deletions api/package.json

This file was deleted.

10 changes: 0 additions & 10 deletions api/tsconfig.json

This file was deleted.

Binary file added bun.lockb
Binary file not shown.
Loading

0 comments on commit 1840b11

Please sign in to comment.