From 154f4c70dbfba00e74b59d562afb2c4ef76b8785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=B9=A4=E4=BB=99?= Date: Tue, 6 Feb 2024 14:14:08 +0800 Subject: [PATCH] commitlint lint-staged prettier --- packages/f2elint/src/index.ts | 3 --- .../{prettier => base}/.prettierrc.delete | 0 .../{prettier => base}/.prettierrc.js.delete | 0 .../.prettierrc.json.delete | 0 .../{stylelint => base}/.stylelintrc.delete | 0 .../.stylelintrc.js.delete | 0 .../.stylelintrc.json.delete | 0 .../base/commitlint.config.js.delete | 0 .../templates/base/f2elint.config.js.delete | 0 .../templates/base/package.delete.json | 26 +++++++++++++++++++ .../f2elint/templates/base/package.merge.json | 10 +++++++ .../templates/commitlint/package.merge.json | 13 ++++++++++ .../templates/husky/.husky/commit-msg.ejs | 6 ----- .../templates/husky/.husky/pre-commit.ejs | 6 ----- .../templates/husky/package.merge.json | 9 ------- .../templates/lint-staged/package.merge.json | 7 +++++ .../templates/prettier/.prettierignore.ejs | 2 ++ .../templates/prettier/package.merge.json | 20 ++++++++++++++ 18 files changed, 78 insertions(+), 24 deletions(-) rename packages/f2elint/templates/{prettier => base}/.prettierrc.delete (100%) rename packages/f2elint/templates/{prettier => base}/.prettierrc.js.delete (100%) rename packages/f2elint/templates/{prettier => base}/.prettierrc.json.delete (100%) rename packages/f2elint/templates/{stylelint => base}/.stylelintrc.delete (100%) rename packages/f2elint/templates/{stylelint => base}/.stylelintrc.js.delete (100%) rename packages/f2elint/templates/{stylelint => base}/.stylelintrc.json.delete (100%) create mode 100644 packages/f2elint/templates/base/commitlint.config.js.delete create mode 100644 packages/f2elint/templates/base/f2elint.config.js.delete create mode 100644 packages/f2elint/templates/base/package.delete.json create mode 100644 packages/f2elint/templates/base/package.merge.json create mode 100644 packages/f2elint/templates/commitlint/package.merge.json delete mode 100755 packages/f2elint/templates/husky/.husky/commit-msg.ejs delete mode 100755 packages/f2elint/templates/husky/.husky/pre-commit.ejs delete mode 100644 packages/f2elint/templates/husky/package.merge.json create mode 100644 packages/f2elint/templates/prettier/package.merge.json diff --git a/packages/f2elint/src/index.ts b/packages/f2elint/src/index.ts index 3055ce8..e38e14e 100644 --- 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/packages/f2elint/templates/prettier/.prettierrc.delete b/packages/f2elint/templates/base/.prettierrc.delete similarity index 100% rename from packages/f2elint/templates/prettier/.prettierrc.delete rename to packages/f2elint/templates/base/.prettierrc.delete diff --git a/packages/f2elint/templates/prettier/.prettierrc.js.delete b/packages/f2elint/templates/base/.prettierrc.js.delete similarity index 100% rename from packages/f2elint/templates/prettier/.prettierrc.js.delete rename to packages/f2elint/templates/base/.prettierrc.js.delete diff --git a/packages/f2elint/templates/prettier/.prettierrc.json.delete b/packages/f2elint/templates/base/.prettierrc.json.delete similarity index 100% rename from packages/f2elint/templates/prettier/.prettierrc.json.delete rename to packages/f2elint/templates/base/.prettierrc.json.delete diff --git a/packages/f2elint/templates/stylelint/.stylelintrc.delete b/packages/f2elint/templates/base/.stylelintrc.delete similarity index 100% rename from packages/f2elint/templates/stylelint/.stylelintrc.delete rename to packages/f2elint/templates/base/.stylelintrc.delete diff --git a/packages/f2elint/templates/stylelint/.stylelintrc.js.delete b/packages/f2elint/templates/base/.stylelintrc.js.delete similarity index 100% rename from packages/f2elint/templates/stylelint/.stylelintrc.js.delete rename to packages/f2elint/templates/base/.stylelintrc.js.delete diff --git a/packages/f2elint/templates/stylelint/.stylelintrc.json.delete b/packages/f2elint/templates/base/.stylelintrc.json.delete similarity index 100% rename from packages/f2elint/templates/stylelint/.stylelintrc.json.delete rename to packages/f2elint/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 new file mode 100644 index 0000000..e69de29 diff --git a/packages/f2elint/templates/base/f2elint.config.js.delete b/packages/f2elint/templates/base/f2elint.config.js.delete new file mode 100644 index 0000000..e69de29 diff --git a/packages/f2elint/templates/base/package.delete.json b/packages/f2elint/templates/base/package.delete.json new file mode 100644 index 0000000..0b66db9 --- /dev/null +++ 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 new file mode 100644 index 0000000..534e03a --- /dev/null +++ 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 new file mode 100644 index 0000000..585d9fe --- /dev/null +++ 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 deleted file mode 100755 index cd0035f..0000000 --- a/packages/f2elint/templates/husky/.husky/commit-msg.ejs +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -<% if (commitlint) { %> -. "$(dirname -- "$0")/_/husky.sh" - -PATH=$(pwd)/.node/bin:$(pwd)/node_modules/.bin:$PATH commitlint --edit ${1} -<% } %> diff --git a/packages/f2elint/templates/husky/.husky/pre-commit.ejs b/packages/f2elint/templates/husky/.husky/pre-commit.ejs deleted file mode 100755 index ed12952..0000000 --- a/packages/f2elint/templates/husky/.husky/pre-commit.ejs +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -<% if (lintStaged) { %> -. "$(dirname -- "$0")/_/husky.sh" - -PATH=$(pwd)/.node/bin:$(pwd)/node_modules/.bin:$PATH lint-staged -<% } %> diff --git a/packages/f2elint/templates/husky/package.merge.json b/packages/f2elint/templates/husky/package.merge.json deleted file mode 100644 index 9b2cf82..0000000 --- a/packages/f2elint/templates/husky/package.merge.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "lint-staged": { - "*.{cjs,cts,js,jsx,mjs,mts,ts,tsx,vue}": "eslint", - "*.{css,less,scss}": "stylelint" - }, - "devDependencies": { - "lint-staged": "^15.2.2" - } -} diff --git a/packages/f2elint/templates/lint-staged/package.merge.json b/packages/f2elint/templates/lint-staged/package.merge.json index 617955c..122830e 100644 --- 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 index 63ac9cf..79ba412 100644 --- 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 new file mode 100644 index 0000000..ff39ce5 --- /dev/null +++ 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", + <% } %> + } +}