Skip to content

Commit

Permalink
Merge pull request #28 from dominicarrojado/dependabot/npm_and_yarn/n…
Browse files Browse the repository at this point in the history
…ext-14.1.1

Bump next from 13.2.4 to 14.1.1
  • Loading branch information
dominicarrojado authored Sep 13, 2024
2 parents b13d9a7 + 63c0bd6 commit a195a77
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 131 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:

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

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -26,7 +26,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache dependencies and Next.js build
uses: actions/cache@v3
uses: actions/cache@v4
id: nestjs-cache
with:
path: |
Expand All @@ -46,14 +46,11 @@ jobs:
run: yarn test

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- name: Build
run: yarn build

- name: Generate static files
run: yarn export

- name: Move 404 page to root directory
run: mv ./out/404/index.html ./out/404.html

Expand All @@ -70,7 +67,7 @@ jobs:
repository: ${{ github.repository }}

- name: Merge gh-pages -> main
uses: devmasx/merge-branch@v1.3.1
uses: devmasx/merge-branch@v1.4.0
with:
type: now
from_branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:

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

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -26,7 +26,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache dependencies and Next.js build
uses: actions/cache@v3
uses: actions/cache@v4
id: nestjs-cache
with:
path: |
Expand All @@ -46,10 +46,7 @@ jobs:
run: yarn test

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

- name: Build
run: yarn build

- name: Generate static files
run: yarn export
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ yarn test:watch

```bash
yarn build
yarn export
```

2. The `out` directory can be served by any static hosting service or CDN.
Expand Down
1 change: 1 addition & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const nextConfig = {
reactStrictMode: true,
trailingSlash: true,
pageExtensions: ['page.tsx'],
output: 'export',
};

module.exports = nextConfig;
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"start": "next start",
"lint": "next lint",
"postbuild": "next-sitemap",
"export": "next export",
"test": "jest --coverage",
"test:watch": "jest --coverage --watch",
"deploy": "gh-pages -d out"
Expand All @@ -28,7 +27,7 @@
"eslint-plugin-testing-library": "^5.10.2",
"gray-matter": "^4.0.3",
"moveto": "^1.8.2",
"next": "13.2.4",
"next": "14.1.1",
"next-seo": "^5.15.0",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
Loading

0 comments on commit a195a77

Please sign in to comment.