Skip to content

Commit

Permalink
Merge branch 'main' into bundle-analyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
MikuroXina committed Jan 2, 2024
2 parents 579947c + 7d3575d commit 21e4343
Show file tree
Hide file tree
Showing 23 changed files with 14 additions and 11,185 deletions.
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,22 @@ jobs:
- stylelint
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: yarn
- run: yarn install --immutable
- uses: oven-sh/setup-bun@v1
- run: bun install

- name: Run ${{ matrix.lint }}
run: yarn ${{ matrix.lint }}
run: bun run ${{ matrix.lint }}

build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: yarn
- run: yarn install --immutable
- uses: oven-sh/setup-bun@v1
- run: bun install

- name: Run build
run: |
yarn build
bun run build
env:
NEXT_PUBLIC_BASE_URL: ${{ secrets.BASE_URL }}
NEXT_PUBLIC_GOOGLE_ANALYTICS_ID: ${{ secrets.GOOGLE_ANALYTICS_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint-staged
bun x lint-staged
6 changes: 1 addition & 5 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"recommendations": [
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
]
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
}
10 changes: 0 additions & 10 deletions .vscode/settings.json

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.3.cjs

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/eslint/bin/eslint.js

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/eslint/lib/api.js

This file was deleted.

6 changes: 0 additions & 6 deletions .yarn/sdks/eslint/package.json

This file was deleted.

5 changes: 0 additions & 5 deletions .yarn/sdks/integrations.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/prettier/index.js

This file was deleted.

6 changes: 0 additions & 6 deletions .yarn/sdks/prettier/package.json

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/typescript/bin/tsc

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/typescript/bin/tsserver

This file was deleted.

20 changes: 0 additions & 20 deletions .yarn/sdks/typescript/lib/tsc.js

This file was deleted.

Loading

0 comments on commit 21e4343

Please sign in to comment.