vite-plugin-zephyr 0.0.20 → 0.0.22

package/LICENSE

@@ -1,39 +1,39 @@
- Apache License
-   Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-   ...
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same line as the copyright notice for each file. The "copyright"
-  word should be left as is (without quotes).
-
-   Copyright [2023] [Zephyr Cloud]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+   ...
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same line as the copyright notice for each file. The "copyright"
+  word should be left as is (without quotes).
+
+   Copyright [2023] [Zephyr Cloud]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
    limitations under the License.

package/dist/lib/remote_map_parser.d.ts

@@ -1,17 +1,20 @@
+export interface RemoteEntry {
+    name: string;
+    entryGlobalName?: string;
+    entry: string;
+    type?: string;
+}
 export interface RemoteMapExtraction {
-    remotesMap: {
-        [index: string]: {
-            url: string;
-        };
-    };
+    remotesMap: RemoteEntry[];
     startIndex: number;
     endIndex: number;
 }
 /**
- * Parses the provided code to extract the remotesMap object.
+ * Parses the provided code to extract the remotes object.
  *
- * @param code - The code containing the remotesMap declaration.
- * @returns An object containing the remotesMap as a Record<string, string> and the start and end indices of the remotesMap declaration in the code, or undefined if parsing fails.
+ * @param code - The code containing the remotes object declaration.
+ * @returns An object containing the remotes object and the start and end indices of the remotes object declaration in the code, or
+ *   undefined if parsing fails.
  */
-export declare function parseRemoteMap(code: string): Promise<RemoteMapExtraction | undefined>;
+export declare function parseRemoteMap(code: string, id: string): RemoteMapExtraction | undefined;
 export declare function replaceProtocolAndHost(originalUrl: string, newProtocolAndHost: string): string;

package/dist/lib/remote_map_parser.js

@@ -4,53 +4,86 @@ exports.replaceProtocolAndHost = exports.parseRemoteMap = void 0;
 const tslib_1 = require("tslib");
 const json5_1 = tslib_1.__importDefault(require("json5"));
 const zephyr_edge_contract_1 = require("zephyr-edge-contract");
+const acorn_1 = tslib_1.__importDefault(require("acorn"));
+const acorn_walk_1 = tslib_1.__importDefault(require("acorn-walk"));
 /**
- * Parses the provided code to extract the remotesMap object.
+ * Parses the provided code to extract the remotes object.
  *
- * @param code - The code containing the remotesMap declaration.
- * @returns An object containing the remotesMap as a Record<string, string> and the start and end indices of the remotesMap declaration in the code, or undefined if parsing fails.
+ * @param code - The code containing the remotes object declaration.
+ * @returns An object containing the remotes object and the start and end indices of the remotes object declaration in the code, or
+ *   undefined if parsing fails.
  */
