Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/eslint-8.43.0
Browse files Browse the repository at this point in the history
  • Loading branch information
assanges committed Oct 26, 2023
2 parents d5ee484 + 8178d55 commit 93de30c
Show file tree
Hide file tree
Showing 3 changed files with 552 additions and 472 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml → .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
name: ci
name: deploy

on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master
- master

jobs:
ci:
deploy:
runs-on: ${{ matrix.os }}

env:
Expand Down Expand Up @@ -46,7 +42,7 @@ jobs:
NODE_ENV: production
- name: Deploy 🚀
uses: JamesIves/[email protected].1
uses: JamesIves/[email protected].2
with:
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: out # The folder the action should deploy.
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@
"dependencies": {
"@mdx-js/mdx": "^2.3.0",
"@mdx-js/react": "^2.3.0",
"autoprefixer": "^10.4.13",
"next": "^13.2.4",
"autoprefixer": "^10.4.14",
"next": "^13.5.0",
"next-themes": "^0.2.1",
"prop-types": "^15.8.1",
"react": "18",
"react-dom": "18",
"react-helmet": "^6.1.0",
"swr": "^2.1.0",
"react-helmet": "^6.1.0
"swr": "^2.1.5",
"tailwindcss": "^3.2.7"
},
"devDependencies": {
"cssnano": "5.1.15",
"cssnano": "6.0.1
"eslint": "^8.43.0",
"eslint-config-airbnb": "19",
"eslint-config-next": "^13.2.3",
"eslint-config-next": "^13.4.6",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.0",
"eslint-plugin-react": "^7.30.1",
"gh-pages": "^5.0.0",
"husky": "^8.0.1",
"postcss": "^8.4.14",
"prettier": "^2.8.5"
"postcss": "^8.4.31",
"prettier": "^2.8.8"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 93de30c

Please sign in to comment.