@dazhicheng/common 1.0.5 → 1.0.7

package/.env

@@ -3,6 +3,7 @@
 #  版本号
 VITE_VERSION = 1.0.0
 
+<<<VITE_PORT>>>
 
 # 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
 VITE_BASE_URL = /
@@ -10,11 +11,13 @@ VITE_BASE_URL = /
 # 权限模式【 frontend 前端模式 / backend 后端模式 】
 VITE_ACCESS_MODE = backend
 
-# 跨域请求时是否携带 Cookie（开启前需确保后端支持）
-VITE_WITH_CREDENTIALS = false
+<<<VITE_WITH_CREDENTIALS>>>
 
 # 是否打开路由信息
 VITE_OPEN_ROUTE_INFO = false
 
 # 锁屏加密密钥
 VITE_LOCK_ENCRYPT_KEY = s3cur3k3y4adpro
+
+# 飞书扫码登录回调地址
+VITE_FEISHU_REDIRECT_URI = http://120.76.61.203:13000/feishuOAuth

package/.env.dev

@@ -0,0 +1,16 @@
+# 【开发】环境变量
+
+# 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
+VITE_BASE_URL = /
+
+# API 地址前缀
+VITE_API_URL = dev-api
+
+# Delete console
+VITE_DROP_CONSOLE = true
+
+# 飞书扫码登录回调地址
+# VITE_FEISHU_REDIRECT_URI = http://120.76.61.203:13006/feishuOAuth
+
+# webSocket地址
+VITE_WEBSOCKET_URL = ws://192.168.128.215:11000

package/.env.development

@@ -0,0 +1,29 @@
+# 【本地开发】环境变量
+
+# 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
+VITE_BASE_URL = /
+
+# API 请求基础路径（开发环境设置为 / 使用代理，生产环境设置为完整后端地址）
+VITE_API_URL = dev
+VITE_MOCK_ENABLED = true
+
+# 代理目标地址（开发环境通过 Vite 代理转发请求到此地址，解决跨域问题）
+VITE_API_PROXY_URL = https://m1.apifoxmock.com/m1/6400575-6097373-default
+VITE_API_PROXY_URL_dev = http://192.168.128.215:11000
+VITE_API_MOCK = http://192.168.129.158:9998/mock/
+VITE_API_PROXY_URL_test = http://192.168.127.72:11000/
+
+
+VITE_API_PROXY_URL_dev_yun = http://116.6.49.180:11000/
+VITE_API_PROXY_URL_test_yun = http://116.6.49.180:11001/
+
+<<<VITE_API_PROXY_URL>>>
+
+# Delete console
+VITE_DROP_CONSOLE = false
+
+# 飞书扫码登录回调地址
+# VITE_FEISHU_REDIRECT_URI = http://120.76.61.203:13006/feishuOAuth
+
+# webSocket地址
+VITE_WEBSOCKET_URL = ws://192.168.128.215:11000

package/.env.production

@@ -0,0 +1,10 @@
+# 【生产】环境变量
+
+# 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
+VITE_BASE_URL = /
+
+# API 地址前缀
+VITE_API_URL = https://m1.apifoxmock.com/m1/6400575-6097373-default
+
+# Delete console
+VITE_DROP_CONSOLE = true

package/.env.sit

@@ -0,0 +1,10 @@
+# 【预发布】环境变量
+
+# 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
+VITE_BASE_URL = /
+
+# API 地址前缀
+VITE_API_URL = sit-api
+
+# Delete console
+VITE_DROP_CONSOLE = true

package/.env.test

@@ -0,0 +1,16 @@
+# 【测试】环境变量
+
+# 应用部署基础路径（如部署在子目录 /admin，则设置为 /admin/）
+VITE_BASE_URL = /
+
+# API 地址前缀
+VITE_API_URL = test-api
+
+# Delete console
+VITE_DROP_CONSOLE = true
+
+# 飞书扫码登录回调地址
+VITE_FEISHU_REDIRECT_URI = http://120.76.61.203:23000/feishuOAuth
+
+# webSocket地址
+VITE_WEBSOCKET_URL = ws://116.6.49.180:11001

package/.gitlab-ci.yml

