weapp-vite 6.0.0-alpha.2 → 6.0.0-alpha.4

package/README.md

@@ -33,9 +33,9 @@
 ### Vue 项目
 
 ```typescript
+import weappVite from '@weapp-vite/vite'
 // vite.config.ts
 import { defineConfig } from 'vite'
-import weappVite from '@weapp-vite/vite'
 
 export default defineConfig({
   plugins: [
@@ -53,23 +53,25 @@ export default defineConfig({
 
 ```vue
 <!-- App.vue -->
-<template>
-  <view class="container">
-    <text>{{ message }}</text>
-    <button @click="handleClick">Click</button>
-  </view>
-</template>
-
 <script setup>
 import { ref } from 'vue'
 
 const message = ref('Hello Vue in Mini-program!')
 
-const handleClick = () => {
+function handleClick() {
   console.log('Button clicked!')
 }
 </script>
 
+<template>
+  <view class="container">
+    <text>{{ message }}</text>
+    <button @click="handleClick">
+      Click
+    </button>
+  </view>
+</template>
+
 <style scoped>
 .container {
   padding: 20rpx;

package/client.d.ts

@@ -30,3 +30,19 @@ declare module 'process' {
     }
   }
 }
+
+type __WEAPP_APP_JSON__ = import('@weapp-core/schematics').App
+type __WEAPP_PAGE_JSON__ = import('@weapp-core/schematics').Page
+type __WEAPP_COMPONENT_JSON__ = import('@weapp-core/schematics').Component
+
+declare function defineAppJson(config: () => __WEAPP_APP_JSON__): () => __WEAPP_APP_JSON__
+declare function defineAppJson(config: () => Promise<__WEAPP_APP_JSON__>): () => Promise<__WEAPP_APP_JSON__>
+declare function defineAppJson(config: __WEAPP_APP_JSON__): __WEAPP_APP_JSON__
+
+declare function definePageJson(config: () => __WEAPP_PAGE_JSON__): () => __WEAPP_PAGE_JSON__
+declare function definePageJson(config: () => Promise<__WEAPP_PAGE_JSON__>): () => Promise<__WEAPP_PAGE_JSON__>
+declare function definePageJson(config: __WEAPP_PAGE_JSON__): __WEAPP_PAGE_JSON__
+
+declare function defineComponentJson(config: () => __WEAPP_COMPONENT_JSON__): () => __WEAPP_COMPONENT_JSON__
+declare function defineComponentJson(config: () => Promise<__WEAPP_COMPONENT_JSON__>): () => Promise<__WEAPP_COMPONENT_JSON__>
+declare function defineComponentJson(config: __WEAPP_COMPONENT_JSON__): __WEAPP_COMPONENT_JSON__

package/dist/auto-routes.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkKBGC6ODZcjs = require('./chunk-KBGC6ODZ.cjs');
-require('./chunk-IEICAJDZ.cjs');
+var _chunkEVZXCCHNcjs = require('./chunk-EVZXCCHN.cjs');
+require('./chunk-R6Z72GR5.cjs');
 require('./chunk-E34K6TPD.cjs');
 require('./chunk-SJSLFDTA.cjs');
 
@@ -25,7 +25,7 @@ function createGetter(resolver) {
     get: resolver
   };
 }
-var ctx = _chunkKBGC6ODZcjs.getCompilerContext.call(void 0, );
+var ctx = _chunkEVZXCCHNcjs.getCompilerContext.call(void 0, );
 var service = ctx.autoRoutesService;
 var routes = {};
 Object.defineProperties(routes, {

package/dist/auto-routes.mjs

@@ -1,7 +1,7 @@
 import {
   getCompilerContext
-} from "./chunk-IHHBS4DF.mjs";
-import "./chunk-MK4LDVBT.mjs";
+} from "./chunk-ZAAP7JAU.mjs";
+import "./chunk-AYB4WOZM.mjs";
 import "./chunk-YXFADQPY.mjs";
 import "./chunk-O6633IWP.mjs";
 import {

package/dist/{chunk-MK4LDVBT.mjs → chunk-AYB4WOZM.mjs}

@@ -144,18 +144,21 @@ async function extractConfigFromVue(vueFilePath) {
     if (errors.length > 0) {
       return void 0;
     }
-    const configBlocks = descriptor.customBlocks.filter((block) => block.type === "config");
-    if (!configBlocks.length) {
+    const jsonBlocks = descriptor.customBlocks.filter((block) => block.type === "json");
+    if (!jsonBlocks.length) {
       return void 0;
     }
     const mergedConfig = {};
     const { parse: parseJson } = await import("comment-json");
-    for (const block of configBlocks) {
+    for (const block of jsonBlocks) {
       try {
-        const lang = block.lang || "json";
-        if (lang === "json" || lang === "json5" || lang === "jsonc") {
+        const lang = (block.lang || "json").toLowerCase();
+        if (lang === "json" || lang === "jsonc" || lang === "json5" || lang === "txt") {
           const config = parseJson(block.content, void 0, true);
-          Object.assign(mergedConfig, config);
+          if (config && typeof config === "object" && !Array.isArray(config)) {
+            Object.assign(mergedConfig, config);
+          }
+          continue;
         }
       } catch {
       }