@tarojs/service 3.4.5 → 3.5.0-alpha.0

package/dist/Config.js

@@ -17,7 +17,7 @@ class Config {
             this.isInitSuccess = false;
         }
         else {
-            helper_1.createBabelRegister({
+            helper_1.createSwcRegister({
                 only: [
                     filePath => filePath.indexOf(path.join(this.appPath, constants_1.CONFIG_DIR_NAME)) >= 0
                 ]
@@ -43,7 +43,7 @@ class Config {
         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.js

@@ -65,7 +65,7 @@ class Kernel extends events_1.EventEmitter {
         const allConfigPlugins = utils_1.mergePlugins(this.optsPlugins || [], initialConfig.plugins || [])();
         this.debugger('initPresetsAndPlugins', allConfigPresets, allConfigPlugins);
         process.env.NODE_ENV !== 'test' &&
-            helper_1.createBabelRegister({
+            helper_1.createSwcRegister({
                 only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
             });
         this.plugins = new Map();
@@ -115,7 +115,7 @@ class Kernel extends events_1.EventEmitter {
         if (typeof pluginCtx.optsSchema !== 'function') {
             return;
         }
-        const joi = require('@hapi/joi');
+        const joi = require('joi');
         const schema = pluginCtx.optsSchema(joi);
         if (!joi.isSchema(schema)) {
             throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.4.5",
+  "version": "3.5.0-alpha.0",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -33,15 +33,15 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.4.5",
-    "@tarojs/shared": "3.4.5",
-    "@tarojs/taro": "3.4.5",
-    "fs-extra": "^8.0.1",
+    "@tarojs/helper": "3.5.0-alpha.0",
+    "@tarojs/shared": "3.5.0-alpha.0",
+    "@tarojs/taro": "3.5.0-alpha.0",
+    "fs-extra": "^8.1.0",
+    "joi": "^17.6.0",
     "lodash": "^4.17.21",
-    "resolve": "^1.6.0",
+    "resolve": "^1.22.0",
     "tapable": "^1.1.3",
     "webpack-merge": "^4.2.2"
   },
-  "gitHead": "789e873f7b9477124b44a900cd4f6a2810e4e06a"
+  "gitHead": "8b2acf55c5f98e54bb2788a723a2ef0e0a1b75b6"
 }

package/src/Config.ts

@@ -8,7 +8,7 @@ import {
   OUTPUT_DIR,
   ENTRY,
   resolveScriptPath,
-  createBabelRegister,
+  createSwcRegister,
   getModuleDefaultExport
 } from '@tarojs/helper'
 
@@ -37,7 +37,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 +73,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 +87,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

@@ -6,7 +6,7 @@ import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile'
 import {
   NODE_MODULES,
   recursiveFindNodeModules,
-  createBabelRegister,
+  createSwcRegister,
   createDebug
 } from '@tarojs/helper'
 import * as helper from '@tarojs/helper'
@@ -104,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()
@@ -160,7 +160,7 @@ export default class Kernel extends EventEmitter {
     if (typeof pluginCtx.optsSchema !== 'function') {
       return
     }
-    const joi = require('@hapi/joi')
+    const joi = require('joi')
     const schema = pluginCtx.optsSchema(joi)
     if (!joi.isSchema(schema)) {
       throw new Error(`插件${pluginCtx.id}中设置参数检查 schema 有误，请检查！`)

package/src/platform-plugin-base.ts

@@ -42,6 +42,7 @@ export abstract class TaroPlatformBase {
   ctx: IPluginContext
   helper: IPluginContext['helper']
   config: any
+  compiler: string
 
   abstract platform: string
   abstract globalObject: string
@@ -58,6 +59,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 +79,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 +94,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
 
-    const { isWindows, chalk } = this.helper
-    let exampleCommand
+    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`
 
-    if (isWindows) {
-      exampleCommand = `$ set NODE_ENV=production && taro build --type ${platform} --watch`
-    } else {
-      exampleCommand = `$ NODE_ENV=production taro build --type ${platform} --watch`
+      tips.push(chalk.yellowBright(`预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
+Example:
+${exampleCommand}`))
     }
 
-    console.log(chalk.yellowBright(`Tips: 预览模式生成的文件较大，设置 NODE_ENV 为 production 可以开启压缩。
-Example:
-${exampleCommand}
-`))
+    if (this.compiler === 'webpack5' && !config.cache?.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')
+    }
   }
 
   /**
@@ -112,7 +126,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/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'