vite-plugin-zephyr 0.1.5-next.4 → 0.1.6-next.1

package/dist/lib/internal/extract/load_public_dir.d.ts

@@ -3,5 +3,5 @@ interface LoadPublicDirOptions {
     outDir: string;
     publicDir: string;
 }
-export declare function load_public_dir(props: LoadPublicDirOptions): Promise<OutputAsset[]>;
+export declare function load_public_dir({ publicDir, outDir, }: LoadPublicDirOptions): Promise<OutputAsset[]>;
 export {};

package/dist/lib/internal/extract/load_public_dir.js

@@ -1,39 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load_public_dir = load_public_dir;
-const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const vite_1 = require("vite");
-const node_util_1 = require("node:util");
-async function load_public_dir(props) {
-    const { publicDir, outDir } = props;
-    const publicAssets = [];
-    const loadDir = async (srcDir, destDir) => {
-        for (const file of (0, node_fs_1.readdirSync)(srcDir)) {
-            const srcFile = (0, node_path_1.resolve)(srcDir, file);
-            if (srcFile === destDir) {
-                continue;
-            }
-            const destFile = (0, node_path_1.resolve)(destDir, file);
-            const stat = (0, node_fs_1.statSync)(srcFile);
-            if (stat.isDirectory()) {
-                await loadDir(srcFile, destFile);
-            }
-            else {
-                publicAssets.push({
-                    name: (0, node_path_1.basename)(file),
-                    names: [(0, node_path_1.basename)(file)],
-                    needsCodeReference: false,
-                    source: await (0, node_util_1.promisify)(node_fs_1.readFile)(srcFile),
-                    type: 'asset',
-                    fileName: (0, vite_1.normalizePath)((0, node_path_1.relative)(outDir, destFile)),
-                    originalFileName: (0, node_path_1.basename)(file),
-                    originalFileNames: [(0, node_path_1.basename)(file)],
-                });
-            }
-        }
-    };
-    await loadDir(publicDir, outDir);
-    return publicAssets;
+const zephyr_agent_1 = require("zephyr-agent");
+async function load_public_dir({ publicDir, outDir, }) {
+    const files = await (0, zephyr_agent_1.readDirRecursiveWithContents)(publicDir);
+    const normalizedOutDir = (0, node_path_1.resolve)(outDir);
+    return files
+        .filter((file) => 
+    // Skip outDir and its contents to avoid including build outputs as public assets
+    // (e.g., when publicDir = '/project' and outDir = '/project/dist')
+    file.fullPath !== normalizedOutDir &&
+        !file.fullPath.startsWith(normalizedOutDir + '/'))
+        .map((file) => {
+        const fileName = (0, node_path_1.basename)(file.fullPath);
+        return {
+            name: fileName,
+            names: [fileName],
+            needsCodeReference: false,
+            source: file.content,
+            type: 'asset',
+            fileName: (0, vite_1.normalizePath)(file.relativePath),
+            originalFileName: fileName,
+            originalFileNames: [fileName],
+        };
+    });
 }
 //# sourceMappingURL=load_public_dir.js.map

package/dist/lib/internal/extract/load_public_dir.js.map

@@ -1 +1 @@
-{"version":3,"file":"load_public_dir.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_public_dir.ts"],"names":[],"mappings":";;AAWA,0CAgCC;AA1CD,qCAA0D;AAC1D,yCAAwD;AACxD,+BAAqC;AACrC,yCAAsC;AAO/B,KAAK,UAAU,eAAe,CACnC,KAA2B;IAE3B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,MAAM,OAAO,GAAG,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE;QACxD,KAAK,MAAM,IAAI,IAAI,IAAA,qBAAW,EAAC,MAAM,CAAC,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACxB,SAAS;YACX,CAAC;YACD,MAAM,QAAQ,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,CAAC;YAC/B,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,MAAM,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,IAAI,CAAC;oBAChB,IAAI,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC;oBACpB,KAAK,EAAE,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;oBACvB,kBAAkB,EAAE,KAAK;oBACzB,MAAM,EAAE,MAAM,IAAA,qBAAS,EAAC,kBAAQ,CAAC,CAAC,OAAO,CAAC;oBAC1C,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,IAAA,oBAAa,EAAC,IAAA,oBAAQ,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACnD,gBAAgB,EAAE,IAAA,oBAAQ,EAAC,IAAI,CAAC;oBAChC,iBAAiB,EAAE,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;iBACpC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,MAAM,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"load_public_dir.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_public_dir.ts"],"names":[],"mappings":";;AAUA,0CA6BC;AAvCD,yCAA8C;AAE9C,+BAAqC;AACrC,+CAA4D;AAOrD,KAAK,UAAU,eAAe,CAAC,EACpC,SAAS,EACT,MAAM,GACe;IACrB,MAAM,KAAK,GAAG,MAAM,IAAA,2CAA4B,EAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,IAAA,mBAAO,EAAC,MAAM,CAAC,CAAC;IAEzC,OAAO,KAAK;SACT,MAAM,CACL,CAAC,IAAI,EAAE,EAAE;IACP,iFAAiF;IACjF,mEAAmE;IACnE,IAAI,CAAC,QAAQ,KAAK,gBAAgB;QAClC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,GAAG,GAAG,CAAC,CACpD;SACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,kBAAkB,EAAE,KAAK;YACzB,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,IAAI,EAAE,OAAgB;YACtB,QAAQ,EAAE,IAAA,oBAAa,EAAC,IAAI,CAAC,YAAY,CAAC;YAC1C,gBAAgB,EAAE,QAAQ;YAC1B,iBAAiB,EAAE,CAAC,QAAQ,CAAC;SAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/lib/internal/extract/load_static_assets.js

@@ -1,25 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadStaticAssets = loadStaticAssets;
+const tslib_1 = require("tslib");
 const load_public_dir_1 = require("./load_public_dir");
 const load_static_entries_1 = require("./load_static_entries");
 async function loadStaticAssets(vite_internal_options) {
-    const publicAssets = [];
-    if (vite_internal_options.publicDir) {
-        const _public_assets = await (0, load_public_dir_1.load_public_dir)({
-            outDir: vite_internal_options.outDir,
-            publicDir: vite_internal_options.publicDir,
-        });
-        publicAssets.push(..._public_assets);
+    var _a, e_1, _b, _c;
+    const bundle = {};
+    try {
+        for (var _d = true, _e = tslib_1.__asyncValues([
+            (0, load_static_entries_1.load_static_entries)({
+                root: vite_internal_options.root,
+                outDir: vite_internal_options.outDir,
+            }),
+            // Only load if specified
+            vite_internal_options.publicDir
+                ? (0, load_public_dir_1.load_public_dir)({
+                    outDir: vite_internal_options.outDir,
+                    publicDir: vite_internal_options.publicDir,
+                })
+                : [],
+        ]), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
+            _c = _f.value;
+            _d = false;
+            const assets = _c;
+            for (const asset of assets) {
+                bundle[asset.fileName] = asset;
+            }
+        }
     }
-    const _static_assets = await (0, load_static_entries_1.load_static_entries)({
-        root: vite_internal_options.root,
-        outDir: vite_internal_options.outDir,
-    });
-    publicAssets.push(..._static_assets);
-    return publicAssets.reduce((acc, asset) => {
-        acc[asset.fileName] = asset;
-        return acc;
-    }, {});
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return bundle;
 }
 //# sourceMappingURL=load_static_assets.js.map

package/dist/lib/internal/extract/load_static_assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"load_static_assets.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_static_assets.ts"],"names":[],"mappings":";;AAKA,4CAuBC;AA3BD,uDAAoD;AACpD,+DAA4D;AAGrD,KAAK,UAAU,gBAAgB,CACpC,qBAA4C;IAE5C,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,IAAI,qBAAqB,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,cAAc,GAAG,MAAM,IAAA,iCAAe,EAAC;YAC3C,MAAM,EAAE,qBAAqB,CAAC,MAAM;YACpC,SAAS,EAAE,qBAAqB,CAAC,SAAS;SAC3C,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,IAAA,yCAAmB,EAAC;QAC/C,IAAI,EAAE,qBAAqB,CAAC,IAAI;QAChC,MAAM,EAAE,qBAAqB,CAAC,MAAM;KACrC,CAAC,CAAC;IACH,YAAY,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;IAErC,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACxC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAkB,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"load_static_assets.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_static_assets.ts"],"names":[],"mappings":";;AAKA,4CAyBC;;AA5BD,uDAAoD;AACpD,+DAA4D;AAErD,KAAK,UAAU,gBAAgB,CACpC,qBAA4C;;IAE5C,MAAM,MAAM,GAAiB,EAAE,CAAC;;QAEhC,KAA2B,eAAA,KAAA,sBAAA;YACzB,IAAA,yCAAmB,EAAC;gBAClB,IAAI,EAAE,qBAAqB,CAAC,IAAI;gBAChC,MAAM,EAAE,qBAAqB,CAAC,MAAM;aACrC,CAAC;YAEF,yBAAyB;YACzB,qBAAqB,CAAC,SAAS;gBAC7B,CAAC,CAAC,IAAA,iCAAe,EAAC;oBACd,MAAM,EAAE,qBAAqB,CAAC,MAAM;oBACpC,SAAS,EAAE,qBAAqB,CAAC,SAAS;iBAC3C,CAAC;gBACJ,CAAC,CAAC,EAAE;SACP,CAAA,IAAA,sDAAE,CAAC;YAbuB,cAa1B;YAb0B,WAa1B;YAbU,MAAM,MAAM,KAAA,CAAA;YAcrB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;YACjC,CAAC;QACH,CAAC;;;;;;;;;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/lib/internal/extract/load_static_entries.js

@@ -2,35 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load_static_entries = load_static_entries;
 const node_path_1 = require("node:path");
-const node_fs_1 = require("node:fs");
 const vite_1 = require("vite");
-const node_util_1 = require("node:util");
+const zephyr_agent_1 = require("zephyr-agent");
 async function load_static_entries(props) {
-    const { root } = props;
-    const publicAssets = [];
-    const root_dist_dir = (0, node_path_1.resolve)(root, props.outDir);
-    const loadDir = async (destDir) => {
-        for (const file of (0, node_fs_1.readdirSync)(destDir)) {
-            const destFile = (0, node_path_1.resolve)(destDir, file);
-            const stat = (0, node_fs_1.statSync)(destFile);
-            if (stat.isDirectory()) {
-                await loadDir(destFile);
-                continue;
-            }
-            const fileName = (0, vite_1.normalizePath)((0, node_path_1.relative)(root_dist_dir, destFile));
-            publicAssets.push({
-                fileName,
-                name: file,
-                names: [file],
-                needsCodeReference: false,
-                source: await (0, node_util_1.promisify)(node_fs_1.readFile)(destFile),
-                type: 'asset',
-                originalFileName: file,
-                originalFileNames: [file],
-            });
-        }
-    };
-    await loadDir(root_dist_dir);
-    return publicAssets;
+    const root_dist_dir = (0, node_path_1.resolve)(props.root, props.outDir);
+    // Load all files from the output directory - no filtering needed since
+    // we're intentionally reading build outputs, not public assets
+    const files = await (0, zephyr_agent_1.readDirRecursiveWithContents)(root_dist_dir);
+    return files.map((file) => {
+        const fileName = (0, node_path_1.basename)(file.fullPath);
+        return {
+            fileName: (0, vite_1.normalizePath)(file.relativePath),
+            name: fileName,
+            names: [fileName],
+            needsCodeReference: false,
+            source: file.content,
+            type: 'asset',
+            originalFileName: fileName,
+            originalFileNames: [fileName],
+        };
+    });
 }
 //# sourceMappingURL=load_static_entries.js.map

package/dist/lib/internal/extract/load_static_entries.js.map

@@ -1 +1 @@
-{"version":3,"file":"load_static_entries.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_static_entries.ts"],"names":[],"mappings":";;AAWA,kDA+BC;AAzCD,yCAA8C;AAC9C,qCAA0D;AAC1D,+BAAqC;AACrC,yCAAsC;AAO/B,KAAK,UAAU,mBAAmB,CACvC,KAA+B;IAE/B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,MAAM,aAAa,GAAG,IAAA,mBAAO,EAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAElD,MAAM,OAAO,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACxC,KAAK,MAAM,IAAI,IAAI,IAAA,qBAAW,EAAC,OAAO,CAAC,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,IAAA,mBAAO,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAA,kBAAQ,EAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACxB,SAAS;YACX,CAAC;YACD,MAAM,QAAQ,GAAG,IAAA,oBAAa,EAAC,IAAA,oBAAQ,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;YAClE,YAAY,CAAC,IAAI,CAAC;gBAChB,QAAQ;gBACR,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,CAAC,IAAI,CAAC;gBACb,kBAAkB,EAAE,KAAK;gBACzB,MAAM,EAAE,MAAM,IAAA,qBAAS,EAAC,kBAAQ,CAAC,CAAC,QAAQ,CAAC;gBAC3C,IAAI,EAAE,OAAO;gBACb,gBAAgB,EAAE,IAAI;gBACtB,iBAAiB,EAAE,CAAC,IAAI,CAAC;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7B,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"load_static_entries.js","sourceRoot":"","sources":["../../../../src/lib/internal/extract/load_static_entries.ts"],"names":[],"mappings":";;AAUA,kDAsBC;AA/BD,yCAA8C;AAC9C,+BAAqC;AACrC,+CAA4D;AAOrD,KAAK,UAAU,mBAAmB,CACvC,KAA+B;IAE/B,MAAM,aAAa,GAAG,IAAA,mBAAO,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxD,uEAAuE;IACvE,+DAA+D;IAC/D,MAAM,KAAK,GAAG,MAAM,IAAA,2CAA4B,EAAC,aAAa,CAAC,CAAC;IAEhE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,QAAQ,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzC,OAAO;YACL,QAAQ,EAAE,IAAA,oBAAa,EAAC,IAAI,CAAC,YAAY,CAAC;YAC1C,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,kBAAkB,EAAE,KAAK;YACzB,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,IAAI,EAAE,OAAgB;YACtB,gBAAgB,EAAE,QAAQ;YAC1B,iBAAiB,EAAE,CAAC,QAAQ,CAAC;SAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-zephyr",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Vite plugin for Zephyr",
   "repository": {
     "type": "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-zephyr",
-  "version": "0.1.5-next.4",
+  "version": "0.1.6-next.1",
   "description": "Vite plugin for Zephyr",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "acorn-walk": "^8.3.4",
     "magic-string": "0.30.17",
     "tslib": "^2.8.1",
-    "zephyr-agent": "0.1.5-next.4"
+    "zephyr-agent": "0.1.6-next.1"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",