@@ -0,0 +1,74 @@
+stages:
+  - MR_TEST
+  - develop
+  - test
+  - sit
+
+variables:
+  DOCKER_BUILDKIT: 1
+
+MR 构建测试:
+  stage: MR_TEST
+  image: docker:20.10.20
+  tags:
+    - MR_TEST
+  script:
+    # 构建镜像（不部署）
+    - docker build --build-arg NODE_ENV=dev --no-cache -t a-fulfillment-mr-test:mr-$CI_MERGE_REQUEST_IID .
+    # 验证镜像构建成功
+    - docker images | grep a-fulfillment-mr-test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+
+开发环境发版:
+  stage: develop
+  image: docker:20.10.20
+  tags:
+    - develop
+  resource_group: deploy-develop # 重点
+  script:
+    <<<script_开发环境发版>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - develop
+
+开发环境发版_107:
+  stage: develop
+  image: docker:20.10.20
+  tags:
+    - develop_107
+  resource_group: deploy-develop_107 # 重点
+  script:
+    <<<script_开发环境发版_107>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - develop
+
+# 测试环境 -----------------------------------------------------------------------------------------------
+测试环境发版:
+  stage: test
+  image: docker:20.10.20
+  tags:
+    - test
+  resource_group: deploy-test # 重点
+  script:
+    <<<script_测试环境发版>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - test
+
+测试环境发版_107:
+  stage: test
+  image: docker:20.10.20
+  tags:
+    - test_107
+  resource_group: deploy-test_107 # 重点
+  script:
+    <<<script_测试环境发版_107>>>
+    # 清理悬空镜像
+    - docker image prune -f || true
+  only:
+    - test

package/.prettierignore

@@ -0,0 +1,2 @@
+/node_modules/*
+/dist/*

package/{.prettierrc → .prettierrc.txt}

@@ -16,5 +16,6 @@
   "proseWrap": "never",
   "htmlWhitespaceSensitivity": "strict",
   "endOfLine": "auto",
-  "rangeStart": 0
+  "rangeStart": 0,
+  <<<自定义>>>
 }

package/.stylelintignore

@@ -3,3 +3,6 @@ node_modules
 public
 .husky
 .vscode
+src/components/Layout/MenuLeft/index.vue
+src/assets
+stats.html

package/{.stylelintrc.cjs → .stylelintrc.cjs.txt}

@@ -1,4 +1,5 @@
 module.exports = {
+  // 继承推荐规范配置
   extends: [
     'stylelint-config-standard',
     'stylelint-config-recommended-scss',
@@ -6,6 +7,7 @@ module.exports = {
     'stylelint-config-html/vue',
     'stylelint-config-recess-order',
   ],
+  // 指定不同文件对应的解析器
   overrides: [
     {
       files: ['**/*.{vue,html}'],
@@ -16,26 +18,30 @@ module.exports = {
       customSyntax: 'postcss-scss',
     },
   ],
