@gct-paas/build 0.1.4-dev.2 → 0.1.4-dev.3

package/dist/prettier/prettier-config/prettier-config.cjs

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.definePrettierConfig = definePrettierConfig;
-var _lodashEs = require("lodash-es");
+var _util = require("../../util/index.cjs");
 function definePrettierConfig(config = {}) {
-  return (0, _lodashEs.merge)({
+  return (0, _util.mergeConfig)({
     // 起始格式化间隔
     tabWidth: 2,
     // 使用单引号

package/dist/rollup/rollup-config/dev-config.cjs

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defineRollupConfig = defineRollupConfig;
 var _rollup = require("rollup");
-var _lodashEs = require("lodash-es");
 var _path = _interopRequireDefault(require("path"));
 var _fastGlob = _interopRequireDefault(require("fast-glob"));
 var _pluginNodeResolve = require("@rollup/plugin-node-resolve");
@@ -80,7 +79,7 @@ function defineRollupConfig(opts = {}) {
     preserveModulesRoot: rootDir,
     entryFileNames: "[name].mjs"
   }];
-  return (0, _lodashEs.merge)((0, _rollup.defineConfig)({
+  return (0, _util.mergeConfig)((0, _rollup.defineConfig)({
     input,
     treeshake: false,
     external: _constants.DEFAULT_EXTERNAL,

package/dist/util/index.cjs

@@ -9,12 +9,22 @@ Object.defineProperty(exports, "CopyWatch", {
     return _watcher.CopyWatch;
   }
 });
+exports.mergeConfig = mergeConfig;
 exports.unixToWinPath = unixToWinPath;
 exports.winToUnixPath = winToUnixPath;
+var _lodashEs = require("lodash-es");
 var _watcher = require("./watcher/watcher.cjs");
 function winToUnixPath(pathStr) {
   return pathStr.replace(/\\/g, "/");
 }
 function unixToWinPath(pathStr) {
   return pathStr.replace(/\//g, "\\");
+}
+function mergeConfig(obj, obj2) {
+  return (0, _lodashEs.mergeWith)(obj, obj2, (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return objValue.concat(srcValue);
+    }
+    return void 0;
+  });
 }

package/dist/util/index.d.ts

@@ -15,3 +15,15 @@ export declare function winToUnixPath(pathStr: string): string;
  * @return {*}  {string}
  */
 export declare function unixToWinPath(pathStr: string): string;
+/**
+ * 自定义合并配置，数据非替换为 concat 合并
+ *
+ * @author chitanda
+ * @date 2025-08-20 20:08:45
+ * @export
+ * @template T
+ * @param {T} obj
+ * @param {U} obj2
+ * @returns {*}  {T}
+ */
+export declare function mergeConfig<T extends object, U extends object>(obj: T, obj2: U): T & U;

package/dist/vite/vite-config/vite-base-config.cjs

@@ -11,11 +11,12 @@ var _pluginBabel = require("@rollup/plugin-babel");
 var _pluginJson = _interopRequireDefault(require("@rollup/plugin-json"));
 var _path = _interopRequireDefault(require("path"));
 var _constants = require("../../constants/index.cjs");
+var _util = require("../../util/index.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function defineViteBaseConfig(opts = {}) {
   const cwd = process.cwd();
   const outDir = _path.default.resolve(cwd, "dist");
-  return (0, _vite.mergeConfig)((0, _vite.defineConfig)({
+  return (0, _util.mergeConfig)((0, _vite.defineConfig)({
     css: {
       preprocessorOptions: {
         scss: {

package/es/prettier/prettier-config/prettier-config.mjs

@@ -1,6 +1,6 @@
-import { merge } from "lodash-es";
+import { mergeConfig } from "../../util/index.mjs";
 export function definePrettierConfig(config = {}) {
-  return merge(
+  return mergeConfig(
     {
       // 起始格式化间隔
       tabWidth: 2,

package/es/rollup/rollup-config/dev-config.mjs

@@ -1,5 +1,4 @@
 import { defineConfig } from "rollup";
-import { merge } from "lodash-es";
 import path from "path";
 import glob from "fast-glob";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
@@ -15,7 +14,7 @@ import fs from "fs-extra";
 import os from "os";
 import { copyFile, ignoreCompilerFile } from "../rollup-plugins/index.mjs";
 import { DEFAULT_EXTERNAL, PROD_MODE } from "../../constants/index.mjs";
-import { winToUnixPath } from "../../util/index.mjs";
+import { mergeConfig, winToUnixPath } from "../../util/index.mjs";
 export function defineRollupConfig(opts = {}) {
   process.on("SIGINT", () => {
     process.exit();
@@ -79,7 +78,7 @@ export function defineRollupConfig(opts = {}) {
       entryFileNames: "[name].mjs"
     }
   ];
-  return merge(
+  return mergeConfig(
     defineConfig({
       input,
       treeshake: false,

package/es/util/index.d.ts

@@ -15,3 +15,15 @@ export declare function winToUnixPath(pathStr: string): string;
  * @return {*}  {string}
  */
 export declare function unixToWinPath(pathStr: string): string;
+/**
+ * 自定义合并配置，数据非替换为 concat 合并
+ *
+ * @author chitanda
+ * @date 2025-08-20 20:08:45
+ * @export
+ * @template T
+ * @param {T} obj
+ * @param {U} obj2
+ * @returns {*}  {T}
+ */
+export declare function mergeConfig<T extends object, U extends object>(obj: T, obj2: U): T & U;

package/es/util/index.mjs

@@ -1,3 +1,4 @@
+import { mergeWith } from "lodash-es";
 export { CopyWatch } from "./watcher/watcher.mjs";
 export function winToUnixPath(pathStr) {
   return pathStr.replace(/\\/g, "/");
@@ -5,3 +6,11 @@ export function winToUnixPath(pathStr) {
 export function unixToWinPath(pathStr) {
   return pathStr.replace(/\//g, "\\");
 }
+export function mergeConfig(obj, obj2) {
+  return mergeWith(obj, obj2, (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return objValue.concat(srcValue);
+    }
+    return void 0;
+  });
+}

package/es/vite/vite-config/vite-base-config.mjs

@@ -1,10 +1,11 @@
-import { defineConfig, mergeConfig } from "vite";
+import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import vueJsx from "@vitejs/plugin-vue-jsx";
 import { babel } from "@rollup/plugin-babel";
 import json from "@rollup/plugin-json";
 import path from "path";
 import { DEFAULT_EXTERNAL } from "../../constants/index.mjs";
+import { mergeConfig } from "../../util/index.mjs";
 export function defineViteBaseConfig(opts = {}) {
   const cwd = process.cwd();
   const outDir = path.resolve(cwd, "dist");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/build",
-  "version": "0.1.4-dev.2",
+  "version": "0.1.4-dev.3",
   "type": "module",
   "description": "paas 平台核心包",
   "main": "dist/index.cjs",
@@ -39,13 +39,13 @@
     "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@babel/core": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
+    "@babel/core": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "@eslint/js": "^9.33.0",
-    "@gct-paas/scss": "^0.1.4-dev.2",
-    "@inquirer/prompts": "^7.8.1",
+    "@gct-paas/scss": "^0.1.4-dev.3",
+    "@inquirer/prompts": "^7.8.3",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-eslint": "^9.0.5",
@@ -60,14 +60,14 @@
     "consola": "^3.4.2",
     "copy-file": "^11.1.0",
     "core-js": "^3.45.0",
-    "cpy": "^12.0.0",
+    "cpy": "^12.0.1",
     "crypto": "^1.0.1",
     "esbuild": "^0.25.9",
     "eslint": "^9.33.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint-plugin-unused-imports": "^4.2.0",
     "eslint-plugin-vue": "^10.4.0",
     "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.1",
@@ -77,12 +77,12 @@
     "picocolors": "^1.1.1",
     "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
-    "rollup": "^4.46.2",
+    "rollup": "^4.46.4",
     "rollup-plugin-esbuild": "^6.2.1",
     "stylelint": "^16.23.1",
     "stylelint-config-standard-scss": "^15.0.1",
-    "typescript-eslint": "^8.39.1",
-    "vite": "^7.1.2",
+    "typescript-eslint": "^8.40.0",
+    "vite": "^7.1.3",
     "vite-plugin-dts": "^4.5.4",
     "vue-eslint-parser": "^10.2.0",
     "vue-tsc": "^3.0.5"
@@ -93,10 +93,10 @@
     "@types/babel__preset-env": "^7.10.0",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.3.0",
     "tsx": "^4.20.4",
     "typescript": "^5.9.2",
-    "unbuild": "^3.6.0"
+    "unbuild": "^3.6.1"
   },
-  "gitHead": "d837ea9836db8bae169908326208cc031b2e9eac"
+  "gitHead": "caa65b07a6bbfb27d41911da2f5459567db38b1d"
 }