@shaper.org/vite-react-plugin 1.0.13 → 1.0.15

package/dist/index.mjs

@@ -1799,14 +1799,40 @@ function jsxSourcePlugin(options = {}) {
 					runtime: "automatic"
 				}], "@babel/preset-typescript"],
 				plugins: [function injectSourceFile() {
-					return { visitor: { JSXOpeningElement(path, state) {
-						const root = state.file.opts.root;
-						const filename = state.file.opts.filename;
-						const relativeFilename = PathUtil.relative(root, filename);
-						const { line, column } = path.node.loc.start;
-						const attr = t.jsxAttribute(t.jsxIdentifier("data-loc"), t.stringLiteral(`${relativeFilename}:${line}:${column}`));
-						path.node.attributes.push(attr);
-					} } };
+					return { visitor: {
+						Program(programPath, state) {
+							const root = state.file.opts.root;
+							const filename = state.file.opts.filename;
+							const relativeFilename = PathUtil.relative(root, filename);
+							const injected = /* @__PURE__ */ new Set();
+							function injectAtProgramEnd(name) {
+								if (injected.has(name)) return;
+								injected.add(name);
+								programPath.pushContainer("body", t.expressionStatement(t.assignmentExpression("=", t.memberExpression(t.identifier(name), t.identifier("__file")), t.stringLiteral(relativeFilename))));
+							}
+							programPath.traverse({
+								ExportNamedDeclaration(path) {
+									const decl = path.node.declaration;
+									if (t.isFunctionDeclaration(decl) && decl.id) injectAtProgramEnd(decl.id.name);
+									if (t.isVariableDeclaration(decl)) {
+										for (const d of decl.declarations) if (t.isIdentifier(d.id) && (t.isArrowFunctionExpression(d.init) || t.isFunctionExpression(d.init))) injectAtProgramEnd(d.id.name);
+									}
+								},
+								ExportDefaultDeclaration(path) {
+									const decl = path.node.declaration;
+									if (t.isIdentifier(decl)) injectAtProgramEnd(decl.name);
+								}
+							});
+						},
+						JSXOpeningElement(path, state) {
+							const root = state.file.opts.root;
+							const filename = state.file.opts.filename;
+							const relativeFilename = PathUtil.relative(root, filename);
+							const { line, column } = path.node.loc.start;
+							const attr = t.jsxAttribute(t.jsxIdentifier("data-loc"), t.stringLiteral(`${relativeFilename}:${line}:${column}`));
+							path.node.attributes.push(attr);
+						}
+					} };
 				}]
 			});
 			if (!result) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaper.org/vite-react-plugin",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "",
   "type": "module",
   "private": false,

package/templates/main.ts

@@ -104,17 +104,6 @@ export class ReactRouteMonitor {
 
         this.sendAllRoutes = this.sendAllRoutes.bind(this);
         window.addEventListener("getroutes", this.sendAllRoutes);
-
-        this.iframeClient.onMessage((event) => {
-            const messageData = event.data;
-            if (messageData.type == "push-route") {
-                history.pushState(
-                    { type: "from-iframe-parent" },
-                    "",
-                    messageData.message.path,
-                );
-            }
-        });
     }
 
     stop() {
@@ -133,13 +122,8 @@ export class ReactRouteMonitor {
 
     patchHistory() {
         history.pushState = (...args) => {
-            let shouldTrigger = true;
-            if (args[0] && args[0].type === "from-iframe-parent") {
-                args[0] = {};
-                shouldTrigger = false;
-            }
             this.origPush.apply(history, args);
-            if (shouldTrigger) this.triggerRouteChange();
+            this.triggerRouteChange();
         };
 
         history.replaceState = (...args) => {
@@ -154,10 +138,11 @@ export class ReactRouteMonitor {
         const validRoutes = event.detail.routes.filter(
             (route) => route.element !== undefined && route.path !== "*",
         );
+
         const routes = validRoutes.map((route) => ({
             name: route.path,
             path: route.path,
-            file: route.element.type().props["data-loc"],
+            file: route.element.type.__file,
         }));
 
         this.iframeClient.sendAllRoutes(routes);
@@ -254,17 +239,3 @@ const monitor = new ReactRouteMonitor({
 
 monitor.start();
 monitor.triggerRoutes();
-
-// // simulate parent message
-// setTimeout(() => {
-//     console.log("Simulating parent message");
-//     window.dispatchEvent(
-//         new MessageEvent("message", {
-//             data: {
-//                 type: "push-route",
-//                 message: { path: "/test" },
-//             },
-//             origin: "http://localhost:5173",
-//         }),
-//     );
-// }, 1000);