weapp-vite 6.0.0-alpha.6 → 6.0.0

package/dist/auto-routes.cjs

@@ -1,7 +1,9 @@
 "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 _chunkX4XBMC6Dcjs = require('./chunk-X4XBMC6D.cjs');
-require('./chunk-ZZA26GJI.cjs');
+var _chunk4ZPNCEA4cjs = require('./chunk-4ZPNCEA4.cjs');
+require('./chunk-PCFMCUAE.cjs');
+require('./chunk-4BJD3MLI.cjs');
+require('./chunk-BZODFQ4Z.cjs');
 require('./chunk-HL25C7YQ.cjs');
 require('./chunk-2CHNKORP.cjs');
 
@@ -25,7 +27,7 @@ function createGetter(resolver) {
     get: resolver
   };
 }
-var ctx = _chunkX4XBMC6Dcjs.getCompilerContext.call(void 0, );
+var ctx = _chunk4ZPNCEA4cjs.getCompilerContext.call(void 0, );
 var service = ctx.autoRoutesService;
 var routes = {};
 Object.defineProperties(routes, {

package/dist/auto-routes.mjs

@@ -1,7 +1,9 @@
 import {
   getCompilerContext
-} from "./chunk-CUXJUO62.mjs";
-import "./chunk-T6MAVU7E.mjs";
+} from "./chunk-4PZDXK3H.mjs";
+import "./chunk-PHN5WL6B.mjs";
+import "./chunk-EHG44ZB2.mjs";
+import "./chunk-4DN42HS3.mjs";
 import "./chunk-AZBN7A5I.mjs";
 import "./chunk-V5RMQ6TF.mjs";
 import {

package/dist/{chunk-ZZA26GJI.cjs → chunk-4BJD3MLI.cjs}

@@ -1,9 +1,14 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _chunkBZODFQ4Zcjs = require('./chunk-BZODFQ4Z.cjs');
+
+
 
 var _chunkPFE2IVZ3cjs = require('./chunk-PFE2IVZ3.cjs');
 
 // src/utils/file.ts
 _chunkPFE2IVZ3cjs.init_cjs_shims.call(void 0, );
+var import_merge = _chunkPFE2IVZ3cjs.__toESM.call(void 0, _chunkBZODFQ4Zcjs.require_src.call(void 0, ), 1);
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
 var _pathe = require('pathe'); var _pathe2 = _interopRequireDefault(_pathe);
 var _compilersfc = require('vue/compiler-sfc');
@@ -144,12 +149,9 @@ async function extractConfigFromVue(vueFilePath) {
     if (errors.length > 0) {
       return void 0;
     }
-    const jsonBlocks = descriptor.customBlocks.filter((block) => block.type === "json");
-    if (!jsonBlocks.length) {
-      return void 0;
-    }
     const mergedConfig = {};
     const { parse: parseJson } = await Promise.resolve().then(() => _interopRequireWildcard(require("comment-json")));
+    const jsonBlocks = descriptor.customBlocks.filter((block) => block.type === "json");
     for (const block of jsonBlocks) {
       try {
         const lang = (block.lang || "json").toLowerCase();
@@ -163,6 +165,25 @@ async function extractConfigFromVue(vueFilePath) {
       } catch (e3) {
       }
     }
+    const setupContent = _optionalChain([descriptor, 'access', _ => _.scriptSetup, 'optionalAccess', _2 => _2.content]);
+    const hasMacroHint = typeof setupContent === "string" && /\bdefine(?:App|Page|Component)Json\s*\(/.test(setupContent);
+    if (hasMacroHint) {
+      const { extractJsonMacroFromScriptSetup } = await Promise.resolve().then(() => _interopRequireWildcard(require("./jsonMacros-F6BGS7I5.cjs")));
+      try {
+        const extracted = await extractJsonMacroFromScriptSetup(
+          setupContent,
+          vueFilePath,
+          _optionalChain([descriptor, 'access', _3 => _3.scriptSetup, 'optionalAccess', _4 => _4.lang])
+        );
+        if (extracted.config && typeof extracted.config === "object" && !Array.isArray(extracted.config)) {
+          (0, import_merge.recursive)(mergedConfig, extracted.config);
+        }
+      } catch (error) {
+        if (jsonBlocks.length === 0) {
+          throw error;
+        }
+      }
+    }
     return Object.keys(mergedConfig).length > 0 ? mergedConfig : void 0;
   } catch (e4) {
     return void 0;

package/dist/chunk-4DN42HS3.mjs

@@ -0,0 +1,94 @@
+import {
+  __commonJS,
+  init_esm_shims
+} from "./chunk-AOUAT7U3.mjs";
+
+// ../../node_modules/.pnpm/merge@2.1.1/node_modules/merge/lib/src/index.js
+var require_src = __commonJS({
+  "../../node_modules/.pnpm/merge@2.1.1/node_modules/merge/lib/src/index.js"(exports, module) {
+    "use strict";
+    init_esm_shims();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isPlainObject = exports.clone = exports.recursive = exports.merge = exports.main = void 0;
+    module.exports = exports = main;
+    exports.default = main;
+    function main() {
+      var items = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        items[_i] = arguments[_i];
+      }
+      return merge.apply(void 0, items);
+    }
+    exports.main = main;
+    main.clone = clone;
+    main.isPlainObject = isPlainObject;
+    main.recursive = recursive;
+    function merge() {
+      var items = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        items[_i] = arguments[_i];
+      }
+      return _merge(items[0] === true, false, items);
+    }
+    exports.merge = merge;
+    function recursive() {
+      var items = [];
+      for (var _i = 0; _i < arguments.length; _i++) {
+        items[_i] = arguments[_i];
+      }
+      return _merge(items[0] === true, true, items);
+    }
+    exports.recursive = recursive;
+    function clone(input) {
+      if (Array.isArray(input)) {
+        var output = [];
+        for (var index = 0; index < input.length; ++index)
+          output.push(clone(input[index]));
+        return output;
+      } else if (isPlainObject(input)) {
+        var output = {};
+        for (var index in input)
+          output[index] = clone(input[index]);
+        return output;
+      } else {
+        return input;
+      }
+    }
+    exports.clone = clone;
+    function isPlainObject(input) {
+      return input && typeof input === "object" && !Array.isArray(input);
+    }
+    exports.isPlainObject = isPlainObject;
+    function _recursiveMerge(base, extend) {
+      if (!isPlainObject(base))
+        return extend;
+      for (var key in extend) {
+        if (key === "__proto__" || key === "constructor" || key === "prototype")
+          continue;
+        base[key] = isPlainObject(base[key]) && isPlainObject(extend[key]) ? _recursiveMerge(base[key], extend[key]) : extend[key];
+      }
+      return base;
+    }
+    function _merge(isClone, isRecursive, items) {
+      var result;
+      if (isClone || !isPlainObject(result = items.shift()))
+        result = {};
+      for (var index = 0; index < items.length; ++index) {
+        var item = items[index];
+        if (!isPlainObject(item))
+          continue;
+        for (var key in item) {
+          if (key === "__proto__" || key === "constructor" || key === "prototype")
+            continue;
+          var value = isClone ? clone(item[key]) : item[key];
+          result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
+        }
+      }
+      return result;
+    }
+  }
+});
+
+export {
+  require_src
+};