Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: fix typo #257

Merged
merged 1 commit into from
May 2, 2024
Merged

docs: fix typo #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ module.exports = function (merge) {
:::info
Taro v3.6.9 开始支持

Taro v4.0.0 之后支持范型，可以传入编译器类型 'webpack4 | 'webpack5 | 'vite'
Taro v4.0.0 之后支持范型，可以传入编译器类型 'webpack4 | 'webpack5 | 'vite'

react native 暂不支持
:::
Expand Down Expand Up @@ -131,7 +131,7 @@ export default {
```ts
import { defineConfig } from '@tarojs/cli'

export default defineConfig(async (mergin, { command, mode }) => {
export default defineConfig(async (merge, { command, mode }) => {
const data = await asyncFunction()
return {
// Taro 配置
Expand All @@ -146,8 +146,8 @@ export default defineConfig(async (mergin, { command, mode }) => {
```ts
import { defineConfig } from '@tarojs/cli'

export default defineConfig((mergin, { command, mode }) => {
// mergin 为webpack-mergin, 兼容以前的配置
export default defineConfig((merge, { command, mode }) => {
// merge 为 webpack-merge, 兼容以前的配置
// 假如执行的命令为: "taro build --type weapp --mode test"
// 则 command 的值为 build, mode 的值为 test
if (mode === 'development') {
Expand Down
6 changes: 3 additions & 3 deletions versioned_docs/version-3.x/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default {
```ts
import { defineConfig } from '@tarojs/cli'

export default defineConfig(async (mergin, { command, mode }) => {
export default defineConfig(async (merge, { command, mode }) => {
const data = await asyncFunction()
return {
// Taro 配置
Expand All @@ -151,8 +151,8 @@ export default defineConfig(async (mergin, { command, mode }) => {
```ts
import { defineConfig } from '@tarojs/cli'

export default defineConfig((mergin, { command, mode }) => {
// mergin 为webpack-mergin, 兼容以前的配置
export default defineConfig((merge, { command, mode }) => {
// merge 为 webpack-merge, 兼容以前的配置
// 假如执行的命令为: "taro build --type weapp --mode test"
// 则 command 的值为 build, mode 的值为 test
if (mode === 'development') {
Expand Down