Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce bundle size #1697

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
import type { ReactElement } from 'react';

import * as ClientStartup from './clientStartup';
import handleError from './handleError';
import ComponentRegistry from './ComponentRegistry';
import StoreRegistry from './StoreRegistry';
import serverRenderReactComponent from './serverRenderReactComponent';
import buildConsoleReplay from './buildConsoleReplay';
import createReactOutput from './createReactOutput';
import Authenticity from './Authenticity';
import context from './context';
import type {
RegisteredComponent,
RenderParams,
RenderResult,
RenderReturnType,
ErrorOptions,
ReactComponentOrRenderFunction,
AuthenticityHeaders,
Store,
Expand Down Expand Up @@ -243,8 +239,8 @@ ctx.ReactOnRails = {
* Used by server rendering by Rails
* @param options
*/
serverRenderReactComponent(options: RenderParams): null | string | Promise<RenderResult> {
return serverRenderReactComponent(options);
serverRenderReactComponent(): null | string | Promise<RenderResult> {
throw new Error('serverRenderReactComponent is not available in "react-on-rails/client". Import "react-on-rails" server-side.');
},

/**
Expand All @@ -259,8 +255,8 @@ ctx.ReactOnRails = {
* Used by Rails to catch errors in rendering
* @param options
*/
handleError(options: ErrorOptions): string | undefined {
return handleError(options);
handleError(): string | undefined {
throw new Error('handleError is not available in "react-on-rails/client". Import "react-on-rails" server-side.');
},

/**
Expand Down
6 changes: 3 additions & 3 deletions node_package/src/ReactOnRails.node.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ReactOnRails from './ReactOnRails';
import ReactOnRails from './ReactOnRails.server';
import streamServerRenderedReactComponent from './streamServerRenderedReactComponent';

ReactOnRails.streamServerRenderedReactComponent = streamServerRenderedReactComponent;

export * from './ReactOnRails';
export { default } from './ReactOnRails';
export * from './ReactOnRails.server';
export { default } from './ReactOnRails.server';
19 changes: 19 additions & 0 deletions node_package/src/ReactOnRails.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import handleError from './handleError';
import serverRenderReactComponent from './serverRenderReactComponent';
import type {
RenderParams,
RenderResult,
ErrorOptions,
} from './types';

import Client from './ReactOnRails.client';

if (typeof window !== 'undefined') {
throw new Error('"react-on-rails" is for server-side rendering only. Import "react-on-rails/client".');
}

Client.handleError = (options: ErrorOptions): string | undefined => handleError(options);
Client.serverRenderReactComponent = (options: RenderParams): null | string | Promise<RenderResult> => serverRenderReactComponent(options);

export * from "./types";
export default Client;
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"version": "14.1.1",
"description": "react-on-rails JavaScript for react_on_rails Ruby gem",
"exports": {
".": {
"./server": {
"node": "./node_package/lib/ReactOnRails.node.js",
"default": "./node_package/lib/ReactOnRails.js"
}
"default": "./node_package/lib/ReactOnRails.server.js"
},
"./client": "./node_package/lib/ReactOnRails.client.js"
},
"directories": {
"doc": "docs"
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"esModuleInterop": true,
"jsx": "react-jsx",
"lib": ["dom", "es2015"],
"module": "CommonJS",
"module": "Preserve",
"noImplicitAny": true,
"outDir": "node_package/lib",
"strict": true,
"incremental": true,
"target": "es5"
"target": "es2015"
Copy link
Collaborator

@alexeyr-ci alexeyr-ci Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even Node 14 has es2020, so that should definitely be safe.

This tells TypeScript that it's okay to output JavaScript syntax with features from ES2020. In practice, this means that it will e.g. output optional chaining operators & async/await syntax instead of embedding a polyfill.

Anyone running an older Node is also not going to upgrade this before upgrading Node, I think :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

},
"include": ["node_package/src/**/*"]
}
Loading