@tarojs/taro 3.7.0-alpha.18 → 3.7.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro",
-  "version": "3.7.0-alpha.18",
+  "version": "3.7.0-alpha.19",
   "description": "Taro framework",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro#readme",
   "main": "index.js",
@@ -21,12 +21,12 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.7.0-alpha.18",
-    "@tarojs/runtime": "3.7.0-alpha.18"
+    "@tarojs/api": "3.7.0-alpha.19",
+    "@tarojs/runtime": "3.7.0-alpha.19"
   },
   "devDependencies": {
-    "@tarojs/helper": "3.7.0-alpha.18",
-    "@tarojs/shared": "3.7.0-alpha.18"
+    "@tarojs/helper": "3.7.0-alpha.19",
+    "@tarojs/shared": "3.7.0-alpha.19"
   },
   "peerDependenciesMeta": {
     "@types/react": {

package/types/compile/compiler.d.ts

@@ -1,7 +1,9 @@
 import type { swc } from '@tarojs/helper'
 import type Webpack from 'webpack'
 
-type CompilerTypes = 'webpack4' | 'webpack5' | 'vite'
+export type CompilerTypes = CompilerWebpackTypes | 'vite'
+
+export type CompilerWebpackTypes = 'webpack5' | 'webpack4'
 
 interface IPrebundle {
   enable?: boolean
@@ -17,9 +19,10 @@ interface IPrebundle {
   }
 }
 
-interface ICompiler {
-  type: CompilerTypes
+interface ICompiler<T> {
+  type: T
   prebundle?: IPrebundle
+  vitePlugins?: any
 }
 
-export type Compiler = CompilerTypes | ICompiler
+export type Compiler<T extends CompilerTypes = CompilerWebpackTypes> = T | ICompiler<T>

package/types/compile/config/h5.d.ts

@@ -4,6 +4,7 @@ import type webpackDevServer from 'webpack-dev-server'
 import type HtmlWebpackPlugin from 'html-webpack-plugin'
 import type { IOption, IPostcssOption, IUrlLoaderOption } from './util'
 import type { OutputOptions as RollupOutputOptions } from 'rollup'
+import type { CompilerTypes, CompilerWebpackTypes } from '../compiler'
 
 export interface IH5RouterConfig {
   /** 配置路由模式 */
@@ -17,7 +18,7 @@ export interface IH5RouterConfig {
   forcePath?: string
 }
 
-export interface IH5Config <T = 'webapck' | 'vite'> {
+export interface IH5Config <T extends CompilerTypes = CompilerWebpackTypes> {
   /** 设置输出解析文件的目录（默认值：'/'）*/
   publicPath?: string
 
@@ -36,8 +37,9 @@ export interface IH5Config <T = 'webapck' | 'vite'> {
    */
   webpackChain?: (chain: Chain, webpack: typeof Webpack) => void
 
-  /** webpack 编译模式下，可用于修改、拓展 Webpack 的 output 选项，配置项参考[官方文档](https://webpack.js.org/configuration/output/) */
-  /** vite 编译模式下，用于修改、扩展 rollup 的 output，目前仅适配 chunkFileNames 和 assetFileNames 两个配置，修改其他配置请使用 vite 插件进行修改。配置想参考[官方文档](https://rollupjs.org/configuration-options/) */
+  /** webpack 编译模式下，可用于修改、拓展 Webpack 的 output 选项，配置项参考[官方文档](https://webpack.js.org/configuration/output/)
+  * vite 编译模式下，用于修改、扩展 rollup 的 output，目前仅适配 chunkFileNames 和 assetFileNames 两个配置，修改其他配置请使用 vite 插件进行修改。配置想参考[官方文档](https://rollupjs.org/configuration-options/) 
+  */
   output?: T extends 'vite' ? Pick<RollupOutputOptions, 'chunkFileNames' | 'assetFileNames' > : Webpack.Configuration['output']
   
   /** 路由相关的配置 */

package/types/compile/config/mini.d.ts

@@ -2,6 +2,7 @@ import type Webpack from 'webpack'
 import type Chain from 'webpack-chain'
 import type { IOption, IPostcssOption, IUrlLoaderOption } from './util'
 import type { OutputOptions as RollupOutputOptions } from 'rollup'
+import type { CompilerTypes, CompilerWebpackTypes } from '../compiler'
 
 interface Runtime {
   enableInnerHTML: boolean
@@ -28,7 +29,7 @@ interface OutputExt {
   }
 }
 
-export interface IMiniAppConfig<T = 'webpack' | 'vite'> {
+export interface IMiniAppConfig<T extends CompilerTypes = CompilerWebpackTypes> {
   /** 默认值：'cheap-module-source-map'， 具体参考[Webpack devtool 配置](https://webpack.js.org/configuration/devtool/#devtool) */
   sourceMapType?: string
 
@@ -54,7 +55,8 @@ export interface IMiniAppConfig<T = 'webpack' | 'vite'> {
   webpackChain?: (chain: Chain, webpack: typeof Webpack, PARSE_AST_TYPE: any) => void
 
   /** webpack 编译模式下，可用于修改、拓展 Webpack 的 output 选项，配置项参考[官方文档](https://webpack.js.org/configuration/output/)
-  vite 编译模式下，用于修改、扩展 rollup 的 output，目前仅适配 chunkFileNames 这个配置，修改其他配置请使用 vite 插件进行修改。配置想参考[官方文档](https://rollupjs.org/configuration-options/) */
+  * vite 编译模式下，用于修改、扩展 rollup 的 output，目前仅适配 chunkFileNames 和 assetFileNames 两个配置，修改其他配置请使用 vite 插件进行修改。配置想参考[官方文档](https://rollupjs.org/configuration-options/) 
+  */
   output?: T extends 'vite' 
     ? Pick<RollupOutputOptions, 'chunkFileNames'>  & OutputExt
     : Webpack.Configuration['output'] & OutputExt
@@ -110,7 +112,7 @@ export interface IMiniAppConfig<T = 'webpack' | 'vite'> {
 
 export interface IMiniFilesConfig {
   [configName: string]: {
-    content: Config
+    content: any
     path: string
   }
 }

package/types/compile/config/project.d.ts

@@ -1,13 +1,12 @@
 import type Webpack from 'webpack'
 import type Chain from 'webpack-chain'
 import { type Input } from 'postcss'
-import type { Compiler } from '../compiler'
+import type { Compiler, IPrebundle, CompilerTypes, CompilerWebpackTypes } from '../compiler'
 import type { IModifyChainData } from '../hooks'
 import type { ICopyOptions, IOption, ISassOptions, TogglableOptions } from './util'
 import type { IH5Config } from './h5'
 import type { IMiniAppConfig, IMiniFilesConfig } from './mini'
 import type { IRNConfig } from './rn'
-import type { IPrebundle } from '../compiler'
 
 export type PluginItem<T = object> = string | [string, T] | [string, () => T | Promise<T>]
 
@@ -204,9 +203,7 @@ export interface IProjectBaseConfig {
 }
 
 /** 暴露出来给 config/index 使用的配置类型，参考 https://github.com/NervJS/taro-doctor/blob/main/assets/config_schema.json */
-
-
-interface IBaseProjectConfig {
+export interface IProjectConfig<T extends CompilerTypes = CompilerWebpackTypes> {
   /** 项目名称 */
   projectName?: string
 
@@ -298,42 +295,23 @@ interface IBaseProjectConfig {
   /** 使用的开发框架。可选值：react、preact、nerv、vue、vue3 */
   framework?: 'react' | 'preact' | 'nerv' | 'vue' | 'vue3'
 
-  /** 使用的编译工具。可选值：webpack4、webpack5、vite */
-  compiler?: Compiler
-
   /** Webpack5 持久化缓存配置。具体配置请参考 [WebpackConfig.cache](https://webpack.js.org/configuration/cache/#cache) */
   cache?: ICache
 
   /** 控制 Taro 编译日志的输出方式 */
   logger?: ILogger
 
-  /** 专属于 RN 的配置 */
-  rn?: IRNConfig
-
-  [key: string]: any
-}
-
-
-export interface IViteProjectConfig extends IBaseProjectConfig {
-  compiler?: 'vite' | {
-    type: 'vite'
-    prebundle?: IPrebundle
-    vitePlugins?: any[]
-  }
+  /** 使用的编译工具。可选值：webpack4、webpack5、vite */
+  compiler?: Compiler<T>
 
   /** 专属于 H5 的配置 */
-  h5?: IH5Config<'vite'>
+  h5?: IH5Config<T>
 
   /** 专属于小程序的配置 */
-  mini?: IMiniAppConfig<'vite'>
-}
-
-interface IWebpackProjectConfig extends IBaseProjectConfig {
-  /** 专属于 H5 的配置 */
-  h5?: IH5Config<'webpack'>
+  mini?: IMiniAppConfig<T>
 
-  /** 专属于小程序的配置 */
-  mini?: IMiniAppConfig<'webpack'>
-}
+  /** 专属于 RN 的配置 */
+  rn?: IRNConfig
 
-export type IProjectConfig = IWebpackProjectConfig | IViteProjectConfig
+  [key: string]: any
+}

package/types/compile/viteCompilerContext.d.ts

@@ -1,6 +1,6 @@
 import type { AppConfig, PageConfig } from "../index"
 import type { IMiniFilesConfig, IH5Config, IMiniAppConfig } from "./config"
-import type { IViteProjectConfig } from './config/project'
+import type { IProjectConfig } from './config/project'
 import type { PluginContext } from "rollup"
 import { IComponentConfig } from "./hooks"
 
@@ -48,7 +48,7 @@ export interface ViteH5BuildConfig extends CommonBuildConfig, IH5Config<'vite'>
   runtimePath?: string | string[]
 }
 
-export interface CommonBuildConfig extends IViteProjectConfig {
+export interface CommonBuildConfig extends IProjectConfig<'vite'> {
   entry: {
     app: string | string[]
   }
@@ -88,7 +88,6 @@ export interface ViteCompilerContext<T> {
   sourceDir: string
   taroConfig: T
   rawTaroConfig: T
-  processConfig: () => void
   frameworkExts: string[]
   app: ViteAppMeta
   pages: VitePageMeta[]