@tarojs/service 3.4.4 → 3.4.5

package/dist/Kernel.d.ts

@@ -28,7 +28,6 @@ export default class Kernel extends EventEmitter {
     runOpts: any;
     debugger: any;
     constructor(options: IKernelOptions);
-    init(): Promise<void>;
     initConfig(): void;
     initPaths(): void;
     initHelper(): void;

package/dist/Kernel.js

@@ -15,7 +15,6 @@ const lodash_1 = require("lodash");
 const tapable_1 = require("tapable");
 const helper_1 = require("@tarojs/helper");
 const helper = require("@tarojs/helper");
-const joi = require("@hapi/joi");
 const constants_1 = require("./utils/constants");
 const utils_1 = require("./utils");
 const Plugin_1 = require("./Plugin");
@@ -23,7 +22,7 @@ const Config_1 = require("./Config");
 class Kernel extends events_1.EventEmitter {
     constructor(options) {
         super();
-        this.debugger = helper_1.createDebug('Taro:Kernel');
+        this.debugger = process.env.DEBUG === 'Taro:Kernel' ? helper_1.createDebug('Taro:Kernel') : function () { };
         this.appPath = options.appPath || process.cwd();
         this.optsPresets = options.presets;
         this.optsPlugins = options.plugins;
@@ -32,15 +31,8 @@ class Kernel extends events_1.EventEmitter {
         this.commands = new Map();
         this.platforms = new Map();
         this.initHelper();
-    }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.debugger('init');
-            this.initConfig();
-            this.initPaths();
-            this.initPresetsAndPlugins();
-            yield this.applyPlugins('onReady');
-        });
+        this.initConfig();
+        this.initPaths();
     }
     initConfig() {
         this.config = new Config_1.default({
@@ -123,6 +115,7 @@ class Kernel extends events_1.EventEmitter {
         if (typeof pluginCtx.optsSchema !== 'function') {
             return;
         }
+        const joi = require('@hapi/joi');
         const schema = pluginCtx.optsSchema(joi);
         if (!joi.isSchema(schema)) {
             throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`);
@@ -198,6 +191,9 @@ class Kernel extends events_1.EventEmitter {
                 throw new Error('调用失败，未传入正确的名称！');
             }
             const hooks = this.hooks.get(name) || [];
+            if (!hooks.length) {
+                return yield initialVal;
+            }
             const waterfall = new tapable_1.AsyncSeriesWaterfallHook(['arg']);
             if (hooks.length) {
                 const resArr = [];
@@ -261,7 +257,9 @@ class Kernel extends events_1.EventEmitter {
             this.debugger('command:runOpts');
             this.debugger(`command:runOpts:${JSON.stringify(opts, null, 2)}`);
             this.setRunOpts(opts);
-            yield this.init();
+            this.debugger('initPresetsAndPlugins');
+            this.initPresetsAndPlugins();
+            yield this.applyPlugins('onReady');
             this.debugger('command:onStart');
             yield this.applyPlugins('onStart');
             if (!this.commands.has(name)) {
@@ -272,13 +270,13 @@ class Kernel extends events_1.EventEmitter {
             }
             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);
+                yield this.applyPlugins({
+                    name: 'modifyRunnerOpts',
+                    opts: {
+                        opts: opts === null || opts === void 0 ? void 0 : opts.config
+                    }
+                });
             }
-            yield this.applyPlugins({
-                name: 'modifyRunnerOpts',
-                opts: {
-                    opts: opts === null || opts === void 0 ? void 0 : opts.config
-                }
-            });
             yield this.applyPlugins({
                 name,
                 opts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -34,14 +34,14 @@
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.4.4",
-    "@tarojs/shared": "3.4.4",
-    "@tarojs/taro": "3.4.4",
+    "@tarojs/helper": "3.4.5",
+    "@tarojs/shared": "3.4.5",
+    "@tarojs/taro": "3.4.5",
     "fs-extra": "^8.0.1",
     "lodash": "^4.17.21",
     "resolve": "^1.6.0",
     "tapable": "^1.1.3",
     "webpack-merge": "^4.2.2"
   },
-  "gitHead": "099d062d74faa3f124ca2499de1154fae0adc4f9"
+  "gitHead": "789e873f7b9477124b44a900cd4f6a2810e4e06a"
 }

package/src/Kernel.ts

@@ -10,7 +10,6 @@ import {
   createDebug
 } from '@tarojs/helper'
 import * as helper from '@tarojs/helper'
-import * as joi from '@hapi/joi'
 
 import {
   IPreset,
@@ -58,7 +57,7 @@ export default class Kernel extends EventEmitter {
 
   constructor (options: IKernelOptions) {
     super()
-    this.debugger = createDebug('Taro:Kernel')
+    this.debugger = process.env.DEBUG === 'Taro:Kernel' ? createDebug('Taro:Kernel') : function () {}
     this.appPath = options.appPath || process.cwd()
     this.optsPresets = options.presets
     this.optsPlugins = options.plugins
@@ -67,14 +66,8 @@ export default class Kernel extends EventEmitter {
     this.commands = new Map()
     this.platforms = new Map()
     this.initHelper()
-  }
-
-  async init () {
-    this.debugger('init')
     this.initConfig()
     this.initPaths()
-    this.initPresetsAndPlugins()
-    await this.applyPlugins('onReady')
   }
 
   initConfig () {
@@ -167,6 +160,7 @@ export default class Kernel extends EventEmitter {
     if (typeof pluginCtx.optsSchema !== 'function') {
       return
     }
+    const joi = require('@hapi/joi')
     const schema = pluginCtx.optsSchema(joi)
     if (!joi.isSchema(schema)) {
       throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`)
@@ -243,6 +237,9 @@ export default class Kernel extends EventEmitter {
       throw new Error('调用失败，未传入正确的名称！')
     }
     const hooks = this.hooks.get(name) || []
+    if (!hooks.length) {
+      return await initialVal
+    }
     const waterfall = new AsyncSeriesWaterfallHook(['arg'])
     if (hooks.length) {
       const resArr: any[] = []
@@ -306,24 +303,33 @@ export default class Kernel extends EventEmitter {
     this.debugger('command:runOpts')
     this.debugger(`command:runOpts:${JSON.stringify(opts, null, 2)}`)
     this.setRunOpts(opts)
-    await this.init()
+
+    this.debugger('initPresetsAndPlugins')
+    this.initPresetsAndPlugins()
+
+    await this.applyPlugins('onReady')
+
     this.debugger('command:onStart')
     await this.applyPlugins('onStart')
+
     if (!this.commands.has(name)) {
       throw new Error(`${name} 命令不存在`)
     }
+
     if (opts?.isHelp) {
       return this.runHelp(name)
     }
+
     if (opts?.options?.platform) {
       opts.config = this.runWithPlatform(opts.options.platform)
+      await this.applyPlugins({
+        name: 'modifyRunnerOpts',
+        opts: {
+          opts: opts?.config
+        }
+      })
     }
-    await this.applyPlugins({
-      name: 'modifyRunnerOpts',
-      opts: {
-        opts: opts?.config
-      }
-    })
+
     await this.applyPlugins({
       name,
       opts