create-weapp-vite 2.0.58 → 2.0.60

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { n as TemplateName, t as createProject } from "./src-hBW5b5RM.js";
+import { n as TemplateName, t as createProject } from "./src-CXCuh90o.js";
 import logger from "@weapp-core/logger";
 import fs from "fs-extra";
 import path from "node:path";

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as TemplateName, t as createProject } from "./src-hBW5b5RM.js";
+import { n as TemplateName, t as createProject } from "./src-CXCuh90o.js";
 export { TemplateName, createProject };

package/dist/{src-hBW5b5RM.js → src-CXCuh90o.js}

@@ -4,10 +4,10 @@ import fs from "fs-extra";
 import path from "pathe";
 import https from "node:https";
 //#region ../weapp-vite/package.json
-var version$1 = "6.11.3";
+var version$1 = "6.11.5";
 //#endregion
 //#region ../wevu/package.json
-var version = "6.11.3";
+var version = "6.11.5";
 //#endregion
 //#region src/enums.ts
 let TemplateName = /* @__PURE__ */ function(TemplateName) {
@@ -72,8 +72,8 @@ const TEMPLATE_CATALOG = {
 	sass: "^1.98.0",
 	tailwindcss: "^4.2.2",
 	tslib: "^2.8.1",
-	typescript: "^5.9.3",
-	vite: "8.0.0",
+	typescript: "^6.0.2",
+	vite: "8.0.2",
 	vue: "^3.5.30",
 	zod: "^4.3.6"
 };
@@ -82,7 +82,7 @@ const TEMPLATE_NAMED_CATALOG = {
 	"weapp-tailwindcss-fixed": { "weapp-tailwindcss": "4.10.3" },
 	latest: {
 		"miniprogram-api-typings": "^5.1.2",
-		typescript: "latest"
+		typescript: "^6.0.2"
 	},
 	tailwind3: { tailwindcss: "3.4.19" },
 	tailwind4: { tailwindcss: "^4.2.2" }
@@ -169,9 +169,9 @@ dist-web
 dist/web
 vite.config.ts.timestamp-*.mjs
 .weapp-vite/`;
-const CRLF_RE = /\r\n/g;
+const CRLF_RE$1 = /\r\n/g;
 function normalizeLineEndings(value) {
-	return value.replace(CRLF_RE, "\n");
+	return value.replace(CRLF_RE$1, "\n");
 }
 function trimTrailingBlankLines(lines) {
 	let end = lines.length;
@@ -266,9 +266,61 @@ async function updateGitIgnore(options) {
 //#endregion
 //#region src/createProject.ts
 const DIGIT_RE = /\d/;
+const CRLF_RE = /\r\n/g;
 const moduleDir = path.dirname(fileURLToPath(import.meta.url));
+const TEMPLATE_DIR_MAP = {
+	[TemplateName.default]: "weapp-vite-template",
+	[TemplateName.lib]: "weapp-vite-lib-template",
+	[TemplateName.wevu]: "weapp-vite-wevu-template",
+	[TemplateName.wevuTdesign]: "weapp-vite-wevu-tailwindcss-tdesign-template",
+	[TemplateName.tailwindcss]: "weapp-vite-tailwindcss-template",
+	[TemplateName.tdesign]: "weapp-vite-tailwindcss-tdesign-template",
+	[TemplateName.vant]: "weapp-vite-tailwindcss-vant-template"
+};
 const templateCatalogMap = { ...TEMPLATE_CATALOG };
 const templateNamedCatalogMap = Object.fromEntries(Object.entries(TEMPLATE_NAMED_CATALOG).map(([name, deps]) => [name, { ...deps }]));
+function resolveWorkspaceTemplateDir(templateName) {
+	const templateDirName = TEMPLATE_DIR_MAP[templateName];
+	return templateDirName ? path.resolve(moduleDir, "../../../templates", templateDirName) : path.resolve(moduleDir, "../../../templates", templateName);
+}
+async function resolveTemplateDirs(templateName) {
+	const packagedTemplateDir = path.resolve(moduleDir, "../templates", templateName);
+	const workspaceTemplateDir = resolveWorkspaceTemplateDir(templateName);
+	return {
+		packagedTemplateDir,
+		workspaceTemplateDir,
+		preferredTemplateDir: await fs.pathExists(packagedTemplateDir) ? packagedTemplateDir : workspaceTemplateDir
+	};
+}
+function shouldSkipTemplateFile(filePath) {
+	return filePath.includes("node_modules") || filePath.includes(`${path.sep}.weapp-vite${path.sep}`) || filePath.includes("vite.config.ts.timestamp") || filePath.includes(`${path.sep}dist${path.sep}`) || filePath.endsWith(`${path.sep}CHANGELOG.md`) || filePath.includes(`${path.sep}.turbo${path.sep}`) || filePath.endsWith(`${path.sep}.DS_Store`);
+}
+function normalizeLines(value) {
+	return value.replace(CRLF_RE, "\n").split("\n");
+}
+function mergeGitignoreSource(existing, template) {
+	const merged = normalizeLines(existing);
+	const seen = new Set(merged);
+	for (const line of normalizeLines(template)) {
+		if (seen.has(line)) continue;
+		merged.push(line);
+		seen.add(line);
+	}
+	while (merged.length > 0 && merged.at(-1) === "") merged.pop();
+	return `${merged.join("\n")}\n`;
+}
+async function copyTemplateDir(sourceDir, fallbackDir, targetDir) {
+	const copyOptions = { filter(src) {
+		return !shouldSkipTemplateFile(src);
+	} };
+	try {
+		await fs.copy(sourceDir, targetDir, copyOptions);
+	} catch (error) {
+		const errorCode = error?.code;
+		if (sourceDir === fallbackDir || errorCode !== "ENOENT") throw error;
+		await fs.copy(fallbackDir, targetDir, copyOptions);
+	}
+}
 async function ensureDotGitignore(root) {
 	const gitignorePath = path.resolve(root, "gitignore");
 	const dotGitignorePath = path.resolve(root, ".gitignore");
@@ -342,15 +394,21 @@ function normalizeTemplateDependencySpecs(pkgJson) {
 * @description 根据模板创建项目
 */
 async function createProject(targetDir = "", templateName = TemplateName.default) {
-	const targetTemplateDir = path.resolve(moduleDir, "../templates", templateName);
-	if (!await fs.pathExists(targetTemplateDir)) {
+	const { preferredTemplateDir, workspaceTemplateDir } = await resolveTemplateDirs(templateName);
+	const dotGitignorePath = path.resolve(targetDir, ".gitignore");
+	const existingGitignore = await fs.pathExists(dotGitignorePath) ? await fs.readFile(dotGitignorePath, "utf8") : null;
+	if (!await fs.pathExists(preferredTemplateDir) && !await fs.pathExists(workspaceTemplateDir)) {
 		logger.warn(`没有找到 ${templateName} 模板!`);
 		return;
 	}
-	await fs.copy(targetTemplateDir, targetDir);
-	const templatePackagePath = path.resolve(targetTemplateDir, "package.json");
+	await copyTemplateDir(preferredTemplateDir, workspaceTemplateDir, targetDir);
+	const templatePackagePath = path.resolve(preferredTemplateDir, "package.json");
 	const packageJsonPath = path.resolve(targetDir, "package.json");
 	await ensureDotGitignore(targetDir);
+	if (existingGitignore !== null && await fs.pathExists(dotGitignorePath)) {
+		const currentGitignore = await fs.readFile(dotGitignorePath, "utf8");
+		await fs.writeFile(dotGitignorePath, mergeGitignoreSource(existingGitignore, currentGitignore));
+	}
 	const pkgJson = await fs.pathExists(templatePackagePath) ? await fs.readJSON(templatePackagePath) : createEmptyPackageJson();
 	normalizeTemplateDependencySpecs(pkgJson);
 	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-weapp-vite",
   "type": "module",
-  "version": "2.0.58",
+  "version": "2.0.60",
   "description": "create-weapp-vite",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",

package/templates/default/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.0"
+  "libVersion": "3.15.0"
 }

package/templates/lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite-lib-template",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "private": true,
   "description": "weapp-vite 组件库（lib 模式）模板",
   "author": "ice breaker <1324318532@qq.com>",

package/templates/lib/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.0"
+  "libVersion": "3.15.0"
 }

package/templates/tailwindcss/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.3"
+  "libVersion": "3.15.0"
 }

package/templates/tdesign/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.14.2"
+  "libVersion": "3.15.0"
 }

package/templates/vant/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.14.0"
+  "libVersion": "3.15.0"
 }

package/templates/wevu/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.13.0"
+  "libVersion": "3.15.0"
 }

package/templates/wevu-tdesign/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite-wevu-tailwindcss-tdesign-template",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "private": true,
   "description": "weapp-vite + wevu (Vue SFC) 模板",
   "author": "ice breaker <1324318532@qq.com>",

package/templates/wevu-tdesign/project.private.config.json

@@ -13,6 +13,24 @@
           "query": "",
           "scene": null
         },
+        {
+          "name": "布局页",
+          "pathName": "pages/layouts/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "Layout 通信演示",
+          "pathName": "pages/layout-feedback/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "Store 调用 Layout",
+          "pathName": "pages/layout-store/index",
+          "query": "",
+          "scene": null
+        },
         {
           "name": "数据页",
           "pathName": "pages/data/index",
@@ -58,5 +76,5 @@
       ]
     }
   },
-  "libVersion": "3.14.0"
+  "libVersion": "3.15.0"
 }

package/templates/wevu-tdesign/src/app.vue

@@ -5,6 +5,8 @@ defineAppJson({
   pages: [
     'pages/index/index',
     'pages/layouts/index',
+    'pages/layout-store/index',
+    'pages/layout-feedback/index',
     'pages/data/index',
     'pages/form/index',
     'pages/list/index',

package/templates/wevu-tdesign/src/hooks/useDialog.ts

@@ -1,12 +1,15 @@
 import Dialog from 'tdesign-miniprogram/dialog/index'
-import { getCurrentInstance } from 'wevu'
+import { getCurrentInstance, resolveLayoutBridge, resolveLayoutHost } from 'wevu'
+import { LAYOUT_DIALOG_BRIDGE_KEY } from '@/hooks/useLayoutFeedbackBridge'
 
 export interface DialogOptions {
+  bridgeKey?: string
   context?: any
   selector?: string
 }
 
-export interface AlertOptions {
+interface BaseDialogPayload {
+  bridgeKey?: string
   confirmBtn?: string
   content: string
   context?: any
@@ -14,61 +17,189 @@ export interface AlertOptions {
   title: string
 }
 
-export interface ConfirmOptions {
+export interface AlertOptions extends BaseDialogPayload {}
+
+export interface ConfirmOptions extends BaseDialogPayload {
   cancelBtn?: string
-  confirmBtn?: string
-  content: string
-  context?: any
-  selector?: string
-  title: string
 }
 
-function resolveDialogContext(context?: any) {
-  return context ?? getCurrentInstance()
+interface HostDialogInstance {
+  _onCancel?: (reason?: unknown) => void
+  _onConfirm?: (value?: unknown) => void
+  close?: () => void
+  setData?: (payload: Record<string, unknown>) => void
 }
 
-export function alertDialog(payload: AlertOptions) {
-  const context = resolveDialogContext(payload.context)
-  if (!context) {
+type DialogMode = 'alert' | 'confirm'
+
+type ResolvedDialogPayload<T extends BaseDialogPayload> = Omit<T, 'bridgeKey' | 'context' | 'selector'>
+
+function resolveDialogContext(options: DialogOptions) {
+  return options.bridgeKey
+    ? resolveLayoutBridge(options.bridgeKey, options.context ?? getCurrentInstance())
+    : options.context ?? getCurrentInstance()
+}
+
+function resolveDialogHost(options: DialogOptions) {
+  const bridgeKey = options.bridgeKey ?? LAYOUT_DIALOG_BRIDGE_KEY
+  const context = resolveDialogContext({
+    bridgeKey,
+    context: options.context,
+  })
+  const host = bridgeKey
+    ? resolveLayoutHost<HostDialogInstance>(bridgeKey, { context })
+    : options.selector
+      ? context?.selectComponent?.(options.selector) ?? null
+      : null
+
+  return {
+    context,
+    host,
+    selector: options.selector,
+  }
+}
+
+function closeDialogHost(host: HostDialogInstance) {
+  if (typeof host.close === 'function') {
+    host.close()
     return
   }
-  const { selector = '#t-dialog', ...rest } = payload
-  return Dialog.alert({
-    selector,
-    context: context as any,
-    ...rest,
+  if (typeof host.setData === 'function') {
+    host.setData({ visible: false })
+  }
+}
+
+function attachHostDialogHandlers(
+  host: HostDialogInstance,
+  handlers: {
+    onCancel?: (reason?: unknown) => void
+    onConfirm?: (value?: unknown) => void
+  },
+) {
+  const originalConfirm = typeof host._onConfirm === 'function' ? host._onConfirm : undefined
+  const originalCancel = typeof host._onCancel === 'function' ? host._onCancel : undefined
+
+  host._onConfirm = (value?: unknown) => {
+    host._onConfirm = originalConfirm
+    host._onCancel = originalCancel
+
+    if (originalConfirm) {
+      originalConfirm.call(host, value)
+    }
+    else {
+      closeDialogHost(host)
+    }
+
+    handlers.onConfirm?.(value)
+  }
+
+  host._onCancel = (reason?: unknown) => {
+    host._onConfirm = originalConfirm
+    host._onCancel = originalCancel
+
+    if (originalCancel) {
+      originalCancel.call(host, reason)
+    }
+    else {
+      closeDialogHost(host)
+    }
+
+    handlers.onCancel?.(reason)
+  }
+}
+
+function normalizeDialogPayload<T extends BaseDialogPayload>(
+  mode: DialogMode,
+  payload: T,
+): ResolvedDialogPayload<T> {
+  const { bridgeKey: _bridgeKey, context: _context, selector: _selector, ...rest } = payload
+
+  if (mode === 'alert') {
+    return {
+      ...rest,
+      cancelBtn: null,
+    } as ResolvedDialogPayload<T>
+  }
+
+  return rest as ResolvedDialogPayload<T>
+}
+
+function openDialogWithHost<T extends BaseDialogPayload>(
+  mode: DialogMode,
+  host: HostDialogInstance,
+  payload: ResolvedDialogPayload<T>,
+) {
+  return new Promise((resolve, reject) => {
+    host.setData?.({
+      ...payload,
+      visible: true,
+    })
+
+    attachHostDialogHandlers(host, {
+      onConfirm: resolve,
+      ...(mode === 'confirm' ? { onCancel: reject } : {}),
+    })
   })
 }
 
-export function confirmDialog(payload: ConfirmOptions) {
-  const context = resolveDialogContext(payload.context)
+function openDialog<T extends BaseDialogPayload>(mode: DialogMode, payload: T) {
+  const bridgeKey = payload.bridgeKey ?? LAYOUT_DIALOG_BRIDGE_KEY
+  const { context, host, selector } = resolveDialogHost({
+    bridgeKey,
+    context: payload.context,
+    selector: payload.selector,
+  })
+
   if (!context) {
-    return
+    return Promise.resolve()
   }
-  const { selector = '#t-dialog', ...rest } = payload
-  return Dialog.confirm({
+
+  const normalizedPayload = normalizeDialogPayload(mode, payload)
+
+  if (host && typeof host.setData === 'function') {
+    return openDialogWithHost(mode, host, normalizedPayload)
+  }
+
+  if (!selector) {
+    return Promise.resolve()
+  }
+
+  const open = mode === 'alert' ? Dialog.alert : Dialog.confirm
+
+  return open({
     selector,
     context: context as any,
-    ...rest,
+    ...normalizedPayload,
   })
 }
 
+export function alertDialog(payload: AlertOptions) {
+  return openDialog('alert', payload)
+}
+
+export function confirmDialog(payload: ConfirmOptions) {
+  return openDialog('confirm', payload)
+}
+
 export function useDialog(options: DialogOptions = {}) {
+  const bridgeKey = options.bridgeKey ?? LAYOUT_DIALOG_BRIDGE_KEY
   const context = options.context ?? getCurrentInstance()
+
+  function withDefaults<T extends BaseDialogPayload>(payload: T): T {
+    return {
+      ...payload,
+      bridgeKey,
+      context: payload.context ?? context,
+      selector: payload.selector ?? options.selector,
+    }
+  }
+
   return {
     alert(payload: AlertOptions) {
-      return alertDialog({
-        ...payload,
-        context: payload.context ?? context,
-        selector: payload.selector ?? options.selector,
-      })
+      return alertDialog(withDefaults(payload))
     },
     confirm(payload: ConfirmOptions) {
-      return confirmDialog({
-        ...payload,
-        context: payload.context ?? context,
-        selector: payload.selector ?? options.selector,
-      })
+      return confirmDialog(withDefaults(payload))
     },
   }
 }

package/templates/wevu-tdesign/src/hooks/useLayoutFeedbackBridge.ts

@@ -0,0 +1,17 @@
+export const LAYOUT_TOAST_BRIDGE_KEY = 'layout-toast'
+export const LAYOUT_DIALOG_BRIDGE_KEY = 'layout-dialog'
+
+export interface ToastHostInstance {
+  hide?: () => void
+  show: (options: Record<string, unknown>) => void
+}
+
+export interface DialogHostInstance {
+  _onCancel?: (reason?: unknown) => void
+  _onConfirm?: (value?: unknown) => void
+  close?: () => void
+  onCancel?: (reason?: unknown) => void
+  onConfirm?: (value?: unknown) => void
+  properties?: Record<string, unknown>
+  setData: (payload: Record<string, unknown>) => void
+}

package/templates/wevu-tdesign/src/hooks/useToast.ts

@@ -1,9 +1,11 @@
 import Toast from 'tdesign-miniprogram/toast/index'
-import { getCurrentInstance } from 'wevu'
+import { getCurrentInstance, resolveLayoutBridge, resolveLayoutHost } from 'wevu'
+import { LAYOUT_TOAST_BRIDGE_KEY } from '@/hooks/useLayoutFeedbackBridge'
 
 export type ToastTheme = 'success' | 'warning' | 'error' | 'default' | 'loading'
 
 export interface ShowToastPayload {
+  bridgeKey?: string
   context?: any
   duration?: number
   icon?: string
@@ -15,41 +17,78 @@ export interface ShowToastPayload {
 }
 
 export interface ToastOptions {
+  bridgeKey?: string
   selector?: string
   duration?: number
   theme?: ToastTheme
 }
 
+function resolveToastContext(options: { bridgeKey?: string, context?: any }) {
+  return options.bridgeKey
+    ? resolveLayoutBridge(options.bridgeKey, options.context ?? getCurrentInstance())
+    : options.context ?? getCurrentInstance()
+}
+
 export function showToast(payload: string | ShowToastPayload, theme?: ToastTheme) {
   const mpContext = getCurrentInstance()
   const normalized = typeof payload === 'string'
     ? { message: payload, theme }
     : payload
-
-  const context = normalized.context ?? mpContext
+  const bridgeKey = normalized.bridgeKey ?? LAYOUT_TOAST_BRIDGE_KEY
+  const selector = normalized.selector
+  const {
+    bridgeKey: _bridgeKey,
+    context: _context,
+    selector: _selector,
+    theme: nextTheme,
+    title,
+    message,
+    ...rest
+  } = normalized
+  const options = {
+    message: message ?? title ?? '',
+    ...rest,
+    ...(nextTheme && nextTheme !== 'default' ? { theme: nextTheme } : {}),
+  }
+  const context = resolveToastContext({
+    bridgeKey,
+    context: normalized.context ?? mpContext,
+  })
+  const host = bridgeKey
+    ? resolveLayoutHost<{
+        show?: (payload: typeof options) => void
+      }>(bridgeKey, { context })
+    : selector
+      ? context?.selectComponent?.(selector) ?? null
+      : null
   if (!context) {
     return
   }
-
-  const { selector = '#t-toast', theme: nextTheme, title, message, ...rest } = normalized
+  if (host && typeof host.show === 'function') {
+    host.show(options)
+    return
+  }
+  if (!selector) {
+    return
+  }
   Toast({
     selector,
     context: context as any,
-    message: message ?? title ?? '',
-    ...rest,
-    ...(nextTheme && nextTheme !== 'default' ? { theme: nextTheme } : {}),
+    ...options,
   } as any)
 }
 
 export function useToast(options: ToastOptions = {}) {
   const context = getCurrentInstance()
-  const selector = options.selector ?? '#t-toast'
+  const bridgeKey = options.bridgeKey ?? LAYOUT_TOAST_BRIDGE_KEY
+  const selector = options.selector
   const duration = options.duration ?? 1200
   const defaultTheme = options.theme ?? 'success'
 
   return {
     showToast(message: string, theme: ToastTheme = defaultTheme) {
       return showToast({
+        bridgeKey,
         context,
         selector,
         message,

package/templates/wevu-tdesign/src/layouts/admin.vue

@@ -6,6 +6,10 @@ const props = defineProps<{
 
 defineComponentJson({
   component: true,
+  usingComponents: {
+    't-dialog': 'tdesign-miniprogram/dialog/dialog',
+    't-toast': 'tdesign-miniprogram/toast/toast',
+  },
 })
 </script>
 
@@ -25,6 +29,8 @@ defineComponentJson({
     <view class="pb-[32rpx]">
       <slot />
     </view>
+    <t-toast layout-host="layout-toast" />
+    <t-dialog layout-host="layout-dialog" />
   </view>
 </template>
 

package/templates/wevu-tdesign/src/layouts/default.vue

@@ -1,12 +1,18 @@
 <script setup lang="ts">
 defineComponentJson({
   component: true,
+  usingComponents: {
+    't-dialog': 'tdesign-miniprogram/dialog/dialog',
+    't-toast': 'tdesign-miniprogram/toast/toast',
+  },
 })
 </script>
 
 <template>
   <view class="layout-default">
     <slot />
+    <t-toast layout-host="layout-toast" />
+    <t-dialog layout-host="layout-dialog" />
   </view>
 </template>
 

package/templates/wevu-tdesign/src/pages/ability/index.vue

@@ -156,7 +156,5 @@ function navigateTo(url: string) {
         </t-cell-group>
       </view>
     </view>
-    <t-toast id="t-toast" />
-    <t-dialog id="t-dialog" />
   </view>
 </template>

package/templates/wevu-tdesign/src/pages/form/index.vue

@@ -241,6 +241,5 @@ function submit() {
         {{ currentStep === steps.length - 1 ? (submitted ? '已提交' : '提交') : '下一步' }}
       </t-button>
     </view>
-    <t-toast id="t-toast" />
   </view>
 </template>