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

package/dist/constants/index.cjs

@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
 exports.PROD_MODE = exports.DEV_MODE = exports.DEFAULT_EXTERNAL = void 0;
 const DEV_MODE = exports.DEV_MODE = "development";
 const PROD_MODE = exports.PROD_MODE = "production";
-const DEFAULT_EXTERNAL = exports.DEFAULT_EXTERNAL = ["vue", "vue-router", "vue-i18n", "axios", "dayjs", "lodash-es", "qs", "pinia", "vuedraggable", "sortablejs", "vue-grid-layout", "vant", "ant-design-vue", "@gct-paas/build", "@gct-paas/core", "@gct-paas/core-mobile", "@gct-paas/core-web", "@gct-paas/design", "@gct-paas/design-mobile", "@gct-paas/design-web", "@gct-paas/mobile", "@gct-paas/scss", "@gct-paas/web", "systemjs"];
+const DEFAULT_EXTERNAL = exports.DEFAULT_EXTERNAL = ["vue", "vue-router", "vue-i18n", "axios", "dayjs", "lodash-es", "qs", "pinia", "vuedraggable", "sortablejs", "vue-grid-layout", "vant", "ant-design-vue", "@gct-paas/build", "@gct-paas/api", "@gct-paas/core", "@gct-paas/core-mobile", "@gct-paas/core-web", "@gct-paas/design", "@gct-paas/design-mobile", "@gct-paas/design-web", "@gct-paas/mobile", "@gct-paas/scss", "@gct-paas/web", "systemjs"];

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

@@ -73,6 +73,7 @@ function defineRollupConfig(opts = {}) {
   }
   const output = [{
     dir: outDir,
+    esModule: true,
     format: "es",
     sourcemap: false,
     preserveModules: true,
@@ -82,7 +83,15 @@ function defineRollupConfig(opts = {}) {
   return (0, _util.mergeConfig)((0, _rollup.defineConfig)({
     input,
     treeshake: false,
-    external: _constants.DEFAULT_EXTERNAL,
+    external: id => {
+      if (_util.IS_NODE_MODULE.test(id)) {
+        return true;
+      }
+      if (_constants.DEFAULT_EXTERNAL.includes(id)) {
+        return true;
+      }
+      return false;
+    },
     output,
     plugins: [(0, _rollupPlugins.ignoreCompilerFile)(externalCompileFileReg), (0, _pluginJson.default)(), (0, _pluginVue.default)({
       isProduction: isProd

package/dist/util/index.cjs

@@ -9,10 +9,17 @@ Object.defineProperty(exports, "CopyWatch", {
     return _watcher.CopyWatch;
   }
 });
+Object.defineProperty(exports, "IS_NODE_MODULE", {
+  enumerable: true,
+  get: function () {
+    return _regExp.IS_NODE_MODULE;
+  }
+});
 exports.mergeConfig = mergeConfig;
 exports.unixToWinPath = unixToWinPath;
 exports.winToUnixPath = winToUnixPath;
 var _lodashEs = require("lodash-es");
+var _regExp = require("./reg-exp/reg-exp.cjs");
 var _watcher = require("./watcher/watcher.cjs");
 function winToUnixPath(pathStr) {
   return pathStr.replace(/\\/g, "/");
@@ -22,7 +29,7 @@ function unixToWinPath(pathStr) {
 }
 function mergeConfig(obj, obj2) {
   return (0, _lodashEs.mergeWith)(obj, obj2, (objValue, srcValue) => {
-    if (Array.isArray(objValue)) {
+    if (Array.isArray(objValue) && Array.isArray(srcValue)) {
       return objValue.concat(srcValue);
     }
     return void 0;

package/dist/util/index.d.ts

@@ -1,3 +1,4 @@
+export { IS_NODE_MODULE } from './reg-exp/reg-exp';
 export { CopyWatch } from './watcher/watcher';
 /**
  * win 路径 \\ 转 linux 路径 /

package/dist/util/reg-exp/reg-exp.cjs

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.IS_NODE_MODULE = void 0;
+const IS_NODE_MODULE = exports.IS_NODE_MODULE = /node_modules\//;

package/dist/util/reg-exp/reg-exp.d.ts

@@ -0,0 +1 @@
+export declare const IS_NODE_MODULE: RegExp;

package/es/constants/index.mjs

@@ -15,6 +15,7 @@ export const DEFAULT_EXTERNAL = [
   "vant",
   "ant-design-vue",
   "@gct-paas/build",
+  "@gct-paas/api",
   "@gct-paas/core",
   "@gct-paas/core-mobile",
   "@gct-paas/core-web",

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

@@ -14,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 { mergeConfig, winToUnixPath } from "../../util/index.mjs";
+import { IS_NODE_MODULE, mergeConfig, winToUnixPath } from "../../util/index.mjs";
 export function defineRollupConfig(opts = {}) {
   process.on("SIGINT", () => {
     process.exit();
@@ -71,6 +71,7 @@ export function defineRollupConfig(opts = {}) {
   const output = [
     {
       dir: outDir,
+      esModule: true,
       format: "es",
       sourcemap: false,
       preserveModules: true,
@@ -82,7 +83,15 @@ export function defineRollupConfig(opts = {}) {
     defineConfig({
       input,
       treeshake: false,
-      external: DEFAULT_EXTERNAL,
+      external: (id) => {
+        if (IS_NODE_MODULE.test(id)) {
+          return true;
+        }
+        if (DEFAULT_EXTERNAL.includes(id)) {
+          return true;
+        }
+        return false;
+      },
       output,
       plugins: [
         ignoreCompilerFile(externalCompileFileReg),

package/es/util/index.d.ts

@@ -1,3 +1,4 @@
+export { IS_NODE_MODULE } from './reg-exp/reg-exp';
 export { CopyWatch } from './watcher/watcher';
 /**
  * win 路径 \\ 转 linux 路径 /

package/es/util/index.mjs

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

package/es/util/reg-exp/reg-exp.d.ts

@@ -0,0 +1 @@
+export declare const IS_NODE_MODULE: RegExp;

package/es/util/reg-exp/reg-exp.mjs

@@ -0,0 +1 @@
+export const IS_NODE_MODULE = /node_modules\//;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/build",
-  "version": "0.1.4-dev.3",
+  "version": "0.1.4-dev.4",
   "type": "module",
   "description": "paas 平台核心包",
   "main": "dist/index.cjs",
@@ -44,7 +44,7 @@
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
     "@eslint/js": "^9.33.0",
-    "@gct-paas/scss": "^0.1.4-dev.3",
+    "@gct-paas/scss": "^0.1.4-dev.4",
     "@inquirer/prompts": "^7.8.3",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^28.0.6",
@@ -98,5 +98,5 @@
     "typescript": "^5.9.2",
     "unbuild": "^3.6.1"
   },
-  "gitHead": "caa65b07a6bbfb27d41911da2f5459567db38b1d"
+  "gitHead": "8243f48a5c33973e9d610917555d9a3e27e6bd04"
 }