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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro",
-  "version": "3.7.0-alpha.16",
+  "version": "3.7.0-alpha.19",
   "description": "Taro framework",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/taro#readme",
   "main": "index.js",
@@ -21,11 +21,12 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.7.0-alpha.16",
-    "@tarojs/runtime": "3.7.0-alpha.16"
+    "@tarojs/api": "3.7.0-alpha.19",
+    "@tarojs/runtime": "3.7.0-alpha.19"
   },
   "devDependencies": {
-    "@tarojs/helper": "3.7.0-alpha.16"
+    "@tarojs/helper": "3.7.0-alpha.19",
+    "@tarojs/shared": "3.7.0-alpha.19"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -37,6 +38,9 @@
     "@types/webpack-dev-server": {
       "optional": true
     },
+    "@types/postcss-url": {
+      "optional": true
+    },
     "postcss": {
       "optional": true
     },

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,10 +19,10 @@ interface IPrebundle {
   }
 }
 
-interface ICompiler {
-  type: CompilerTypes
+interface ICompiler<T> {
+  type: T
   prebundle?: IPrebundle
-  vitePlugins?: any[]
+  vitePlugins?: any
 }
 
-export type Compiler = CompilerTypes | ICompiler
+export type Compiler<T extends CompilerTypes = CompilerWebpackTypes> = T | ICompiler<T>

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

@@ -2,8 +2,9 @@ import type Webpack from 'webpack'
 import type Chain from 'webpack-chain'
 import type webpackDevServer from 'webpack-dev-server'
 import type HtmlWebpackPlugin from 'html-webpack-plugin'
-import type { IOption, IPostcssOption } from './util'
+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 {
+export interface IH5Config <T extends CompilerTypes = CompilerWebpackTypes> {
   /** 设置输出解析文件的目录（默认值：'/'）*/
   publicPath?: string
 
@@ -36,11 +37,10 @@ export interface IH5Config {
    */
   webpackChain?: (chain: Chain, webpack: typeof Webpack) => void
 
-  /** 可用于修改、拓展 Webpack 的 output 选项，配置项参考[官方文档](https://webpack.js.org/configuration/output/) */
-  output?: Webpack.Configuration['output']
-
-  /** vite 编译模式下，用于修改、扩展 rollup 的 output，配置想参考[官方文档](https://rollupjs.org/configuration-options/) */
-  viteOutput?: RollupOutputOptions
+  /** 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']
   
   /** 路由相关的配置 */
   router?: IH5RouterConfig
@@ -83,13 +83,13 @@ export interface IH5Config {
   stylusLoaderOption?: IOption
 
   /** 针对 mp4 | webm | ogg | mp3 | wav | flac | aac 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  mediaUrlLoaderOption?: IOption
+  mediaUrlLoaderOption?: IUrlLoaderOption
 
   /** 针对 woff | woff2 | eot | ttf | otf 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  fontUrlLoaderOption?: IOption
+  fontUrlLoaderOption?: IUrlLoaderOption
 
   /** 针对 png | jpg | jpeg | gif | bpm | svg 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  imageUrlLoaderOption?: IOption
+  imageUrlLoaderOption?: IUrlLoaderOption
 
   /** [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) 的附加配置 */
   miniCssExtractPluginOption?: IOption
@@ -104,7 +104,7 @@ export interface IH5Config {
   useDeprecatedAdapterComponent?: boolean
 
   /** 配置 postcss 相关插件 */
-  postcss?: IPostcssOption
+  postcss?: IPostcssOption<'H5'>
 
   /** html-webpack-plugin 的具体配置 */
   htmlPluginOption?: HtmlWebpackPlugin.Options

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

@@ -1,6 +1,8 @@
 import type Webpack from 'webpack'
 import type Chain from 'webpack-chain'
-import type { IOption, IPostcssOption } from './util'
+import type { IOption, IPostcssOption, IUrlLoaderOption } from './util'
+import type { OutputOptions as RollupOutputOptions } from 'rollup'
+import type { CompilerTypes, CompilerWebpackTypes } from '../compiler'
 
 interface Runtime {
   enableInnerHTML: boolean
@@ -12,7 +14,22 @@ interface Runtime {
   enableMutationObserver: boolean
 }
 
-export interface IMiniAppConfig {
+interface OutputExt {
+  /**
+   * 编译前清空输出目录
+   * @since Taro v3.6.9
+   * @description
+   * - 默认清空输出目录，可设置 clean: false 不清空
+   * - 可设置 clean: { keep: ['project.config.json'] } 保留指定文件
+   * - 注意 clean.keep 不支持函数
+   */
+  clean?: boolean | {
+    /** 保留指定文件不删除 */
+    keep?: Array<string | RegExp> | string | RegExp
+  }
+}
+
+export interface IMiniAppConfig<T extends CompilerTypes = CompilerWebpackTypes> {
   /** 默认值：'cheap-module-source-map'， 具体参考[Webpack devtool 配置](https://webpack.js.org/configuration/devtool/#devtool) */
   sourceMapType?: string
 
@@ -37,24 +54,15 @@ export interface IMiniAppConfig {
    */
   webpackChain?: (chain: Chain, webpack: typeof Webpack, PARSE_AST_TYPE: any) => void
 
-  /** 可用于修改、拓展 Webpack 的 [output](https://webpack.js.org/configuration/output/) 选项 */
-  output?: Webpack.Configuration['output'] & {
-    /**
-     * 编译前清空输出目录
-     * @since Taro v3.6.9
-     * @description
-     * - 默认清空输出目录，可设置 clean: false 不清空
-     * - 可设置 clean: { keep: ['project.config.json'] } 保留指定文件
-     * - 注意 clean.keep 不支持函数
-     */
-    clean?: boolean | {
-      /** 保留指定文件不删除 */
-      keep?: Array<string | RegExp> | string | RegExp
-    }
-  }
+  /** 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'>  & OutputExt
+    : Webpack.Configuration['output'] & OutputExt
 
   /** 配置 postcss 相关插件 */
-  postcss?: IPostcssOption
+  postcss?: IPostcssOption<'mini'>
 
   /** [css-loader](https://github.com/webpack-contrib/css-loader) 的附加配置 */
   cssLoaderOption?: IOption
@@ -69,13 +77,13 @@ export interface IMiniAppConfig {
   stylusLoaderOption?: IOption
 
   /** 针对 mp4 | webm | ogg | mp3 | wav | flac | aac 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  mediaUrlLoaderOption?: IOption
+  mediaUrlLoaderOption?: IUrlLoaderOption
 
   /** 针对 woff | woff2 | eot | ttf | otf 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  fontUrlLoaderOption?: IOption
+  fontUrlLoaderOption?: IUrlLoaderOption
 
   /** 针对 png | jpg | jpeg | gif | bpm | svg 文件的 [url-loader](https://github.com/webpack-contrib/url-loader) 配置 */
-  imageUrlLoaderOption?: IOption
+  imageUrlLoaderOption?: IUrlLoaderOption
 
   /** [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) 的附加配置 */
   miniCssExtractPluginOption?: IOption
@@ -104,7 +112,7 @@ export interface IMiniAppConfig {
 
 export interface IMiniFilesConfig {
   [configName: string]: {
-    content: Config
+    content: any
     path: string
   }
 }

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

@@ -1,7 +1,7 @@
 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'
@@ -203,7 +203,7 @@ export interface IProjectBaseConfig {
 }
 
 /** 暴露出来给 config/index 使用的配置类型，参考 https://github.com/NervJS/taro-doctor/blob/main/assets/config_schema.json */
-export interface IProjectConfig {
+export interface IProjectConfig<T extends CompilerTypes = CompilerWebpackTypes> {
   /** 项目名称 */
   projectName?: string
 
@@ -295,23 +295,23 @@ export interface IProjectConfig {
   /** 使用的开发框架。可选值：react、preact、nerv、vue、vue3 */
   framework?: 'react' | 'preact' | 'nerv' | 'vue' | 'vue3'
 
-  /** 使用的编译工具。可选值：webpack4、webpack5 */
-  compiler?: Compiler
-
   /** Webpack5 持久化缓存配置。具体配置请参考 [WebpackConfig.cache](https://webpack.js.org/configuration/cache/#cache) */
   cache?: ICache
 
   /** 控制 Taro 编译日志的输出方式 */
   logger?: ILogger
 
-  /** 专属于小程序的配置 */
-  mini?: IMiniAppConfig
+  /** 使用的编译工具。可选值：webpack4、webpack5、vite */
+  compiler?: Compiler<T>
 
   /** 专属于 H5 的配置 */
-  h5?: IH5Config
+  h5?: IH5Config<T>
+
+  /** 专属于小程序的配置 */
+  mini?: IMiniAppConfig<T>
 
   /** 专属于 RN 的配置 */
   rn?: IRNConfig
 
   [key: string]: any
-}
+}

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

@@ -1,4 +1,7 @@
-import { type Input } from 'postcss'
+import { type } from 'os'
+import type { Input } from 'postcss'
+
+import type { Options as PostcssUrlOption } from 'postcss-url'
 
 export type Func = (...args: any[]) => any
 
@@ -9,6 +12,11 @@ export type TogglableOptions<T = IOption> = {
   config?: T
 }
 
+export interface IUrlLoaderOption extends IOption { 
+  limit?: number | boolean 
+  name?: ((moduleId: string) => string) | string
+}
+
 export namespace PostcssOption {
   export type cssModules = TogglableOptions<{
     /** 转换模式，取值为 global/module */
@@ -16,10 +24,7 @@ export namespace PostcssOption {
     /** 自定义生成的class名称规则 */
     generateScopedName: string | ((localName: string, absoluteFilePath: string) => string)
   }>
-  export type url = TogglableOptions<{
-    limit: number
-    basePath?: string | string[]
-  }>
+  export type url = TogglableOptions<PostcssUrlOption>
 }
 
 export interface IHtmlTransformOption {
@@ -72,18 +77,27 @@ export interface IPxTransformOption {
   designWidth?: number | ((size?: string | number | Input) => number)
   /** 设计稿尺寸换算规则 */
   deviceRatio?: TaroGeneral.TDeviceRatio
+  /** 平台 */
+  platform?: 'weapp' | 'h5' | string
+  /** fliter 回调函数，可 exclude 不处理的文件 */
+  exclude?: (fileName: string) => boolean
 }
 
-export interface IPostcssOption {
+interface IBasePostcssOption {
   autoprefixer?: TogglableOptions
   pxtransform?: TogglableOptions<IPxTransformOption>
   cssModules?: PostcssOption.cssModules
-  url?: PostcssOption.url
   /** 插件 postcss-html-transform 相关配置, 一般启用了 @tarojs/plugin-html 插件才配置 */
   htmltransform?: IHtmlTransformOption
   [key: string]: any
 }
 
+export type IPostcssOption<T = 'H5' | 'mini'> = T extends 'H5' 
+  ? IBasePostcssOption & { url?: PostcssOption.url } 
+  : IBasePostcssOption
+
+export type Conifg = ViteConfg | WebpackConfig
+
 export interface ICopyOptions {
   patterns: {
     from: string

package/types/compile/viteCompilerContext.d.ts

@@ -1,7 +1,10 @@
 import type { AppConfig, PageConfig } from "../index"
 import type { IMiniFilesConfig, IH5Config, IMiniAppConfig } from "./config"
-import type { IProjectBaseConfig } from './config/project'
+import type { IProjectConfig } from './config/project'
 import type { PluginContext } from "rollup"
+import { IComponentConfig } from "./hooks"
+
+import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
 
 export interface ViteNativeCompMeta {
   name: string
@@ -40,12 +43,12 @@ export interface VitePageMeta {
 }
 
 
-export interface ViteH5BuildConfig extends CommonBuildConfig, IH5Config {
+export interface ViteH5BuildConfig extends CommonBuildConfig, IH5Config<'vite'> {
   entryFileName?: string
   runtimePath?: string | string[]
 }
 
-export interface CommonBuildConfig extends IProjectBaseConfig {
+export interface CommonBuildConfig extends IProjectConfig<'vite'> {
   entry: {
     app: string | string[]
   }
@@ -60,7 +63,7 @@ export interface CommonBuildConfig extends IProjectBaseConfig {
 }
 
 
-export interface ViteMiniBuildConfig extends CommonBuildConfig, IMiniAppConfig {
+export interface ViteMiniBuildConfig extends CommonBuildConfig, IMiniAppConfig<'vite'> {
   isBuildPlugin: boolean
   isSupportRecursive: boolean
   isSupportXS: boolean
@@ -84,6 +87,7 @@ export interface ViteCompilerContext<T> {
   cwd: string
   sourceDir: string
   taroConfig: T
+  rawTaroConfig: T
   frameworkExts: string[]
   app: ViteAppMeta
   pages: VitePageMeta[]