Skip to content

Commit

Permalink
Merge pull request #150 from rharkor/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
rharkor authored Sep 26, 2023
2 parents 9ad6309 + 30bffa6 commit 36da745
Show file tree
Hide file tree
Showing 10 changed files with 218 additions and 137 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
},

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "./scripts/install-zsh10k.sh && ./scripts/install-bun.sh && ./scripts/install-brew.sh && bun install",
"postCreateCommand": "./scripts/install-zsh10k.sh && ./scripts/install-bun.sh && ./scripts/install-brew.sh && npm install",

// Configure tool-specific properties.
"customizations": {
"postCreateCommand": "./scripts/install-zsh10k.sh && ./scripts/install-bun.sh && ./scripts/install-brew.sh && bun install",
"postCreateCommand": "./scripts/install-zsh10k.sh && ./scripts/install-bun.sh && ./scripts/install-brew.sh && npm install",
"vscode": {
"extensions": [
"formulahendry.auto-rename-tag",
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install bun
uses: oven-sh/setup-bun@v1
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "18.x"
cache: "npm"
- name: Install dependencies
run: bun install --frozen-lockfile
run: npm install
- name: Set example env
run: cp .env.example .env
- name: Lint check
run: bun run lint
run: npm run lint
- name: Format check
run: bun run prettier
run: npm run prettier
- name: Unit & Integration tests
run: bun run test
run: npm run test
- name: Check dependencies usage
run: bun run depcheck
run: npm run depcheck
12 changes: 7 additions & 5 deletions .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install bun
uses: oven-sh/setup-bun@v1
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Install dependencies
run: bun install
run: npm install

# If pbun is used, you need to switch the previous step with the following one. pbun does not create a package-lock.json
# If pnpm is used, you need to switch the previous step with the following one. pnpm does not create a package-lock.json
# so the step above will fail to pull dependencies
# - uses: pnpm/action-setup@v2
# name: Install pnpm
Expand Down Expand Up @@ -60,7 +62,7 @@ jobs:

- name: Build next.js app
# change this if your site requires a custom build command
run: bun run build
run: npm run build

# Here's the first place where next-bundle-analysis' own script is used
# This step pulls the raw bundle stats for the current bundle
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install bun
uses: oven-sh/setup-bun@v1
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "lts/*"
- name: Install dependencies
run: bun install --frozen-lockfile
run: npm install
- name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
run: npm audit signatures
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: bunx semantic-release
run: npx semantic-release
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,19 @@ cp .env.example .env
3. Initialize the project:

```bash
bun run init
npm run init
```

4. Install the dependencies:

```bash
bun install
npm install
```

5. Run the development server:

```bash
bun run dev
npm run dev
```

6. Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
Expand Down Expand Up @@ -166,7 +166,7 @@ This boilerplate comes with various testing setups to ensure your application's

### Running Tests

- **Unit and integration tests**: Run Jest tests using `bun run test`
- **Unit and integration tests**: Run Jest tests using `npm run test`

<img width="1392" alt="image" src="https://user-images.githubusercontent.com/28964599/233666655-93b7d08b-2fd8-406a-b43c-44d4d96cf387.png">

Expand Down
Loading

0 comments on commit 36da745

Please sign in to comment.