@varlet/cli 2.0.1 → 2.0.3-alpha.1665825802777

package/lib/config/varlet.config.d.ts

@@ -6,7 +6,7 @@ interface VarletConfig {
     name?: string;
     /**
      * @default `var`
-     * Component class name preffix
+     * Component name prefix
      */
     namespace?: string;
     /**
@@ -16,7 +16,7 @@ interface VarletConfig {
     host?: string;
     /**
      * @default `8080`
-     * Local dev server protcol
+     * Local dev server port
      */
     port?: number;
     logo?: string;
@@ -38,6 +38,7 @@ interface VarletConfig {
     mobile?: Record<string, any>;
     moduleCompatible?: Record<string, string>;
 }
-export declare const defineConfig: (conf: VarletConfig) => VarletConfig;
+export declare function defineConfig(conf: VarletConfig): VarletConfig;
+export declare function mergeStrategy(value: any, srcValue: any, key: string): any[] | undefined;
 export declare function getVarletConfig(emit?: boolean): any;
 export {};

package/lib/config/varlet.config.js

@@ -1,12 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVarletConfig = exports.defineConfig = void 0;
+exports.getVarletConfig = exports.mergeStrategy = exports.defineConfig = void 0;
 var fs_extra_1 = require("fs-extra");
 var lodash_1 = require("lodash");
 var constant_1 = require("../shared/constant");
 var fsUtils_1 = require("../shared/fsUtils");
-var defineConfig = function (conf) { return conf; };
+var shared_1 = require("@varlet/shared");
+function defineConfig(conf) {
+    return conf;
+}
 exports.defineConfig = defineConfig;
+function mergeStrategy(value, srcValue, key) {
+    if (key === 'features' && (0, shared_1.isArray)(srcValue)) {
+        return srcValue;
+    }
+}
+exports.mergeStrategy = mergeStrategy;
 function getVarletConfig(emit) {
     if (emit === void 0) { emit = false; }
     var config = {};
@@ -16,7 +25,7 @@ function getVarletConfig(emit) {
     }
     delete require.cache[require.resolve('../../varlet.default.config.js')];
     var defaultConfig = require('../../varlet.default.config.js');
-    var mergedConfig = (0, lodash_1.merge)(defaultConfig, config);
+    var mergedConfig = (0, lodash_1.mergeWith)(defaultConfig, config, mergeStrategy);
     if (emit) {
         var source = JSON.stringify(mergedConfig, null, 2);
         (0, fsUtils_1.outputFileSyncOnChange)(constant_1.SITE_CONFIG, source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.0.1",
+  "version": "2.0.3-alpha.1665825802777",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/bin.js"
@@ -34,10 +34,10 @@
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-typescript": "^7.14.5",
-    "@varlet/icons": "2.0.1",
-    "@varlet/markdown-vite-plugin": "2.0.1",
-    "@varlet/shared": "2.0.1",
-    "@varlet/touch-emulator": "2.0.1",
+    "@varlet/icons": "2.0.3-alpha.1665825802777",
+    "@varlet/markdown-vite-plugin": "2.0.3-alpha.1665825802777",
+    "@varlet/shared": "2.0.3-alpha.1665825802777",
+    "@varlet/touch-emulator": "2.0.3-alpha.1665825802777",
     "@vitejs/plugin-vue": "3.0.1",
     "@vitejs/plugin-vue-jsx": "2.0.0",
     "@vue/babel-plugin-jsx": "1.1.1",
@@ -82,7 +82,7 @@
     "@types/semver": "^7.3.9"
   },
   "peerDependencies": {
-    "@varlet/touch-emulator": "2.0.1",
+    "@varlet/touch-emulator": "2.0.3-alpha.1665825802777",
     "@vue/runtime-core": "3.2.16",
     "@vue/test-utils": "^2.0.2",
     "clipboard": "^2.0.6",

package/site/pc/Layout.vue

@@ -403,6 +403,10 @@ iframe {
             padding: 0;
             font-size: 13px;
           }
+
+          a {
+            font-size: 13px;
+          }
         }
 
         em {