+  // 自定义规则
   rules: {
-    'import-notation': 'string',
-    'selector-class-pattern': null,
-    'custom-property-pattern': null,
-    'keyframes-name-pattern': null,
-    'no-descending-specificity': null,
-    'no-empty-source': null,
-    'property-no-vendor-prefix': null,
+    'import-notation': 'string', // 指定导入CSS文件的方式("string"|"url")
+    'selector-class-pattern': null, // 选择器类名命名规则
+    'custom-property-pattern': null, // 自定义属性命名规则
+    'keyframes-name-pattern': null, // 动画帧节点样式命名规则
+    'no-descending-specificity': null, // 允许无降序特异性
+    'no-empty-source': null, // 允许空样式
+    'property-no-vendor-prefix': null, // 允许属性前缀
+    // 允许 global 、export 、deep伪类
     'selector-pseudo-class-no-unknown': [
       true,
       {
         ignorePseudoClasses: ['global', 'export', 'deep'],
       },
     ],
+    // 允许未知属性
     'property-no-unknown': [
       true,
       {
         ignoreProperties: [],
       },
     ],
+    // 允许未知规则
     'at-rule-no-unknown': [
       true,
       {

package/Dockerfile

@@ -30,4 +30,4 @@ COPY "nginx_${NODE_ENV}.conf" /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/dist /usr/share/nginx/html
 
 # 启动 Nginx
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

package/{commitlint.config.cjs → commitlint.config.cjs.txt}

@@ -16,7 +16,7 @@ const taskIdPlugin = {
     },
   },
 };
-
+<<<自定义>>>
 module.exports = {
   // 继承的规则
   extends: ["@commitlint/config-conventional"],

package/{eslint.config.mjs → eslint.config.mjs.txt}

@@ -1,9 +1,24 @@
+// 从 URL 和路径模块中导入必要的功能
+import fs from 'fs';
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+// 从 ESLint 插件中导入推荐配置
 import pluginJs from '@eslint/js';
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
 import pluginVue from 'eslint-plugin-vue';
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
 
+// 使用 import.meta.url 获取当前模块的路径
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// 读取 .auto-import.json 文件的内容，并将其解析为 JSON 对象
+const autoImportConfig = JSON.parse(
+  fs.readFileSync(path.resolve(__dirname, '.auto-import.json'), 'utf-8'),
+);
+
 export default [
   // 指定文件匹配规则
   {
@@ -46,17 +61,6 @@ export default [
       '@typescript-eslint/no-unused-vars': 'off', // 禁用 TypeScript 未使用的变量检查
     },
   },
-  {
-    files: ['**/*.vue'],
-    languageOptions: {
-      parserOptions: {
-        parser: tseslint.parser,
-        ecmaFeatures: {
-          jsx: true,
-        },
-      },
-    },
-  },
   // vue 规则
   {
     files: ['**/*.vue'],

package/nginx_dev.conf

@@ -1,26 +1,26 @@
-# HTTP 服务器 - 保持原有配置
-  server_name localhost;
-  charset utf-8;
-
-  root /usr/share/nginx/html;
-  index index.html;
-
-  location / {
-    try_files $uri $uri/ /index.html;
-    # CORS 配置
-    add_header 'Access-Control-Allow-Origin' '*' always;
-    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
-  }
-  
-  location /dev-api/ {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-Ip $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_pass http://116.6.49.180:11000/;
-  }
-  
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-    root   html;
-  }
+# HTTP 服务器 - 保持原有配置
+server {
+  <<<listen>>>
+  server_name localhost;
+  charset utf-8;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+    <<<CORS配置>>>
+  }
+  
+  location /dev-api/ {
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-Ip $remote_addr;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_pass http://116.6.49.180:11000/;
+  }
+  
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   html;
+  }
+}

package/nginx_test.conf

@@ -1,26 +1,26 @@
-# HTTP 服务器 - 保持原有配置
-  server_name localhost;
-  charset utf-8;
-
-  root /usr/share/nginx/html;
-  index index.html;
-
-  location / {
-    try_files $uri $uri/ /index.html;
-    # CORS 配置
-    add_header 'Access-Control-Allow-Origin' '*' always;
-    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-    add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
-  }
-
-  location /test-api/ {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-Ip $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_pass http://116.6.49.180:11001/;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-    root   html;
-  }
+# HTTP 服务器 - 保持原有配置
+server {
+  <<<listen>>>
+  server_name localhost;
+  charset utf-8;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+    <<<CORS配置>>>
+  }
+  
+  location /test-api/ {
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-Ip $remote_addr;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_pass http://116.6.49.180:11001/;
+  }
+  
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   html;
+  }
+}

package/package.json

