@tarojs/taro 3.7.0-canary.4 → 3.7.0-canary.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro",
-  "version": "3.7.0-canary.4",
+  "version": "3.7.0-canary.6",
   "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/runtime": "3.7.0-canary.4",
-    "@tarojs/api": "3.7.0-canary.4"
+    "@tarojs/api": "3.7.0-canary.6",
+    "@tarojs/runtime": "3.7.0-canary.6"
   },
   "devDependencies": {
-    "@tarojs/helper": "3.7.0-canary.4",
-    "@tarojs/shared": "3.7.0-canary.4"
+    "@tarojs/shared": "3.7.0-canary.6",
+    "@tarojs/helper": "3.7.0-canary.6"
   },
   "peerDependenciesMeta": {
     "@types/react": {

package/types/api/device/clipboard.d.ts

@@ -43,7 +43,7 @@ declare module '../../index' {
 
   interface TaroStatic {
     /** 设置系统剪贴板的内容。调用成功后，会弹出 toast 提示"内容已复制"，持续 1.5s
-     * @supported weapp, swan, jd, qq, h5, rn, tt
+     * @supported weapp, swan, jd, qq, tt, h5, rn
      * @h5 部分实现
      * @example
      * ```tsx
@@ -63,19 +63,19 @@ declare module '../../index' {
     setClipboardData(option: setClipboardData.Option): Promise<setClipboardData.Promised>
 
     /**
-      * 获取系统剪贴板内容
-      * @supported weapp, swan, jd, qq, h5, rn, tt
-      * @h5 部分实现
-      * @example
-      * ```tsx
-      * Taro.getClipboardData({
-      *   success: function (res){
-      *     console.log(res.data)
-      *   }
-      * })
-      * ```
-      * @see https://developers.weixin.qq.com/miniprogram/dev/api/device/clipboard/wx.getClipboardData.html
-      */
+     * 获取系统剪贴板内容
+     * @supported weapp, swan, jd, qq, tt, h5, rn
+     * @h5 部分实现
+     * @example
+     * ```tsx
+     * Taro.getClipboardData({
+     *   success: function (res){
+     *     console.log(res.data)
+     *   }
+     * })
+     * ```
+     * @see https://developers.weixin.qq.com/miniprogram/dev/api/device/clipboard/wx.getClipboardData.html
+     */
     getClipboardData(res?: getClipboardData.Option): Promise<getClipboardData.Promised>
   }
 }

package/types/api/device/screen.d.ts

@@ -179,7 +179,7 @@ declare module '../../index' {
 
     /** 取消用户录屏事件的监听函数
      * @supported weapp
-     * @see https://developers.weixin.qq.com/miniprogram/dev/api/device/screen/wx.offScreenRecordingStateChanged.html 
+     * @see https://developers.weixin.qq.com/miniprogram/dev/api/device/screen/wx.offScreenRecordingStateChanged.html
      */
     offScreenRecordingStateChanged(
       /** 用户录屏事件的监听函数 */

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

@@ -4,7 +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'
+import type { Compiler, CompilerTypes, CompilerWebpackTypes } from '../compiler'
 
 export interface IH5RouterConfig {
   /** 配置路由模式 */
@@ -120,4 +120,7 @@ export interface IH5Config <T extends CompilerTypes = CompilerWebpackTypes> {
   }
   /** 生成的代码是否要兼容旧版浏览器，值为 true 时，会去读取 package.json 的 browserslist 字段。只在 vite 编译模式下有效 */
   legacy?: T extends 'vite' ? boolean : undefined
+  
+  /** 使用的编译工具。可选值：webpack4、webpack5、vite */
+  compiler?: Compiler<T>
 }

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

@@ -2,7 +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'
+import type { Compiler, CompilerTypes, CompilerWebpackTypes } from '../compiler'
 
 interface Runtime {
   enableInnerHTML?: boolean
@@ -112,6 +112,9 @@ export interface IMiniAppConfig<T extends CompilerTypes = CompilerWebpackTypes>
 
   /** 插件内部使用 */
   runtime?: Runtime
+
+  /** 使用的编译工具。可选值：webpack4、webpack5、vite */
+  compiler?: Compiler<T>
 }
 
 export interface IMiniFilesConfig {

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

@@ -0,0 +1,34 @@
+import type { CustomPluginOptions, ResolvedId, ResolveIdResult } from 'rollup'
+
+interface IRollupPluginResolveIdOptions {
+  assertions?: Record<string, string>
+  custom?: CustomPluginOptions
+  isEntry?: boolean
+  skipSelf?: boolean
+}
+
+export type TRollupResolveMethod = (
+  source: string,
+  importer?: string,
+  options?: IRollupPluginResolveIdOptions
+) => Promise<ResolvedId | null>
+
+export interface ILoaderMeta {
+  importFrameworkStatement: string
+  importFrameworkName: string
+  creator: string
+  creatorLocation: string
+  extraImportForWeb: string
+  execBeforeCreateWebApp: string
+  frameworkArgs: string
+  isNeedRawLoader?: boolean
+  mockAppStatement: string
+  modifyConfig?: (config: Record<string, any>, source: string) => void
+  modifyResolveId?: (res: {
+    source?: string
+    importer?: string
+    options?: IRollupPluginResolveIdOptions
+    name?: string
+    resolve: TRollupResolveMethod
+  }) => Promise<ResolveIdResult> | ResolveIdResult
+}

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

@@ -94,6 +94,8 @@ export type IPostcssOption<T = 'h5' | 'mini'> = T extends 'h5'
   ? IBasePostcssOption & { url?: PostcssOption.url }
   : IBasePostcssOption
 
+export type Config = ViteConfig | WebpackConfig
+
 export interface ICopyOptions {
   patterns: {
     from: string

package/types/compile/viteCompilerContext.d.ts

@@ -1,10 +1,9 @@
+import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
+import type { PluginContext } from 'rollup'
 import type { AppConfig, PageConfig } from '../index'
 import type { IMiniFilesConfig, IH5Config, IMiniAppConfig } from './config'
 import type { IProjectConfig } from './config/project'
-import type { PluginContext } from "rollup"
-import { IComponentConfig } from "./hooks"
-
-import type { RecursiveTemplate, UnRecursiveTemplate } from '@tarojs/shared/dist/template'
+import type { IComponentConfig } from './hooks'
 
 export interface ViteNativeCompMeta {
   name: string
@@ -91,6 +90,7 @@ export interface ViteCompilerContext<T> {
   frameworkExts: string[]
   app: ViteAppMeta
   pages: VitePageMeta[]
+  components?: VitePageMeta[]
   loaderMeta: any
   logger
   filesConfig: IMiniFilesConfig