@teambit/react 0.0.1035 → 0.0.1037

package/dist/apps/web/plugins/prerender.d.ts

@@ -1,2 +1,11 @@
-import { ReactAppPrerenderOptions } from '../react-app-options';
-export declare const prerenderPlugin: (options: ReactAppPrerenderOptions) => any;
+import type { RenderedRoute, PrerendererOptions } from '@prerenderer/prerenderer';
+import PrerendererWebpackPlugin from '@prerenderer/webpack-plugin';
+import { JSDOMRendererOptions } from '@prerenderer/renderer-jsdom';
+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 declare const prerenderPlugin: (options: WebpackPrerenderSPAOptions) => PrerendererWebpackPlugin;

package/dist/apps/web/plugins/prerender.js

@@ -12,16 +12,23 @@ function _defineProperty2() {
   };
   return data;
 }
-function _prerenderSpaPluginNext() {
-  const data = _interopRequireDefault(require("prerender-spa-plugin-next"));
-  _prerenderSpaPluginNext = function () {
+function _objectWithoutProperties2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+  _objectWithoutProperties2 = function () {
     return data;
   };
   return data;
 }
-function _reactModules() {
-  const data = require("@teambit/react.modules.prerenderer-puppeteer");
-  _reactModules = function () {
+function _webpackPlugin() {
+  const data = _interopRequireDefault(require("@prerenderer/webpack-plugin"));
+  _webpackPlugin = function () {
+    return data;
+  };
+  return data;
+}
+function _rendererJsdom() {
+  const data = _interopRequireDefault(require("@prerenderer/renderer-jsdom"));
+  _rendererJsdom = function () {
     return data;
   };
   return data;
@@ -29,9 +36,13 @@ function _reactModules() {
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const prerenderPlugin = options => {
-  return new (_prerenderSpaPluginNext().default)(_objectSpread({
-    renderer: _reactModules().PuppeteerRenderer
-  }, options));
+  const {
+      prerenderOptions
+    } = options,
+    rest = (0, _objectWithoutProperties2().default)(options, ["prerenderOptions"]);
+  return new (_webpackPlugin().default)(_objectSpread({
+    renderer: new (_rendererJsdom().default)(_objectSpread({}, prerenderOptions))
+  }, rest));
 };
 exports.prerenderPlugin = prerenderPlugin;
 

package/dist/apps/web/plugins/prerender.js.map

@@ -1 +1 @@
-{"version":3,"names":["prerenderPlugin","options","PrerenderSPAPlugin","renderer","PuppeteerRenderer"],"sources":["prerender.ts"],"sourcesContent":["import PrerenderSPAPlugin from 'prerender-spa-plugin-next';\nimport { PuppeteerRenderer } from '@teambit/react.modules.prerenderer-puppeteer';\nimport { ReactAppPrerenderOptions } from '../react-app-options';\n\nexport const prerenderPlugin = (options: ReactAppPrerenderOptions) => {\n  return new PrerenderSPAPlugin({\n    renderer: PuppeteerRenderer,\n    ...options,\n  });\n};\n"],"mappings":";;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAiF;AAAA;AAG1E,MAAMA,eAAe,GAAIC,OAAiC,IAAK;EACpE,OAAO,KAAIC,iCAAkB;IAC3BC,QAAQ,EAAEC;EAAiB,GACxBH,OAAO,EACV;AACJ,CAAC;AAAC"}
+{"version":3,"names":["prerenderPlugin","options","prerenderOptions","rest","PrerendererWebpackPlugin","renderer","JSdomPrerenderer"],"sources":["prerender.ts"],"sourcesContent":["// 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)\n// eslint-disable-next-line import/no-unresolved\nimport type { RenderedRoute, PrerendererOptions } from '@prerenderer/prerenderer';\n// eslint-disable-next-line import/no-unresolved\nimport PrerendererWebpackPlugin from '@prerenderer/webpack-plugin';\n// eslint-disable-next-line import/no-unresolved\nimport JSdomPrerenderer, { JSDOMRendererOptions } from '@prerenderer/renderer-jsdom';\n\nexport interface WebpackPrerenderSPAOptions extends Omit<PrerendererOptions, 'staticDir'> {\n  entryPath?: string;\n  routes?: Array<string>;\n  postProcess?: (renderedRoutes: RenderedRoute) => Promise<void> | void;\n  urlModifier?(url: string): string;\n  prerenderOptions?: JSDOMRendererOptions;\n}\n\nexport const prerenderPlugin = (options: WebpackPrerenderSPAOptions) => {\n  const { prerenderOptions, ...rest } = options;\n  return new PrerendererWebpackPlugin({\n    renderer: new JSdomPrerenderer({\n      ...prerenderOptions,\n    }),\n    ...rest,\n  });\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAIA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAAqF;AAAA;AAU9E,MAAMA,eAAe,GAAIC,OAAmC,IAAK;EACtE,MAAM;MAAEC;IAA0B,CAAC,GAAGD,OAAO;IAAhBE,IAAI,4CAAKF,OAAO;EAC7C,OAAO,KAAIG,wBAAwB;IACjCC,QAAQ,EAAE,KAAIC,wBAAgB,oBACzBJ,gBAAgB;EACnB,GACCC,IAAI,EACP;AACJ,CAAC;AAAC"}

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

@@ -1,58 +1,9 @@
 import { Bundler, DevServer } from '@teambit/bundler';
 import { WebpackConfigTransformer } from '@teambit/webpack';
 import { ReactDeployContext } from './deploy-context';
-declare 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 declare 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;
-};
+import { WebpackPrerenderSPAOptions } from './plugins/prerender';
+/** https://github.com/Tofandel/prerenderer */
+export declare type ReactAppPrerenderOptions = WebpackPrerenderSPAOptions;
 export declare type ReactAppOptions = {
     /**
      * name of the application.
@@ -102,4 +53,3 @@ export declare type ReactAppOptions = {
      */
     favicon?: string;
 };
-export {};

package/dist/apps/web/react-app-options.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["react-app-options.ts"],"sourcesContent":["import { Bundler, DevServer } from '@teambit/bundler';\nimport { WebpackConfigTransformer } from '@teambit/webpack';\n\nimport { ReactDeployContext } from './deploy-context';\n\ntype prerenderedRoute = {\n  /** The prerendered route, after following redirects */\n  route: string;\n  /** The original route passed, before redirects */\n  originalRoute: string;\n  /** The resulting HTML for the route */\n  html: string;\n  /**\n   * The path to write the rendered HTML to.\n   * This is null (automatically calculated after postProcess)\n   * unless explicitly set. */\n  outputPath?: string | null;\n};\n\n/** https://github.com/Tofandel/prerender-spa-plugin-next */\nexport type ReactAppPrerenderOptions = {\n  /**\n   * sub folder to output the prerender, inside the webpack output folder\n   * @default '/'\n   */\n  staticDir?: string;\n\n  /** The index file to fall back on for SPAs. */\n  indexPath?: string;\n\n  /**\n   * routes to prerender\n   */\n  routes: string[];\n\n  /**\n   * the proxy server you want the prerender headless browser to run on\n   */\n  server?: {\n    proxy: {\n      [key: string]: {\n        /** required by HPM.\n         * @default 'http://localhost:8000/' */\n        target: string;\n        pathRewrite: { [key: string]: string };\n      };\n    };\n  };\n\n  /**\n   * Post processing of the prerendered html. This is useful for adding meta tags to the html or changing the file name.\n   */\n  postProcess?: (prerenderRoute: prerenderedRoute) => prerenderedRoute;\n\n  /** The renderer you'd like to use to prerender the app.\n   * @default new require(\"@prerenderer/renderer-puppeteer\").\n   */\n  renderer?: any;\n\n  /** options to pass to the renderer class's constructor */\n  rendererOptions?: any;\n};\n\nexport type ReactAppOptions = {\n  /**\n   * name of the application.\n   */\n  name: string;\n\n  /**\n   * path to entry files of the application.\n   */\n  entry: string[] | ((path?: string) => Promise<string[]>);\n\n  /**\n   * path to server-rendered entrypoint of the app\n   */\n  ssr?: string | (() => Promise<string>);\n\n  /**\n   * instance of bundler to use. default is Webpack.\n   */\n  bundler?: Bundler;\n\n  /**\n   * instance of serverside bundler to use. default is Webpack.\n   */\n  ssrBundler?: Bundler;\n\n  /**\n   * instance of dev server to use. default is Webpack.\n   */\n  devServer?: DevServer;\n\n  /**\n   * set webpack transformers\n   */\n  webpackTransformers?: WebpackConfigTransformer[];\n\n  /**\n   * decide whether to prerender your app. accepts an array of routes. if none, prerender would not apply.\n   *  e.g ['/plugins', '/learn', '/docs/quick-start]\n   * You can also pass a configuration for the proxy, please refer here: https://github.com/webpack/docs/wiki/webpack-dev-server#proxy\n   *\n   */\n  prerender?: ReactAppPrerenderOptions;\n\n  /**\n   * deploy function.\n   */\n  deploy?: (context: ReactDeployContext) => Promise<void>;\n\n  /**\n   * ranges of ports to use to run the app server.\n   */\n  portRange?: [start: number, end: number];\n\n  /**\n   * favicon for the app. You can pass an abs path (using require.resolve()) or a url.\n   */\n  favicon?: string;\n};\n"],"mappings":""}
+{"version":3,"names":[],"sources":["react-app-options.ts"],"sourcesContent":["import { Bundler, DevServer } from '@teambit/bundler';\nimport { WebpackConfigTransformer } from '@teambit/webpack';\n\nimport { ReactDeployContext } from './deploy-context';\nimport { WebpackPrerenderSPAOptions } from './plugins/prerender';\n\n/** https://github.com/Tofandel/prerenderer */\nexport type ReactAppPrerenderOptions = WebpackPrerenderSPAOptions;\n\nexport type ReactAppOptions = {\n  /**\n   * name of the application.\n   */\n  name: string;\n\n  /**\n   * path to entry files of the application.\n   */\n  entry: string[] | ((path?: string) => Promise<string[]>);\n\n  /**\n   * path to server-rendered entrypoint of the app\n   */\n  ssr?: string | (() => Promise<string>);\n\n  /**\n   * instance of bundler to use. default is Webpack.\n   */\n  bundler?: Bundler;\n\n  /**\n   * instance of serverside bundler to use. default is Webpack.\n   */\n  ssrBundler?: Bundler;\n\n  /**\n   * instance of dev server to use. default is Webpack.\n   */\n  devServer?: DevServer;\n\n  /**\n   * set webpack transformers\n   */\n  webpackTransformers?: WebpackConfigTransformer[];\n\n  /**\n   * decide whether to prerender your app. accepts an array of routes. if none, prerender would not apply.\n   *  e.g ['/plugins', '/learn', '/docs/quick-start]\n   * You can also pass a configuration for the proxy, please refer here: https://github.com/webpack/docs/wiki/webpack-dev-server#proxy\n   *\n   */\n  prerender?: ReactAppPrerenderOptions;\n\n  /**\n   * deploy function.\n   */\n  deploy?: (context: ReactDeployContext) => Promise<void>;\n\n  /**\n   * ranges of ports to use to run the app server.\n   */\n  portRange?: [start: number, end: number];\n\n  /**\n   * favicon for the app. You can pass an abs path (using require.resolve()) or a url.\n   */\n  favicon?: string;\n};\n"],"mappings":""}

package/dist/apps/web/react.application.d.ts

@@ -5,7 +5,6 @@ import { DependencyResolverMain } from '@teambit/dependency-resolver';
 import { WebpackConfigTransformer } from '@teambit/webpack';
 import { ReactEnv } from '../../react.env';
 import { ReactAppBuildResult } from './react-build-result';
-import { ReactAppPrerenderOptions } from './react-app-options';
 import { ReactDeployContext } from '.';
 export declare class ReactApp implements Application {
     readonly name: string;
@@ -15,14 +14,14 @@ export declare class ReactApp implements Application {
     private reactEnv;
     private logger;
     private dependencyResolver;
-    readonly prerender?: ReactAppPrerenderOptions | undefined;
+    readonly prerender?: import("./plugins/prerender").WebpackPrerenderSPAOptions | undefined;
     readonly bundler?: Bundler | undefined;
     readonly ssrBundler?: Bundler | undefined;
     readonly devServer?: DevServer | undefined;
     readonly transformers: WebpackConfigTransformer[];
     readonly deploy?: ((context: ReactDeployContext) => Promise<void>) | undefined;
     readonly favicon?: string | undefined;
-    constructor(name: string, entry: string[] | ((path?: string) => Promise<string[]>), ssr: string | (() => Promise<string>) | undefined, portRange: [number, number], reactEnv: ReactEnv, logger: Logger, dependencyResolver: DependencyResolverMain, prerender?: ReactAppPrerenderOptions | undefined, bundler?: Bundler | undefined, ssrBundler?: Bundler | undefined, devServer?: DevServer | undefined, transformers?: WebpackConfigTransformer[], deploy?: ((context: ReactDeployContext) => Promise<void>) | undefined, favicon?: string | undefined);
+    constructor(name: string, entry: string[] | ((path?: string) => Promise<string[]>), ssr: string | (() => Promise<string>) | undefined, portRange: [number, number], reactEnv: ReactEnv, logger: Logger, dependencyResolver: DependencyResolverMain, prerender?: import("./plugins/prerender").WebpackPrerenderSPAOptions | undefined, bundler?: Bundler | undefined, ssrBundler?: Bundler | undefined, devServer?: DevServer | undefined, transformers?: WebpackConfigTransformer[], deploy?: ((context: ReactDeployContext) => Promise<void>) | undefined, favicon?: string | undefined);
     readonly applicationType = "react-common-js";
     readonly dir = "public";
     readonly ssrDir = "ssr";

package/dist/{preview-1681356521665.js → preview-1681875190881.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.1035/dist/react.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.1035/dist/react.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.1037/dist/react.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.1037/dist/react.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/react",
-  "version": "0.0.1035",
+  "version": "0.0.1037",
   "homepage": "https://bit.cloud/teambit/react/react",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.react",
     "name": "react",
-    "version": "0.0.1035"
+    "version": "0.0.1037"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -40,7 +40,9 @@
     "comment-json": "3.0.3",
     "react-error-overlay": "6.0.9",
     "strip-ansi": "6.0.0",
-    "prerender-spa-plugin-next": "4.2.0",
+    "@prerenderer/prerenderer": "^1.2.0",
+    "@prerenderer/renderer-jsdom": "^1.1.2",
+    "@prerenderer/webpack-plugin": "^5.2.0",
     "express": "4.17.1",
     "url-join": "4.0.1",
     "react-refresh": "0.10.0",
@@ -85,46 +87,45 @@
     "@teambit/component-id": "0.0.427",
     "@teambit/react.rendering.ssr": "0.0.3",
     "@teambit/compositions.ui.hooks.use-composition": "0.0.172",
-    "@teambit/builder": "0.0.1035",
-    "@teambit/bundler": "0.0.1035",
-    "@teambit/compiler": "0.0.1035",
+    "@teambit/builder": "0.0.1037",
+    "@teambit/bundler": "0.0.1037",
+    "@teambit/compiler": "0.0.1037",
     "@teambit/component.modules.component-url": "0.0.151",
-    "@teambit/component": "0.0.1035",
-    "@teambit/dependency-resolver": "0.0.1035",
-    "@teambit/envs": "0.0.1035",
-    "@teambit/eslint": "0.0.1035",
-    "@teambit/formatter": "0.0.586",
-    "@teambit/jest": "0.0.1035",
-    "@teambit/linter": "0.0.1035",
-    "@teambit/logger": "0.0.789",
-    "@teambit/pkg": "0.0.1035",
-    "@teambit/prettier": "0.0.586",
-    "@teambit/preview": "0.0.1035",
+    "@teambit/component": "0.0.1037",
+    "@teambit/dependency-resolver": "0.0.1037",
+    "@teambit/envs": "0.0.1037",
+    "@teambit/eslint": "0.0.1037",
+    "@teambit/formatter": "0.0.588",
+    "@teambit/jest": "0.0.1037",
+    "@teambit/linter": "0.0.1037",
+    "@teambit/logger": "0.0.791",
+    "@teambit/pkg": "0.0.1037",
+    "@teambit/prettier": "0.0.588",
+    "@teambit/preview": "0.0.1037",
     "@teambit/react.ui.compositions-app": "0.0.12",
     "@teambit/react.ui.docs-app": "0.0.205",
     "@teambit/react.ui.highlighter.component-metadata.bit-component-meta": "0.0.31",
-    "@teambit/schema": "0.0.1035",
-    "@teambit/tester": "0.0.1035",
-    "@teambit/typescript": "0.0.1035",
-    "@teambit/webpack": "0.0.1035",
-    "@teambit/workspace": "0.0.1035",
-    "@teambit/application": "0.0.677",
-    "@teambit/cli": "0.0.696",
-    "@teambit/generator": "0.0.1035",
-    "@teambit/graphql": "0.0.1035",
+    "@teambit/schema": "0.0.1037",
+    "@teambit/tester": "0.0.1037",
+    "@teambit/typescript": "0.0.1037",
+    "@teambit/webpack": "0.0.1037",
+    "@teambit/workspace": "0.0.1037",
+    "@teambit/application": "0.0.679",
+    "@teambit/cli": "0.0.698",
+    "@teambit/generator": "0.0.1037",
+    "@teambit/graphql": "0.0.1037",
     "@teambit/react.ui.highlighter-provider": "0.0.200",
-    "@teambit/compositions": "0.0.1035",
-    "@teambit/ui": "0.0.1035",
-    "@teambit/react.eslint-config-bit-react": "0.0.768",
+    "@teambit/compositions": "0.0.1037",
+    "@teambit/ui": "0.0.1037",
+    "@teambit/react.eslint-config-bit-react": "0.0.770",
     "@teambit/mdx.modules.mdx-loader": "0.0.509",
     "@teambit/react.babel.bit-react-transformer": "0.0.529",
     "@teambit/webpack.modules.generate-style-loaders": "0.0.110",
     "@teambit/webpack.modules.style-regexps": "0.0.139",
     "@teambit/bit-error": "0.0.402",
     "@teambit/toolbox.network.get-port": "0.0.121",
-    "@teambit/react.modules.prerenderer-puppeteer": "0.0.9",
     "@teambit/ui-foundation.ui.pages.static-error": "0.0.86",
-    "@teambit/config": "0.0.709"
+    "@teambit/config": "0.0.711"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -146,7 +147,7 @@
     "@teambit/react.content.react-overview": "1.95.0"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.476",
+    "@teambit/legacy": "1.0.478",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },