@apdesign/code-style-react 1.0.9 → 1.1.1

package/cli.js

@@ -1,12 +1,15 @@
 #!/usr/bin/env node
 
 const main = require('./index');
+const eslint = require('./scripts/runEslint');
 
 const args = process.argv.slice(2);
 const command = args[0];
 
 if (command === 'init') {
   main();
+} else if (command === 'eslint') {
+  eslint();
 } else {
   console.log(`Unknown command: "${command}"`);
 }

package/eslint/.eslintrc.build.js

@@ -21,6 +21,9 @@ module.exports = {
     camelcase: 'off',
     'class-methods-use-this': 'off',
 
+    'dot-notation': 'warn',
+
+    'import/order': 'warn',
     'import/first': 'off',
     'import/extensions': 'off',
     'import/prefer-default-export': 'off',
@@ -30,6 +33,7 @@ module.exports = {
     'jsx-a11y/no-noninteractive-element-interactions': 'off',
 
     'linebreak-style': 'off',
+    'lines-between-class-members': 'warn',
 
     'max-classes-per-file': 'off',
 
@@ -47,6 +51,11 @@ module.exports = {
     'react/self-closing-comp': 'off',
     'react/jsx-no-useless-fragment': 'off',
 
+    '@typescript-eslint/no-explicit-any': 'warn',
+
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': ['warn'],
+
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
 
@@ -56,7 +65,7 @@ module.exports = {
     'no-shadow': 'off',
     '@typescript-eslint/no-shadow': 'warn',
 
-    'no-empty-function': ['warn', { allow: ['constructors'] }],
+    'no-empty-function': ['warn', { allow: ['constructors', 'arrowFunctions'] }],
     'no-param-reassign': ['warn', { props: true, ignorePropertyModificationsFor: ['draft'] }],
     'no-restricted-syntax': [
       'warn',

package/eslint/.eslintrc.js

@@ -21,6 +21,9 @@ module.exports = {
     camelcase: 'off',
     'class-methods-use-this': 'off',
 
+    'dot-notation': 'warn',
+
+    'import/order': 'warn',
     'import/first': 'off',
     'import/extensions': 'off',
     'import/prefer-default-export': 'off',
@@ -30,6 +33,7 @@ module.exports = {
     'jsx-a11y/no-noninteractive-element-interactions': 'off',
 
     'linebreak-style': 'off',
+    'lines-between-class-members': 'warn',
 
     'max-classes-per-file': 'off',
 
@@ -47,6 +51,11 @@ module.exports = {
     'react/self-closing-comp': 'off',
     'react/jsx-no-useless-fragment': 'off',
 
+    '@typescript-eslint/no-explicit-any': 'warn',
+
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': ['warn'],
+
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
 
@@ -54,10 +63,10 @@ module.exports = {
     '@typescript-eslint/no-useless-constructor': 'error',
 
     'no-shadow': 'off',
-    '@typescript-eslint/no-shadow': 'error',
+    '@typescript-eslint/no-shadow': 'warn',
 
-    'no-empty-function': ['error', { allow: ['constructors'] }],
-    'no-param-reassign': ['error', { props: true, ignorePropertyModificationsFor: ['draft'] }],
+    'no-empty-function': ['warn', { allow: ['constructors', 'arrowFunctions'] }],
+    'no-param-reassign': ['warn', { props: true, ignorePropertyModificationsFor: ['draft'] }],
     'no-restricted-syntax': [
       'warn',
       {

package/husky/_/h

@@ -1,27 +1,27 @@
-#!/usr/bin/env sh
-[ "$HUSKY" = "2" ] && set -x
-n=$(basename "$0")
-s=$(dirname "$(dirname "$0")")/$n
-
-if [[ "$(uname)" == "Darwin" ]]; then
-elif [[ "$(uname -o)" == "Msys" || "$(uname)" == "CYGWIN" || "$(uname)" == "MINGW"* ]]; then
-  sed -i 's/\r//' "$0"
-fi
-
-[ ! -f "$s" ] && exit 0
-
-if [ -f "$HOME/.huskyrc" ]; then
-	echo "husky - '~/.huskyrc' is DEPRECATED, please move your code to ~/.config/husky/init.sh"
-fi
-i="${XDG_CONFIG_HOME:-$HOME/.config}/husky/init.sh"
-[ -f "$i" ] && . "$i"
-
-[ "${HUSKY-}" = "0" ] && exit 0
-
-export PATH="node_modules/.bin:$PATH"
-sh -e "$s" "$@"
-c=$?
-
-[ $c != 0 ] && echo "husky - $n script failed (code $c)"
-[ $c = 127 ] && echo "husky - command not found in PATH=$PATH"
-exit $c
+#!/usr/bin/env sh
+[ "$HUSKY" = "2" ] && set -x
+n=$(basename "$0")
+s=$(dirname "$(dirname "$0")")/$n
+
+if [[ "$(uname)" == "Darwin" ]]; then
+elif [[ "$(uname -o)" == "Msys" || "$(uname)" == "CYGWIN" || "$(uname)" == "MINGW"* ]]; then
+  sed -i 's/\r//' "$0"
+fi
+
+[ ! -f "$s" ] && exit 0
+
+if [ -f "$HOME/.huskyrc" ]; then
+	echo "husky - '~/.huskyrc' is DEPRECATED, please move your code to ~/.config/husky/init.sh"
+fi
+i="${XDG_CONFIG_HOME:-$HOME/.config}/husky/init.sh"
+[ -f "$i" ] && . "$i"
+
+[ "${HUSKY-}" = "0" ] && exit 0
+
+export PATH="node_modules/.bin:$PATH"
+sh -e "$s" "$@"
+c=$?
+
+[ $c != 0 ] && echo "husky - $n script failed (code $c)"
+[ $c = 127 ] && echo "husky - command not found in PATH=$PATH"
+exit $c

package/husky/_/pre-commit

@@ -1,2 +1,2 @@
-#!/usr/bin/env sh
+#!/usr/bin/env sh
 . "$(dirname "$0")/h"

package/husky/_/pre-push

@@ -1,2 +1,2 @@
-#!/usr/bin/env sh
+#!/usr/bin/env sh
 . "$(dirname "$0")/h"

package/husky/pre-commit

@@ -1,2 +1,2 @@
-#!/usr/bin/env sh
+#!/usr/bin/env sh
 npx lint-staged

package/husky/pre-push

@@ -1,25 +1,25 @@
-#!/usr/bin/env sh
-branch_name=$(git symbolic-ref --short HEAD)
-
-branch_regex_master="^master$"
-branch_regex_env="^(master|uat|dev)-[a-z]+$"
-branch_regex_feature="^(feature|test|hotfix)-[a-z]+-[a-zA-Z0-9]+(-[A-Z]+[0-9]+)?$"
-branch_regex_release="^release-[a-z]+-[0-9]{8}$"
-
-if echo "$branch_name" | grep -Eq "$branch_regex_master"; then
-  exit 0
-elif echo "$branch_name" | grep -Eq "$branch_regex_env"; then
-  exit 0
-elif echo "$branch_name" | grep -Eq "$branch_regex_feature"; then
-  exit 0
-elif echo "$branch_name" | grep -Eq "$branch_regex_release"; then
-  exit 0
-else
-  echo -e "❌ \033[31m[ERROR] 当前分支名 '$branch_name' 不符合规范！\033[0m"
-  echo "分支命名规范要求如下："
-  echo "✅ master"
-  echo "✅ master|uat|dev-[小写字母]"
-  echo "✅ feature|test|hotfix-[小写字母]+-[字母或数字]+（可选 -大写字母+数字）"
-  echo "✅ release-[小写字母]+-8位日期"
-  exit 1
-fi
+#!/usr/bin/env sh
+branch_name=$(git symbolic-ref --short HEAD)
+
+branch_regex_master="^master$"
+branch_regex_env="^(master|uat|dev)-[a-z]+$"
+branch_regex_feature="^(feature|test|hotfix)-[a-z]+-[a-zA-Z0-9]+(-[A-Z]+[0-9]+)?$"
+branch_regex_release="^release-[a-z]+-[0-9]{8}$"
+
+if echo "$branch_name" | grep -Eq "$branch_regex_master"; then
+  exit 0
+elif echo "$branch_name" | grep -Eq "$branch_regex_env"; then
+  exit 0
+elif echo "$branch_name" | grep -Eq "$branch_regex_feature"; then
+  exit 0
+elif echo "$branch_name" | grep -Eq "$branch_regex_release"; then
+  exit 0
+else
+  echo -e "❌ \033[31m[ERROR] 当前分支名 '$branch_name' 不符合规范！\033[0m"
+  echo "分支命名规范要求如下："
+  echo "✅ master"
+  echo "✅ master|uat|dev-[小写字母]"
+  echo "✅ feature|test|hotfix-[小写字母]+-[字母或数字]+（可选 -大写字母+数字）"
+  echo "✅ release-[小写字母]+-8位日期"
+  exit 1
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apdesign/code-style-react",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "scripts": {},
   "bin": {
     "apdesign-code-style": "cli.js"
@@ -33,6 +33,7 @@
     "husky": "^9.1.7",
     "lint-staged": "^15.3.0",
     "postcss-less": "^6.0.0",
+    "postcss-scss": "^4.0.9",
     "prettier": "^3.3.3",
     "stylelint": "^16.19.1",
     "stylelint-config-standard": "^38.0.0",

package/scripts/buildEslint.sh

@@ -1,52 +1,52 @@
-#!/usr/bin/env sh
-echo "🔍 Starting ESLint check (Git diff files only)..."
-
-# 切换到 Git 仓库根目录
-PROJECT_ROOT=$(git rev-parse --show-toplevel)
-cd "$PROJECT_ROOT" || exit 1
-
-TARGET_COMMIT=$1
-LATEST_COMMIT=$(git rev-parse HEAD)
-
-if [ -z "$TARGET_COMMIT" ]; then
-  echo "❗ Error: Missing target commit ID."
-  echo "👉 Usage: $0 <target-commit-id>"
-  exit 1
-fi
-
-echo "获取到上一次运行commit ID: $TARGET_COMMIT"
-echo "获取到当前最新的commit ID: $LATEST_COMMIT"
-
-DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.ts' '*.tsx' '*.js' '*.jsx')
-
-if [ -z "$DIFF_FILES" ]; then
-  echo "✅ No matching file changes detected, skipping ESLint check"
-  exit 0
-fi
-
-echo "📂 Changed files:"
-echo "$DIFF_FILES"
-
-FILE_COUNT=$(echo "$DIFF_FILES" | wc -l)
-echo "🧾 Total changed files: $FILE_COUNT"
-
-ESLINT_CONFIG_FILE="$PROJECT_ROOT/.eslintrc.build.cjs"
-
-ESLINT_CMD_ARGS="--no-error-on-unmatched-pattern --report-unused-disable-directives"
-
-if [ -f "$ESLINT_CONFIG_FILE" ]; then
-  echo "🔧 Using ESLint config file: $ESLINT_CONFIG_FILE"
-  ESLINT_CMD_ARGS="--config $ESLINT_CONFIG_FILE $ESLINT_CMD_ARGS"
-else
-  echo "⚠️ ESLint config file not found, using default ESLint config resolution."
-fi
-
-echo "$DIFF_FILES" | tr -d '\r' | \
-  xargs -d '\n' -P 4 -n 30 npx --no-install eslint $ESLINT_CMD_ARGS
-
-if [ $? -ne 0 ]; then
-  echo "❌ ESLint check failed. Aborting build process"
-  exit 1
-fi
-
+#!/usr/bin/env sh
+echo "🔍 Starting ESLint check (Git diff files only)..."
+
+# 切换到 Git 仓库根目录
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+cd "$PROJECT_ROOT" || exit 1
+
+TARGET_COMMIT=$1
+LATEST_COMMIT=$(git rev-parse HEAD)
+
+if [ -z "$TARGET_COMMIT" ]; then
+  echo "❗ Error: Missing target commit ID."
+  echo "👉 Usage: $0 <target-commit-id>"
+  exit 1
+fi
+
+echo "获取到上一次运行commit ID: $TARGET_COMMIT"
+echo "获取到当前最新的commit ID: $LATEST_COMMIT"
+
+DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.ts' '*.tsx' '*.js' '*.jsx')
+
+if [ -z "$DIFF_FILES" ]; then
+  echo "✅ No matching file changes detected, skipping ESLint check"
+  exit 0
+fi
+
+echo "📂 Changed files:"
+echo "$DIFF_FILES"
+
+FILE_COUNT=$(echo "$DIFF_FILES" | wc -l)
+echo "🧾 Total changed files: $FILE_COUNT"
+
+ESLINT_CONFIG_FILE="$PROJECT_ROOT/.eslintrc.build.cjs"
+
+ESLINT_CMD_ARGS="--no-error-on-unmatched-pattern --report-unused-disable-directives"
+
+if [ -f "$ESLINT_CONFIG_FILE" ]; then
+  echo "🔧 Using ESLint config file: $ESLINT_CONFIG_FILE"
+  ESLINT_CMD_ARGS="--config $ESLINT_CONFIG_FILE $ESLINT_CMD_ARGS"
+else
+  echo "⚠️ ESLint config file not found, using default ESLint config resolution."
+fi
+
+echo "$DIFF_FILES" | tr -d '\r' | \
+  xargs -d '\n' -P 4 -n 30 npx --no-install eslint $ESLINT_CMD_ARGS
+
+if [ $? -ne 0 ]; then
+  echo "❌ ESLint check failed. Aborting build process"
+  exit 1
+fi
+
 echo "✅ ESLint check passed"

package/scripts/buildStylelint.sh

@@ -1,50 +1,50 @@
-#!/usr/bin/env sh
-echo "🔍 Starting Stylelint check (Git diff files only)..."
-
-PROJECT_ROOT=$(git rev-parse --show-toplevel)
-cd "$PROJECT_ROOT" || exit 1
-
-TARGET_COMMIT=$1
-LATEST_COMMIT=$(git rev-parse HEAD)
-
-if [ -z "$TARGET_COMMIT" ]; then
-  echo "❗ Error: Missing target commit ID."
-  echo "👉 Usage: $0 <target-commit-id>"
-  exit 1
-fi
-
-echo "获取到上一次运行commit ID: $TARGET_COMMIT"
-echo "获取到当前最新的commit ID: $LATEST_COMMIT"
-
-DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.css' '*.scss' '*.sass' '*.less')
-
-if [ -z "$DIFF_FILES" ]; then
-  echo "✅ No matching file changes detected, skipping Stylelint check"
-  exit 0
-fi
-
-echo "📂 Changed files:"
-echo "$DIFF_FILES"
-
-FILE_COUNT=$(echo "$DIFF_FILES" | wc -l)
-echo "🧾 Total changed files: $FILE_COUNT"
-
-STYLELINT_CONFIG_FILE="$PROJECT_ROOT/.stylelintrc.build.cjs"
-STYLELINT_CMD_ARGS="--allow-empty-input --report-needless-disables --report-invalid-scope-disables"
-
-if [ -f "$STYLELINT_CONFIG_FILE" ]; then
-  echo "🔧 Using Stylelint config file: $STYLELINT_CONFIG_FILE"
-  STYLELINT_CMD_ARGS="--config $STYLELINT_CONFIG_FILE $STYLELINT_CMD_ARGS"
-else
-  echo "⚠️ Stylelint config file not found, using default Stylelint config resolution."
-fi
-
-echo "$DIFF_FILES" | tr -d '\r' | \
-  xargs -d '\n' -P 4 -n 30 npx --no-install stylelint $STYLELINT_CMD_ARGS
-
-if [ $? -ne 0 ]; then
-  echo "❌ Stylelint check failed. Aborting build process"
-  exit 1
-fi
-
+#!/usr/bin/env sh
+echo "🔍 Starting Stylelint check (Git diff files only)..."
+
+PROJECT_ROOT=$(git rev-parse --show-toplevel)
+cd "$PROJECT_ROOT" || exit 1
+
+TARGET_COMMIT=$1
+LATEST_COMMIT=$(git rev-parse HEAD)
+
+if [ -z "$TARGET_COMMIT" ]; then
+  echo "❗ Error: Missing target commit ID."
+  echo "👉 Usage: $0 <target-commit-id>"
+  exit 1
+fi
+
+echo "获取到上一次运行commit ID: $TARGET_COMMIT"
+echo "获取到当前最新的commit ID: $LATEST_COMMIT"
+
+DIFF_FILES=$(git diff --name-only "$TARGET_COMMIT" "$LATEST_COMMIT" -- '*.css' '*.scss' '*.sass' '*.less')
+
+if [ -z "$DIFF_FILES" ]; then
+  echo "✅ No matching file changes detected, skipping Stylelint check"
+  exit 0
+fi
+
+echo "📂 Changed files:"
+echo "$DIFF_FILES"
+
+FILE_COUNT=$(echo "$DIFF_FILES" | wc -l)
+echo "🧾 Total changed files: $FILE_COUNT"
+
+STYLELINT_CONFIG_FILE="$PROJECT_ROOT/.stylelintrc.build.cjs"
+STYLELINT_CMD_ARGS="--allow-empty-input --report-needless-disables --report-invalid-scope-disables"
+
+if [ -f "$STYLELINT_CONFIG_FILE" ]; then
+  echo "🔧 Using Stylelint config file: $STYLELINT_CONFIG_FILE"
+  STYLELINT_CMD_ARGS="--config $STYLELINT_CONFIG_FILE $STYLELINT_CMD_ARGS"
+else
+  echo "⚠️ Stylelint config file not found, using default Stylelint config resolution."
+fi
+
+echo "$DIFF_FILES" | tr -d '\r' | \
+  xargs -d '\n' -P 4 -n 30 npx --no-install stylelint $STYLELINT_CMD_ARGS
+
+if [ $? -ne 0 ]; then
+  echo "❌ Stylelint check failed. Aborting build process"
+  exit 1
+fi
+
 echo "✅ Stylelint check passed"

package/scripts/runEslint.js

@@ -0,0 +1,127 @@
+#!/usr/bin/env node
+
+let spawnSync;
+let spawn;
+let path;
+let fs;
+
+(async () => {
+  try {
+    if (typeof require !== 'undefined') {
+      // CommonJS
+      ({ spawnSync, spawn } = require('child_process'));
+      path = require('path');
+      fs = require('fs');
+    } else {
+      // ESM
+      ({ spawnSync, spawn } = await import('node:child_process'));
+      path = await import('node:path');
+      fs = await import('node:fs');
+    }
+
+    // 获取目标路径
+    const targetPath = process.argv[2] || process.cwd();
+    let rootDir = path.resolve(targetPath);
+
+    // 如果传的是单个目录名且路径不存在，则在 packages/ 下查找
+    if (!fs.existsSync(rootDir) && targetPath !== process.cwd()) {
+      const baseDir = process.cwd(); // 当前项目根目录
+      const fullPath = path.join(baseDir, 'packages', targetPath);
+      if (fs.existsSync(fullPath)) {
+        rootDir = fullPath;
+      } else {
+        console.error(`找不到目录: packages/${targetPath}`);
+        process.exit(1);
+      }
+    }
+
+    console.log('目标路径:', rootDir);
+
+    const gitRootResult = spawnSync('git', ['rev-parse', '--show-toplevel'], {
+      cwd: rootDir,
+      encoding: 'utf-8',
+      shell: true,
+    });
+
+    if (gitRootResult.status !== 0 || !gitRootResult.stdout) {
+      console.error('无法获取 Git 根目录，请确保路径在 Git 仓库内');
+      process.exit(1);
+    }
+
+    const gitRoot = gitRootResult.stdout.trim();
+    console.log('Git 根目录:', gitRoot);
+
+    let targetBranch = 'master';
+    if (targetPath !== process.cwd()) {
+      const lastDir = path.basename(rootDir);
+      targetBranch = `master-${lastDir.split('-').pop()}`;
+    }
+    console.log('目标分支:', targetBranch);
+
+    // 获取当前分支
+    const currentBranchResult = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+      cwd: gitRoot,
+      encoding: 'utf-8',
+      shell: true,
+    });
+
+    if (currentBranchResult.status !== 0 || !currentBranchResult.stdout) {
+      console.error('无法获取当前 Git 分支');
+      process.exit(1);
+    }
+
+    const currentBranch = currentBranchResult.stdout.trim();
+    console.log('当前分支:', currentBranch);
+
+    // 切换分支并拉取最新代码
+    if (currentBranch !== targetBranch) {
+      console.log(`切换到分支 ${targetBranch} ...`);
+      const checkout = spawnSync('git', ['checkout', targetBranch], {
+        cwd: gitRoot,
+        stdio: 'inherit',
+        shell: true,
+      });
+      if (checkout.status !== 0) {
+        console.error(`切换分支失败`);
+        process.exit(1);
+      }
+    }
+
+    console.log('拉取最新代码...');
+    const pull = spawnSync('git', ['pull'], {
+      cwd: gitRoot,
+      stdio: 'inherit',
+      shell: true,
+    });
+    if (pull.status !== 0) {
+      console.error('git pull 失败');
+      process.exit(1);
+    }
+
+    const srcPath = path.join(rootDir, 'src');
+    const eslintTarget = fs.existsSync(srcPath) ? srcPath : '.';
+    if (!fs.existsSync(srcPath)) {
+      console.warn(`src 文件夹不存在，改为检查当前目录: ${eslintTarget}`);
+    } else {
+      console.log(`检查目录: ${eslintTarget}`);
+    }
+
+    console.log('执行 ESLint...');
+    const eslint = spawn(
+      'npx',
+      ['eslint', eslintTarget, '--ext', 'ts,tsx,js,jsx', '--report-unused-disable-directives'],
+      {
+        cwd: rootDir,
+        stdio: 'inherit',
+        shell: true,
+      },
+    );
+
+    eslint.on('close', (code) => {
+      process.exit(code);
+    });
+  } catch (err) {
+    console.error('脚本执行出错:', err);
+    process.exit(1);
+  }
+})();