Skip to content

Commit

Permalink
Merge branch 'develop' into sitemap
Browse files Browse the repository at this point in the history
  • Loading branch information
TyHil committed Feb 7, 2024
2 parents 597fd82 + 3368ec7 commit cacfb9e
Show file tree
Hide file tree
Showing 34 changed files with 840 additions and 2,942 deletions.
27 changes: 20 additions & 7 deletions .github/workflows/lint-check.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
name: lint-check
on: [push]
name: Lint and Formatting Check

on: push

jobs:
main:
name: Run ESLint + Prettier
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- name: Check out Git repository
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '18'
- run: npm install next
- run: npm run lint:check
- run: npm run format:check

- name: Install Next for ESLint and Prettier
run: npm install next prettier

- name: Run ESLint
run: npm run lint:check

- name: Run Prettier
run: npm run format:check
7 changes: 1 addition & 6 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@ const nextConfig = {
reactStrictMode: true,
};

const withNextra = require('nextra')({
theme: 'nextra-theme-docs',
themeConfig: './theme.config.tsx',
});

module.exports = withNextra(nextConfig);
module.exports = nextConfig;
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
"clsx": "^2.0.0",
"next": "^13.4.19",
"next-sitemap": "^4.2.3",
"nextra": "^2.12.3",
"nextra-theme-docs": "^2.12.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sharp": "^0.32.6"
Expand All @@ -31,7 +29,7 @@
"eslint": "^8.48.0",
"eslint-config-next": "^13.4.19",
"postcss": "^8.4.29",
"prettier": "^3.0.3",
"prettier": "^3.2.5",
"tailwindcss": "^3.3.3",
"typescript": "5.2.2"
}
Expand Down
Loading

0 comments on commit cacfb9e

Please sign in to comment.