@webjourney/vite-plugins 1.2.10-0 → 1.2.10-2

package/dist/build.js

@@ -1,8 +1,8 @@
+import { JSDOM } from 'jsdom';
 import { execSync } from 'node:child_process';
-import { createRequire } from 'node:module';
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
-import { JSDOM } from 'jsdom';
 export async function buildWithSSR(options = {}) {
     const { projectRoot = process.cwd(), appPath = 'src/App.tsx', clientBuildOptions = '--base=\'./\'' } = options;
     const toAbsolute = (p) => path.resolve(projectRoot, p);
@@ -86,6 +86,7 @@ async function prerender(projectRoot) {
     // Setup globals for React SSR
     const originalWindow = global.window;
     const originalDocument = global.document;
+    const originalConsoleError = console.error;
     Object.defineProperty(global, 'window', {
         writable: true,
         configurable: true,
@@ -96,6 +97,32 @@ async function prerender(projectRoot) {
         configurable: true,
         value: dom.window.document,
     });
+    // Track if we're in a warning block (for multi-line warnings with stack traces)
+    let suppressingWarning = false;
+    // Suppress known SSR warnings from React and Radix UI
+    const filterWarnings = (...args) => {
+        const message = args[0]?.toString() || '';
+        // Filter out common SSR warnings
+        const ignoredWarnings = [
+            'Warning: ',
+        ];
+        if (ignoredWarnings.some(warning => message.includes(warning))) {
+            suppressingWarning = true;
+            return true; // Suppress the warning
+        }
+        // Check if this looks like a stack trace continuation (indented lines starting with "at")
+        if (suppressingWarning && message.trim().startsWith('at ')) {
+            return true; // Suppress stack trace lines
+        }
+        // Reset suppression for non-stack-trace lines
+        suppressingWarning = false;
+        return suppressingWarning;
+    };
+    console.error = (...args) => {
+        if (!filterWarnings(...args)) {
+            originalConsoleError(...args);
+        }
+    };
     // Import the server entry after setting up globals
     const entryServerPath = toAbsolute('dist-ssr/.webjourney-entry-server.js');
     const { render } = await import(entryServerPath);
@@ -103,44 +130,51 @@ async function prerender(projectRoot) {
     const require = createRequire(path.join(projectRoot, 'package.json'));
     const reactDomServerPath = require.resolve('react-dom/server');
     const { renderToString } = await import(reactDomServerPath);
-    // Extract routes from App.tsx
-    const routes = await extractRoutes(projectRoot);
-    console.log(`  Found ${routes.length} route(s): ${routes.join(', ')}`);
-    for (const route of routes) {
-        // Render the app HTML
-        const appHtml = renderToString(render(route));
-        // Replace the empty root div with the rendered content
-        let html = template.replace('<div id="root"></div>', `<div id="root">${appHtml}</div>`);
-        // Adjust asset paths based on route depth
-        if (route !== '/') {
-            const depth = route.split('/').filter(Boolean).length;
-            const prefix = '../'.repeat(depth);
-            // Replace asset references: ./assets/ -> ../assets/ or ../../assets/ etc
-            html = html.replace(/\.\/assets\//g, `${prefix}assets/`);
-        }
-        // Write the pre-rendered HTML
-        const filePath = route === '/'
-            ? toAbsolute('dist/index.html')
-            : toAbsolute(`dist${route}/index.html`);
-        // Ensure directory exists
-        const dir = path.dirname(filePath);
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
+    try {
+        // Extract routes from App.tsx
+        const routes = await extractRoutes(projectRoot);
+        console.log(`  Found ${routes.length} route(s): ${routes.join(', ')}`);
+        for (const route of routes) {
+            // Render the app HTML
+            const appHtml = renderToString(render(route));
+            // Replace the empty root div with the rendered content
+            let html = template.replace('<div id="root"></div>', `<div id="root">${appHtml}</div>`);
+            // Adjust asset paths based on route depth
+            if (route !== '/') {
+                const depth = route.split('/').filter(Boolean).length;
+                const prefix = '../'.repeat(depth);
+                // Replace asset references: ./assets/ -> ../assets/ or ../../assets/ etc
+                html = html.replace(/\.\/assets\//g, `${prefix}assets/`);
+            }
+            // Write the pre-rendered HTML
+            const filePath = route === '/'
+                ? toAbsolute('dist/index.html')
+                : toAbsolute(`dist${route}/index.html`);
+            // Ensure directory exists
+            const dir = path.dirname(filePath);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            fs.writeFileSync(filePath, html);
+            console.log(`  Pre-rendered: ${route}`);
         }
-        fs.writeFileSync(filePath, html);
-        console.log(`  Pre-rendered: ${route}`);
-    }
-    // Clean up
-    if (originalWindow !== undefined) {
-        global.window = originalWindow;
-    }
-    else {
-        delete global.window;
+        // Wait for any pending console messages to flush
+        await new Promise(resolve => setTimeout(resolve, 10));
     }
-    if (originalDocument !== undefined) {
-        global.document = originalDocument;
-    }
-    else {
-        delete global.document;
+    finally {
+        // Clean up - always restore console methods even if there's an error
+        console.error = originalConsoleError;
+        if (originalWindow !== undefined) {
+            global.window = originalWindow;
+        }
+        else {
+            delete global.window;
+        }
+        if (originalDocument !== undefined) {
+            global.document = originalDocument;
+        }
+        else {
+            delete global.document;
+        }
     }
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,wBAAgB,uBAAuB;;;oBAKnB,MAAM,MAAM,MAAM;;;;EA6OrC;AAED,wBAAgB,sBAAsB;;;6BAKT,MAAM;EAelC;AAED,wBAAgB,iBAAiB;;;oBArQb,MAAM,MAAM,MAAM;;;;;;;6BAoPT,MAAM;KAqBlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,wBAAgB,uBAAuB;;;oBAKnB,MAAM,MAAM,MAAM;;;;EA6OrC;AAED,wBAAgB,sBAAsB;;;6BAKT,MAAM;EAoBlC;AAED,wBAAgB,iBAAiB;;;oBA1Qb,MAAM,MAAM,MAAM;;;;;;;6BAoPT,MAAM;KA0BlC"}

package/dist/index.js

@@ -116,13 +116,13 @@ export function webjourneyElementTagger() {
                                 modified = true;
                             }
                         }
-                        // Handle anchor elements
-                        if (tagName === 'a') {
-                            // Check if anchor has href attribute
-                            const hasHref = openingElement.attributes.some((attr) => t.isJSXAttribute(attr) &&
+                        // Handle anchor elements and Link components
+                        if (tagName === 'a' || tagName === 'Link') {
+                            // Check if anchor has href attribute or Link has to attribute
+                            const hasHrefOrTo = openingElement.attributes.some((attr) => t.isJSXAttribute(attr) &&
                                 t.isJSXIdentifier(attr.name) &&
-                                attr.name.name === 'href');
-                            if (hasHref) {
+                                (attr.name.name === 'href' || attr.name.name === 'to'));
+                            if (hasHrefOrTo) {
                                 // Generate unique ID: filename:line
                                 const elementId = `${relativePath}:${lineNumber}`;
                                 openingElement.attributes.push(t.jsxAttribute(t.jsxIdentifier('data-wj-file'), t.stringLiteral(relativePath)), t.jsxAttribute(t.jsxIdentifier('data-wj-line'), t.stringLiteral(String(lineNumber))), t.jsxAttribute(t.jsxIdentifier('data-wj-type'), t.stringLiteral('link')), t.jsxAttribute(t.jsxIdentifier('data-wj-id'), t.stringLiteral(elementId)));
@@ -156,13 +156,17 @@ export function webjourneyPluginScript() {
         name: 'webjourney-plugin-script',
         enforce: 'pre',
         transformIndexHtml(html) {
-            // Get project ID from environment variable
+            // Get project ID and badge visibility from environment variables
             const projectId = process.env.WEBJOURNEY_PROJECT_ID;
-            // Build the meta tag if project ID exists
-            const metaTag = projectId
+            const hideBadge = process.env.WEBJOURNEY_HIDE_BADGE === 'true';
+            // Build the meta tags
+            const projectIdTag = projectId
                 ? `<meta name="webjourney-project-id" content="${projectId}">\n  `
                 : '';
-            return html.replace('</head>', `${metaTag}<script src="${webjourneyPluginScriptHost}/plugins/plugin.iife.js"></script></head>`);
+            const hideBadgeTag = hideBadge
+                ? `<meta name="webjourney-hide-badge" content="true">\n  `
+                : '';
+            return html.replace('</head>', `${projectIdTag}${hideBadgeTag}<script src="${webjourneyPluginScriptHost}/plugins/plugin.iife.js"></script></head>`);
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webjourney/vite-plugins",
-  "version": "1.2.10-0",
+  "version": "1.2.10-2",
   "description": "Vite plugins for Webjourney WYSIWYG editing",
   "type": "module",
   "main": "dist/index.js",