@@ -1,19 +1,27 @@
 {
   "name": "@dazhicheng/common",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "共享配置文件",
   "type": "module",
   "types": "./src/types/index.d.ts",
   "files": [
-    "commitlint.config.cjs",
+    "commitlint.config.cjs.txt",
     ".husky",
-    ".prettierrc",
-    ".stylelintrc.cjs",
+    ".prettierignore",
+    ".prettierrc.txt",
+    ".stylelintrc.cjs.txt",
     ".stylelintignore",
     ".gitignore",
     ".gitattributes",
     ".env",
-    "eslint.config.mjs",
+    ".env.dev",
+    ".env.development",
+    ".env.production",
+    ".env.sit",
+    ".env.test",
+    ".gitlab-ci.yml",
+    "pnpm-workspace.yaml",
+    "eslint.config.mjs.txt",
     "tsconfig.json",
     "Dockerfile",
     "nginx_dev.conf",

package/pnpm-workspace.yaml

@@ -0,0 +1,9 @@
+minimumReleaseAge: 0
+
+allowBuilds:
+  '@parcel/watcher': true
+  core-js: true
+  es5-ext: true
+  esbuild: true
+  vue-demi: true
+  '@tailwindcss/oxide': true

package/sync-common.mjs

@@ -1,139 +1,140 @@
-import fs from 'fs';
-import path from 'path';
-import { createRequire } from 'module';
-import { fileURLToPath } from 'url';
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import prettier from "prettier";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const require = createRequire(import.meta.url);
 const commonDir = __dirname;
 
-const markerPattern = /^<<<(before|common|after)>>>$/gm;
-const textLikeFiles = new Set([
-  '.gitignore',
-  '.stylelintignore',
-  '.gitattributes',
-  '.prettierrc',
-  '.env',
-]);
-const directLikeFiles = new Set([
-  'Dockerfile',
-  'nginx_dev.conf',
-  'nginx_test.conf',
-  'commit-msg',
-  'pre-commit',
-  '.stylelintrc.cjs',
-  'commitlint.config.cjs',
-  'eslint.config.mjs',
-  'tsconfig.json',
-]);
+const localMarkerPattern = /^\s*<<<([^>]+)>>>\s*$/gm;
+const commonMarkerPattern = /<<<([^>]+)>>>/g;
 const defaultManagedFiles = [
-  '.gitignore',
-  '.stylelintignore',
-  '.gitattributes',
-  '.prettierrc',
-  '.env',
-  '.stylelintrc.cjs',
-  'commitlint.config.cjs',
-  'Dockerfile',
-  'eslint.config.mjs',
-  'tsconfig.json',
-  { name: 'nginx_dev.conf' },
-  { name: 'nginx_test.conf' },
-  { name: 'commit-msg', dir: '.husky' },
-  { name: 'pre-commit', dir: '.husky' },
+  ".gitignore",
+  ".stylelintignore",
+  ".gitattributes",
+  ".prettierignore",
+  { name: ".prettierrc.txt" },
+  ".env",
+  ".env.dev",
+  ".env.development",
+  ".env.production",
+  ".env.sit",
+  ".env.test",
+  { name: ".stylelintrc.cjs.txt" },
+  { name: "commitlint.config.cjs.txt" },
+  ".gitlab-ci.yml",
+  "pnpm-workspace.yaml",
+  "Dockerfile",
+  { name: "eslint.config.mjs.txt" },
+  "tsconfig.json",
+  { name: "nginx_dev.conf" },
+  { name: "nginx_test.conf" },
+  { name: "commit-msg", dir: ".husky" },
+  { name: "pre-commit", dir: ".husky" },
 ];
 
-const getFileRelativePath = (file) => (file.dir ? path.join(file.dir, file.name) : file.name);
-const getFileKey = (file) => `${file.dir ?? ''}::${file.name}`;
+const getFileRelativePath = file => (file.dir ? path.join(file.dir, file.name) : file.name);
+const getTargetFileName = file => {
+  if (file.targetName) {
+    return file.targetName;
+  }
+
+  return file.name.endsWith(".txt") ? file.name.slice(0, -4) : file.name;
+};
+const getTargetRelativePath = file =>
+  file.dir ? path.join(file.dir, getTargetFileName(file)) : getTargetFileName(file);
+const getFileKey = file => `${file.dir ?? ""}::${file.name}`;
 
-const ensureCommonFile = (file) => {
+const ensureCommonFile = file => {
   const filePath = path.join(commonDir, getFileRelativePath(file));
   if (!fs.existsSync(filePath)) {
-    throw new Error(`Missing common file: ${filePath}`);
+    console.error(`\n[sync:common] {${getFileKey(file)}} missing common file: ${filePath}`);
+    return "";
   }
   return filePath;
 };
 
-const parseLocalSections = (filePath) => {
-  if (!filePath || !fs.existsSync(filePath)) {
-    return { before: '', after: '', hasMarkers: false };
+const normalizeLineEndings = content => content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+
+const parseLocalSections = filePaths => {
+  const candidates = [filePaths].flat().filter(Boolean);
+  const existingPath = candidates.find(filePath => fs.existsSync(filePath));
+
+  if (!existingPath) {
+    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: "" };
   }
 
-  const rawContent = fs.readFileSync(filePath, 'utf8').trim();
-  if (!rawContent) {
-    return { before: '', after: '', hasMarkers: false };
+  const rawContent = normalizeLineEndings(fs.readFileSync(existingPath, "utf8"));
+  if (!rawContent.trim()) {
+    return { before: "", after: "", blocks: {}, hasMarkers: false, sourcePath: existingPath };
   }
 
-  const markers = [...rawContent.matchAll(markerPattern)];
+  const markers = [...rawContent.matchAll(localMarkerPattern)];
   if (markers.length === 0) {
-    return { before: '', after: rawContent, hasMarkers: false };
+    return { before: "", after: rawContent, blocks: {}, hasMarkers: false, sourcePath: existingPath };
   }
 
-  const sections = {
-    before: '',
-    common: '',
-    after: '',
-  };
+  const blocks = {};
 
   for (let index = 0; index < markers.length; index += 1) {
     const current = markers[index];
     const next = markers[index + 1];
-    const sectionName = current[1];
+    const blockName = current[1].trim();
     const start = current.index + current[0].length;
     const end = next ? next.index : rawContent.length;
-    sections[sectionName] = rawContent.slice(start, end).trim();
+    const blockContent = rawContent.slice(start, end).replace(/^\n/, "");
+    blocks[blockName] = blockContent;
   }
 
   return {
-    before: sections.before,
-    after: sections.after,
+    before: blocks.before ?? "",
+    after: blocks.after ?? "",
+    blocks,
     hasMarkers: true,
+    sourcePath: existingPath,
   };
 };
 
-const getDefaultHeader = (fileName) => {
-  if (!textLikeFiles.has(fileName)) {
-    return '';
-  }
+const replaceNamedBlocks = (content, blocks = {}) =>
+  content.replace(commonMarkerPattern, (match, blockName, offset, source) => {
+    const replacement = blocks[blockName.trim()];
+    if (!replacement) {
+      return "";
+    }
 
-  return `# base\n# 由 scripts/sync-common.mjs 根据 @dazhicheng/common/${fileName} 自动生成，请勿直接修改\n\n`;
-};
+    const lineStart = source.lastIndexOf("\n", offset - 1) + 1;
+    const linePrefix = source.slice(lineStart, offset);
+    const indentation = (linePrefix.match(/^\s*/) ?? [""])[0];
 
-const getDefaultLocalFiles = (file) => ({
-  merged: path.join('local', getFileRelativePath(file)),
-});
+    return replacement.split("\n").map(line => `${indentation}${line}`).join("\n");
+  });
 
-const getDefaultBlockHeaders = (fileName) => {
-  if (textLikeFiles.has(fileName)) {
-    return {
-      before: '# project specific\n',
-      common: '',
-      after: '\n\n# project specific\n',
-    };
-  }
+const getDefaultHeader = () => "";
 
-  if (directLikeFiles.has(fileName)) {
-    return {
-      before: '# 这里是增量\n\n',
-      common: '# 这里是 common 的内容\n\n',
-      after: '\n\n# 这里还是增量\n\n',
-    };
-  }
+const getDefaultLocalFiles = file => {
+  const sourceRelativePath = getFileRelativePath(file);
+  const targetRelativePath = getTargetRelativePath(file);
 
   return {
-    before: '',
-    common: '',
-    after: '',
+    merged: path.join("local", sourceRelativePath),
+    targetMerged: targetRelativePath !== sourceRelativePath ? path.join("local", targetRelativePath) : "",
   };
 };
 
-const getDefaultFileConfig = (file) => ({
+const getDefaultBlockHeaders = () => ({
+  before: "",
+  common: "",
+  after: "",
+});
+
+const getDefaultFileConfig = file => ({
   name: file.name,
   dir: file.dir,
-  header: getDefaultHeader(file.name),
+  targetName: file.targetName,
+  header: getDefaultHeader(),
   localFiles: getDefaultLocalFiles(file),
-  blockHeaders: getDefaultBlockHeaders(file.name),
+  blockHeaders: getDefaultBlockHeaders(),
 });
 
 const mergeFileConfig = (defaultFile, projectFile = {}) => ({
@@ -149,8 +150,8 @@ const mergeFileConfig = (defaultFile, projectFile = {}) => ({
   },
 });
 
-const normalizeFileEntry = (file) => {
-  if (typeof file === 'string') {
+const normalizeFileEntry = file => {
+  if (typeof file === "string") {
     return { name: file };
   }
 
@@ -167,21 +168,21 @@ const normalizeFiles = (config = {}) => {
   }
 
   return [
-    ...(config.textFiles ?? []).map((file) => ({ type: 'textFiles', ...normalizeFileEntry(file) })),
-    ...(config.directFiles ?? []).map((file) => ({
-      type: 'directFiles',
+    ...(config.textFiles ?? []).map(file => ({ type: "textFiles", ...normalizeFileEntry(file) })),
+    ...(config.directFiles ?? []).map(file => ({
+      type: "directFiles",
       ...normalizeFileEntry(file),
     })),
   ];
 };
 
 const mergeManagedFiles = (projectConfig = {}, runtimeConfig = {}) => {
-  const defaultFiles = normalizeFiles(defaultManagedFiles).map((file) =>
+  const defaultFiles = normalizeFiles(defaultManagedFiles).map(file =>
     mergeFileConfig(getDefaultFileConfig(file), file),
   );
   const projectFiles = normalizeFiles(projectConfig);
   const runtimeFiles = normalizeFiles(runtimeConfig);
-  const mergedMap = new Map(defaultFiles.map((file) => [getFileKey(file), { ...file }]));
+  const mergedMap = new Map(defaultFiles.map(file => [getFileKey(file), { ...file }]));
 
   for (const projectFile of projectFiles) {
     const key = getFileKey(projectFile);
@@ -195,60 +196,87 @@ const mergeManagedFiles = (projectConfig = {}, runtimeConfig = {}) => {
     mergedMap.set(key, mergeFileConfig(current, runtimeFile));
   }
 
-  return [...mergedMap.values()].filter((file) => file.enabled !== false);
+  return [...mergedMap.values()].filter(file => file.enabled !== false);
 };
 
 const logGenerated = ({ rootDir, targetPath, commonPath, localPaths, usedLocalPaths }) => {
-  const targetName = path.relative(rootDir, targetPath).replaceAll('\\', '/');
-  const commonName = `@dazhicheng/common/${path.relative(commonDir, commonPath).replaceAll('\\', '/')}`;
-  const sourceText = [commonName, ...usedLocalPaths].join(' + ');
+  const targetName = path.relative(rootDir, targetPath).replaceAll("\\", "/");
+  const commonName = `@dazhicheng/common/${path.relative(commonDir, commonPath).replaceAll("\\", "/")}`;
+  const sourceText = [commonName, ...usedLocalPaths].join(" + ");
 
-  console.log(`[sync:common] generated ${targetName} <- ${sourceText}`);
+  console.log(`\n[sync:common] generated ${targetName} <- ${sourceText}`);
   if (localPaths.length > 0) {
-    console.log(`[sync:common] 如需项目增量，请修改 ${localPaths.join(' / ')}`);
-    console.log(
-      '[sync:common] 单个 local 文件可使用 <<<before>>> / <<<common>>> / <<<after>>> 标记',
-    );
+    console.log(`[sync:common] 如需项目增量，请修改 ${localPaths.join(" / ")}`);
+    console.log("[sync:common] local 文件支持 <<<name>>> 任意命名块，占位将替换 common 中同名标记");
   }
 };
 
 const renderFile = ({ file, commonContent, localSections, usedLocalPaths }) => {
-  let output = file.header ?? '';
+  let output = file.header ?? "";
+  const renderedCommonContent = replaceNamedBlocks(commonContent, localSections.blocks);
 
   if (localSections.before) {
-    usedLocalPaths.push(file.localFiles.merged);
-    output += `${file.blockHeaders.before ?? ''}${localSections.before}\n\n`;
+    if (localSections.sourcePath) {
+      usedLocalPaths.push(path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/"));
+    }
+    output += `${file.blockHeaders.before ?? ""}${localSections.before}\n\n`;
   }
 
-  output += `${file.blockHeaders.common ?? ''}${commonContent}`;
+  output += `${file.blockHeaders.common ?? ""}${renderedCommonContent}`;
 
   if (localSections.after) {
-    if (!usedLocalPaths.includes(file.localFiles.merged)) {
-      usedLocalPaths.push(file.localFiles.merged);
+    if (localSections.sourcePath) {
+      const localPath = path.relative(process.cwd(), localSections.sourcePath).replaceAll("\\", "/");
+      if (!usedLocalPaths.includes(localPath)) {
+        usedLocalPaths.push(localPath);
+      }
     }
-    output += `${file.blockHeaders.after ?? ''}${localSections.after}\n`;
-  } else {
-    output += '\n';
+    output += `${file.blockHeaders.after ?? ""}${localSections.after}`;
   }
 
-  return output;
+  return output.endsWith("\n") ? output : `${output}\n`;
 };
 
-const syncFiles = ({ files, rootDir }) => {
+const formatWithPrettier = async ({ targetPath, output }) => {
+  try {
+    const fileInfo = await prettier.getFileInfo(targetPath);
+    if (fileInfo.ignored || !fileInfo.inferredParser) {
+      console.log(`[sync:common] skipped prettier for ${targetPath}: parser unavailable`);
+      return output;
+    }
+
+    const config = (await prettier.resolveConfig(targetPath)) ?? {};
+    return normalizeLineEndings(await prettier.format(output, {
+      ...config,
+      filepath: targetPath,
+    }));
+  } catch (error) {
+    console.log(`[sync:common] skipped prettier for ${targetPath}: ${error.message}`);
+    return output;
+  }
+};
+
+const syncFiles = async ({ files, rootDir }) => {
   for (const file of files) {
     const commonPath = ensureCommonFile(file);
-    const targetPath = path.join(rootDir, getFileRelativePath(file));
+    if (!commonPath) {
+      continue;
+    }
+    const targetPath = path.join(rootDir, getTargetRelativePath(file));
     const targetDir = path.dirname(targetPath);
     if (!fs.existsSync(targetDir)) {
       fs.mkdirSync(targetDir, { recursive: true });
     }
-    const mergedPath = file.localFiles?.merged ? path.join(rootDir, file.localFiles.merged) : '';
-    const localSections = parseLocalSections(mergedPath);
-    const commonContent = fs.readFileSync(commonPath, 'utf8').trimEnd();
+    const localPaths = Object.values(file.localFiles ?? {}).filter(Boolean);
+    const resolvedLocalPaths = localPaths.map(localPath => path.join(rootDir, localPath));
+    const localSections = parseLocalSections(resolvedLocalPaths);
+    const commonContent = normalizeLineEndings(fs.readFileSync(commonPath, "utf8")).trimEnd();
     const usedLocalPaths = [];
     const output = renderFile({ file, commonContent, localSections, usedLocalPaths });
 
-    fs.writeFileSync(targetPath, output);
+    const formattedOutput = await formatWithPrettier({ targetPath, output });
+
+    fs.writeFileSync(targetPath, formattedOutput);
     logGenerated({
       rootDir,
       targetPath,
@@ -266,7 +294,7 @@ export const runSyncCommon = async ({ rootDir, files = [], config = {} }) => {
   };
   const managedFiles = mergeManagedFiles({}, runtimeConfig);
 
-  syncFiles({ files: managedFiles, rootDir });
+  await syncFiles({ files: managedFiles, rootDir });
 };
 
 const isDirectRun = process.argv[1] && path.resolve(process.argv[1]) === __filename;

package/tsconfig.json

@@ -1,29 +1,29 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "strict": true,
-    "jsx": "preserve",
-    "jsxImportSource": "vue",
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "lib": ["esnext", "dom"],
-    "types": ["vite/client", "node", "element-plus/global"],
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["src/*"],
-      "@views/*": ["src/views/*"],
-      "@imgs/*": ["src/assets/images/*"],
-      "@icons/*": ["src/assets/icons/*"],
-      "@utils/*": ["src/utils/*"],
-      "@stores/*": ["src/store/*"],
-      "@plugins/*": ["src/plugins/*"],
-      "@styles/*": ["src/assets/styles/*"]
-    }
-  },
-  "include": ["src/**/*", "src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-  "exclude": ["node_modules", "dist", "**/*.js"]
-}
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "strict": true,
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "lib": ["esnext", "dom"],
+    "types": ["vite/client", "node", "element-plus/global"],
+    "skipLibCheck": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"],
+      "@views/*": ["src/views/*"],
+      "@imgs/*": ["src/assets/images/*"],
+      "@icons/*": ["src/assets/icons/*"],
+      "@utils/*": ["src/utils/*"],
+      "@stores/*": ["src/store/*"],
+      "@plugins/*": ["src/plugins/*"],
+      "@styles/*": ["src/assets/styles/*"]
+    }
+  },
+  "include": ["src/**/*", "src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "exclude": ["node_modules", "dist", "**/*.js"]
+}