improve(ts-lib-scripts): 升级 husky 和 lint-staged

Author: liujinxing

.eslintignore

@@ -1,2 +1,4 @@
 **/assets/*
 **/*.d.ts
+**/dist/
+**/build/

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged

.lintstagedrc

@@ -0,0 +1,10 @@
+{
+  "**/*.{md,mdx,js,json}": [
+    "prettier --write"
+  ],
+  "(packages|src)/**/*.{ts,tsx}!(**/assets/**)": [
+    "prettier --write",
+    "eslint --fix --color",
+    "cross-env CI=true ts-lib-tools test"
+  ]
+}

.prettierrc.json

@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "useTabs": false,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "always"
+}

CHANGELOG.md

@@ -6,6 +6,7 @@
 - fix(eslint-config-ts-lib): 修复 prettier 和 eslint 规则冲突的缺陷
 - breadchange(eslint-config-ts-lib): 增加 jsdoc 和 typescript 类型显式声明的规则
 - improve(ts-lib-scripts): 启用 eslint 的缓存
+- improve(ts-lib-scripts): 升级 husky 和 lint-staged
 
 ## v0.14.3 - 2021.8.19
 

e2e/jest-css-transform-demo/package.json

@@ -3,7 +3,7 @@
   "version": "0.14.3",
   "dependencies": {
     "@types/draft-js": "^0.11.0",
-    "@types/jest": "^26.0.21",
+    "@types/jest": "^27.0.1",
     "draft-js": "^0.11.7",
     "react": "17.0.2",
     "react-dom": "17.0.2",

e2e/jest-resolver-tsconfig-paths/package.json

@@ -4,6 +4,6 @@
     "resolver": "jest-resolver-tsconfig-paths"
   },
   "dependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.1.1"
   }
 }

examples/package.json

@@ -15,8 +15,8 @@
   },
   "devDependencies": {
     "@types/react": "^16.8.19",
-    "husky": "^2.3.0",
-    "lint-staged": "^8.1.7",
+    "husky": "^7.0.2",
+    "lint-staged": "^11.1.2",
     "react": "^16.8.6",
     "rimraf": "^2.6.3",
     "typescript": "^4.4.2"
@@ -35,17 +35,6 @@
   "eslintConfig": {
     "extends": "ts-lib"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,ts,tsx}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
   "module": "dist/ts-lib-scripts-example.esm.js",
   "types": "types/index.d.ts"
 }

package.json

@@ -17,10 +17,10 @@
     "url": "git+https://github.com/sinoui/ts-lib-scripts.git"
   },
   "devDependencies": {
-    "cross-env": "^5.2.0",
-    "husky": "^4.2.5",
+    "cross-env": "^7.0.3",
+    "husky": "^7.0.2",
     "lerna": "^3.16.4",
-    "lint-staged": "^8.1.7",
+    "lint-staged": "^11.1.2",
     "typescript": "^4.4.2",
     "typescript-plugin-css-modules": "^3.4.0"
   },
@@ -31,17 +31,6 @@
       "no-console": "off"
     }
   },
-  "prettier": {
-    "printWidth": 80,
-    "useTabs": false,
-    "tabWidth": 2,
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": false,
-    "arrowParens": "always"
-  },
   "scripts": {
     "lint": "ts-lib-tools lint",
     "format": "ts-lib-tools lint --fix",
@@ -50,24 +39,8 @@
     "build": "tsc --build packages/tsconfig.json",
     "clean": "yarn build --clean",
     "postinstall": "yarn-deduplicate yarn.lock && yarn build",
-    "prepublishOnly": "yarn clean && yarn build"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "linters": {
-      "packages/**/*.{ts,tsx}": [
-        "cross-env CI=true ts-lib-tools test",
-        "eslint --fix --color",
-        "git add"
-      ]
-    },
-    "ignore": [
-      "**/assets/**"
-    ]
+    "prepublishOnly": "yarn clean && yarn build",
+    "prepare": "husky install"
   },
   "resolutions": {
     "serialize-javascript": "^2.1.1"

packages/eslint-config-ts-lib/package.json

@@ -31,7 +31,7 @@
     "@types/parse5": "^6.0.1",
     "cheerio": "^1.0.0-rc.10",
     "fs-extra": "^10.0.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "rxjs": "^7.3.0",
     "ts-node": "^10.2.1"
   }

packages/eslint-config-ts-lib/tsconfig.json

@@ -5,6 +5,6 @@
     "allowJs": true,
     "noEmit": true,
     "moduleResolution": "node",
-    "module": "commonjs"
+    "module": "CommonJS"
   }
 }

packages/jest-resolver-tsconfig-paths/package.json

@@ -20,6 +20,6 @@
     "tsconfig-paths": "^3.9.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.4"
+    "@types/jest": "^27.0.1"
   }
 }

