Merge branch 'main' into fix/stylelint-taro-rn

.cargo/config.toml

@@ -18,7 +18,7 @@ rustflags = ["-C", "target-feature=+crt-static"]
 
 [alias]
 # Alias to build actual SWC plugin binary for the specified target.
-build-wasi = "build --target wasm32-wasi"
+build-wasi = "build --target wasm32-wasip1"
 build-wasm32 = "build --target wasm32-unknown-unknown"
 build-swc-plugins = "build-wasi --release -p swc_plugin_compile_mode -p swc_plugin_define_config -p swc_plugin_compile_mode_pre_process"
 test-swc-plugins = "test -p swc_plugin_compile_mode -p swc_plugin_define_config -p swc_plugin_compile_mode_pre_process"

.github/workflows/build-rust-wasm.yml

@@ -16,7 +16,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          targets: wasm32-wasi
+          targets: wasm32-wasip1
       - name: Cache cargo
         uses: actions/cache@v3
         with:
@@ -33,5 +33,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: wasm-wasi-swc_plugins
-          path: target/wasm32-wasi/release/*.wasm
+          path: target/wasm32-wasip1/release/*.wasm
           if-no-files-found: error

.github/workflows/nodejs.yml

@@ -164,7 +164,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          targets: wasm32-wasi
+          targets: wasm32-wasip1
       - name: Cache cargo
         uses: actions/cache@v3
         with:

CONTRIBUTING.md

@@ -185,7 +185,7 @@ $ pnpm --filter @tarojs/binding run test
 
 #### SWC 插件
 
-首先在项目根目录执行 `rustup target add wasm32-wasi` 命令安装 `wasm32-wasi` 的 `target`。
+首先在项目根目录执行 `rustup target add wasm32-wasip1` 命令安装 `wasm32-wasip1` 的 `target`。
 
 开发过程中可以使用 SWC 测试套件进行单元测试：
 
@@ -207,7 +207,7 @@ $ cargo build -p [package-name]
 
 Cargo workspace 会把编译产物输出到根目录的 `target` 文件夹中。进行集成测试时，需要手动把 `.wasm` 产物软链到目标文件夹，而 Github CI 在正式发布时会自动拷贝产物到正确的文件夹中。
 
-如对 `@taorjs/helper` 进行集成测试时，会把 `target/wasm32-wasi/release/swc_plugin_xxx.wasm` 文件的软链到 `packages/taro-helper/swc/swc_plugin_xxx.wasm`。
+如对 `@taorjs/helper` 进行集成测试时，会把 `target/wasm32-wasip1/release/swc_plugin_xxx.wasm` 文件的软链到 `packages/taro-helper/swc/swc_plugin_xxx.wasm`。
 
 #### 
 

crates/native_binding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

npm/darwin-arm64/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-arm64",
   "description": "Native binding for taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "os": [
     "darwin"
   ],

npm/darwin-x64/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-x64",
   "description": "Native binding for taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "os": [
     "darwin"
   ],

npm/linux-x64-gnu/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-linux-x64-gnu",
   "description": "Native binding for taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "os": [
     "linux"
   ],

npm/linux-x64-musl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding-linux-x64-musl",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "os": [
     "linux"
   ],

npm/win32-x64-msvc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-win32-x64-msvc",
   "description": "Native binding for taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "os": [
     "win32"
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "开放式跨端跨框架开发解决方案",
   "homepage": "https://github.com/NervJS/taro#readme",
   "author": "O2Team",

packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "author": "O2Team",
   "license": "MIT",

packages/babel-plugin-transform-solid-jsx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-transform-solid-jsx",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/babel-plugin-transform-taroapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

packages/babel-preset-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro babel preset",
   "author": "O2Team",
   "license": "MIT",

packages/create-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "create taro app with one command",
   "author": "O2Team",
   "license": "MIT",

packages/css-to-react-native/package.json

@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

packages/eslint-config-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro specific linting rules for ESLint",
   "author": "O2Team",
   "license": "MIT",

packages/jest-helper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-taro-helper",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "jest helper for taro",
   "private": true,
   "author": "O2Team",

packages/postcss-html-transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-html-transform",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "transform html tag name selector",
   "author": "O2Team",
   "license": "MIT",

packages/postcss-plugin-constparse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "parse constants defined in config",
   "author": "O2Team",
   "license": "MIT",

packages/postcss-pxtransform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "author": "O2Team",
   "license": "MIT",

packages/postcss-unit-transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-taro-unit-transform",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "小程序单位转换",
   "author": "O2Team",
   "license": "MIT",

packages/rollup-plugin-copy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-copy",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "rollup-plugin-copy for taro",
   "private": true,
   "author": "O2Team",

packages/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro utils internal use.",
   "author": "O2Team",
   "license": "MIT",

packages/stylelint-config-taro-rn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Shareable stylelint config for React Native CSS modules",
   "author": "O2Team",
   "license": "MIT",

packages/stylelint-taro-rn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro-rn",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "A collection of React Native specific rules for stylelint",
   "author": "O2Team",
   "license": "MIT",

packages/stylelint-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro stylelint 规则集合",
   "author": "O2Team",
   "license": "MIT",

packages/taro-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro common API",
   "author": "O2Team",
   "license": "MIT",

packages/taro-cli-convertor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli-convertor",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "cli tool for taro-convert",
   "author": "O2Team",
   "license": "MIT",

packages/taro-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "cli tool for taro",
   "author": "O2Team",
   "license": "MIT",

packages/taro-cli/src/cli.ts

@@ -202,6 +202,7 @@ export default class CLI {
             projectName: _[1] || args.name,
             description: args.description,
             typescript: args.typescript,
+            buildEs5: args['build-es5'],
             framework: args.framework,
             compiler: args.compiler,
             npm: args.npm,

packages/taro-cli/src/presets/commands/build.ts

@@ -3,6 +3,7 @@ import {
   validateConfig
 } from '@tarojs/plugin-doctor'
 
+import { extractCompileEntry } from '../../util/appConfig'
 import * as hooks from '../constant'
 
 import type { IPluginContext } from '@tarojs/service'
@@ -14,6 +15,8 @@ export default (ctx: IPluginContext) => {
       '--type [typeName]': 'Build type, weapp/swan/alipay/tt/qq/jd/h5/rn',
       '--watch': 'Watch mode',
       '--env [env]': 'Value for process.env.NODE_ENV',
+      '--pages': 'Specify the pages to be compiled, separate multiple by comma',
+      '--components': 'Specify the components to be compiled, separate multiple by comma',
       '--mode [mode]': 'Value of dotenv extname',
       '-p, --port [port]': 'Specified port',
       '--no-build': 'Do not build project',
@@ -36,6 +39,7 @@ export default (ctx: IPluginContext) => {
     synopsisList: [
       'taro build --type weapp',
       'taro build --type weapp --watch',
+      'taro build --type weapp --watch --pages pages/index/index',
       'taro build --type weapp --env production',
       'taro build --type weapp --blended',
       'taro build --type weapp --no-build',
@@ -50,6 +54,7 @@ export default (ctx: IPluginContext) => {
       const { platform, isWatch, blended, newBlended, withoutBuild, noInjectGlobalStyle, noCheck } = options
       const { fs, chalk, PROJECT_CONFIG } = ctx.helper
       const { outputPath, configPath } = ctx.paths
+      const { args } = options
 
       if (!configPath || !fs.existsSync(configPath)) {
         console.log(chalk.red(`找不到项目配置文件${PROJECT_CONFIG}，请确定当前目录是 Taro 项目根目录!`))
@@ -120,6 +125,8 @@ export default (ctx: IPluginContext) => {
             newBlended,
             noInjectGlobalStyle,
             async modifyAppConfig (appConfig) {
+              extractCompileEntry(appConfig, args, ctx)
+
               await ctx.applyPlugins({
                 name: hooks.MODIFY_APP_CONFIG,
                 opts: {

packages/taro-cli/src/presets/commands/init.ts

@@ -7,6 +7,7 @@ export default (ctx: IPluginContext) => {
       '--name [name]': '项目名称',
       '--description [description]': '项目介绍',
       '--typescript': '使用TypeScript',
+      '--build-es5': '是否需要编译为es5',
       '--npm [npm]': '包管理工具',
       '--template-source [templateSource]': '项目模板源',
       '--clone [clone]': '拉取远程模板时使用git clone',
@@ -25,6 +26,7 @@ export default (ctx: IPluginContext) => {
         template,
         description,
         typescript,
+        buildEs5,
         css,
         npm,
         framework,
@@ -45,6 +47,7 @@ export default (ctx: IPluginContext) => {
         template,
         description,
         typescript,
+        buildEs5,
         framework,
         compiler,
         hideDefaultTemplate,

packages/taro-cli/src/util/appConfig.ts

@@ -0,0 +1,29 @@
+import { IPluginContext } from '@tarojs/service'
+import { isString } from '@tarojs/shared'
+import { AppConfig } from '@tarojs/taro'
+
+/**
+ * 按需编译功能，只编译指定的页面或组件
+ * @param appConfig
+ * @param args
+ */
+export function extractCompileEntry(
+  appConfig: AppConfig,
+  args: { _: string[], [key: string]: any },
+  ctx: IPluginContext
+): void {
+  const { chalk } = ctx.helper
+
+  const extractType = isString(args.pages) ? 'pages' : isString(args.components) ? 'components' : ''
+  if (!extractType) return
+
+  const entries = args[extractType].split(',').map(item => item.trim()).filter(Boolean)
+  if (!entries.length) {
+    console.log(chalk.yellow(`按需编译开启失败，请指定要编译的${extractType}`))
+    return
+  }
+
+  appConfig[extractType] = entries
+  appConfig.subPackages = []
+  console.log(chalk.green(`已开启按需编译，仅编译以下${extractType}: ${appConfig[extractType]}`))
+}

packages/taro-components-advanced/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "",
   "author": "O2Team",
   "license": "MIT",

packages/taro-components-library-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-react",
-  "version": "4.0.9-beta.2",
+  "version": "4.0.9-beta.8",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "author": "O2Team",