Move react-html to react-markup (#30688)

packages/react-client/src/forks/ReactFlightClientConfig.markup.js

@@ -9,7 +9,7 @@
 
 import type {Thenable} from 'shared/ReactTypes';
 
-export * from 'react-html/src/ReactHTMLLegacyClientStreamConfig.js';
+export * from 'react-markup/src/ReactMarkupLegacyClientStreamConfig.js';
 export * from 'react-client/src/ReactClientConsoleConfigPlain';
 
 export type ModuleLoading = null;

packages/react-html/README.md → packages/react-markup/README.md

@@ -1,17 +1,17 @@
-# `react-html`
+# `react-markup`
 
 This package provides the ability to render standalone HTML from Server Components for use in embedded contexts such as e-mails and RSS/Atom feeds. It cannot use Client Components and does not hydrate. It is intended to be paired with the generic React package, which is shipped as `react` to npm.
 
 ## Installation
 
 ```sh
-npm install react react-html
+npm install react react-markup
 ```
 
 ## Usage
 
 ```js
-import { renderToMarkup } from 'react-html';
+import { renderToMarkup } from 'react-markup';
 import EmailTemplate from './my-email-template-component.js'
 
 async function action(email, name) {
@@ -27,6 +27,6 @@ Note that this is an async function that needs to be awaited - unlike the legacy
 
 ## API
 
-### `react-html`
+### `react-markup`
 
-See https://react.dev/reference/react-html
+See https://react.dev/reference/react-markup

packages/react-html/index.js → packages/react-markup/index.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactHTMLClient';
+export * from './src/ReactMarkupClient';

packages/react-markup/npm/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+ module.exports = require('./cjs/react-markup.production.js');
+} else {
+ module.exports = require('./cjs/react-markup.development.js');
+}

packages/react-markup/npm/react-markup.react-server.js

@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+ module.exports = require('./cjs/react-markup.react-server.production.js');
+} else {
+ module.exports = require('./cjs/react-markup.react-server.development.js');
+}

packages/react-html/package.json → packages/react-markup/package.json

@@ -1,13 +1,13 @@
 {
- "name": "react-html",
+ "name": "react-markup",
  "version": "19.0.0",
  "private": true,
  "description": "React package generating embedded HTML markup such as e-mails using Server Components.",
  "main": "index.js",
  "repository": {
  "type": "git",
  "url": "https:/facebook/react.git",
- "directory": "packages/react-html"
+ "directory": "packages/react-markup"
  },
  "keywords": [
  "react"
@@ -24,12 +24,12 @@
  "LICENSE",
  "README.md",
  "index.js",
- "react-html.react-server.js",
+ "react-markup.react-server.js",
  "cjs/"
  ],
  "exports": {
  ".": {
- "react-server": "./react-html.react-server.js",
+ "react-server": "./react-markup.react-server.js",
  "default": "./index.js"
  },
  "./src/*": "./src/*",

packages/react-html/react-html.react-server.js → packages/react-markup/react-markup.react-server.js

@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from './src/ReactHTMLServer';
+export * from './src/ReactMarkupServer';

packages/react-html/src/ReactHTMLClient.js → packages/react-markup/src/ReactMarkupClient.js

@@ -23,7 +23,7 @@ import {
  createResumableState,
  createRenderState,
  createRootFormatContext,
-} from './ReactFizzConfigHTML';
+} from './ReactFizzConfigMarkup';
 
 type MarkupOptions = {
  identifierPrefix?: string,

packages/react-html/src/ReactHTMLClient.stable.js → packages/react-markup/src/ReactMarkupClient.stable.js

@@ -8,4 +8,4 @@
  */
 
 // eslint-disable-next-line react-internal/prod-error-codes
-throw new Error('react-html should not get built in stable');
+throw new Error('react-markup should not get built in stable');

packages/react-html/src/ReactHTMLServer.js → packages/react-markup/src/ReactMarkupServer.js

@@ -41,7 +41,7 @@ import {
  createResumableState,
  createRenderState,
  createRootFormatContext,
-} from './ReactFizzConfigHTML';
+} from './ReactFizzConfigMarkup';
 
 type ReactMarkupNodeList =
  // This is the intersection of ReactNodeList and ReactClientValue minus

packages/react-html/src/ReactHTMLServer.stable.js → packages/react-markup/src/ReactMarkupServer.stable.js

@@ -8,4 +8,4 @@
  */
 
 // eslint-disable-next-line react-internal/prod-error-codes
-throw new Error('react-html should not get built in stable');
+throw new Error('react-markup should not get built in stable');

packages/react-html/src/__tests__/ReactHTMLClient-test.js → packages/react-markup/src/__tests__/ReactMarkupClient-test.js

@@ -10,7 +10,7 @@
 'use strict';
 
 let React;
-let ReactHTML;
+let ReactMarkup;
 
 function normalizeCodeLocInfo(str) {
  return (
@@ -24,26 +24,26 @@ function normalizeCodeLocInfo(str) {
 if (!__EXPERIMENTAL__) {
  it('should not be built in stable', () => {
  try {
- require('react-html');
+ require('react-markup');
  } catch (x) {
  return;
  }
- throw new Error('Expected react-html not to exist in stable.');
+ throw new Error('Expected react-markup not to exist in stable.');
  });
 } else {
- describe('ReactHTML', () => {
+ describe('ReactMarkup', () => {
  beforeEach(() => {
  jest.resetModules();
  React = require('react');
- ReactHTML = require('react-html');
+ ReactMarkup = require('react-markup');
  });
 
  it('should be able to render a simple component', async () => {
  function Component() {
  return <div>hello world</div>;
  }
 
- const html = await ReactHTML.renderToMarkup(<Component />);
+ const html = await ReactMarkup.renderToMarkup(<Component />);
  expect(html).toBe('<div>hello world</div>');
  });
 
@@ -52,14 +52,14 @@ if (!__EXPERIMENTAL__) {
  return <div>{'hello '.repeat(200)}world</div>;
  }
 
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  React.createElement(Component),
  );
  expect(html).toBe('<div>' + ('hello '.repeat(200) + 'world') + '</div>');
  });
 
  it('should prefix html tags with a doctype', async () => {
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  <html>
  <body>hello</body>
  </html>,
@@ -76,7 +76,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(<Component />);
+ await ReactMarkup.renderToMarkup(<Component />);
  }).rejects.toThrow();
  });
 
@@ -87,7 +87,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(<Component />);
+ await ReactMarkup.renderToMarkup(<Component />);
  }).rejects.toThrow();
  });
 
@@ -100,7 +100,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(<Component />);
+ await ReactMarkup.renderToMarkup(<Component />);
  }).rejects.toThrow();
  });
 
@@ -142,7 +142,7 @@ if (!__EXPERIMENTAL__) {
  );
  }
 
- const html = await ReactHTML.renderToMarkup(<Component />);
+ const html = await ReactMarkup.renderToMarkup(<Component />);
  const container = document.createElement('div');
  container.innerHTML = html;
 
@@ -176,7 +176,7 @@ if (!__EXPERIMENTAL__) {
  );
  }
 
- const html = await ReactHTML.renderToMarkup(<Component />);
+ const html = await ReactMarkup.renderToMarkup(<Component />);
  expect(html).toBe('<div>01</div>');
  });
 
@@ -199,7 +199,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(
+ await ReactMarkup.renderToMarkup(
  <div>
  <Foo />
  </div>,

packages/react-html/src/__tests__/ReactHTMLServer-test.js → packages/react-markup/src/__tests__/ReactMarkupServer-test.js

@@ -13,7 +13,7 @@ global.TextDecoder = require('util').TextDecoder;
 global.TextEncoder = require('util').TextEncoder;
 
 let React;
-let ReactHTML;
+let ReactMarkup;
 
 function normalizeCodeLocInfo(str) {
  return (
@@ -27,34 +27,34 @@ function normalizeCodeLocInfo(str) {
 if (!__EXPERIMENTAL__) {
  it('should not be built in stable', () => {
  try {
- require('react-html');
+ require('react-markup');
  } catch (x) {
  return;
  }
- throw new Error('Expected react-html not to exist in stable.');
+ throw new Error('Expected react-markup not to exist in stable.');
  });
 } else {
- describe('ReactHTML', () => {
+ describe('ReactMarkup', () => {
  beforeEach(() => {
  jest.resetModules();
  // We run in the react-server condition.
  jest.mock('react', () => require('react/react.react-server'));
  if (__EXPERIMENTAL__) {
- jest.mock('react-html', () =>
- require('react-html/react-html.react-server'),
+ jest.mock('react-markup', () =>
+ require('react-markup/react-markup.react-server'),
  );
  }
 
  React = require('react');
  if (__EXPERIMENTAL__) {
- ReactHTML = require('react-html');
+ ReactMarkup = require('react-markup');
  } else {
  try {
- require('react-html/react-html.react-server');
+ require('react-markup/react-markup.react-server');
  } catch (x) {
  return;
  }
- throw new Error('Expected react-html not to exist in stable.');
+ throw new Error('Expected react-markup not to exist in stable.');
  }
  });
 
@@ -64,7 +64,7 @@ if (!__EXPERIMENTAL__) {
  return React.createElement('div', null, 'hello world');
  }
 
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  React.createElement(Component),
  );
  expect(html).toBe('<div>hello world</div>');
@@ -76,14 +76,14 @@ if (!__EXPERIMENTAL__) {
  return React.createElement('div', null, 'hello '.repeat(200) + 'world');
  }
 
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  React.createElement(Component),
  );
  expect(html).toBe('<div>' + ('hello '.repeat(200) + 'world') + '</div>');
  });
 
  it('should prefix html tags with a doctype', async () => {
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  // We can't use JSX because that's client-JSX in our tests.
  React.createElement(
  'html',
@@ -104,7 +104,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(React.createElement(Component));
+ await ReactMarkup.renderToMarkup(React.createElement(Component));
  }).rejects.toThrow();
  });
 
@@ -116,7 +116,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(React.createElement(Component));
+ await ReactMarkup.renderToMarkup(React.createElement(Component));
  }).rejects.toThrow();
  });
 
@@ -130,7 +130,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(React.createElement(Component));
+ await ReactMarkup.renderToMarkup(React.createElement(Component));
  }).rejects.toThrow();
  });
 
@@ -173,7 +173,7 @@ if (!__EXPERIMENTAL__) {
  );
  }
 
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  React.createElement(Component),
  );
  const container = document.createElement('div');
@@ -204,7 +204,7 @@ if (!__EXPERIMENTAL__) {
  return React.createElement('div', null, a, b);
  }
 
- const html = await ReactHTML.renderToMarkup(
+ const html = await ReactMarkup.renderToMarkup(
  React.createElement(Component),
  );
  expect(html).toBe('<div>00</div>');
@@ -225,7 +225,7 @@ if (!__EXPERIMENTAL__) {
  }
 
  await expect(async () => {
- await ReactHTML.renderToMarkup(
+ await ReactMarkup.renderToMarkup(
  React.createElement('div', null, React.createElement(Foo)),
  {
  onError(error, errorInfo) {

packages/react-reconciler/src/forks/ReactFiberConfig.markup.js

@@ -13,4 +13,4 @@ export * from 'react-dom-bindings/src/client/ReactFiberConfigDOM';
 export * from 'react-client/src/ReactClientConsoleConfigBrowser';
 
 // eslint-disable-next-line react-internal/prod-error-codes
-throw new Error('Fiber is not used in react-html');
+throw new Error('Fiber is not used in react-markup');