Skip to content

Commit

Permalink
Merge branch 'master' into feature/perf-ts-type-import
Browse files Browse the repository at this point in the history
  • Loading branch information
bigbigDreamer authored Mar 22, 2022
2 parents c7b94d6 + ebb3588 commit a0d69d3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run lint-staged
11 changes: 10 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"gatsby-plugin-less": "^5.2.0",
"gatsby-plugin-pnpm": "^1.2.10",
"gh-pages": "^3.1.0",
"husky": "^7.0.4",
"less": "^4.1.0",
"lint-staged": "^12.3.5",
"prettier": "2.2.1",
"rimraf": "^2.5.4",
"ts-loader": "^8.0.18",
Expand All @@ -38,7 +40,14 @@
"build": "gatsby build --prefix-paths",
"format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\"",
"clean": "gatsby clean",
"deploy": "npm run clean && gatsby build --prefix-paths && gh-pages -d public"
"deploy": "npm run clean && gatsby build --prefix-paths && gh-pages -d public",
"prepare": "husky install",
"lint-staged": "lint-staged"
},
"lint-staged": {
"*.{ts,tsx}": [
"prettier --write"
]
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Drawer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import arrayMove from 'array-move';
import { FormCreator } from '../FormCreator';
import { getDefaultTitleNameMap } from '@/datas/constant';
import { getLocale } from '@/locale';
import { MODULES, CONTENT_OF_MODULE } from '../../helpers/contant';
import { MODULES, CONTENT_OF_MODULE } from '@/helpers/contant';
import type { ResumeConfig, ThemeConfig } from '../types';
import { ConfigTheme } from './ConfigTheme';
import { Templates } from './Templates';
Expand Down

0 comments on commit a0d69d3

Please sign in to comment.