Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Pivot-Studio/ps-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
1360151219 committed Oct 2, 2022
2 parents dcd5f72 + 46ac820 commit 2d43e00
Show file tree
Hide file tree
Showing 33 changed files with 2,347 additions and 1,985 deletions.
15 changes: 11 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"extends": [
"eslint-config-psfe"
]
}
"extends": ["eslint-config-psfe"],
"settings": {
//eslint-import-resolver-alias
"import/resolver": {
"alias": {
"map": [["@", "./src"]],
"extensions": [".ts"] // ***2.解决引入问题
}
}
}
}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
strict-peer-dependencies=false
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,22 @@
"es-dirname": "^0.1.0",
"execa": "^6.1.0",
"figlet": "^1.5.2",
"fs-extra": "^10.1.0",
"inquirer": "^8.2.1",
"ora": "^5.4.1"
"ora": "^5.4.1",
"simple-git": "^3.14.1",
"yargs": "^17.5.1"
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/inquirer": "^9.0.1",
"@types/node": "^18.7.18",
"@types/yargs": "^17.0.12",
"@typescript-eslint/eslint-plugin": "^5.35.1",
"@typescript-eslint/parser": "^5.35.1",
"eslint": "^8.23.0",
"eslint-config-psfe": "^1.0.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.1",
Expand Down
Loading

0 comments on commit 2d43e00

Please sign in to comment.