commitlint lint-staged prettier

alibaba · Feb 6, 2024 · 154f4c7 · 154f4c7
1 parent b0843c2
commit 154f4c7
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 24 deletions.
diff --git a/packages/f2elint/src/index.ts b/packages/f2elint/src/index.ts
@@ -26,9 +26,6 @@ export async function f2elint(project: string | null, options: F2elintOptions =
  if (options.prettier) {
  await initTemplate('prettier');
  }
- if (options.lintStaged || options.commitlint) {
- await initTemplate('husky');
- }
  if (options.lintStaged) {
  await initTemplate('lint-staged');
  }

diff --git a/...int/templates/prettier/.prettierrc.delete → ...f2elint/templates/base/.prettierrc.delete b/...int/templates/prettier/.prettierrc.delete → ...f2elint/templates/base/.prettierrc.delete
diff --git a/.../templates/prettier/.prettierrc.js.delete → ...lint/templates/base/.prettierrc.js.delete b/.../templates/prettier/.prettierrc.js.delete → ...lint/templates/base/.prettierrc.js.delete
diff --git a/...emplates/prettier/.prettierrc.json.delete → ...nt/templates/base/.prettierrc.json.delete b/...emplates/prettier/.prettierrc.json.delete → ...nt/templates/base/.prettierrc.json.delete
diff --git a/...t/templates/stylelint/.stylelintrc.delete → ...2elint/templates/base/.stylelintrc.delete b/...t/templates/stylelint/.stylelintrc.delete → ...2elint/templates/base/.stylelintrc.delete
diff --git a/...emplates/stylelint/.stylelintrc.js.delete → ...int/templates/base/.stylelintrc.js.delete b/...emplates/stylelint/.stylelintrc.js.delete → ...int/templates/base/.stylelintrc.js.delete
diff --git a/...plates/stylelint/.stylelintrc.json.delete → ...t/templates/base/.stylelintrc.json.delete b/...plates/stylelint/.stylelintrc.json.delete → ...t/templates/base/.stylelintrc.json.delete
diff --git a/packages/f2elint/templates/base/commitlint.config.js.delete b/packages/f2elint/templates/base/commitlint.config.js.delete
diff --git a/packages/f2elint/templates/base/f2elint.config.js.delete b/packages/f2elint/templates/base/f2elint.config.js.delete
diff --git a/packages/f2elint/templates/base/package.delete.json b/packages/f2elint/templates/base/package.delete.json
@@ -0,0 +1,26 @@
+{
+ "husky": null,
+ "jest": null,
+ "just": null,
+ "teleport": null,
+ "dependencies": {
+ "@alife/next": null
+ },
+ "devDependencies": {
+ "@types/jest": null,
+ "@alib/build-scripts": null,
+ "@alife/eslint-config-crated": null,
+ "@alife/jest-preset-crated": null,
+ "@alife/next": null,
+ "@alife/tsconfig-crated": null,
+ "build-scripts": null,
+ "build-plugin-component": null,
+ "build-plugin-fusion": null,
+ "build-plugin-moment-locales": null,
+ "ice.js": null,
+ "f2elint": null,
+ "jest": null,
+ "jest-environment-jsdom": null,
+ "ts-jest": null
+ }
+}
diff --git a/packages/f2elint/templates/base/package.merge.json b/packages/f2elint/templates/base/package.merge.json
@@ -0,0 +1,10 @@
+{
+ "scripts": {
+ "lint": "eslint .<% if (stylelint) { %> && stylelint \"**/*.{css,less,scss}\"<% } %>",
+ "lint:fix": "<% if (stylelint) { %>prettier --write . && <% } %>eslint --fix .<% if (stylelint) { %> && stylelint --fix \"**/*.{css,less,scss}\"<% } %>"
+ },
+ "devDependencies": {
+ "eslint": "^8.56.0",
+ "eslint-config-ali": "^14.2.1"
+ }
+}
diff --git a/packages/f2elint/templates/commitlint/package.merge.json b/packages/f2elint/templates/commitlint/package.merge.json
@@ -0,0 +1,13 @@
+{
+ "scripts": {
+ "prepare": "husky install"
+ },
+ "commitlint": {
+ "extends": ["ali"]
+ },
+ "devDependencies": {
+ "husky": "^8.0.0",
+ "@commitlint/cli": "^18.4.3",
+ "commitlint-config-ali": "^1.0.0"
+ }
+}
diff --git a/packages/f2elint/templates/husky/.husky/commit-msg.ejs b/packages/f2elint/templates/husky/.husky/commit-msg.ejs
diff --git a/packages/f2elint/templates/husky/.husky/pre-commit.ejs b/packages/f2elint/templates/husky/.husky/pre-commit.ejs
diff --git a/packages/f2elint/templates/husky/package.merge.json b/packages/f2elint/templates/husky/package.merge.json
diff --git a/packages/f2elint/templates/lint-staged/package.merge.json b/packages/f2elint/templates/lint-staged/package.merge.json
@@ -1,6 +1,13 @@
 {
+ "scripts": {
+ "prepare": "husky install"
+ },
  "lint-staged": {
  "*.{cjs,cts,js,jsx,mjs,mts,ts,tsx,vue}": "eslint",
  "*.{css,less,scss}": "stylelint"
+ },
+ "devDependencies": {
+ "husky": "^8.0.0",
+ "lint-staged": "^15.2.2"
  }
 }
diff --git a/packages/f2elint/templates/prettier/.prettierignore.ejs b/packages/f2elint/templates/prettier/.prettierignore.ejs
@@ -10,3 +10,5 @@ node_modules
 package-lock.json
 pnpm-lock.yaml
 yarn.lock
+*.min.js
+*.min.css
diff --git a/packages/f2elint/templates/prettier/package.merge.json b/packages/f2elint/templates/prettier/package.merge.json
@@ -0,0 +1,20 @@
+{
+ "prettier": "prettier-config-ali",
+ "eslintConfig": {
+ "extends": ["plugin:prettier/recommended"]
+ },
+ <% if (stylelint) { %>
+ "stylelint": {
+ "extends": ["stylelint-config-ali", "stylelint-prettier/recommended"]
+ },
+ <% } %>
+ "devDependencies": {
+ "eslint-config-prettier": "^9.1.0",
+ "eslint-plugin-prettier": "^5.0.1",
+ "prettier": "^3.1.1",
+ "prettier-config-ali": "^1.0.0",
+ <% if (stylelint) { %>
+ "stylelint-prettier": "^5.0.0",
+ <% } %>
+ }
+}