@tarojs/service 3.5.0-canary.0 → 3.5.0-theta.1

package/dist/Config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const fs = require("fs-extra");
-const lodash_1 = require("lodash");
 const helper_1 = require("@tarojs/helper");
+const fs = require("fs-extra");
+const path = require("path");
+const merge = require("webpack-merge");
 const constants_1 = require("./utils/constants");
 class Config {
     constructor(opts) {
@@ -11,19 +11,19 @@ class Config {
         this.init();
     }
     init() {
-        this.configPath = helper_1.resolveScriptPath(path.join(this.appPath, constants_1.CONFIG_DIR_NAME, constants_1.DEFAULT_CONFIG_FILE));
+        this.configPath = (0, helper_1.resolveScriptPath)(path.join(this.appPath, constants_1.CONFIG_DIR_NAME, constants_1.DEFAULT_CONFIG_FILE));
         if (!fs.existsSync(this.configPath)) {
             this.initialConfig = {};
             this.isInitSuccess = false;
         }
         else {
-            helper_1.createBabelRegister({
+            (0, helper_1.createSwcRegister)({
                 only: [
                     filePath => filePath.indexOf(path.join(this.appPath, constants_1.CONFIG_DIR_NAME)) >= 0
                 ]
             });
             try {
-                this.initialConfig = helper_1.getModuleDefaultExport(require(this.configPath))(lodash_1.merge);
+                this.initialConfig = (0, helper_1.getModuleDefaultExport)(require(this.configPath))(merge);
                 this.isInitSuccess = true;
             }
             catch (err) {
@@ -39,11 +39,11 @@ class Config {
         const outputDirName = initialConfig.outputRoot || helper_1.OUTPUT_DIR;
         const sourceDir = path.join(this.appPath, sourceDirName);
         const entryName = helper_1.ENTRY;
-        const entryFilePath = helper_1.resolveScriptPath(path.join(sourceDir, entryName));
+        const entryFilePath = (0, helper_1.resolveScriptPath)(path.join(sourceDir, entryName));
         const entry = {
             [entryName]: [entryFilePath]
         };
-        return Object.assign({ entry, alias: initialConfig.alias || {}, copy: initialConfig.copy, sourceRoot: sourceDirName, outputRoot: outputDirName, platform, framework: initialConfig.framework, baseLevel: initialConfig.baseLevel, csso: initialConfig.csso, sass: initialConfig.sass, uglify: initialConfig.uglify, plugins: initialConfig.plugins, projectName: initialConfig.projectName, env: initialConfig.env, defineConstants: initialConfig.defineConstants, designWidth: initialConfig.designWidth, deviceRatio: initialConfig.deviceRatio, projectConfigName: initialConfig.projectConfigName, terser: initialConfig.terser }, initialConfig[useConfigName]);
+        return Object.assign({ entry, alias: initialConfig.alias || {}, copy: initialConfig.copy, sourceRoot: sourceDirName, outputRoot: outputDirName, platform, framework: initialConfig.framework, compiler: initialConfig.compiler, cache: initialConfig.cache, logger: initialConfig.logger, baseLevel: initialConfig.baseLevel, csso: initialConfig.csso, sass: initialConfig.sass, uglify: initialConfig.uglify, plugins: initialConfig.plugins, projectName: initialConfig.projectName, env: initialConfig.env, defineConstants: initialConfig.defineConstants, designWidth: initialConfig.designWidth, deviceRatio: initialConfig.deviceRatio, projectConfigName: initialConfig.projectConfigName, jsMinimizer: initialConfig.jsMinimizer, cssMinimizer: initialConfig.cssMinimizer, terser: initialConfig.terser, esbuild: initialConfig.esbuild }, initialConfig[useConfigName]);
     }
 }
 exports.default = Config;

package/dist/Kernel.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { EventEmitter } from 'events';
 import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile';
-import { IPreset, IPluginsObject, IPlugin, IPaths, IHook, ICommand, IPlatform } from './utils/types';
-import Plugin from './Plugin';
+import { EventEmitter } from 'events';
 import Config from './Config';
+import Plugin from './Plugin';
+import { ICommand, IHook, IPaths, IPlatform, IPlugin, IPluginsObject, IPreset } from './utils/types';
 interface IKernelOptions {
     appPath: string;
     presets?: PluginItem[];
@@ -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;
@@ -51,6 +50,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

@@ -9,21 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
+const helper_1 = require("@tarojs/helper");
+const helper = require("@tarojs/helper");
 const events_1 = require("events");
 const lodash_1 = require("lodash");
+const path = require("path");
 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");
 const Config_1 = require("./Config");
+const Plugin_1 = require("./Plugin");
+const utils_1 = require("./utils");
+const constants_1 = require("./utils/constants");
 class Kernel extends events_1.EventEmitter {
     constructor(options) {
         super();
-        this.debugger = helper_1.createDebug('Taro:Kernel');
+        this.debugger = process.env.DEBUG === 'Taro:Kernel' ? (0, 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({
@@ -52,13 +44,13 @@ class Kernel extends events_1.EventEmitter {
     initPaths() {
         this.paths = {
             appPath: this.appPath,
-            nodeModulesPath: helper_1.recursiveFindNodeModules(path.join(this.appPath, helper_1.NODE_MODULES))
+            nodeModulesPath: (0, helper_1.recursiveFindNodeModules)(path.join(this.appPath, helper_1.NODE_MODULES))
         };
         if (this.config.isInitSuccess) {
             Object.assign(this.paths, {
                 configPath: this.config.configPath,
                 sourcePath: path.join(this.appPath, this.initialConfig.sourceRoot),
-                outputPath: path.resolve(this.appPath, this.initialConfig.outputRoot)
+                outputPath: path.join(this.appPath, this.initialConfig.outputRoot)
             });
         }
         this.debugger(`initPaths:${JSON.stringify(this.paths, null, 2)}`);
@@ -69,11 +61,11 @@ class Kernel extends events_1.EventEmitter {
     }
     initPresetsAndPlugins() {
         const initialConfig = this.initialConfig;
-        const allConfigPresets = utils_1.mergePlugins(this.optsPresets || [], initialConfig.presets || [])();
-        const allConfigPlugins = utils_1.mergePlugins(this.optsPlugins || [], initialConfig.plugins || [])();
+        const allConfigPresets = (0, utils_1.mergePlugins)(this.optsPresets || [], initialConfig.presets || [])();
+        const allConfigPlugins = (0, utils_1.mergePlugins)(this.optsPlugins || [], initialConfig.plugins || [])();
         this.debugger('initPresetsAndPlugins', allConfigPresets, allConfigPlugins);
         process.env.NODE_ENV !== 'test' &&
-            helper_1.createBabelRegister({
+            (0, helper_1.createSwcRegister)({
                 only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
             });
         this.plugins = new Map();
@@ -82,14 +74,14 @@ class Kernel extends events_1.EventEmitter {
         this.resolvePlugins(allConfigPlugins);
     }
     resolvePresets(presets) {
-        const allPresets = utils_1.resolvePresetsOrPlugins(this.appPath, presets, constants_1.PluginType.Preset);
+        const allPresets = (0, utils_1.resolvePresetsOrPlugins)(this.appPath, presets, constants_1.PluginType.Preset);
         while (allPresets.length) {
             this.initPreset(allPresets.shift());
         }
     }
     resolvePlugins(plugins) {
-        plugins = lodash_1.merge(this.extraPlugins, plugins);
-        const allPlugins = utils_1.resolvePresetsOrPlugins(this.appPath, plugins, constants_1.PluginType.Plugin);
+        plugins = (0, lodash_1.merge)(this.extraPlugins, plugins);
+        const allPlugins = (0, utils_1.resolvePresetsOrPlugins)(this.appPath, plugins, constants_1.PluginType.Plugin);
         while (allPlugins.length) {
             this.initPlugin(allPlugins.shift());
         }
@@ -102,13 +94,13 @@ class Kernel extends events_1.EventEmitter {
         const { presets, plugins } = apply()(pluginCtx, opts) || {};
         this.registerPlugin(preset);
         if (Array.isArray(presets)) {
-            const _presets = utils_1.resolvePresetsOrPlugins(this.appPath, utils_1.convertPluginsToObject(presets)(), constants_1.PluginType.Preset);
+            const _presets = (0, utils_1.resolvePresetsOrPlugins)(this.appPath, (0, utils_1.convertPluginsToObject)(presets)(), constants_1.PluginType.Preset);
             while (_presets.length) {
                 this.initPreset(_presets.shift());
             }
         }
         if (Array.isArray(plugins)) {
-            this.extraPlugins = lodash_1.merge(this.extraPlugins, utils_1.convertPluginsToObject(plugins)());
+            this.extraPlugins = (0, lodash_1.merge)(this.extraPlugins, (0, utils_1.convertPluginsToObject)(plugins)());
         }
     }
     initPlugin(plugin) {
@@ -123,6 +115,8 @@ class Kernel extends events_1.EventEmitter {
         if (typeof pluginCtx.optsSchema !== 'function') {
             return;
         }
+        this.debugger('checkPluginOpts', pluginCtx);
+        const joi = require('joi');
         const schema = pluginCtx.optsSchema(joi);
         if (!joi.isSchema(schema)) {
             throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`);
@@ -134,6 +128,7 @@ class Kernel extends events_1.EventEmitter {
         }
     }
     registerPlugin(plugin) {
+        this.debugger('registerPlugin', plugin);
         if (this.plugins.has(plugin.id)) {
             throw new Error(`插件 ${plugin.id} 已被注册`);
         }
@@ -198,6 +193,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 = [];
@@ -233,6 +231,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]);
+        (0, 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* () {
@@ -250,33 +259,26 @@ 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)) {
                 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);
+                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/dist/Plugin.d.ts

@@ -1,5 +1,5 @@
 import Kernel from './Kernel';
-import { IHook, ICommand, IPlatform } from './utils/types';
+import { ICommand, IHook, IPlatform } from './utils/types';
 export default class Plugin {
     id: string;
     path: string;

package/dist/Plugin.js

@@ -29,7 +29,7 @@ class Plugin {
         if (this.ctx.platforms.has(platform.name)) {
             throw new Error(`适配平台 ${platform.name} 已存在`);
         }
-        helper_1.addPlatforms(platform.name);
+        (0, helper_1.addPlatforms)(platform.name);
         this.ctx.platforms.set(platform.name, platform);
         this.register(platform);
     }

package/dist/platform-plugin-base.d.ts

@@ -22,6 +22,7 @@ export declare abstract class TaroPlatformBase {
     ctx: IPluginContext;
     helper: IPluginContext['helper'];
     config: any;
+    compiler: string;
     abstract platform: string;
     abstract globalObject: string;
     abstract runtimePath: string | string[];

package/dist/platform-plugin-base.js

@@ -40,6 +40,8 @@ class TaroPlatformBase {
         this.ctx = ctx;
         this.helper = ctx.helper;
         this.config = config;
+        const _compiler = config.compiler;
+        this.compiler = typeof _compiler === 'object' ? _compiler.type : _compiler;
     }
     /**
      * 1. 清空 dist 文件夹
@@ -54,36 +56,46 @@ class TaroPlatformBase {
         });
     }
     setupImpl() {
+        var _a;
         const { needClearOutput } = this.config;
         if (typeof needClearOutput === 'undefined' || !!needClearOutput) {
             this.emptyOutputDir();
         }
         this.printDevelopmentTip(this.platform);
-        const { printLog, processTypeEnum } = this.ctx.helper;
-        printLog("start" /* START */, '开发者工具-项目目录', `${this.ctx.paths.outputPath}`);
         if (this.projectConfigJson) {
             this.generateProjectConfig(this.projectConfigJson);
         }
+        if (((_a = this.ctx.initialConfig.logger) === null || _a === void 0 ? void 0 : _a.quiet) === false) {
+            const { printLog, processTypeEnum } = this.ctx.helper;
+            printLog("start" /* START */, '开发者工具-项目目录', `${this.ctx.paths.outputPath}`);
+        }
     }
     emptyOutputDir() {
         const { outputPath } = this.ctx.paths;
         this.helper.emptyDirectory(outputPath);
     }
     printDevelopmentTip(platform) {
-        if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test')
-            return;
-        const { isWindows, chalk } = this.helper;
-        let exampleCommand;
-        if (isWindows) {
-            exampleCommand = `$ set NODE_ENV=production && taro build --type ${platform} --watch`;
+        var _a;
+        const tips = [];
+        const config = this.config;
+        const { chalk } = this.helper;
+        if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+            const { isWindows } = this.helper;
+            const exampleCommand = isWindows
+                ? `$ set NODE_ENV=production && taro build --type ${platform} --watch`
+                : `$ NODE_ENV=production taro build --type ${platform} --watch`;
+            tips.push(chalk.yellowBright(`预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
+Example:
+${exampleCommand}`));
         }
-        else {
-            exampleCommand = `$ NODE_ENV=production taro build --type ${platform} --watch`;
+        if (this.compiler === 'webpack5' && !((_a = config.cache) === null || _a === void 0 ? void 0 : _a.enable)) {
+            tips.push(chalk.yellowBright('建议开启持久化缓存功能，能有效提升二次编译速度，详情请参考: https://docs.taro.zone/docs/config-detail#cache。'));
+        }
+        if (tips.length) {
+            console.log(chalk.yellowBright('Tips:'));
+            tips.forEach((item, index) => console.log(`${chalk.yellowBright(index + 1)}. ${item}`));
+            console.log('\n');
         }
-        console.log(chalk.yellowBright(`Tips: 预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
-Example:
-${exampleCommand}
-`));
     }
     /**
      * 返回当前项目内的 @tarojs/mini-runner 包
@@ -92,7 +104,15 @@ ${exampleCommand}
         return __awaiter(this, void 0, void 0, function* () {
             const { appPath } = this.ctx.paths;
             const { npm } = this.helper;
-            const runner = yield npm.getNpmPkg('@tarojs/mini-runner', appPath);
+            let runnerPkg;
+            switch (this.compiler) {
+                case 'webpack5':
+                    runnerPkg = '@tarojs/webpack5-runner';
+                    break;
+                default:
+                    runnerPkg = '@tarojs/mini-runner';
+            }
+            const runner = yield npm.getNpmPkg(runnerPkg, appPath);
             return runner.bind(null, appPath);
         });
     }

package/dist/utils/index.d.ts

@@ -1,6 +1,6 @@
-import { PluginItem } from '@tarojs/taro/types/compile';
+import type { PluginItem } from '@tarojs/taro/types/compile';
 import { PluginType } from './constants';
-import { IPluginsObject, IPlugin } from './types';
+import { IPlugin, IPluginsObject } from './types';
 export declare const isNpmPkg: (name: string) => boolean;
 export declare function getPluginPath(pluginPath: string): string;
 export declare function convertPluginsToObject(items: PluginItem[]): () => IPluginsObject;

package/dist/utils/index.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printHelpLog = exports.resolvePresetsOrPlugins = exports.mergePlugins = exports.convertPluginsToObject = exports.getPluginPath = exports.isNpmPkg = void 0;
-const path = require("path");
+const helper_1 = require("@tarojs/helper");
 const lodash_1 = require("lodash");
+const path = require("path");
 const resolve = require("resolve");
-const helper_1 = require("@tarojs/helper");
 const isNpmPkg = name => !(/^(\.|\/)/.test(name));
 exports.isNpmPkg = isNpmPkg;
 function getPluginPath(pluginPath) {
-    if (exports.isNpmPkg(pluginPath) || path.isAbsolute(pluginPath))
+    if ((0, exports.isNpmPkg)(pluginPath) || path.isAbsolute(pluginPath))
         return pluginPath;
     throw new Error('plugin 和 preset 配置必须为绝对路径或者包名');
 }
@@ -36,7 +36,7 @@ function mergePlugins(dist, src) {
     return () => {
         const srcObj = convertPluginsToObject(src)();
         const distObj = convertPluginsToObject(dist)();
-        return lodash_1.merge(distObj, srcObj);
+        return (0, lodash_1.merge)(distObj, srcObj);
     };
 }
 exports.mergePlugins = mergePlugins;
@@ -67,7 +67,13 @@ function resolvePresetsOrPlugins(root, args, type) {
             type,
             opts: args[item] || {},
             apply() {
-                return helper_1.getModuleDefaultExport(require(fPath));
+                try {
+                    return (0, helper_1.getModuleDefaultExport)(require(fPath));
+                }
+                catch (error) {
+                    console.error(error);
+                    throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`);
+                }
             }
         };
     });

package/index.js

@@ -1,2 +1,3 @@
 module.exports = require('./dist/index.js').default
+
 module.exports.default = module.exports

package/package.json

@@ -1,18 +1,9 @@
 {
   "name": "@tarojs/service",
-  "version": "3.5.0-canary.0",
+  "version": "3.5.0-theta.1",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
-  "scripts": {
-    "build": "run-s clean prod",
-    "dev": "tsc -w",
-    "prod": "tsc",
-    "clean": "rimraf dist",
-    "prepack": "npm run build",
-    "test": "jest",
-    "test:dev": "jest --watch"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NervJS/taro.git"
@@ -33,14 +24,22 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.5.0-canary.0",
-    "@tarojs/shared": "3.5.0-canary.0",
-    "@tarojs/taro": "3.5.0-canary.0",
-    "fs-extra": "^8.0.1",
+    "@tarojs/helper": "3.5.0-theta.1",
+    "@tarojs/shared": "3.5.0-theta.1",
+    "@tarojs/taro": "3.5.0-theta.1",
+    "fs-extra": "^8.1.0",
+    "joi": "^17.6.0",
     "lodash": "^4.17.21",
-    "resolve": "^1.6.0",
-    "tapable": "^1.1.3"
+    "resolve": "^1.22.0",
+    "tapable": "^1.1.3",
+    "webpack-merge": "^4.2.2"
   },
-  "gitHead": "a0222bc41bc05b0e34413d6db3de963d777a5015"
-}
+  "scripts": {
+    "build": "run-s clean prod",
+    "dev": "tsc -w",
+    "prod": "tsc",
+    "clean": "rimraf dist",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  }
+}

package/src/Config.ts

@@ -1,16 +1,15 @@
-import * as path from 'path'
-import * as fs from 'fs-extra'
-
-import { merge } from 'lodash'
-import { IProjectConfig } from '@tarojs/taro/types/compile'
 import {
-  SOURCE_DIR,
-  OUTPUT_DIR,
+  createSwcRegister,
   ENTRY,
+  getModuleDefaultExport,
+  OUTPUT_DIR,
   resolveScriptPath,
-  createBabelRegister,
-  getModuleDefaultExport
+  SOURCE_DIR
 } from '@tarojs/helper'
+import { IProjectConfig } from '@tarojs/taro/types/compile'
+import * as fs from 'fs-extra'
+import * as path from 'path'
+import * as merge from 'webpack-merge'
 
 import {
   CONFIG_DIR_NAME,
@@ -18,7 +17,7 @@ import {
 } from './utils/constants'
 
 interface IConfigOptions {
-  appPath: string,
+  appPath: string
 }
 
 export default class Config {
@@ -37,7 +36,7 @@ export default class Config {
       this.initialConfig = {}
       this.isInitSuccess = false
     } else {
-      createBabelRegister({
+      createSwcRegister({
         only: [
           filePath => filePath.indexOf(path.join(this.appPath, CONFIG_DIR_NAME)) >= 0
         ]
@@ -73,6 +72,9 @@ export default class Config {
       outputRoot: outputDirName,
       platform,
       framework: initialConfig.framework,
+      compiler: initialConfig.compiler,
+      cache: initialConfig.cache,
+      logger: initialConfig.logger,
       baseLevel: initialConfig.baseLevel,
       csso: initialConfig.csso,
       sass: initialConfig.sass,
@@ -84,7 +86,10 @@ export default class Config {
       designWidth: initialConfig.designWidth,
       deviceRatio: initialConfig.deviceRatio,
       projectConfigName: initialConfig.projectConfigName,
+      jsMinimizer: initialConfig.jsMinimizer,
+      cssMinimizer: initialConfig.cssMinimizer,
       terser: initialConfig.terser,
+      esbuild: initialConfig.esbuild,
       ...initialConfig[useConfigName]
     }
   }

package/src/Kernel.ts

@@ -1,35 +1,34 @@
-import * as path from 'path'
-import { EventEmitter } from 'events'
-import { merge } from 'lodash'
-import { AsyncSeriesWaterfallHook } from 'tapable'
-import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile'
 import {
+  createDebug,
+  createSwcRegister,
   NODE_MODULES,
-  recursiveFindNodeModules,
-  createBabelRegister,
-  createDebug
+  recursiveFindNodeModules
 } from '@tarojs/helper'
 import * as helper from '@tarojs/helper'
-import * as joi from '@hapi/joi'
+import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile'
+import { EventEmitter } from 'events'
+import { merge } from 'lodash'
+import * as path from 'path'
+import { AsyncSeriesWaterfallHook } from 'tapable'
 
+import Config from './Config'
+import Plugin from './Plugin'
+import { convertPluginsToObject, mergePlugins, printHelpLog, resolvePresetsOrPlugins } from './utils'
 import {
-  IPreset,
-  IPluginsObject,
-  IPlugin,
-  IPaths,
-  IHook,
-  ICommand,
-  IPlatform
-} from './utils/types'
-import {
-  PluginType,
-  IS_MODIFY_HOOK,
   IS_ADD_HOOK,
-  IS_EVENT_HOOK
+  IS_EVENT_HOOK,
+  IS_MODIFY_HOOK,
+  PluginType
 } from './utils/constants'
-import { mergePlugins, resolvePresetsOrPlugins, convertPluginsToObject, printHelpLog } from './utils'
-import Plugin from './Plugin'
-import Config from './Config'
+import {
+  ICommand,
+  IHook,
+  IPaths,
+  IPlatform,
+  IPlugin,
+  IPluginsObject,
+  IPreset
+} from './utils/types'
 
 interface IKernelOptions {
   appPath: string
@@ -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 () {
@@ -94,7 +87,7 @@ export default class Kernel extends EventEmitter {
       Object.assign(this.paths, {
         configPath: this.config.configPath,
         sourcePath: path.join(this.appPath, this.initialConfig.sourceRoot as string),
-        outputPath: path.resolve(this.appPath, this.initialConfig.outputRoot as string)
+        outputPath: path.join(this.appPath, this.initialConfig.outputRoot as string)
       })
     }
     this.debugger(`initPaths:${JSON.stringify(this.paths, null, 2)}`)
@@ -111,7 +104,7 @@ export default class Kernel extends EventEmitter {
     const allConfigPlugins = mergePlugins(this.optsPlugins || [], initialConfig.plugins || [])()
     this.debugger('initPresetsAndPlugins', allConfigPresets, allConfigPlugins)
     process.env.NODE_ENV !== 'test' &&
-    createBabelRegister({
+    createSwcRegister({
       only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
     })
     this.plugins = new Map()
@@ -167,6 +160,8 @@ export default class Kernel extends EventEmitter {
     if (typeof pluginCtx.optsSchema !== 'function') {
       return
     }
+    this.debugger('checkPluginOpts', pluginCtx)
+    const joi = require('joi')
     const schema = pluginCtx.optsSchema(joi)
     if (!joi.isSchema(schema)) {
       throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`)
@@ -179,6 +174,7 @@ export default class Kernel extends EventEmitter {
   }
 
   registerPlugin (plugin: IPlugin) {
+    this.debugger('registerPlugin', plugin)
     if (this.plugins.has(plugin.id)) {
       throw new Error(`插件 ${plugin.id} 已被注册`)
     }
@@ -243,6 +239,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[] = []
@@ -280,6 +279,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
@@ -294,33 +305,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) {
-      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)
+      await this.applyPlugins({
+        name: 'modifyRunnerOpts',
+        opts: {
+          opts: opts?.config
+        }
+      })
     }
-    await this.applyPlugins({
-      name: 'modifyRunnerOpts',
-      opts: {
-        opts: opts?.config
-      }
-    })
+
     await this.applyPlugins({
       name,
       opts

package/src/Plugin.ts

@@ -1,7 +1,7 @@
 import { addPlatforms } from '@tarojs/helper'
 
 import Kernel from './Kernel'
-import { IHook, ICommand, IPlatform } from './utils/types'
+import { ICommand, IHook, IPlatform } from './utils/types'
 
 export default class Plugin {
   id: string

package/src/platform-plugin-base.ts

@@ -1,4 +1,5 @@
 import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
+
 import type { IPluginContext } from '../types/index'
 
 interface IFileType {
@@ -42,6 +43,7 @@ export abstract class TaroPlatformBase {
   ctx: IPluginContext
   helper: IPluginContext['helper']
   config: any
+  compiler: string
 
   abstract platform: string
   abstract globalObject: string
@@ -58,6 +60,8 @@ export abstract class TaroPlatformBase {
     this.ctx = ctx
     this.helper = ctx.helper
     this.config = config
+    const _compiler = config.compiler
+    this.compiler = typeof _compiler === 'object' ? _compiler.type : _compiler
   }
 
   /**
@@ -76,11 +80,13 @@ export abstract class TaroPlatformBase {
       this.emptyOutputDir()
     }
     this.printDevelopmentTip(this.platform)
-    const { printLog, processTypeEnum } = this.ctx.helper
-    printLog(processTypeEnum.START, '开发者工具-项目目录', `${this.ctx.paths.outputPath}`)
     if (this.projectConfigJson) {
       this.generateProjectConfig(this.projectConfigJson)
     }
+    if (this.ctx.initialConfig.logger?.quiet === false) {
+      const { printLog, processTypeEnum } = this.ctx.helper
+      printLog(processTypeEnum.START, '开发者工具-项目目录', `${this.ctx.paths.outputPath}`)
+    }
   }
 
   protected emptyOutputDir () {
@@ -89,21 +95,30 @@ export abstract class TaroPlatformBase {
   }
 
   protected printDevelopmentTip (platform: string) {
-    if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') return
+    const tips: string[] = []
+    const config = this.config
+    const { chalk } = this.helper
+
+    if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
+      const { isWindows } = this.helper
+      const exampleCommand = isWindows
+        ? `$ set NODE_ENV=production && taro build --type ${platform} --watch`
+        : `$ NODE_ENV=production taro build --type ${platform} --watch`
 
-    const { isWindows, chalk } = this.helper
-    let exampleCommand
+      tips.push(chalk.yellowBright(`预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
+Example:
+${exampleCommand}`))
+    }
 
-    if (isWindows) {
-      exampleCommand = `$ set NODE_ENV=production && taro build --type ${platform} --watch`
-    } else {
-      exampleCommand = `$ NODE_ENV=production taro build --type ${platform} --watch`
+    if (this.compiler === 'webpack5' && !config.cache?.enable) {
+      tips.push(chalk.yellowBright('建议开启持久化缓存功能，能有效提升二次编译速度，详情请参考: https://docs.taro.zone/docs/config-detail#cache。'))
     }
 
-    console.log(chalk.yellowBright(`Tips: 预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
-Example:
-${exampleCommand}
-`))
+    if (tips.length) {
+      console.log(chalk.yellowBright('Tips:'))
+      tips.forEach((item, index) => console.log(`${chalk.yellowBright(index + 1)}. ${item}`))
+      console.log('\n')
+    }
   }
 
   /**
@@ -112,7 +127,18 @@ ${exampleCommand}
   protected async getRunner () {
     const { appPath } = this.ctx.paths
     const { npm } = this.helper
-    const runner = await npm.getNpmPkg('@tarojs/mini-runner', appPath)
+
+    let runnerPkg: string
+    switch (this.compiler) {
+      case 'webpack5':
+        runnerPkg = '@tarojs/webpack5-runner'
+        break
+      default:
+        runnerPkg = '@tarojs/mini-runner'
+    }
+
+    const runner = await npm.getNpmPkg(runnerPkg, appPath)
+
     return runner.bind(null, appPath)
   }
 

package/src/utils/index.ts

@@ -1,13 +1,11 @@
-import * as path from 'path'
-
+import { chalk, getModuleDefaultExport } from '@tarojs/helper'
+import type { PluginItem } from '@tarojs/taro/types/compile'
 import { merge } from 'lodash'
+import * as path from 'path'
 import * as resolve from 'resolve'
-import { getModuleDefaultExport, chalk } from '@tarojs/helper'
-
-import { PluginItem } from '@tarojs/taro/types/compile'
 
 import { PluginType } from './constants'
-import { IPluginsObject, IPlugin } from './types'
+import { IPlugin, IPluginsObject } from './types'
 
 export const isNpmPkg: (name: string) => boolean = name => !(/^(\.|\/)/.test(name))
 
@@ -66,7 +64,12 @@ export function resolvePresetsOrPlugins (root: string, args, type: PluginType):
       type,
       opts: args[item] || {},
       apply () {
-        return getModuleDefaultExport(require(fPath))
+        try {
+          return getModuleDefaultExport(require(fPath))
+        } catch (error) {
+          console.error(error)
+          throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
+        }
       }
     }
   })

package/src/utils/types.ts

@@ -46,10 +46,10 @@ export interface IHook {
 }
 
 export interface ICommand extends IHook {
-  alias?: string,
+  alias?: string
   optionsMap?: {
     [key: string]: string
-  },
+  }
   synopsisList?: string[]
 }
 

package/types/index.d.ts

@@ -1,6 +1,6 @@
 import helper from '@tarojs/helper'
 import { IProjectConfig } from '@tarojs/taro/types/compile'
-import joi from '@hapi/joi'
+import joi from 'joi'
 
 import { IPlugin, IPaths, IHook, ICommand, IPlatform } from '../src/utils/types'