@tarojs/cli 4.0.0-canary.9 → 4.0.0

package/src/create/project.ts

@@ -1,3 +1,5 @@
+import * as path from 'node:path'
+
 import { CompilerType, createProject, CSSType, FrameworkType, NpmType, PeriodType } from '@tarojs/binding'
 import {
   chalk,
@@ -10,10 +12,9 @@ import {
   TARO_CONFIG_FOLDER
 } from '@tarojs/helper'
 import { isArray } from '@tarojs/shared'
+import axios from 'axios'
 import * as inquirer from 'inquirer'
 import * as ora from 'ora'
-import * as path from 'path'
-import * as request from 'request'
 import * as semver from 'semver'
 
 import { clearConsole, getPkgVersion, getRootPath } from '../util'
@@ -59,9 +60,9 @@ export default class Project extends Creator {
 
   constructor (options: IProjectConfOptions) {
     super(options.sourceRoot)
-    const unSupportedVer = semver.lt(process.version, 'v7.6.0')
+    const unSupportedVer = semver.lt(process.version, 'v18.0.0')
     if (unSupportedVer) {
-      throw new Error('Node.js 版本过低，推荐升级 Node.js 至 v8.0.0+')
+      throw new Error('Node.js 版本过低，推荐升级 Node.js 至 v18.0.0+')
     }
     this.rootPath = this._rootPath
 
@@ -105,12 +106,19 @@ export default class Project extends Creator {
     this.askFramework(conf, prompts)
     this.askTypescript(conf, prompts)
     this.askCSS(conf, prompts)
-    this.askCompiler(conf, prompts)
     this.askNpm(conf, prompts)
-    await this.askTemplateSource(conf, prompts)
-
     const answers = await inquirer.prompt<IProjectConf>(prompts)
 
+    // Note: 由于 Solid 框架适配 Vite 还存在某些问题，所以在选择 Solid 框架时，不再询问编译工具
+    prompts = []
+    if (answers.framework === FrameworkType.Solid || conf.framework === FrameworkType.Solid) {
+      answers.compiler = CompilerType.Webpack5
+    } else {
+      this.askCompiler(conf, prompts)
+    }
+    await this.askTemplateSource(conf, prompts)
+    const compilerAndTemplateSourceAnswer = await inquirer.prompt<IProjectConf>(prompts)
+
     prompts = []
     const templates = await this.fetchTemplates(answers)
     await this.askTemplate(conf, prompts, templates)
@@ -118,6 +126,7 @@ export default class Project extends Creator {
 
     return {
       ...answers,
+      ...compilerAndTemplateSourceAnswer,
       ...templateChoiceAnswer
     }
   }
@@ -212,10 +221,6 @@ export default class Project extends Creator {
         name: 'Webpack5',
         value: CompilerType.Webpack5
       },
-      {
-        name: 'Webpack4',
-        value: CompilerType.Webpack4
-      },
       {
         name: 'Vite',
         value: CompilerType.Vite
@@ -242,17 +247,13 @@ export default class Project extends Creator {
         name: 'PReact',
         value: FrameworkType.Preact
       },
-      // {
-      //   name: 'Nerv',
-      //   value: 'nerv'
-      // },
-      {
-        name: 'Vue',
-        value: FrameworkType.Vue
-      },
       {
         name: 'Vue3',
         value: FrameworkType.Vue3
+      },
+      {
+        name: 'Solid',
+        value: FrameworkType.Solid
       }
     ]
 
@@ -348,7 +349,7 @@ export default class Project extends Creator {
   askTemplate: AskMethods = function (conf, prompts, list = []) {
     const choices = list.map(item => ({
       name: item.desc ? `${item.name}（${item.desc}）` : item.name,
-      value: item.name
+      value: item.value || item.name
     }))
 
     if (!conf.hideDefaultTemplate) {
@@ -400,6 +401,7 @@ export default class Project extends Creator {
 
   async fetchTemplates (answers: IProjectConf): Promise<ITemplates[]> {
     const { templateSource, framework, compiler } = answers
+    this.conf.framework = this.conf.framework || framework || ''
     this.conf.templateSource = this.conf.templateSource || templateSource
 
     // 使用默认模版
@@ -414,10 +416,12 @@ export default class Project extends Creator {
     const templateChoices = await fetchTemplate(this.conf.templateSource, this.templatePath(''), isClone)
 
     const filterFramework = (_framework) => {
+      const current = this.conf.framework?.toLowerCase()
+
       if (typeof _framework === 'string' && _framework) {
-        return framework === _framework
+        return current === _framework.toLowerCase()
       } else if (isArray(_framework)) {
-        return _framework?.includes(framework)
+        return _framework?.map(name => name.toLowerCase()).includes(current)
       } else {
         return true
       }
@@ -468,27 +472,23 @@ export default class Project extends Creator {
   }
 }
 
-function getOpenSourceTemplates (platform) {
+function getOpenSourceTemplates (platform: string) {
   return new Promise((resolve, reject) => {
     const spinner = ora({ text: '正在拉取开源模板列表...', discardStdin: false }).start()
-    request.get('https://gitee.com/NervJS/awesome-taro/raw/next/index.json', (error, _response, body) => {
-      if (error) {
+    axios.get('https://gitee.com/NervJS/awesome-taro/raw/next/index.json')
+      .then(response => {
+        spinner.succeed(`${chalk.grey('拉取开源模板列表成功！')}`)
+        const collection = response.data
+        switch (platform.toLowerCase()) {
+          case 'react':
+            return resolve(collection.react)
+          default:
+            return resolve([NONE_AVAILABLE_TEMPLATE])
+        }
+      })
+      .catch(_error => {
         spinner.fail(chalk.red('拉取开源模板列表失败！'))
         return reject(new Error())
-      }
-
-      spinner.succeed(`${chalk.grey('拉取开源模板列表成功！')}`)
-
-      const collection = JSON.parse(body)
-
-      switch (platform) {
-        case 'react':
-          return resolve(collection.react)
-        case 'vue':
-          return resolve(collection.vue)
-        default:
-          return resolve([NONE_AVAILABLE_TEMPLATE])
-      }
-    })
+      })
   })
 }

package/src/index.ts

@@ -20,4 +20,5 @@ export {
   defineConfig,
   doctor,
   getRootPath,
-  Project }
+  Project
+}

package/src/presets/commands/build.ts

@@ -16,6 +16,7 @@ export default (ctx: IPluginContext) => {
       '--env [env]': 'Value for process.env.NODE_ENV',
       '--mode [mode]': 'Value of dotenv extname',
       '-p, --port [port]': 'Specified port',
+      '--no-build': 'Do not build project',
       '--platform': '[rn] Specific React-Native build target: android / ios, android is default value',
       '--reset-cache': '[rn] Clear transform cache',
       '--public-path': '[rn] Assets public path',
@@ -29,12 +30,15 @@ export default (ctx: IPluginContext) => {
       '--new-blended': 'Blended Taro project in an original MiniApp project while supporting building components independently',
       '--plugin [typeName]': 'Build Taro plugin project, weapp',
       '--env-prefix [envPrefix]': "Provide the dotEnv varables's prefix",
+      '--no-inject-global-style': '[H5] Do not inject global style',
+      '--no-check': 'Do not check config is valid or not',
     },
     synopsisList: [
       'taro build --type weapp',
       'taro build --type weapp --watch',
       'taro build --type weapp --env production',
       'taro build --type weapp --blended',
+      'taro build --type weapp --no-build',
       'taro build native-components --type weapp',
       'taro build --type weapp --new-blended',
       'taro build --plugin weapp --watch',
@@ -43,7 +47,7 @@ export default (ctx: IPluginContext) => {
     ],
     async fn(opts) {
       const { options, config, _ } = opts
-      const { platform, isWatch, blended, newBlended } = options
+      const { platform, isWatch, blended, newBlended, withoutBuild, noInjectGlobalStyle, noCheck } = options
       const { fs, chalk, PROJECT_CONFIG } = ctx.helper
       const { outputPath, configPath } = ctx.paths
 
@@ -58,38 +62,40 @@ export default (ctx: IPluginContext) => {
       }
 
       // 校验 Taro 项目配置
-      const checkResult = await checkConfig({
-        projectConfig: ctx.initialConfig,
-        helper: ctx.helper
-      })
-      if (!checkResult.isValid) {
-        const ERROR = chalk.red('[✗] ')
-        const WARNING = chalk.yellow('[!] ')
-        const SUCCESS = chalk.green('[✓] ')
-
-        const lineChalk = chalk.hex('#fff')
-        const errorChalk = chalk.hex('#f00')
-        console.log(errorChalk(`Taro 配置有误，请检查！ (${configPath})`))
-        checkResult.messages.forEach((message) => {
-          switch (message.kind) {
-            case MessageKind.Error:
-              console.log('  ' + ERROR + lineChalk(message.content))
-              break
-            case MessageKind.Success:
-              console.log('  ' + SUCCESS + lineChalk(message.content))
-              break
-            case MessageKind.Warning:
-              console.log('  ' + WARNING + lineChalk(message.content))
-              break
-            case MessageKind.Manual:
-              console.log('  ' + lineChalk(message.content))
-              break
-            default:
-              break
-          }
+      if (!noCheck) {
+        const checkResult = await checkConfig({
+          projectConfig: ctx.initialConfig,
+          helper: ctx.helper
         })
-        console.log('')
-        process.exit(0)
+        if (!checkResult.isValid) {
+          const ERROR = chalk.red('[✗] ')
+          const WARNING = chalk.yellow('[!] ')
+          const SUCCESS = chalk.green('[✓] ')
+
+          const lineChalk = chalk.hex('#fff')
+          const errorChalk = chalk.hex('#f00')
+          console.log(errorChalk(`Taro 配置有误，请检查！ (${configPath})`))
+          checkResult.messages.forEach((message) => {
+            switch (message.kind) {
+              case MessageKind.Error:
+                console.log('  ' + ERROR + lineChalk(message.content))
+                break
+              case MessageKind.Success:
+                console.log('  ' + SUCCESS + lineChalk(message.content))
+                break
+              case MessageKind.Warning:
+                console.log('  ' + WARNING + lineChalk(message.content))
+                break
+              case MessageKind.Manual:
+                console.log('  ' + lineChalk(message.content))
+                break
+              default:
+                break
+            }
+          })
+          console.log('')
+          process.exit(0)
+        }
       }
 
       const isProduction = process.env.NODE_ENV === 'production' || !isWatch
@@ -110,8 +116,18 @@ export default (ctx: IPluginContext) => {
             mode: isProduction ? 'production' : 'development',
             blended,
             isBuildNativeComp,
+            withoutBuild,
             newBlended,
-            async modifyWebpackChain(chain, webpack, data) {
+            noInjectGlobalStyle,
+            async modifyAppConfig (appConfig) {
+              await ctx.applyPlugins({
+                name: hooks.MODIFY_APP_CONFIG,
+                opts: {
+                  appConfig
+                }
+              })
+            },
+            async modifyWebpackChain (chain, webpack, data) {
               await ctx.applyPlugins({
                 name: hooks.MODIFY_WEBPACK_CHAIN,
                 initialVal: chain,

package/src/presets/commands/config.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 
 import type { IPluginContext } from '@tarojs/service'
 

package/src/presets/commands/create.ts

@@ -41,6 +41,9 @@ export default (ctx: IPluginContext) => {
       const type = options.type || createTemplateTypeEnum.PAGE
       const name = _[1] || options.name
       const description = options.description || ''
+      const afterCreate = options.afterCreate
+      const templateSource = options.templateSource
+      const clone = options.clone
       const { chalk } = ctx.helper
       const { appPath } = ctx.paths
 
@@ -52,11 +55,14 @@ export default (ctx: IPluginContext) => {
 
           const Page = require('../../create/page').default
           const page = new Page({
+            clone,
             subPkg: options.subpkg,
             pageDir: options.dir,
             pageName: name,
             projectDir: appPath,
             description,
+            templateSource,
+            afterCreate,
             async modifyCustomTemplateConfig (cb: TSetCustomTemplateConfig) {
               await ctx.applyPlugins({ name: hooks.MODIFY_CREATE_TEMPLATE, opts: cb })
             }

package/src/presets/commands/global-config.ts

@@ -1,5 +1,6 @@
+import * as path from 'node:path'
+
 import * as ora from 'ora'
-import * as path from 'path'
 import * as validatePkgName from 'validate-npm-package-name'
 
 import { execCommand, getPkgNameByFilterVersion, getRootPath } from '../../util'
@@ -23,8 +24,6 @@ const PLUGIN_TYPE_TO_CONFIG_KEY = {
   preset: 'presets'
 }
 
-
-
 export default (ctx: IPluginContext) => {
   ctx.registerCommand({
     name: 'global-config',
@@ -36,9 +35,10 @@ export default (ctx: IPluginContext) => {
       'taro global-config reset',
     ],
     optionsMap: {
+      '-r --registry [url]': '指定 npm registry',
       '-h, --help': 'output usage information'
     },
-    fn ({ _ }) {
+    fn ({ _, options }) {
       const [, action, pluginName] = _
       const { getUserHomeDir, TARO_GLOBAL_CONFIG_DIR, fs, TARO_GLOBAL_CONFIG_FILE } = ctx.helper
       const homedir = getUserHomeDir()
@@ -46,8 +46,9 @@ export default (ctx: IPluginContext) => {
       if (!homedir) return console.log('找不到用户根目录')
       const rootPath = getRootPath()
       const templatePath = path.join(rootPath, 'templates', 'global-config')
+      const registry = options.registry || options.r
       function makeSureConfigExists () {
-        if (!fs.existsSync(globalPluginConfigDir)){
+        if (!fs.existsSync(globalPluginConfigDir)) {
           const spinner = ora(`目录不存在，全局配置初始化`).start()
           try {
             fs.copySync(templatePath, globalPluginConfigDir)
@@ -56,10 +57,9 @@ export default (ctx: IPluginContext) => {
             spinner.fail(`全局配置初始化失败，${e}`)
             process.exit(1)
           }
-
         }
       }
-      function addOrRemovePresetOrPlugin (actionType: TPresetOrPluginAction, pluginType: TPluginType ) {
+      function addOrRemovePresetOrPlugin (actionType: TPresetOrPluginAction, pluginType: TPluginType) {
         makeSureConfigExists()
         const presetOrPluginChineseName = PRESET_OR_PLUGIN_CHINESE_NAME_MAP[pluginType]
         const chineseCommand = PRESET_OR_PLUGIN_COMMAND_CHINESE_MAP_MAP[actionType]
@@ -74,8 +74,12 @@ export default (ctx: IPluginContext) => {
           spinner.fail('安装的插件名不合规！')
           process.exit(1)
         }
+        let command = `cd ${globalPluginConfigDir} && npm ${actionType} ${pluginName}`
+        if (registry) {
+          command += ` --registry=${registry}`
+        }
         execCommand({
-          command: `cd ${globalPluginConfigDir} && npm ${actionType} ${pluginName}`,
+          command,
           successCallback (data) {
             console.log(data.replace(/\n$/, ''))
             spinner.start(`开始修改${presetOrPluginChineseName}配置`)
@@ -83,21 +87,21 @@ export default (ctx: IPluginContext) => {
             let globalConfig
             try {
               globalConfig = fs.readJSONSync(configFilePath)
-            } catch (e){
+            } catch (e) {
               spinner.fail('获取配置文件失败')
             }
             const configKey = PLUGIN_TYPE_TO_CONFIG_KEY[pluginType]
             const configItem = globalConfig[configKey] || []
-            const pluginIndex = configItem.findIndex((item)=>{
+            const pluginIndex = configItem.findIndex((item) => {
               if (typeof item === 'string') return item === pluginWithoutVersionName
-              if ( item instanceof Array) return item?.[0] === pluginWithoutVersionName
+              if (item instanceof Array) return item?.[0] === pluginWithoutVersionName
             })
             const shouldChangeFile = !(Number(pluginIndex !== -1) ^ Number(actionType === 'uninstall'))
-            if (shouldChangeFile){
+            if (shouldChangeFile) {
               actionType === 'install' ? configItem.push(pluginWithoutVersionName) : configItem.splice(pluginIndex, 1)
               try {
                 fs.writeJSONSync(configFilePath, {
-                  [configKey] : configItem
+                  [configKey]: configItem
                 })
               } catch (e) {
                 spinner.fail(`修改配置文件失败：${e}`)
@@ -134,4 +138,3 @@ export default (ctx: IPluginContext) => {
     }
   })
 }
-

package/src/presets/commands/info.ts

@@ -1,5 +1,6 @@
+import * as path from 'node:path'
+
 import * as envinfo from 'envinfo'
-import * as path from 'path'
 
 import { getPkgVersion } from '../../util'
 

package/src/presets/commands/init.ts

@@ -18,9 +18,10 @@ export default (ctx: IPluginContext) => {
       // init project
       const { appPath } = ctx.paths
       const { options } = opts
-      const { projectName, templateSource, clone, template, description, typescript, css, npm, framework, compiler, hideDefaultTemplate } = options
+      const { projectName, templateSource, clone, template, description, typescript, css, npm, framework, compiler, hideDefaultTemplate, sourceRoot } = options
       const Project = require('../../create/project').default
       const project = new Project({
+        sourceRoot,
         projectName,
         projectDir: appPath,
         npm,

package/src/presets/commands/inspect.ts

@@ -1,3 +1,5 @@
+import * as path from 'node:path'
+
 import {
   ENTRY,
   OUTPUT_DIR,
@@ -5,7 +7,6 @@ import {
   SOURCE_DIR
 } from '@tarojs/helper'
 import { getPlatformType } from '@tarojs/shared'
-import * as path from 'path'
 
 import * as hooks from '../constant'
 
@@ -74,7 +75,7 @@ export default (ctx: IPluginContext) => {
 
               if (mode === 'console') {
                 const highlight = require('cli-highlight').default
-                console.log(highlight(res, { language: 'js' }))
+                console.info(highlight(res, { language: 'js' }))
               } else if (mode === 'output' && outputPath) {
                 fs.writeFileSync(outputPath, res)
               }

package/src/presets/commands/update.ts

@@ -1,7 +1,8 @@
+import * as path from 'node:path'
+
 import * as inquirer from 'inquirer'
 import * as getLatestVersion from 'latest-version'
 import * as ora from 'ora'
-import * as path from 'path'
 import * as semver from 'semver'
 
 import packagesManagement from '../../config/packagesManagement'
@@ -63,7 +64,7 @@ export default (ctx: IPluginContext) => {
         const updateTarget = isSelf ? ' CLI ' : ' Taro 项目依赖'
         const spinString = `正在更新${updateTarget}到 v${version} ...`
         const spinner = ora(spinString).start()
-        execCommand({ 
+        execCommand({
           command,
           successCallback (data) {
             spinner.stop()

package/src/presets/constant/hooks.ts

@@ -1,3 +1,4 @@
+export const MODIFY_APP_CONFIG = 'modifyAppConfig'
 export const MODIFY_WEBPACK_CHAIN = 'modifyWebpackChain'
 export const MODIFY_VITE_CONFIG = 'modifyViteConfig'
 export const MODIFY_BUILD_ASSETS = 'modifyBuildAssets'

package/src/presets/files/generateProjectConfig.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 
 import type { IPluginContext } from '@tarojs/service'
 

package/src/presets/files/writeFileToDist.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 
 import type { IPluginContext } from '@tarojs/service'
 

package/src/presets/hooks/build.ts

@@ -4,6 +4,7 @@ import type { IPluginContext } from '@tarojs/service'
 
 export default (ctx: IPluginContext) => {
   [
+    hooks.MODIFY_APP_CONFIG,
     hooks.MODIFY_WEBPACK_CHAIN,
     hooks.MODIFY_VITE_CONFIG,
     hooks.MODIFY_BUILD_ASSETS,

package/src/presets/index.ts

@@ -1,4 +1,4 @@
-import * as path from 'path'
+import * as path from 'node:path'
 
 export default () => {
   return {

package/src/presets/platforms/plugin.ts

@@ -1,3 +1,6 @@
+import * as path from 'node:path'
+
+import { fs } from '@tarojs/helper'
 import { getPlatformType } from '@tarojs/shared'
 
 import type { IPluginContext } from '@tarojs/service'
@@ -35,7 +38,7 @@ export default (ctx: IPluginContext) => {
               ...config,
               isBuildPlugin: true,
               isWatch,
-              outputRoot: `${config.outputRoot}`,
+              outputRoot: `${config.outputRoot}/plugin`,
               platform
             },
             options: Object.assign({}, options, {
@@ -63,7 +66,15 @@ export default (ctx: IPluginContext) => {
         })
       }
 
-      buildPlugin(plugin)
+      await buildPlugin(plugin)
+
+      try {
+        const docSrcPath = path.join(process.cwd(), 'src/plugin/doc')
+        const docDestPath = path.join(process.cwd(), 'miniprogram/doc')
+        fs.copy(docSrcPath, docDestPath)
+      } catch (err) {
+        console.error('[@tarojs/cli] build plugin doc failed: ', err)
+      }
     }
   })
 }

package/src/presets/platforms/rn.ts

@@ -1,9 +1,9 @@
+import * as fs from 'node:fs'
+import * as os from 'node:os'
+import * as path from 'node:path'
 
 import { chalk } from '@tarojs/helper'
 import * as child_process from 'child_process'
-import * as fs from 'fs'
-import * as os from 'os'
-import * as path from 'path'
 
 import { printDevelopmentTip } from '../../util'
 
@@ -32,7 +32,7 @@ function makeSureReactNativeInstalled (workspaceRoot: string): Promise<void> {
       // 便于开发时切换版本
       const devTag = process.env.DEVTAG || ''
       console.log('Installing React-Native related packages:')
-      let packages = `react@^18.2.0 react-dom@^18.2.0 react-native@^0.73.1 expo@~50.0.2 @tarojs/taro-rn${devTag} @tarojs/components-rn${devTag} @tarojs/rn-runner${devTag} @tarojs/rn-supporter${devTag} @tarojs/runtime-rn${devTag}`
+      let packages = `react@^18.2.0 react-dom@^18.2.0 react-native@^0.73.1 @react-native/metro-config@^0.73.2 expo@~50.0.2 @tarojs/taro-rn${devTag} @tarojs/components-rn${devTag} @tarojs/rn-runner${devTag} @tarojs/rn-supporter${devTag} @tarojs/runtime-rn${devTag}`
       console.log(packages)
       // windows下不加引号的话，package.json中添加的依赖不会自动带上^
       packages = packages.split(' ').map(str => `"${str}"`).join(' ')
@@ -62,8 +62,20 @@ export default (ctx: IPluginContext) => {
     useConfigName: 'rn',
     async fn ({ config }) {
       const { appPath, nodeModulesPath } = ctx.paths
-      const { deviceType = 'android', port, resetCache, publicPath, bundleOutput, sourcemapOutput, sourceMapUrl, sourcemapSourcesRoot, assetsDest, qr } = ctx.runOpts.options
       const { npm } = ctx.helper
+      const {
+        deviceType = 'android',
+        port,
+        resetCache,
+        publicPath,
+        bundleOutput,
+        sourcemapOutput,
+        sourceMapUrl,
+        sourcemapSourcesRoot,
+        assetsDest,
+        qr
+      } = ctx.runOpts.options
+
       printDevelopmentTip('rn')
 
       // 准备 rnRunner 参数
@@ -81,7 +93,6 @@ export default (ctx: IPluginContext) => {
         sourcemapSourcesRoot,
         assetsDest,
         buildAdapter: config.platform,
-        globalObject: 'global' // TODO: 是否可以去掉？
       }
 
       if (!rnRunnerOpts.entry) {

package/src/util/createPage.ts

@@ -26,7 +26,7 @@ const isValidSubPkgObject = (subPkgObject: ObjectExpression) => {
 const addNewSubPackage = (node: ObjectExpression, page: string, subPackage: string): ConfigModificationState => {
   let subPackages = node?.properties.find(node => (node as any).key.name === 'subPackages') as ObjectProperty
   if (!subPackages) {
-  // config 文件不存在 subPackages 字段的情况，给该字段打赋予默认值
+  // config 文件不存在 subPackages 字段的情况，给该字段赋予默认值
     const subPkgObject = t.objectProperty(t.identifier('subPackages'), t.arrayExpression([]))
     subPackages = subPkgObject
     node?.properties.push(subPkgObject)
@@ -72,7 +72,6 @@ const addNewPage = (node: ObjectExpression, page: string): ConfigModificationSta
   return ConfigModificationState.Success
 }
 
-
 const modifyPages = (path: NodePath<ExportDefaultDeclaration>, newPageConfig, callback: ModifyCallback) => {
   let state = ConfigModificationState.Fail
   const node = path.node.declaration as any

package/src/util/defineConfig.ts

@@ -10,7 +10,7 @@ export interface ConfigEnv {
   mode: string
 }
 
-export type UserConfigFn<T extends CompilerTypes = CompilerWebpackTypes> = (mergin: WebpackMerge, env: ConfigEnv) => IProjectConfig<T> | Promise<IProjectConfig<T>>
+export type UserConfigFn<T extends CompilerTypes = CompilerWebpackTypes> = (merge: WebpackMerge, env: ConfigEnv) => IProjectConfig<T> | Promise<IProjectConfig<T>>
 export type UserConfigExport<T extends CompilerTypes = CompilerWebpackTypes> = IProjectConfig<T> | Promise<IProjectConfig<T>> | UserConfigFn
 
 /**

package/src/util/index.ts

@@ -1,6 +1,7 @@
+import * as path from 'node:path'
+
 import { chalk, fs, isWindows } from '@tarojs/helper'
 import { exec } from 'child_process'
-import * as path from 'path'
 
 export function getRootPath (): string {
   return path.resolve(__dirname, '../../')
@@ -120,3 +121,7 @@ export function getPkgNameByFilterVersion (pkgString: string) {
   const versionFlagIndex = pkgString.lastIndexOf('@')
   return versionFlagIndex === 0 ? pkgString : pkgString.slice(0, versionFlagIndex)
 }
+
+export function isNil (value: any): value is null | undefined {
+  return value === null || value === undefined
+}

package/templates/default/{_env.dev → _env.development}

@@ -1,2 +1,2 @@
 # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
-# TARO_APP_ID="开发环境下的小程序appid"
+# TARO_APP_ID="开发环境下的小程序 AppID"

package/templates/default/_env.production

@@ -0,0 +1 @@
+# TARO_APP_ID="生产环境下的小程序 AppID"

package/templates/default/_env.test

@@ -1 +1 @@
-# TARO_APP_ID="测试环境下的小程序appid"
+# TARO_APP_ID="测试环境下的小程序 AppID"