packages/jest-resolver-tsconfig-paths/tsconfig.json

@@ -7,6 +7,6 @@
     "rootDir": "./src",
     "outDir": "./dist",
     "declarationDir": "./dist",
-    "module": "commonjs"
+    "module": "CommonJS"
   }
 }

packages/ts-lib-scripts-utils/package.json

@@ -18,9 +18,9 @@
   ],
   "gitHead": "a0ec9d27b2f24cb228993286530f89957d055b9b",
   "dependencies": {
-    "chalk": "^2.4.2",
-    "execa": "^3.4.0",
-    "fs-extra": "^8.1.0"
+    "chalk": "^4.1.2",
+    "execa": "^5.1.1",
+    "fs-extra": "^10.0.0"
   },
   "devDependencies": {
     "@types/execa": "^2.0.0"

packages/ts-lib-scripts-utils/src/getInstallDepsCmd.ts

@@ -5,12 +5,21 @@ import getInstallCmd from './getInstallCmd';
  *
  * @param deps 依赖
  * @param isDev 是否是开发依赖
+ * @param isMonorepo 是否是 monorepo 模式
  */
-export default function getInstallDepsCmd(deps: string[], isDev = false) {
+export default function getInstallDepsCmd(
+  deps: string[],
+  isDev = false,
+  isMonorepo = false,
+): string {
   const cmd = getInstallCmd();
 
   if (cmd === 'npm') {
-    return `npm add ${deps.join(' ')} ${isDev ? '--save' : '--save-dev'}`;
+    return `npm add ${deps.join(' ')} ${
+      isDev ? '--save' : '--save-dev'
+    }`.trim();
   }
-  return `yarn add ${deps.join(' ')}${isDev ? ' --dev' : ''}`;
+  return `yarn add ${deps.join(' ')}${isDev ? ' --dev' : ''} ${
+    isMonorepo ? '-W' : ''
+  }`.trim();
 }

packages/ts-lib-scripts-utils/tsconfig.json

@@ -7,6 +7,6 @@
     "rootDir": "./src",
     "outDir": "./dist",
     "declarationDir": "./dist",
-    "module": "commonjs"
+    "module": "CommonJS"
   }
 }

packages/ts-lib-scripts/assets/common-template/.browserslistrc

@@ -0,0 +1,16 @@
+[production]
+> 1%
+ie 11
+
+[modern]
+last 1 chrome version
+last 1 firefox version
+last 1 safari version
+
+[development]
+last 1 chrome version
+last 1 chrome version
+last 1 safari version
+
+[ssr]
+node 14

packages/ts-lib-scripts/assets/common-template/.eslintignore

@@ -0,0 +1,3 @@
+**/*.d.ts
+**/dist/
+**/build/

packages/ts-lib-scripts/assets/common-template/.eslintrc.ci.json renamed to packages/ts-lib-scripts/assets/common-template/.eslintrc.json

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged

packages/ts-lib-scripts/assets/common-template/.husky/pre-commit

@@ -0,0 +1,10 @@
+{
+  "**/*.{md,mdx,js,json}": [
+    "prettier --write"
+  ],
+  "(packages|src)/**/*.{ts,tsx}": [
+    "prettier --write",
+    "eslint --fix --color",
+    "cross-env CI=true ts-lib-tools test"
+  ]
+}

packages/ts-lib-scripts/assets/common-template/.lintstagedrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 80,
+  "useTabs": false,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "always"
+}

packages/ts-lib-scripts/assets/common-template/.prettierrc.json

@@ -2,7 +2,6 @@
   "editor.formatOnSave": true,
   "javascript.format.enable": false,
   "typescript.format.enable": false,
-  "eslint.enable": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },

packages/ts-lib-scripts/assets/common-template/.vscode/settings.json

@@ -0,0 +1,21 @@
+{
+  "name": "my-ts-lib",
+  "version": "0.1.0",
+  "license": "MIT",
+  "description": "描述库的用途",
+  "main": "dist/index.js",
+  "umd:main": "dist/sinoui-use-rest-api.umd.production.js",
+  "module": "dist/sinoui-use-rest-api.esm.js",
+  "types": "types/index.d.ts",
+  "scripts": {
+    "test": "ts-lib-tools test",
+    "build": "ts-lib-tools build --simple",
+    "format": "ts-lib-tools format",
+    "lint": "ts-lib-tools lint",
+    "release": "yarn build && yarn publish dist"
+  },
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/ts-lib-scripts/assets/common-template/package.json

@@ -29,6 +29,7 @@
     "composite": true,
     "resolveJsonModule": true,
     "incremental": true,
-    "plugins": [{ "name": "typescript-plugin-css-modules" }]
+    "plugins": [{ "name": "typescript-plugin-css-modules" }],
+    "forceConsistentCasingInFileNames": true
   }
 }