Skip to content

Commit dc357f8

Browse files
Merge pull request #1 from KushibikiMashu/feature/update-v11
Feature/update v11
2 parents 2a0d2c8 + 55ebfce commit dc357f8

File tree

6 files changed

+1351
-1208
lines changed

6 files changed

+1351
-1208
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ module.exports = {
1111
'plugin:react-hooks/recommended',
1212
'plugin:jsx-a11y/recommended',
1313
'plugin:import/typescript',
14+
'plugin:@next/next/recommended',
1415
// 競合を避けるため、prettierは一番最後に書く
1516
'plugin:prettier/recommended',
16-
'prettier/@typescript-eslint',
1717
],
1818
globals: {
1919
Atomics: 'readonly',

.github/workflows/node.js.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,22 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v2
23+
2324
- name: Use Node.js ${{ matrix.node-version }}
2425
uses: actions/setup-node@v1
2526
with:
2627
node-version: ${{ matrix.node-version }}
28+
29+
# @see https://zenn.dev/odan/scraps/81b2738864a908#comment-71195269e61d4f
30+
- name: cache node_modules
31+
id: node_modules_cache_id
32+
uses: actions/cache@v2
33+
with:
34+
path: |
35+
node_modules
36+
key: node-v${{ matrix.node-version }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
37+
2738
- run: yarn install --frozen-lockfile
28-
- run: yarn test
39+
- run: yarn ci
40+
- run: yarn build-storybook
2941
- run: yarn build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ yarn-error.log*
2828
.idea/
2929
.vercel
3030
.eslintcache
31+
storybook-static

CHANGELOG.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
# Changelog
22

3-
## v.2.1.0
4-
### feat
3+
## 2.2.0
4+
### feature
5+
- update Next.js to v11
6+
- update dependencies
7+
- apply eslint-config-next
8+
- add lint, tsc check to ci
9+
10+
## 2.1.0
11+
### feature
512
- update tailwindcss module
613
- update Next.js, react, react-dom
714
- run husky on commit
@@ -12,33 +19,33 @@
1219
### fix
1320
- use green color instead of teal which was removed from tailwindcss v2
1421

15-
## v.2.0.2
22+
## 2.0.2
1623
- use yarn.lock instead of package-lock.json
1724
- update README.md
1825

19-
## v.2.0.1
26+
## 2.0.1
2027
- fix: remove unused github workflow
2128

22-
## v.2.0.0
29+
## 2.0.0
2330
- breaking: update Next.js, React, Tailwind CSS etc.
2431
- breaking: update tailwind.config.js and postcss.config.js
2532

26-
## v.1.3.0
33+
## 1.3.0
2734
- simplify eslint settings
2835
- apply typescript strict mode
2936
- remove unused files
3037

31-
## v.1.2.0
38+
## 1.2.0
3239
- improvement: update Next.js v10, React v17, Tailwind CSS v1.9
3340
- improvement: apply absolute import
3441
- refactor: simplify pre-commit hook
3542

36-
## v1.1.0
43+
## 1.1.0
3744
- improvement: update Next.js version to 9.5.4
3845
- improvement: change _app.js and index.js to tsx file
3946
- fix: remove bug from component script
4047
- improvement: Remove unused component
4148
- improvement: Fix Next.js version as 9.5.3
4249

43-
## v1.0.0
50+
## 1.0.0
4451
release

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
"start": "next start",
88
"test": "jest --env=jsdom",
99
"fix": "prettier --write './**/*.{js,jsx,ts,tsx}'",
10-
"lint": "eslint . --cache",
11-
"lint:fix": "eslint . --cache --fix",
10+
"lint": "next lint . --cache",
11+
"lint:fix": "next lint . --cache --fix",
1212
"storybook": "start-storybook -p 6006",
1313
"build-storybook": "build-storybook",
1414
"tsc": "tsc",
15-
"prepare": "husky install"
15+
"prepare": "husky install",
16+
"ci": "concurrently 'yarn lint' 'yarn tsc' 'yarn test'"
1617
},
1718
"husky": {
1819
"hooks": {
@@ -21,12 +22,13 @@
2122
},
2223
"lint-staged": {
2324
"*.{ts,tsx}": [
25+
"lint:next",
2426
"eslint --fix",
2527
"prettier --write"
2628
]
2729
},
2830
"dependencies": {
29-
"next": "^10.2.3",
31+
"next": "^11.0.0",
3032
"react": "^17.0.2",
3133
"react-dom": "^17.0.2"
3234
},
@@ -45,7 +47,9 @@
4547
"@typescript-eslint/parser": "^4.14.2",
4648
"autoprefixer": "^10.2.6",
4749
"babel-jest": "^27.0.2",
50+
"concurrently": "^6.2.0",
4851
"eslint": "^7.19.0",
52+
"eslint-config-next": "^11.0.0",
4953
"eslint-config-prettier": "^8.3.0",
5054
"eslint-plugin-import": "^2.22.1",
5155
"eslint-plugin-jsx-a11y": "^6.4.1",

0 commit comments

Comments
 (0)