-function parseRemoteMap(code) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const { js } = yield Promise.resolve().then(() => tslib_1.__importStar(require('@ast-grep/napi')));
-            const tree = js.parse(code);
-            const root = tree.root();
-            const objectNode = root.find(`const remotesMap = $OBJECT;`);
-            if (!objectNode) {
-                (0, zephyr_edge_contract_1.ze_error)('ERR_NOT_RESOLVE_APP_NAME_WITH_VERSION', 'Failed to find remotesMap declaration.');
-                return;
-            }
-            const variableDeclaratorNode = objectNode.children().find((child) => child.kind() === 'variable_declarator');
-            if (!variableDeclaratorNode) {
-                (0, zephyr_edge_contract_1.ze_error)('ERR_NOT_RESOLVE_APP_NAME_WITH_VERSION', 'Failed to extract object literal from remotesMap declaration: variable_declarator.');
-                return;
-            }
-            const objectLiteralNode = variableDeclaratorNode.children().find((child) => child.kind() === 'object');
-            if (!objectLiteralNode) {
-                (0, zephyr_edge_contract_1.ze_error)('ERR_NOT_RESOLVE_APP_NAME_WITH_VERSION', 'Failed to extract object literal from remotesMap declaration: object');
-                return;
+function parseRemoteMap(code, id) {
+    if (!id.includes('localSharedImportMap')) {
+        return undefined;
+    }
+    let arrayNode;
+    const startTime = Date.now();
+    // Parse the code into an AST
+    const ast = acorn_1.default.parse(code, {
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        locations: true, // Include line and column numbers
+        ranges: true, // Include start and end indices
+    });
+    // Visitor function to find the variable declaration
+    function findUsedRemotes(node) {
+        if (node.type === 'VariableDeclaration' && node.kind === 'const') {
+            for (const declarator of node.declarations) {
+                if (declarator.id.type === 'Identifier' && declarator.id.name === 'usedRemotes' && declarator.init) {
+                    // Found the 'usedRemotes' variable
+                    arrayNode = declarator.init;
+                    break;
+                }
             }
-            const remotesMapObject = json5_1.default.parse(objectLiteralNode.text() || '');
-            return {
-                remotesMap: remotesMapObject,
-                startIndex: objectNode.range().start.index,
-                endIndex: objectNode.range().end.index,
-            };
-        }
-        catch (error) {
-            (0, zephyr_edge_contract_1.ze_error)('ERR_NOT_RESOLVE_APP_NAME_WITH_VERSION', 'Failed to parse or modify remotesMap:', error);
         }
-        return;
+    }
+    acorn_walk_1.default.simple(ast, {
+        VariableDeclaration: findUsedRemotes,
     });
+    const endTime = Date.now();
+    (0, zephyr_edge_contract_1.ze_log)(`parseRemoteMap took ${endTime - startTime}ms`);
+    if (!arrayNode) {
+        return;
+    }
+    (0, zephyr_edge_contract_1.ze_log)('vite.arrayNode found: ', arrayNode);
+    // Get start and end indices
+    const startIndex = arrayNode.start;
+    const endIndex = arrayNode.end;
+    // Extract the array text from the code
+    const arrayText = code.slice(startIndex, endIndex);
+    let remotesArray;
+    try {
+        // Use a faster JSON parser if possible
+        remotesArray = JSON.parse(arrayText);
+        (0, zephyr_edge_contract_1.ze_log)('vite.parseRemoteMap.remotesArray: ', remotesArray);
+    }
+    catch (error) {
+        // Fallback to json5 only if necessary
+        try {
+            remotesArray = json5_1.default.parse(arrayText);
+        }
+        catch (innerError) {
+            return;
+        }
+    }
+    return {
+        remotesMap: remotesArray,
+        startIndex,
+        endIndex,
+    };
 }
 exports.parseRemoteMap = parseRemoteMap;
 function replaceProtocolAndHost(originalUrl, newProtocolAndHost) {
+    (0, zephyr_edge_contract_1.ze_log)('vite.replaceProtocalAndHost.originalUrl: ', originalUrl);
+    (0, zephyr_edge_contract_1.ze_log)('vite.replaceProtocalAndHost: ', newProtocolAndHost);
     const url = new URL(originalUrl);
     const newUrl = new URL(newProtocolAndHost);
     // Replace protocol and hostname
     url.protocol = newUrl.protocol;
     url.hostname = newUrl.hostname;
+    url.port = '';
+    (0, zephyr_edge_contract_1.ze_log)('vite.transformedUrl: ', url.toString());
     return url.toString();
 }
 exports.replaceProtocolAndHost = replaceProtocolAndHost;

package/dist/lib/remote_map_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote_map_parser.js","sourceRoot":"","sources":["../../src/lib/remote_map_parser.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,+DAAgD;AAUhD;;;;;GAKG;AACH,SAAsB,cAAc,CAAC,IAAY;;QAC/C,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,EAAE,GAAG,gEAAa,gBAAgB,GAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAEzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAE5D,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,wCAAwC,CAAC,CAAC;gBAC5F,OAAO;YACT,CAAC;YAED,MAAM,sBAAsB,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,qBAAqB,CAAC,CAAC;YAE7G,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,IAAA,+BAAQ,EACN,uCAAuC,EACvC,oFAAoF,CACrF,CAAC;gBACF,OAAO;YACT,CAAC;YAED,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,QAAQ,CAAC,CAAC;YAEvG,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,sEAAsE,CAAC,CAAC;gBAC1H,OAAO;YACT,CAAC;YACD,MAAM,gBAAgB,GAAG,eAAK,CAAC,KAAK,CAAoC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACxG,OAAO;gBACL,UAAU,EAAE,gBAAgB;gBAC5B,UAAU,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK;gBAC1C,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK;aACvC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,uCAAuC,EAAE,KAAK,CAAC,CAAC;QACpG,CAAC;QAED,OAAO;IACT,CAAC;CAAA;AAxCD,wCAwCC;AAED,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,kBAA0B;IACpF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE3C,gCAAgC;IAChC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC/B,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAE/B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AATD,wDASC"}
+{"version":3,"file":"remote_map_parser.js","sourceRoot":"","sources":["../../src/lib/remote_map_parser.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,+DAA8C;AAC9C,0DAA0B;AAC1B,oEAA8B;AAe9B;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,IAAY,EAAE,EAAU;IACrD,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,SAAiC,CAAC;IAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,6BAA6B;IAC7B,MAAM,GAAG,GAAG,eAAK,CAAC,KAAK,CAAC,IAAI,EAAE;QAC5B,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,QAAQ;QACpB,SAAS,EAAE,IAAI,EAAE,kCAAkC;QACnD,MAAM,EAAE,IAAI,EAAE,gCAAgC;KAC/C,CAAC,CAAC;IAEH,oDAAoD;IACpD,SAAS,eAAe,CAAC,IAA+B;QACtD,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjE,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC3C,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,KAAK,aAAa,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;oBACnG,mCAAmC;oBACnC,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC;oBAC5B,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,oBAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,mBAAmB,EAAE,eAAe;KACrC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,IAAA,6BAAM,EAAC,uBAAuB,OAAO,GAAG,SAAS,IAAI,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IACD,IAAA,6BAAM,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IAE5C,4BAA4B;IAC5B,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;IACnC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAE/B,uCAAuC;IACvC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACnD,IAAI,YAA2B,CAAC;IAEhC,IAAI,CAAC;QACH,uCAAuC;QACvC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAkB,CAAC;QACtD,IAAA,6BAAM,EAAC,oCAAoC,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,sCAAsC;QACtC,IAAI,CAAC;YACH,YAAY,GAAG,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,UAAU,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU,EAAE,YAAY;QACxB,UAAU;QACV,QAAQ;KACT,CAAC;AACJ,CAAC;AAnED,wCAmEC;AAED,SAAgB,sBAAsB,CAAC,WAAmB,EAAE,kBAA0B;IACpF,IAAA,6BAAM,EAAC,2CAA2C,EAAE,WAAW,CAAC,CAAC;IACjE,IAAA,6BAAM,EAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE3C,gCAAgC;IAChC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC/B,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC/B,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;IAEd,IAAA,6BAAM,EAAC,uBAAuB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEhD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAdD,wDAcC"}

package/dist/lib/resolve_remote_dependency.js

@@ -21,6 +21,7 @@ function resolve_remote_dependency(_a) {
                 throw new Error(res.statusText);
             }
             const response = (yield res.json());
+            (0, zephyr_edge_contract_1.ze_log)('[Vite]: resolve remote dependency response: ', response);
             return response === null || response === void 0 ? void 0 : response.value;
         }
         catch (err) {

package/dist/lib/resolve_remote_dependency.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/lib/resolve_remote_dependency.ts"],"names":[],"mappings":";;;;AAAA,+DAAmG;AAEnG,SAAsB,yBAAyB;iEAAC,EAAE,IAAI,EAAE,OAAO,EAAqC;QAClG,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,GAAG,qCAAc,CAAC,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACtF,IAAA,sCAAe,GAAE,CAClB,CAAC;QACF,IAAA,6BAAM,EAAC,sBAAsB,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE;gBACzC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;oBAChC,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA8C,CAAC;YACjF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,sBAAsB,IAAI,mBAAmB,OAAO,GAAG,CAAC,CAAC;QAC7G,CAAC;IACH,CAAC;CAAA;AAzBD,8DAyBC"}
+{"version":3,"file":"resolve_remote_dependency.js","sourceRoot":"","sources":["../../src/lib/resolve_remote_dependency.ts"],"names":[],"mappings":";;;;AAAA,+DAAmG;AAEnG,SAAsB,yBAAyB;iEAAC,EAAE,IAAI,EAAE,OAAO,EAAqC;QAClG,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,GAAG,qCAAc,CAAC,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACtF,IAAA,sCAAe,GAAE,CAClB,CAAC;QACF,IAAA,6BAAM,EAAC,sBAAsB,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAQ,GAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,iBAAiB,EAAE;gBACzC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,SAAS,GAAG,KAAK;oBAChC,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC;YACD,MAAM,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA8C,CAAC;YAEjF,IAAA,6BAAM,EAAC,8CAA8C,EAAE,QAAQ,CAAC,CAAC;YACjE,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,+BAAQ,EAAC,uCAAuC,EAAE,sBAAsB,IAAI,mBAAmB,OAAO,GAAG,CAAC,CAAC;QAC7G,CAAC;IACH,CAAC;CAAA;AA3BD,8DA2BC"}

package/dist/lib/types/zephyr-internal-options.d.ts

@@ -1,7 +1,11 @@
 export interface ZephyrInternalOptions {
     root: string;
-    configFile: string;
     outDir: string;
     publicDir?: string;
     dir?: string;
 }
+export interface ZephyrPartialInternalOptions {
+    root: string;
+    outDir: string;
+    publicDir?: string;
+}

package/dist/lib/vite-plugin-zephyr.d.ts

@@ -1,3 +1,8 @@
 import type { Plugin } from 'vite';
-import { VitePluginFederationOptions } from '@originjs/vite-plugin-federation';
-export declare function withZephyr(_options?: VitePluginFederationOptions): Plugin;
+import { federation } from '@module-federation/vite';
+type FederationFunction = typeof federation;
+interface VitePluginZephyrOptions {
+    mfConfig?: Parameters<FederationFunction>[0];
+}
+export declare function withZephyr(_options?: VitePluginZephyrOptions): Plugin[];
+export {};

package/dist/lib/vite-plugin-zephyr.js

@@ -9,9 +9,10 @@ const load_public_dir_1 = require("./load_public_dir");
 const load_static_entries_1 = require("./load_static_entries");
 const remote_map_parser_1 = require("./remote_map_parser");
 const resolve_remote_dependency_1 = require("./resolve_remote_dependency");
-const vite_plugin_federation_1 = tslib_1.__importDefault(require("@originjs/vite-plugin-federation"));
+const vite_1 = require("@module-federation/vite");
 function withZephyr(_options) {
-    return zephyrPlugin(_options);
+    const mfConfig = _options === null || _options === void 0 ? void 0 : _options.mfConfig;
+    return mfConfig ? (0, vite_1.federation)(mfConfig).concat([zephyrPlugin(_options)]) : [zephyrPlugin(_options)];
 }
 exports.withZephyr = withZephyr;
 function zephyrPlugin(_options) {
@@ -22,17 +23,11 @@ function zephyrPlugin(_options) {
     return {
         name: 'with-zephyr',
         enforce: 'post',
-        config: (config) => {
-            config.plugins = config.plugins || [];
-            // only push the options when options are presented
-            _options &&
-                config.plugins.push((0, vite_plugin_federation_1.default)(Object.assign({}, _options)));
-        },
         configResolved: (config) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             Object.assign(vite_internal_options, {
                 root: config.root,
-                configFile: config.configFile,
-                outDir: config.build.outDir,
+                outDir: (_a = config.build) === null || _a === void 0 ? void 0 : _a.outDir,
                 publicDir: config.publicDir,
             });
             (0, zephyr_edge_contract_1.ze_log)('Configuring with Zephyr...');
@@ -53,33 +48,39 @@ function zephyrPlugin(_options) {
             });
             (0, zephyr_edge_contract_1.ze_log)('vite-zephyr-options', vite_internal_options);
         }),
-        // Used by Vite dev server for in memory bundles
-        transform: (code) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // If there is no options getting passed in return undefined and pass the code directly to next step
-            const extractedRemoteMap = _options ? yield (0, remote_map_parser_1.parseRemoteMap)(code) : undefined;
-            if (extractedRemoteMap === undefined) {
+        transform: (code, id) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const extractedRemotes = _options ? (0, remote_map_parser_1.parseRemoteMap)(code, id) : undefined;
+            if (extractedRemotes === undefined) {
                 return code;
             }
-            const { remotesMap, startIndex, endIndex } = extractedRemoteMap;
-            for (const [remoteName, remoteConfig] of Object.entries(remotesMap)) {
+            const { remotesMap, startIndex, endIndex } = extractedRemotes;
+            const remotes = [];
+            for (const remote of remotesMap) {
+                const { name, entry, type } = remote;
+                (0, zephyr_edge_contract_1.ze_log)('Remote details:', JSON.stringify(remotesMap));
                 const remote_application_uuid = (0, zephyr_edge_contract_1.createApplicationUID)({
                     org: gitInfo.app.org,
                     project: gitInfo.app.project,
-                    name: remoteName,
+                    name: name,
                 });
-                (0, zephyr_edge_contract_1.ze_log)('Resolving remote:', remote_application_uuid, remoteName);
-                const remoteDetails = yield (0, resolve_remote_dependency_1.resolve_remote_dependency)({ name: remote_application_uuid, version: '*' });
+                (0, zephyr_edge_contract_1.ze_log)('Resolving remote:', remote_application_uuid, name);
+                const remoteDetails = yield (0, resolve_remote_dependency_1.resolve_remote_dependency)({ name: remote_application_uuid, version: name });
                 (0, zephyr_edge_contract_1.ze_log)('Resolved remote:', remoteDetails);
                 if (!remoteDetails) {
                     continue;
                 }
-                (0, zephyr_edge_contract_1.ze_log)('Updating remote url:', remoteConfig.url, remoteDetails.remote_entry_url);
-                remoteConfig.url = (0, remote_map_parser_1.replaceProtocolAndHost)(remoteConfig.url, remoteDetails.remote_entry_url);
-                (0, zephyr_edge_contract_1.ze_log)('Updated remote url:', remoteConfig.url);
+                const updatedUrl = (0, remote_map_parser_1.replaceProtocolAndHost)(entry, remoteDetails.remote_entry_url);
+                (0, zephyr_edge_contract_1.ze_log)('Updating remote url:', entry, 'to ->', updatedUrl);
+                remotes.push({
+                    name,
+                    type,
+                    entryGlobalName: name,
+                    entry: updatedUrl,
+                });
+                (0, zephyr_edge_contract_1.ze_log)('Updated remote url:', entry);
             }
-            (0, zephyr_edge_contract_1.ze_log)('Writing remotesMap to bundle:', remotesMap);
-            const newObjectCode = `const remotesMap = ${JSON.stringify(remotesMap)};`;
-            return code.slice(0, startIndex) + newObjectCode + code.slice(endIndex);
+            (0, zephyr_edge_contract_1.ze_log)('Writing remotesMap to bundle:', remotes);
+            return code.slice(0, startIndex) + JSON.stringify(remotes) + code.slice(endIndex);
         }),
         closeBundle: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const publicAssets = [];

package/dist/lib/vite-plugin-zephyr.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-zephyr.js","sourceRoot":"","sources":["../../src/lib/vite-plugin-zephyr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vite-plugin-zephyr.js","sourceRoot":"","sources":["../../src/lib/vite-plugin-zephyr.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-zephyr",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,14 +8,16 @@
     "build": "nx run vite-plugin-zephyr:build"
   },
   "dependencies": {
-    "vite": "^5.4.6",
-    "rollup": "^4",
+    "@module-federation/runtime": "^0.6.10",
+    "@module-federation/vite": "^1.1.3",
+    "acorn": "^8.12.1",
+    "acorn-walk": "^8.3.4",
     "is-ci": "^3",
-    "@ast-grep/napi": "0.27.0",
-    "@originjs/vite-plugin-federation": "^1.3.5",
     "json5": "2.2.3",
-    "zephyr-edge-contract": "workspace:*",
-    "zephyr-agent": "workspace:*"
+    "rollup": "^4.22.5",
+    "vite": "^5.4.8",
+    "zephyr-agent": "workspace:*",
+    "zephyr-edge-contract": "workspace:*"
   },
   "devDependencies": {
     "@types/is-ci": "^3.0.4"

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "vite-plugin-zephyr",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "vite": "^5.4.6",
-    "rollup": "^4",
+    "@module-federation/runtime": "^0.6.10",
+    "@module-federation/vite": "^1.1.3",
+    "acorn": "^8.12.1",
+    "acorn-walk": "^8.3.4",
     "is-ci": "^3",
-    "@ast-grep/napi": "0.27.0",
-    "@originjs/vite-plugin-federation": "^1.3.5",
     "json5": "2.2.3",
-    "zephyr-edge-contract": "0.0.20",
-    "zephyr-agent": "0.0.20"
+    "rollup": "^4.22.5",
+    "vite": "^5.4.8",
+    "zephyr-agent": "0.0.22",
+    "zephyr-edge-contract": "0.0.22"
   },
   "devDependencies": {
     "@types/is-ci": "^3.0.4"