@teambit/react 0.0.1035 → 0.0.1037

package/apps/web/plugins/prerender.ts

@@ -1,10 +1,25 @@
-import PrerenderSPAPlugin from 'prerender-spa-plugin-next';
-import { PuppeteerRenderer } from '@teambit/react.modules.prerenderer-puppeteer';
-import { ReactAppPrerenderOptions } from '../react-app-options';
+// we need to disable this eslint rule because the packages from "@prerenderer" doesn't have the "main" field in their package.json (https://github.com/import-js/eslint-plugin-import/issues/2132)
+// eslint-disable-next-line import/no-unresolved
+import type { RenderedRoute, PrerendererOptions } from '@prerenderer/prerenderer';
+// eslint-disable-next-line import/no-unresolved
+import PrerendererWebpackPlugin from '@prerenderer/webpack-plugin';
+// eslint-disable-next-line import/no-unresolved
+import JSdomPrerenderer, { JSDOMRendererOptions } from '@prerenderer/renderer-jsdom';
 
-export const prerenderPlugin = (options: ReactAppPrerenderOptions) => {
-  return new PrerenderSPAPlugin({
-    renderer: PuppeteerRenderer,
-    ...options,
+export interface WebpackPrerenderSPAOptions extends Omit<PrerendererOptions, 'staticDir'> {
+  entryPath?: string;
+  routes?: Array<string>;
+  postProcess?: (renderedRoutes: RenderedRoute) => Promise<void> | void;
+  urlModifier?(url: string): string;
+  prerenderOptions?: JSDOMRendererOptions;
+}
+
+export const prerenderPlugin = (options: WebpackPrerenderSPAOptions) => {
+  const { prerenderOptions, ...rest } = options;
+  return new PrerendererWebpackPlugin({
+    renderer: new JSdomPrerenderer({
+      ...prerenderOptions,
+    }),
+    ...rest,
   });
 };

package/apps/web/react-app-options.ts

@@ -2,64 +2,10 @@ import { Bundler, DevServer } from '@teambit/bundler';
 import { WebpackConfigTransformer } from '@teambit/webpack';
 
 import { ReactDeployContext } from './deploy-context';
+import { WebpackPrerenderSPAOptions } from './plugins/prerender';
 
-type prerenderedRoute = {
-  /** The prerendered route, after following redirects */
-  route: string;
-  /** The original route passed, before redirects */
-  originalRoute: string;
-  /** The resulting HTML for the route */
-  html: string;
-  /**
-   * The path to write the rendered HTML to.
-   * This is null (automatically calculated after postProcess)
-   * unless explicitly set. */
-  outputPath?: string | null;
-};
-
-/** https://github.com/Tofandel/prerender-spa-plugin-next */
-export type ReactAppPrerenderOptions = {
-  /**
-   * sub folder to output the prerender, inside the webpack output folder
-   * @default '/'
-   */
-  staticDir?: string;
-
-  /** The index file to fall back on for SPAs. */
-  indexPath?: string;
-
-  /**
-   * routes to prerender
-   */
-  routes: string[];
-
-  /**
-   * the proxy server you want the prerender headless browser to run on
-   */
-  server?: {
-    proxy: {
-      [key: string]: {
-        /** required by HPM.
-         * @default 'http://localhost:8000/' */
-        target: string;
-        pathRewrite: { [key: string]: string };
-      };
-    };
-  };
-
-  /**
-   * Post processing of the prerendered html. This is useful for adding meta tags to the html or changing the file name.
-   */
-  postProcess?: (prerenderRoute: prerenderedRoute) => prerenderedRoute;
-
-  /** The renderer you'd like to use to prerender the app.
-   * @default new require("@prerenderer/renderer-puppeteer").
-   */
-  renderer?: any;
-
-  /** options to pass to the renderer class's constructor */
-  rendererOptions?: any;
-};
+/** https://github.com/Tofandel/prerenderer */
+export type ReactAppPrerenderOptions = WebpackPrerenderSPAOptions;
 
 export type ReactAppOptions = {
   /**

package/artifacts/__bit_junit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="teambit.react/react@0.0.1035" timestamp="2023-04-13T04:05:07.153Z" tests="1" failures="0" errors="0" skipped="0">
-    <testcase classname="index-file.spec.js" name="should match snapshot" time="0.058"/>
+  <testsuite name="teambit.react/react@0.0.1037" timestamp="2023-04-19T04:29:16.848Z" tests="1" failures="0" errors="0" skipped="0">
+    <testcase classname="index-file.spec.js" name="should match snapshot" time="0.065"/>
   </testsuite>
 </testsuites>