@tarojs/service 3.4.0-beta.2 → 3.4.2

package/dist/Config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs-extra");
-const lodash_1 = require("lodash");
+const merge = require("webpack-merge");
 const helper_1 = require("@tarojs/helper");
 const constants_1 = require("./utils/constants");
 class Config {
@@ -23,7 +23,7 @@ class Config {
                 ]
             });
             try {
-                this.initialConfig = helper_1.getModuleDefaultExport(require(this.configPath))(lodash_1.merge);
+                this.initialConfig = helper_1.getModuleDefaultExport(require(this.configPath))(merge);
                 this.isInitSuccess = true;
             }
             catch (err) {

package/dist/Kernel.d.ts

@@ -51,6 +51,7 @@ export default class Kernel extends EventEmitter {
     }): Promise<any>;
     runWithPlatform(platform: any): any;
     setRunOpts(opts: any): void;
+    runHelp(name: string): void;
     run(args: string | {
         name: string;
         opts?: any;

package/dist/Kernel.js

@@ -233,6 +233,17 @@ class Kernel extends events_1.EventEmitter {
     setRunOpts(opts) {
         this.runOpts = opts;
     }
+    runHelp(name) {
+        const command = this.commands.get(name);
+        const defaultOptionsMap = new Map();
+        defaultOptionsMap.set('-h, --help', 'output usage information');
+        let customOptionsMap = new Map();
+        if (command === null || command === void 0 ? void 0 : command.optionsMap) {
+            customOptionsMap = new Map(Object.entries(command === null || command === void 0 ? void 0 : command.optionsMap));
+        }
+        const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap]);
+        utils_1.printHelpLog(name, optionsMap, (command === null || command === void 0 ? void 0 : command.synopsisList) ? new Set(command === null || command === void 0 ? void 0 : command.synopsisList) : new Set());
+    }
     run(args) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -257,16 +268,7 @@ class Kernel extends events_1.EventEmitter {
                 throw new Error(`${name} 命令不存在`);
             }
             if (opts === null || opts === void 0 ? void 0 : opts.isHelp) {
-                const command = this.commands.get(name);
-                const defaultOptionsMap = new Map();
-                defaultOptionsMap.set('-h, --help', 'output usage information');
-                let customOptionsMap = new Map();
-                if (command === null || command === void 0 ? void 0 : command.optionsMap) {
-                    customOptionsMap = new Map(Object.entries(command === null || command === void 0 ? void 0 : command.optionsMap));
-                }
-                const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap]);
-                utils_1.printHelpLog(name, optionsMap, (command === null || command === void 0 ? void 0 : command.synopsisList) ? new Set(command === null || command === void 0 ? void 0 : command.synopsisList) : new Set());
-                return;
+                return this.runHelp(name);
             }
             if ((_a = opts === null || opts === void 0 ? void 0 : opts.options) === null || _a === void 0 ? void 0 : _a.platform) {
                 opts.config = this.runWithPlatform(opts.options.platform);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.4.0-beta.2",
+  "version": "3.4.2",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -34,13 +34,14 @@
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.4.0-beta.2",
-    "@tarojs/shared": "3.4.0-beta.2",
-    "@tarojs/taro": "3.4.0-beta.2",
+    "@tarojs/helper": "3.4.2",
+    "@tarojs/shared": "3.4.2",
+    "@tarojs/taro": "3.4.2",
     "fs-extra": "^8.0.1",
     "lodash": "^4.17.21",
     "resolve": "^1.6.0",
-    "tapable": "^1.1.3"
+    "tapable": "^1.1.3",
+    "webpack-merge": "^4.2.2"
   },
-  "gitHead": "ac3eb29f11aec15d25e061775d9e970efabc2c98"
+  "gitHead": "26b329326c6a7da652e8d712ee33df01ab8d2d0e"
 }

package/src/Config.ts

@@ -1,7 +1,7 @@
 import * as path from 'path'
 import * as fs from 'fs-extra'
 
-import { merge } from 'lodash'
+import * as merge from 'webpack-merge'
 import { IProjectConfig } from '@tarojs/taro/types/compile'
 import {
   SOURCE_DIR,

package/src/Kernel.ts

@@ -280,6 +280,18 @@ export default class Kernel extends EventEmitter {
     this.runOpts = opts
   }
 
+  runHelp (name: string) {
+    const command = this.commands.get(name)
+    const defaultOptionsMap = new Map()
+    defaultOptionsMap.set('-h, --help', 'output usage information')
+    let customOptionsMap = new Map()
+    if (command?.optionsMap) {
+      customOptionsMap = new Map(Object.entries(command?.optionsMap))
+    }
+    const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap])
+    printHelpLog(name, optionsMap, command?.synopsisList ? new Set(command?.synopsisList) : new Set())
+  }
+
   async run (args: string | { name: string, opts?: any }) {
     let name
     let opts
@@ -301,16 +313,7 @@ export default class Kernel extends EventEmitter {
       throw new Error(`${name} 命令不存在`)
     }
     if (opts?.isHelp) {
-      const command = this.commands.get(name)
-      const defaultOptionsMap = new Map()
-      defaultOptionsMap.set('-h, --help', 'output usage information')
-      let customOptionsMap = new Map()
-      if (command?.optionsMap) {
-        customOptionsMap = new Map(Object.entries(command?.optionsMap))
-      }
-      const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap])
-      printHelpLog(name, optionsMap, command?.synopsisList ? new Set(command?.synopsisList) : new Set())
-      return
+      return this.runHelp(name)
     }
     if (opts?.options?.platform) {
       opts.config = this.runWithPlatform(opts.options.platform)