Merge branch 'main' into fix/issues

* main: fix: 修复solid的onShow,onHide不生效的bug (#16569) fix(taro-cli): 修正tsconfig-paths-webpack-plugin插件的导入条件 fix(taro-cli): 使TS条件下生成的模板，import与export间保持一行空隙，以避免ESLint报错
NervJS · Oct 15, 2024 · 408de12 · 408de12
2 parents 4fac460 + 5148dd6
commit 408de12
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/packages/taro-cli/templates/default/config/dev.js b/packages/taro-cli/templates/default/config/dev.js
@@ -1,5 +1,5 @@
-{{#if typescript }}import type { UserConfigExport } from "@tarojs/cli";
-{{/if}}
+{{#if typescript }}import type { UserConfigExport } from "@tarojs/cli"{{/if}}
+
 export default {
   {{#if (eq compiler "Webpack5") }} logger: {
     quiet: false,

diff --git a/packages/taro-cli/templates/default/config/index.js b/packages/taro-cli/templates/default/config/index.js
@@ -1,5 +1,5 @@
 import { defineConfig{{#if typescript }}, type UserConfigExport{{/if}} } from '@tarojs/cli'
-{{#if typescript }}import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'{{/if}}
+{{#if typescript }}{{#unless (eq compiler "Vite")}}import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'{{/unless}}{{/if}}
 import devConfig from './dev'
 import prodConfig from './prod'
 
@@ -46,7 +46,7 @@ export default defineConfig{{#if typescript }}<'{{ to_lower_case compiler }}'>{{
             generateScopedName: '[name]__[local]___[hash:base64:5]'
           }
         }
-      }{{#if typescript }},{{#unless (eq compiler "Vite")}}
+      },{{#if typescript }}{{#unless (eq compiler "Vite")}}
       webpackChain(chain) {
         chain.resolve.plugin('tsconfig-paths').use(TsconfigPathsPlugin)
       }{{/unless}}{{/if}}

diff --git a/packages/taro-cli/templates/default/config/prod.js b/packages/taro-cli/templates/default/config/prod.js
@@ -1,5 +1,5 @@
-{{#if typescript }}import type { UserConfigExport } from "@tarojs/cli";
-{{/if}}
+{{#if typescript }}import type { UserConfigExport } from "@tarojs/cli"{{/if}}
+
 export default {
   mini: {},
   h5: {

diff --git a/packages/taro-framework-solid/src/runtime/connect.ts b/packages/taro-framework-solid/src/runtime/connect.ts
@@ -22,7 +22,6 @@ type SolidComponent = (props?: any) => TaroNode;
 
 export function setReconciler () {
   hooks.tap('getLifecycle', function (instance, lifecycle: string) {
-    lifecycle = lifecycle.replace(/^on(Show|Hide)$/, 'componentDid$1')
     return instance[lifecycle]
   })