@tarojs/service 3.7.0-alpha.0 → 3.7.0-alpha.10

package/src/Config.ts

@@ -1,12 +1,16 @@
 import {
   createSwcRegister,
   ENTRY,
+  fs,
   getModuleDefaultExport,
+  getUserHomeDir,
   OUTPUT_DIR,
   resolveScriptPath,
-  SOURCE_DIR
+  SOURCE_DIR,
+  TARO_GLOBAL_CONFIG_DIR,
+  TARO_GLOBAL_CONFIG_FILE
 } from '@tarojs/helper'
-import * as fs from 'fs-extra'
+import * as ora from 'ora'
 import * as path from 'path'
 import * as merge from 'webpack-merge'
 
@@ -19,23 +23,33 @@ import type { IProjectConfig } from '@tarojs/taro/types/compile'
 
 interface IConfigOptions {
   appPath: string
+  disableGlobalConfig?: boolean
 }
 
 export default class Config {
   appPath: string
   configPath: string
   initialConfig: IProjectConfig
+  initialGlobalConfig: IProjectConfig
   isInitSuccess: boolean
+  disableGlobalConfig: boolean
+
   constructor (opts: IConfigOptions) {
     this.appPath = opts.appPath
-    this.init()
+    this.disableGlobalConfig = !!opts?.disableGlobalConfig
   }
 
-  init () {
+  async init (configEnv: {
+    mode: string
+    command: string
+  }) {
+    this.initialConfig = {}
+    this.initialGlobalConfig = {}
+    this.isInitSuccess = false
     this.configPath = resolveScriptPath(path.join(this.appPath, CONFIG_DIR_NAME, DEFAULT_CONFIG_FILE))
     if (!fs.existsSync(this.configPath)) {
-      this.initialConfig = {}
-      this.isInitSuccess = false
+      if (this.disableGlobalConfig) return
+      this.initGlobalConfig()
     } else {
       createSwcRegister({
         only: [
@@ -43,16 +57,30 @@ export default class Config {
         ]
       })
       try {
-        this.initialConfig = getModuleDefaultExport(require(this.configPath))(merge)
+        const userExport = getModuleDefaultExport(require(this.configPath))
+        this.initialConfig = typeof userExport === 'function' ? await userExport(merge, configEnv) : userExport
         this.isInitSuccess = true
       } catch (err) {
-        this.initialConfig = {}
-        this.isInitSuccess = false
         console.log(err)
       }
     }
   }
 
+  initGlobalConfig () {
+    const homedir = getUserHomeDir()
+    if (!homedir) return console.error('获取不到用户 home 路径')
+    const globalPluginConfigPath = path.join(getUserHomeDir(), TARO_GLOBAL_CONFIG_DIR, TARO_GLOBAL_CONFIG_FILE)
+    const spinner = ora(`开始获取 taro 全局配置文件： ${globalPluginConfigPath}`).start()
+    if (!fs.existsSync(globalPluginConfigPath)) return spinner.warn(`获取 taro 全局配置文件失败，不存在全局配置文件：${globalPluginConfigPath}`)
+    try {
+      this.initialGlobalConfig = fs.readJSONSync(globalPluginConfigPath) || {}
+      spinner.succeed('获取 taro 全局配置成功')
+    } catch (e){
+      spinner.stop()
+      console.warn(`获取全局配置失败，如果需要启用全局插件请查看配置文件: ${globalPluginConfigPath} `)
+    }
+  }
+
   getConfigWithNamed (platform, configName) {
     const initialConfig = this.initialConfig
     const sourceDirName = initialConfig.sourceRoot || SOURCE_DIR

package/src/Kernel.ts

@@ -5,7 +5,6 @@ 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 {
@@ -16,6 +15,7 @@ import {
 } from './utils/constants'
 
 import type { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile'
+import type Config from './Config'
 import type {
   Func,
   ICommand,
@@ -29,6 +29,7 @@ import type {
 
 interface IKernelOptions {
   appPath: string
+  config: Config
   presets?: PluginItem[]
   plugins?: PluginItem[]
 }
@@ -42,10 +43,14 @@ export default class Kernel extends EventEmitter {
   plugins: Map<string, IPlugin>
   paths: IPaths
   extraPlugins: IPluginsObject
+  globalExtraPlugins: IPluginsObject
   config: Config
   initialConfig: IProjectConfig
+  initialGlobalConfig: IProjectConfig
   hooks: Map<string, IHook[]>
   methods: Map<string, Func[]>
+  cliCommands: string []
+  cliCommandsPath: string
   commands: Map<string, ICommand>
   platforms: Map<string, IPlatform>
   helper: any
@@ -58,6 +63,7 @@ export default class Kernel extends EventEmitter {
     this.appPath = options.appPath || process.cwd()
     this.optsPresets = options.presets
     this.optsPlugins = options.plugins
+    this.config = options.config
     this.hooks = new Map()
     this.methods = new Map()
     this.commands = new Map()
@@ -68,10 +74,8 @@ export default class Kernel extends EventEmitter {
   }
 
   initConfig () {
-    this.config = new Config({
-      appPath: this.appPath
-    })
     this.initialConfig = this.config.initialConfig
+    this.initialGlobalConfig = this.config.initialGlobalConfig
     this.debugger('initConfig', this.initialConfig)
   }
 
@@ -97,50 +101,76 @@ export default class Kernel extends EventEmitter {
 
   initPresetsAndPlugins () {
     const initialConfig = this.initialConfig
-    const allConfigPresets = mergePlugins(this.optsPresets || [], initialConfig.presets || [])()
-    const allConfigPlugins = mergePlugins(this.optsPlugins || [], initialConfig.plugins || [])()
-    this.debugger('initPresetsAndPlugins', allConfigPresets, allConfigPlugins)
+    const initialGlobalConfig = this.initialGlobalConfig
+    const cliAndProjectConfigPresets = mergePlugins(this.optsPresets || [], initialConfig.presets || [])()
+    const cliAndProjectPlugins = mergePlugins(this.optsPlugins || [], initialConfig.plugins || [])()
+    const globalPlugins = convertPluginsToObject(initialGlobalConfig.plugins || [])()
+    const globalPresets = convertPluginsToObject(initialGlobalConfig.presets || [])()
+    this.debugger('initPresetsAndPlugins', cliAndProjectConfigPresets, cliAndProjectPlugins)
+    this.debugger('globalPresetsAndPlugins', globalPlugins, globalPresets)
     process.env.NODE_ENV !== 'test' &&
     helper.createSwcRegister({
-      only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
+      only: [
+        ...Object.keys(cliAndProjectConfigPresets),
+        ...Object.keys(cliAndProjectPlugins),
+        ...Object.keys(globalPresets),
+        ...Object.keys(globalPlugins)
+      ]
     })
     this.plugins = new Map()
     this.extraPlugins = {}
-    this.resolvePresets(allConfigPresets)
-    this.resolvePlugins(allConfigPlugins)
+    this.globalExtraPlugins = {}
+    this.resolvePresets(cliAndProjectConfigPresets, globalPresets)
+    this.resolvePlugins(cliAndProjectPlugins, globalPlugins)
   }
 
-  resolvePresets (presets) {
-    const allPresets = resolvePresetsOrPlugins(this.appPath, presets, PluginType.Preset)
-    while (allPresets.length) {
-      this.initPreset(allPresets.shift()!)
+  resolvePresets (cliAndProjectPresets: IPluginsObject, globalPresets: IPluginsObject) {
+    const resolvedCliAndProjectPresets = resolvePresetsOrPlugins(this.appPath, cliAndProjectPresets, PluginType.Preset)
+    while (resolvedCliAndProjectPresets.length) {
+      this.initPreset(resolvedCliAndProjectPresets.shift()!)
+    }
+
+    const globalConfigRootPath = path.join(helper.getUserHomeDir(), helper.TARO_GLOBAL_CONFIG_DIR)
+    const resolvedGlobalPresets = resolvePresetsOrPlugins(globalConfigRootPath, globalPresets, PluginType.Plugin, true)
+    while (resolvedGlobalPresets.length) {
+      this.initPreset(resolvedGlobalPresets.shift()!, true)
     }
   }
 
-  resolvePlugins (plugins) {
-    plugins = merge(this.extraPlugins, plugins)
-    const allPlugins = resolvePresetsOrPlugins(this.appPath, plugins, PluginType.Plugin)
+  resolvePlugins (cliAndProjectPlugins: IPluginsObject, globalPlugins: IPluginsObject) {
+    cliAndProjectPlugins = merge(this.extraPlugins, cliAndProjectPlugins)
+    const resolvedCliAndProjectPlugins = resolvePresetsOrPlugins(this.appPath, cliAndProjectPlugins, PluginType.Plugin)
+
+    globalPlugins = merge(this.globalExtraPlugins, globalPlugins)
+    const globalConfigRootPath = path.join(helper.getUserHomeDir(), helper.TARO_GLOBAL_CONFIG_DIR)
+    const resolvedGlobalPlugins = resolvePresetsOrPlugins(globalConfigRootPath, globalPlugins, PluginType.Plugin, true)
+
+    const resolvedPlugins = resolvedCliAndProjectPlugins.concat(resolvedGlobalPlugins)
 
-    while (allPlugins.length) {
-      this.initPlugin(allPlugins.shift()!)
+    while (resolvedPlugins.length) {
+      this.initPlugin(resolvedPlugins.shift()!)
     }
+
     this.extraPlugins = {}
+    this.globalExtraPlugins = {}
   }
 
-  initPreset (preset: IPreset) {
+  initPreset (preset: IPreset, isGlobalConfigPreset?: boolean) {
     this.debugger('initPreset', preset)
     const { id, path, opts, apply } = preset
     const pluginCtx = this.initPluginCtx({ id, path, ctx: this })
     const { presets, plugins } = apply()(pluginCtx, opts) || {}
     this.registerPlugin(preset)
     if (Array.isArray(presets)) {
-      const _presets = resolvePresetsOrPlugins(this.appPath, convertPluginsToObject(presets)(), PluginType.Preset)
+      const _presets = resolvePresetsOrPlugins(this.appPath, convertPluginsToObject(presets)(), PluginType.Preset, isGlobalConfigPreset)
       while (_presets.length) {
-        this.initPreset(_presets.shift()!)
+        this.initPreset(_presets.shift()!, isGlobalConfigPreset)
       }
     }
     if (Array.isArray(plugins)) {
-      this.extraPlugins = merge(this.extraPlugins, convertPluginsToObject(plugins)())
+      isGlobalConfigPreset
+        ? (this.globalExtraPlugins = merge(this.globalExtraPlugins, convertPluginsToObject(plugins)()))
+        : (this.extraPlugins = merge(this.extraPlugins, convertPluginsToObject(plugins)()))
     }
   }
 
@@ -153,6 +183,21 @@ export default class Kernel extends EventEmitter {
     this.checkPluginOpts(pluginCtx, opts)
   }
 
+  applyCliCommandPlugin (commandNames: string[] = []) {
+    const existsCliCommand: string[] = []
+    for ( let i = 0; i < commandNames.length; i++ ) {
+      const commandName = commandNames[i]
+      const commandFilePath = path.resolve(this.cliCommandsPath, `${commandName}.js`)
+      if (this.cliCommands.includes(commandName)) existsCliCommand.push(commandFilePath)
+    }
+    const commandPlugins = convertPluginsToObject(existsCliCommand || [])()
+    helper.createSwcRegister({ only: [ ...Object.keys(commandPlugins) ] })
+    const resolvedCommandPlugins = resolvePresetsOrPlugins(this.appPath, commandPlugins, PluginType.Plugin)
+    while (resolvedCommandPlugins.length) {
+      this.initPlugin(resolvedCommandPlugins.shift()!)
+    }
+  }
+
   checkPluginOpts (pluginCtx, opts) {
     if (typeof pluginCtx.optsSchema !== 'function') {
       return
@@ -189,7 +234,8 @@ export default class Kernel extends EventEmitter {
       'helper',
       'runOpts',
       'initialConfig',
-      'applyPlugins'
+      'applyPlugins',
+      'applyCliCommandPlugin'
     ]
     internalMethods.forEach(name => {
       if (!this.methods.has(name)) {

package/src/index.ts

@@ -1,8 +1,9 @@
+import Config from './Config'
 import Kernel from './Kernel'
 import { TaroPlatformBase, TaroPlatformWeb } from './platform-plugin-base'
 
 export * from './utils/types'
-export { Kernel, TaroPlatformBase, TaroPlatformWeb }
-export default { Kernel, TaroPlatformBase, TaroPlatformWeb }
+export { Config, Kernel, TaroPlatformBase, TaroPlatformWeb }
+export default { Config, Kernel, TaroPlatformBase, TaroPlatformWeb }
 
 export type { IPluginContext } from './utils/types'

package/src/platform-plugin-base/mini.ts

@@ -1,5 +1,7 @@
-import { PLATFORM_TYPE } from '@tarojs/shared'
+import { recursiveMerge } from '@tarojs/helper'
+import { isObject, PLATFORM_TYPE } from '@tarojs/shared'
 
+import { getPkgVersion } from '../utils/package'
 import TaroPlatform from './platform'
 
 import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
@@ -33,9 +35,15 @@ export abstract class TaroPlatformBase<T extends TConfig = TConfig> extends Taro
   }
 
   private setupImpl () {
-    const { needClearOutput } = this.config
-    if (typeof needClearOutput === 'undefined' || !!needClearOutput) {
+    const { output } = this.config
+    // webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
+    // （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
+    // 仅 output.clean 为 false 时不清空输出目录
+    // eslint-disable-next-line eqeqeq
+    if (output == undefined || output.clean == undefined || output.clean === true) {
       this.emptyOutputDir()
+    } else if (isObject(output.clean)) {
+      this.emptyOutputDir(output.clean.keep || [])
     }
     this.printDevelopmentTip(this.platform)
     if (this.projectConfigJson) {
@@ -103,7 +111,16 @@ ${exampleCommand}`))
    * @param extraOptions 需要额外合入 Options 的配置项
    */
   protected getOptions (extraOptions = {}) {
-    const { ctx, config, globalObject, fileType, template } = this
+    const { ctx, globalObject, fileType, template } = this
+
+    const config = recursiveMerge(Object.assign({}, this.config), {
+      env: {
+        FRAMEWORK: JSON.stringify(this.config.framework),
+        TARO_ENV: JSON.stringify(this.platform),
+        TARO_PLATFORM: JSON.stringify(this.platformType),
+        TARO_VERSION: JSON.stringify(getPkgVersion())
+      }
+    })
 
     return {
       ...config,
@@ -128,10 +145,15 @@ ${exampleCommand}`))
 
   private async buildImpl (extraOptions = {}) {
     const runner = await this.getRunner()
-    const options = this.getOptions(Object.assign({
-      runtimePath: this.runtimePath,
-      taroComponentsPath: this.taroComponentsPath
-    }, extraOptions))
+    const options = this.getOptions(
+      Object.assign(
+        {
+          runtimePath: this.runtimePath,
+          taroComponentsPath: this.taroComponentsPath
+        },
+        extraOptions
+      )
+    )
     await runner(options)
   }
 
@@ -152,7 +174,7 @@ ${exampleCommand}`))
    * 递归替换对象的 key 值
    */
   protected recursiveReplaceObjectKeys (obj, keyMap) {
-    Object.keys(obj).forEach(key => {
+    Object.keys(obj).forEach((key) => {
       if (keyMap[key]) {
         obj[keyMap[key]] = obj[key]
         if (typeof obj[key] === 'object') {

package/src/platform-plugin-base/platform.ts

@@ -53,9 +53,9 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
     this.compiler = typeof _compiler === 'object' ? _compiler.type : _compiler
   }
 
-  protected emptyOutputDir () {
+  protected emptyOutputDir (excludes: Array<string | RegExp> = []) {
     const { outputPath } = this.ctx.paths
-    this.helper.emptyDirectory(outputPath)
+    this.helper.emptyDirectory(outputPath, { excludes })
   }
 
   /**
@@ -63,7 +63,7 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
    */
   private updateOutputPath (config: TConfig) {
     const platformPath = config.output?.path
-    if(platformPath) {
+    if (platformPath) {
       this.ctx.paths.outputPath = platformPath
     }
   }

package/src/platform-plugin-base/web.ts

@@ -1,4 +1,4 @@
-import { PLATFORM_TYPE } from '@tarojs/shared'
+import { isObject, PLATFORM_TYPE } from '@tarojs/shared'
 import { get, merge } from 'lodash'
 import * as path from 'path'
 
@@ -20,9 +20,14 @@ export abstract class TaroPlatformWeb<T extends TConfig = TConfig> extends TaroP
   }
 
   private setupWebApp () {
-    const { needClearOutput } = this.config
-    if (typeof needClearOutput === 'undefined' || !!needClearOutput) {
+    const { output } = this.config
+    // webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
+    // （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
+    // eslint-disable-next-line eqeqeq
+    if (output == undefined || output.clean == undefined || output.clean === true) {
       this.emptyOutputDir()
+    } else if (isObject(output.clean)) {
+      this.emptyOutputDir(output.clean.keep || [])
     }
     this.printDevelopmentTip()
   }
@@ -55,6 +60,9 @@ export abstract class TaroPlatformWeb<T extends TConfig = TConfig> extends TaroP
       case 'webpack5':
         runnerPkg = '@tarojs/webpack5-runner'
         break
+      case 'vite':
+        runnerPkg = '@tarojs/vite-runner'
+        break
       default:
         runnerPkg = '@tarojs/webpack-runner'
     }

package/src/utils/index.ts

@@ -4,9 +4,9 @@ import * as path from 'path'
 import * as resolve from 'resolve'
 
 import { PluginType } from './constants'
-import { IPlugin, IPluginsObject } from './types'
 
 import type { PluginItem } from '@tarojs/taro/types/compile'
+import type { IPlugin, IPluginsObject } from './types'
 
 export const isNpmPkg: (name: string) => boolean = name => !(/^(\.|\/)/.test(name))
 
@@ -42,8 +42,12 @@ export function mergePlugins (dist: PluginItem[], src: PluginItem[]) {
 }
 
 // getModuleDefaultExport
-export function resolvePresetsOrPlugins (root: string, args, type: PluginType): IPlugin[] {
-  return Object.keys(args).map(item => {
+export function resolvePresetsOrPlugins (root: string, args: IPluginsObject, type: PluginType, skipError?: boolean): IPlugin[] {
+  // 全局的插件引入报错，不抛出 Error 影响主流程，而是通过 log 提醒然后把插件 filter 掉，保证主流程不变
+  const resolvedPresetsOrPlugins: IPlugin[] = []
+  const presetsOrPluginsNames = Object.keys(args) || []
+  for ( let i = 0; i < presetsOrPluginsNames.length; i++ ) {
+    const item = presetsOrPluginsNames[i]
     let fPath
     try {
       fPath = resolve.sync(item, {
@@ -53,13 +57,17 @@ export function resolvePresetsOrPlugins (root: string, args, type: PluginType):
     } catch (err) {
       if (args[item]?.backup) {
         // 如果项目中没有，可以使用 CLI 中的插件
-        fPath = args[item].backup
+        fPath = args[item]?.backup
+      } else if (skipError) {
+        // 如果跳过报错，那么 log 提醒，并且不使用该插件
+        console.log(chalk.yellow(`找不到插件依赖 "${item}"，请先在项目中安装，项目路径：${root}`))
+        continue
       } else {
-        console.log(chalk.red(`找不到依赖 "${item}"，请先在项目中安装`))
+        console.log(chalk.red(`找不到插件依赖 "${item}"，请先在项目中安装，项目路径：${root}`))
         process.exit(1)
       }
     }
-    return {
+    const resolvedItem = {
       id: fPath,
       path: fPath,
       type,
@@ -69,11 +77,19 @@ export function resolvePresetsOrPlugins (root: string, args, type: PluginType):
           return getModuleDefaultExport(require(fPath))
         } catch (error) {
           console.error(error)
-          throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
+          // 全局的插件运行报错，不抛出 Error 影响主流程，而是通过 log 提醒然后把插件 filter 掉，保证主流程不变
+          if (skipError) {
+            console.error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
+          } else {
+            throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
+          }
         }
       }
     }
-  })
+    resolvedPresetsOrPlugins.push(resolvedItem)
+  }
+
+  return resolvedPresetsOrPlugins
 }
 
 function supplementBlank (length) {

package/src/utils/types.ts

@@ -1,6 +1,6 @@
 import type helper from '@tarojs/helper'
-import type { IProjectConfig } from '@tarojs/taro/types/compile'
-import type { IModifyWebpackChain } from '@tarojs/taro/types/compile/hooks'
+import type { IMiniFilesConfig, IProjectConfig } from '@tarojs/taro/types/compile'
+import type { IModifyChainData } from '@tarojs/taro/types/compile/hooks'
 import type joi from 'joi'
 import type Webpack from 'webpack'
 import type Chain from 'webpack-chain'
@@ -138,11 +138,11 @@ export declare interface IPluginContext {
   /**
    * 编译中修改 webpack 配置，在这个钩子中，你可以对 webpackChain 作出想要的调整，等同于配置 [`webpackChain`](./config-detail.md#miniwebpackchain)
    */
-  modifyWebpackChain: (fn: (args: { chain: Chain, webpack: typeof Webpack, data?: IModifyWebpackChain }) => void) => void
+  modifyWebpackChain: (fn: (args: { chain: Chain, webpack: typeof Webpack, data?: IModifyChainData }) => void) => void
   /**
    * 编译中修改 vite 配置
    */
-  modifyViteConfig: (fn: (args: { viteConfig: any, componentConfig?: IModifyWebpackChain['componentConfig'] }) => void) => void
+  modifyViteConfig: (fn: (args: { viteConfig: any, data?: IModifyChainData }) => void) => void
   /**
    * 修改编译后的结果
    */
@@ -150,7 +150,11 @@ export declare interface IPluginContext {
   /**
    * 修改编译过程中的页面组件配置
    */
-  modifyMiniConfigs: (fn: (args: { configMap: any }) => void) => void
+  modifyMiniConfigs: (fn: (args: { configMap: IMiniFilesConfig }) => void) => void
+  /**
+   * 修改 Taro 编译配置
+   */
+  modifyRunnerOpts: (fn: (args: { opts: any }) => void) => void
 
   [key: string]: any
 }

package/types/Config.d.ts

@@ -1,14 +1,22 @@
+import * as ora from 'ora';
 import type { IProjectConfig } from '@tarojs/taro/types/compile';
 interface IConfigOptions {
     appPath: string;
+    disableGlobalConfig?: boolean;
 }
 export default class Config {
     appPath: string;
     configPath: string;
     initialConfig: IProjectConfig;
+    initialGlobalConfig: IProjectConfig;
     isInitSuccess: boolean;
+    disableGlobalConfig: boolean;
     constructor(opts: IConfigOptions);
-    init(): void;
+    init(configEnv: {
+        mode: string;
+        command: string;
+    }): Promise<void>;
+    initGlobalConfig(): void | ora.Ora;
     getConfigWithNamed(platform: any, configName: any): any;
 }
 export {};

package/types/Kernel.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import Config from './Config';
 import Plugin from './Plugin';
 import type { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile';
+import type Config from './Config';
 import type { Func, ICommand, IHook, IPaths, IPlatform, IPlugin, IPluginsObject, IPreset } from './utils/types';
 interface IKernelOptions {
     appPath: string;
+    config: Config;
     presets?: PluginItem[];
     plugins?: PluginItem[];
 }
@@ -18,10 +19,14 @@ export default class Kernel extends EventEmitter {
     plugins: Map<string, IPlugin>;
     paths: IPaths;
     extraPlugins: IPluginsObject;
+    globalExtraPlugins: IPluginsObject;
     config: Config;
     initialConfig: IProjectConfig;
+    initialGlobalConfig: IProjectConfig;
     hooks: Map<string, IHook[]>;
     methods: Map<string, Func[]>;
+    cliCommands: string[];
+    cliCommandsPath: string;
     commands: Map<string, ICommand>;
     platforms: Map<string, IPlatform>;
     helper: any;
@@ -32,10 +37,11 @@ export default class Kernel extends EventEmitter {
     initPaths(): void;
     initHelper(): void;
     initPresetsAndPlugins(): void;
-    resolvePresets(presets: any): void;
-    resolvePlugins(plugins: any): void;
-    initPreset(preset: IPreset): void;
+    resolvePresets(cliAndProjectPresets: IPluginsObject, globalPresets: IPluginsObject): void;
+    resolvePlugins(cliAndProjectPlugins: IPluginsObject, globalPlugins: IPluginsObject): void;
+    initPreset(preset: IPreset, isGlobalConfigPreset?: boolean): void;
     initPlugin(plugin: IPlugin): void;
+    applyCliCommandPlugin(commandNames?: string[]): void;
     checkPluginOpts(pluginCtx: any, opts: any): void;
     registerPlugin(plugin: IPlugin): void;
     initPluginCtx({ id, path, ctx }: {

package/types/index.d.ts

@@ -1,8 +1,10 @@
+import Config from './Config';
 import Kernel from './Kernel';
 import { TaroPlatformBase, TaroPlatformWeb } from './platform-plugin-base';
 export * from './utils/types';
-export { Kernel, TaroPlatformBase, TaroPlatformWeb };
+export { Config, Kernel, TaroPlatformBase, TaroPlatformWeb };
 declare const _default: {
+    Config: typeof Config;
     Kernel: typeof Kernel;
     TaroPlatformBase: typeof TaroPlatformBase;
     TaroPlatformWeb: typeof TaroPlatformWeb;

package/types/platform-plugin-base/mini.d.ts

@@ -32,14 +32,7 @@ export declare abstract class TaroPlatformBase<T extends TConfig = TConfig> exte
      * 准备 mini-runner 参数
      * @param extraOptions 需要额外合入 Options 的配置项
      */
-    protected getOptions(extraOptions?: {}): T & {
-        nodeModulesPath: string;
-        buildAdapter: any;
-        platformType: PLATFORM_TYPE;
-        globalObject: string;
-        fileType: IFileType;
-        template: RecursiveTemplate | UnRecursiveTemplate;
-    };
+    protected getOptions(extraOptions?: {}): any;
     /**
      * 调用 mini-runner 开始编译
      * @param extraOptions 需要额外传入 @tarojs/mini-runner 的配置项

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

@@ -22,7 +22,7 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
     protected setupTransaction: Transaction<this>;
     protected buildTransaction: Transaction<this>;
     constructor(ctx: IPluginContext, config: T);
-    protected emptyOutputDir(): void;
+    protected emptyOutputDir(excludes?: Array<string | RegExp>): void;
     /**
      * 如果分端编译详情 webpack 配置了 output 则需更新 outputPath 位置
      */

package/types/utils/index.d.ts

@@ -1,9 +1,9 @@
 import { PluginType } from './constants';
-import { IPlugin, IPluginsObject } from './types';
 import type { PluginItem } from '@tarojs/taro/types/compile';
+import type { 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;
 export declare function mergePlugins(dist: PluginItem[], src: PluginItem[]): () => IPluginsObject;
-export declare function resolvePresetsOrPlugins(root: string, args: any, type: PluginType): IPlugin[];
+export declare function resolvePresetsOrPlugins(root: string, args: IPluginsObject, type: PluginType, skipError?: boolean): IPlugin[];
 export declare function printHelpLog(command: any, optionsList: Map<string, string>, synopsisList?: Set<string>): void;