weapp-vite 5.1.3 → 5.1.5

package/dist/{chunk-DCWHADGW.mjs → chunk-DYKCBHH7.mjs}

@@ -4646,9 +4646,9 @@ init_esm_shims();
 init_esm_shims();
 import { removeExtension, removeExtensionDeep } from "@weapp-core/shared";
 
-// ../../node_modules/.pnpm/lru-cache@11.1.0/node_modules/lru-cache/dist/esm/index.js
+// ../../node_modules/.pnpm/lru-cache@11.2.1/node_modules/lru-cache/dist/esm/index.js
 init_esm_shims();
-var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
+var defaultPerf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
 var warned = /* @__PURE__ */ new Set();
 var PROCESS = typeof process === "object" && !!process ? process : {};
 var emitWarning = /* @__PURE__ */ __name((msg, type, code, fn) => {
@@ -4749,6 +4749,13 @@ var LRUCache = class _LRUCache {
   #disposeAfter;
   #fetchMethod;
   #memoMethod;
+  #perf;
+  /**
+   * {@link LRUCache.OptionsBase.perf}
+   */
+  get perf() {
+    return this.#perf;
+  }
   /**
    * {@link LRUCache.OptionsBase.ttl}
    */
@@ -4917,7 +4924,13 @@ var LRUCache = class _LRUCache {
     return this.#disposeAfter;
   }
   constructor(options) {
-    const { max = 0, ttl, ttlResolution = 1, ttlAutopurge, updateAgeOnGet, updateAgeOnHas, allowStale, dispose, onInsert, disposeAfter, noDisposeOnSet, noUpdateTTL, maxSize = 0, maxEntrySize = 0, sizeCalculation, fetchMethod, memoMethod, noDeleteOnFetchRejection, noDeleteOnStaleGet, allowStaleOnFetchRejection, allowStaleOnFetchAbort, ignoreFetchAbort } = options;
+    const { max = 0, ttl, ttlResolution = 1, ttlAutopurge, updateAgeOnGet, updateAgeOnHas, allowStale, dispose, onInsert, disposeAfter, noDisposeOnSet, noUpdateTTL, maxSize = 0, maxEntrySize = 0, sizeCalculation, fetchMethod, memoMethod, noDeleteOnFetchRejection, noDeleteOnStaleGet, allowStaleOnFetchRejection, allowStaleOnFetchAbort, ignoreFetchAbort, perf } = options;
+    if (perf !== void 0) {
+      if (typeof perf?.now !== "function") {
+        throw new TypeError("perf option must have a now() method if specified");
+      }
+    }
+    this.#perf = perf ?? defaultPerf;
     if (max !== 0 && !isPosInt(max)) {
       throw new TypeError("max option must be a nonnegative integer");
     }
@@ -5026,7 +5039,7 @@ var LRUCache = class _LRUCache {
     const starts = new ZeroArray(this.#max);
     this.#ttls = ttls;
     this.#starts = starts;
-    this.#setItemTTL = (index, ttl, start = perf.now()) => {
+    this.#setItemTTL = (index, ttl, start = this.#perf.now()) => {
       starts[index] = ttl !== 0 ? start : 0;
       ttls[index] = ttl;
       if (ttl !== 0 && this.ttlAutopurge) {
@@ -5041,7 +5054,7 @@ var LRUCache = class _LRUCache {
       }
     };
     this.#updateItemAge = (index) => {
-      starts[index] = ttls[index] !== 0 ? perf.now() : 0;
+      starts[index] = ttls[index] !== 0 ? this.#perf.now() : 0;
     };
     this.#statusTTL = (status, index) => {
       if (ttls[index]) {
@@ -5057,7 +5070,7 @@ var LRUCache = class _LRUCache {
     };
     let cachedNow = 0;
     const getNow = /* @__PURE__ */ __name(() => {
-      const n5 = perf.now();
+      const n5 = this.#perf.now();
       if (this.ttlResolution > 0) {
         cachedNow = n5;
         const t5 = setTimeout(() => cachedNow = 0, this.ttlResolution);
@@ -5365,7 +5378,7 @@ var LRUCache = class _LRUCache {
       const ttl = this.#ttls[i2];
       const start = this.#starts[i2];
       if (ttl && start) {
-        const remain = ttl - (perf.now() - start);
+        const remain = ttl - (this.#perf.now() - start);
         entry.ttl = remain;
         entry.start = Date.now();
       }
@@ -5402,7 +5415,7 @@ var LRUCache = class _LRUCache {
       };
       if (this.#ttls && this.#starts) {
         entry.ttl = this.#ttls[i2];
-        const age = perf.now() - this.#starts[i2];
+        const age = this.#perf.now() - this.#starts[i2];
         entry.start = Math.floor(Date.now() - age);
       }
       if (this.#sizes) {
@@ -5429,7 +5442,7 @@ var LRUCache = class _LRUCache {
     for (const [key, entry] of arr) {
       if (entry.start) {
         const age = Date.now() - entry.start;
-        entry.start = perf.now() - age;
+        entry.start = this.#perf.now() - age;
       }
       this.set(key, entry.value, entry);
     }
@@ -5712,7 +5725,7 @@ var LRUCache = class _LRUCache {
       const bf2 = p3;
       if (this.#valList[index] === p3) {
         if (v4 === void 0) {
-          if (bf2.__staleWhileFetching) {
+          if (bf2.__staleWhileFetching !== void 0) {
             this.#valList[index] = bf2.__staleWhileFetching;
           } else {
             this.#delete(k3, "fetch");
@@ -6074,7 +6087,7 @@ import fs from "fs-extra";
 import path from "pathe";
 function isJsOrTs(name) {
   if (typeof name === "string") {
-    return jsExtensions.some((x4) => name.endsWith(`.${x4}`));
+    return /\.[jt]s$/.test(name);
   }
   return false;
 }
@@ -8176,7 +8189,7 @@ var esm_default = {
   FSWatcher
 };
 
-// ../../node_modules/.pnpm/p-queue@8.1.0/node_modules/p-queue/dist/index.js
+// ../../node_modules/.pnpm/p-queue@8.1.1/node_modules/p-queue/dist/index.js
 init_esm_shims();
 
 // ../../node_modules/.pnpm/eventemitter3@5.0.1/node_modules/eventemitter3/index.mjs
@@ -8280,10 +8293,10 @@ function pTimeout(promise, options) {
 }
 __name(pTimeout, "pTimeout");
 
-// ../../node_modules/.pnpm/p-queue@8.1.0/node_modules/p-queue/dist/priority-queue.js
+// ../../node_modules/.pnpm/p-queue@8.1.1/node_modules/p-queue/dist/priority-queue.js
 init_esm_shims();
 
-// ../../node_modules/.pnpm/p-queue@8.1.0/node_modules/p-queue/dist/lower-bound.js
+// ../../node_modules/.pnpm/p-queue@8.1.1/node_modules/p-queue/dist/lower-bound.js
 init_esm_shims();
 function lowerBound(array, value, comparator) {
   let first = 0;
@@ -8302,7 +8315,7 @@ function lowerBound(array, value, comparator) {
 }
 __name(lowerBound, "lowerBound");
 
-// ../../node_modules/.pnpm/p-queue@8.1.0/node_modules/p-queue/dist/priority-queue.js
+// ../../node_modules/.pnpm/p-queue@8.1.1/node_modules/p-queue/dist/priority-queue.js
 var PriorityQueue = class {
   static {
     __name(this, "PriorityQueue");
@@ -8348,7 +8361,7 @@ var PriorityQueue = class {
   }
 };
 
-// ../../node_modules/.pnpm/p-queue@8.1.0/node_modules/p-queue/dist/index.js
+// ../../node_modules/.pnpm/p-queue@8.1.1/node_modules/p-queue/dist/index.js
 var PQueue = class extends import_index.default {
   static {
     __name(this, "PQueue");
@@ -8559,9 +8572,9 @@ var PQueue = class extends import_index.default {
     return new Promise((resolve8, reject) => {
       this.#queue.enqueue(async () => {
         this.#pending++;
-        this.#intervalCount++;
         try {
           options.signal?.throwIfAborted();
+          this.#intervalCount++;
           let operation = function_({
             signal: options.signal
           });
@@ -14744,7 +14757,7 @@ var BuildService2 = class {
     ];
     return {
       build: {
-        rollupOptions: {
+        rolldownOptions: {
           output: {
             // https://rolldown.rs/guide/in-depth/advanced-chunks
             advancedChunks: {
@@ -14787,7 +14800,8 @@ var BuildService2 = class {
       process2.env.NODE_ENV = "development";
     }
     debug?.("dev build watcher start");
-    const watcher = await build(this.configService.merge(void 0, this.sharedBuildConfig));
+    const buildOptions = this.configService.merge(void 0, this.sharedBuildConfig);
+    const watcher = await build(buildOptions);
     if (this.checkWorkersOptions()) {
       this.devWorkers();
       esm_default.watch(path6.resolve(this.configService.absoluteSrcRoot, this.scanService.workersDir), {
@@ -22671,7 +22685,7 @@ __name(getCssRealPath, "getCssRealPath");
 init_esm_shims();
 import { defu as defu2 } from "@weapp-core/shared";
 
-// ../../node_modules/.pnpm/magic-string@0.30.18/node_modules/magic-string/dist/magic-string.es.mjs
+// ../../node_modules/.pnpm/magic-string@0.30.19/node_modules/magic-string/dist/magic-string.es.mjs
 init_esm_shims();
 
 // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
@@ -22762,7 +22776,7 @@ function encode(decoded) {
 }
 __name(encode, "encode");
 
-// ../../node_modules/.pnpm/magic-string@0.30.18/node_modules/magic-string/dist/magic-string.es.mjs
+// ../../node_modules/.pnpm/magic-string@0.30.19/node_modules/magic-string/dist/magic-string.es.mjs
 var BitSet = class _BitSet {
   static {
     __name(this, "BitSet");
@@ -23219,6 +23233,9 @@ var MagicString = class _MagicString {
       }
       if (chunk.outro.length) mappings.advance(chunk.outro);
     });
+    if (this.outro) {
+      mappings.advance(this.outro);
+    }
     return {
       file: options.file ? options.file.split(/[/\\]/).pop() : void 0,
       sources: [
@@ -23731,7 +23748,12 @@ var MagicString = class _MagicString {
     const { original } = this;
     const index = original.indexOf(string);
     if (index !== -1) {
-      this.overwrite(index, index + string.length, replacement);
+      if (typeof replacement === "function") {
+        replacement = replacement(string, index, original);
+      }
+      if (string !== replacement) {
+        this.overwrite(index, index + string.length, replacement);
+      }
     }
     return this;
   }
@@ -23746,7 +23768,11 @@ var MagicString = class _MagicString {
     const stringLength = string.length;
     for (let index = original.indexOf(string); index !== -1; index = original.indexOf(string, index + stringLength)) {
       const previous = original.slice(index, index + stringLength);
-      if (previous !== replacement) this.overwrite(index, index + stringLength, replacement);
+      let _replacement = replacement;
+      if (typeof replacement === "function") {
+        _replacement = replacement(previous, index, original);
+      }
+      if (previous !== _replacement) this.overwrite(index, index + stringLength, _replacement);
     }
     return this;
   }
@@ -24265,6 +24291,18 @@ function weappVite(ctx, subPackageMeta) {
   const requireAsyncEmittedChunks = /* @__PURE__ */ new Set();
   let pq = [];
   return [
+    {
+      name: "weapp-vite:pre:wxss",
+      enforce: "pre",
+      resolveId: {
+        filter: {
+          id: /\.wxss$/
+        },
+        handler(id) {
+          return id.replace(/\.wxss$/, ".css?wxss");
+        }
+      }
+    },
     {
       name: "weapp-vite:pre",
       enforce: "pre",
@@ -24291,10 +24329,10 @@ function weappVite(ctx, subPackageMeta) {
           pq = scanService.loadSubPackages().filter((x4) => x4.subPackage.independent).map(async (x4) => {
             return {
               meta: x4,
-              rollup: await build2(configService.merge(x4, {
+              rollup: await build2(configService.merge(x4, x4.subPackage.inlineConfig, {
                 build: {
                   write: false,
-                  rollupOptions: {
+                  rolldownOptions: {
                     output: {
                       chunkFileNames() {
                         return `${x4.subPackage.root}/[name].js`;
@@ -24312,12 +24350,15 @@ function weappVite(ctx, subPackageMeta) {
         }
         options.input = scanedInput;
       },
-      resolveId(id) {
-        configService.weappViteConfig?.debug?.resolveId?.(id, subPackageMeta);
-        if (id.endsWith(".wxss")) {
-          return id.replace(/\.wxss$/, ".css?wxss");
-        }
-      },
+      // resolveId: {
+      //   filter: {
+      //     id: /\.wxss$/,
+      //   },
+      //   handler(id) {
+      //     configService.weappViteConfig?.debug?.resolveId?.(id, subPackageMeta)
+      //     return id.replace(/\.wxss$/, '.css?wxss')
+      //   },
+      // },
       // 触发时机
       // https://github.com/rollup/rollup/blob/328fa2d18285185a20bf9b6fde646c3c28f284ae/src/ModuleLoader.ts#L284
       // 假如返回的是 null, 这时候才会往下添加到 this.graph.watchFiles
@@ -24444,14 +24485,14 @@ function weappVite(ctx, subPackageMeta) {
     {
       name: "weapp-vite:post",
       enforce: "post",
-      transform(code, id) {
-        if (isJsOrTs(id)) {
+      transform: {
+        filter: {
+          id: /\.[jt]s$/
+        },
+        handler(code) {
           try {
             const ast = this.parse(code);
-            const { requireTokens } = collectRequireTokens(
-              // @ts-ignore
-              ast
-            );
+            const { requireTokens } = collectRequireTokens(ast);
             return {
               code,
               ast,
@@ -24920,7 +24961,7 @@ var ConfigService2 = class {
       configFile: false
     }, loadedConfig, {
       build: {
-        rollupOptions: {
+        rolldownOptions: {
           output: {
             format: "cjs",
             // strict: false,
@@ -25077,7 +25118,7 @@ var ConfigService2 = class {
         return new RegExp(`^${pkg.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&")}(\\/|$)`);
       }));
     }
-    const rollupOptions = {
+    const rolldownOptions = {
       external
     };
     if (this.options.isDev) {
@@ -25102,9 +25143,10 @@ var ConfigService2 = class {
           },
           minify: false,
           emptyOutDir: false,
-          rollupOptions: {
-            ...rollupOptions
-          }
+          rolldownOptions: {
+            ...rolldownOptions
+          },
+          sourcemap: true
         }
       });
     } else {
@@ -25118,8 +25160,8 @@ var ConfigService2 = class {
         build: {
           // https://github.com/vitejs/vite/blob/8bed1de5710f2a097af0e22a196545446d98f988/packages/vite/src/node/server/index.ts#L484
           emptyOutDir: false,
-          rollupOptions: {
-            ...rollupOptions
+          rolldownOptions: {
+            ...rolldownOptions
           }
         }
       });
@@ -25639,7 +25681,9 @@ var ScanService2 = class {
           subPackage,
           entries
         };
-        meta.subPackage.dependencies = this.configService.weappViteConfig?.subPackages?.[subPackage.root]?.dependencies;
+        const subPackageConfig = this.configService.weappViteConfig?.subPackages?.[subPackage.root];
+        meta.subPackage.dependencies = subPackageConfig?.dependencies;
+        meta.subPackage.inlineConfig = subPackageConfig?.inlineConfig;
         metas.push(meta);
         this.subPackageMap.set(subPackage.root, meta);
         if (subPackage.independent) {