Skip to content

Commit d91ea2d

Browse files
committed
Strip newlines from inline runtime
1 parent 2ad25a7 commit d91ea2d

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

packages/react-dom-bindings/src/server/fizz-instruction-set/ReactDOMFizzInstructionSetInlineCodeStrings.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,24 +141,26 @@ describe('ReactDOMFizzStaticBrowser', () => {
141141

142142
async function readIntoNewDocument(stream) {
143143
const content = await readContent(stream);
144-
const jsdom = new JSDOM(content, {
145-
runScripts: 'dangerously',
146-
});
144+
const jsdom = new JSDOM(
145+
// The Fizz runtime assumes requestAnimationFrame exists so we need to polyfill it.
146+
'<script>window.requestAnimationFrame = setTimeout;</script>' + content,
147+
{
148+
runScripts: 'dangerously',
149+
},
150+
);
147151
const originalWindow = global.window;
148152
const originalDocument = global.document;
149153
const originalNavigator = global.navigator;
150154
const originalNode = global.Node;
151155
const originalAddEventListener = global.addEventListener;
152156
const originalMutationObserver = global.MutationObserver;
157+
const originalRequestAnimationFrame = global.requestAnimationFrame;
153158
global.window = jsdom.window;
154159
global.document = global.window.document;
155160
global.navigator = global.window.navigator;
156161
global.Node = global.window.Node;
157162
global.addEventListener = global.window.addEventListener;
158163
global.MutationObserver = global.window.MutationObserver;
159-
// The Fizz runtime assumes requestAnimationFrame exists so we need to polyfill it.
160-
global.requestAnimationFrame = global.window.requestAnimationFrame = cb =>
161-
setTimeout(cb);
162164
global.window.__restoreGlobalScope = () => {
163165
global.window = originalWindow;
164166
global.document = originalDocument;

scripts/rollup/generate-inline-fizz-runtime.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async function main() {
7070
});
7171
});
7272

73-
return `export const ${exportName} = ${JSON.stringify(code.trim())};`;
73+
return `export const ${exportName} = ${JSON.stringify(code.trim().replace('\n', ''))};`;
7474
})
7575
);
7676

0 commit comments

Comments
 (0)