Refactor '__FIZZ_FUNCTION__' -> __FIZZ_FUNCTION_STR__

Author: mofeiZ

packages/react-dom-bindings/src/server/ReactDOMServerFormatConfig.js

@@ -2022,13 +2022,14 @@ export function writeEndSegment(
 }
 
 // These are injected by the build system. See ReactDOMFizzClientInstructionSet.js.
-const completeSegmentFunction =
-  '__FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION__';
-const completeBoundaryFunction =
-  '__FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION__';
-const styleInsertionFunction =
-  '__FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION__';
-const clientRenderFunction = '__FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION__';
+// eslint-disable-next-line no-undef
+const completeSegmentFunction = __FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION_STR__;
+// eslint-disable-next-line no-undef
+const completeBoundaryFunction = __FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION_STR__;
+// eslint-disable-next-line no-undef
+const styleInsertionFunction = __FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION_STR__;
+// eslint-disable-next-line no-undef
+const clientRenderFunction = __FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION_STR__;
 
 const completeSegmentScript1Full = stringToPrecomputedChunk(
   completeSegmentFunction + ';$RS("',

packages/react-dom/src/server/ReactDOMFizzClientInstructionSet.js

@@ -215,3 +215,10 @@ exports.styleInsertionFunction =
   '$RM=new Map;function $RR(p,q,t){function r(l){this.s=l}for(var m=new Map,n=document,g,e,f=n.querySelectorAll("link[data-rprec]"),d=0;e=f[d++];)m.set(e.dataset.rprec,g=e);e=0;f=[];for(var c,h,b,a;c=t[e++];){var k=0;h=c[k++];if(b=$RM.get(h))"l"!==b.s&&f.push(b);else{a=n.createElement("link");a.href=h;a.rel="stylesheet";for(a.dataset.rprec=d=c[k++];b=c[k++];)a.setAttribute(b,c[k++]);b=a._p=new Promise(function(l,u){a.onload=l;a.onerror=u});b.then(r.bind(b,"l"),r.bind(b,"e"));$RM.set(h,b);f.push(b);c=m.get(d)||g;c===g&&(g=a);m.set(d,a);c?c.parentNode.insertBefore(a,c.nextSibling):(d=n.head,d.insertBefore(a,d.firstChild))}}Promise.all(f).then($RC.bind(null,p,q,""),$RC.bind(null,p,q,"Resource failed to load"))}';
 exports.clientRenderFunction =
   'function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.dgst=c),d&&(a.msg=d),e&&(a.stck=e),b._reactRetry&&b._reactRetry())}';
+
+exports.completeSegmentFunctionStr =
+  "'" + exports.completeSegmentFunction + "'";
+exports.completeBoundaryFunctionStr =
+  "'" + exports.completeBoundaryFunction + "'";
+exports.styleInsertionFunctionStr = "'" + exports.styleInsertionFunction + "'";
+exports.clientRenderFunctionStr = "'" + exports.clientRenderFunction + "'";

scripts/flow/environment.js

@@ -14,10 +14,10 @@ declare var __UMD__: boolean;
 declare var __EXPERIMENTAL__: boolean;
 declare var __VARIANT__: boolean;
 
-declare var __FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION__: string;
-declare var __FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION__: string;
-declare var __FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION__: string;
-declare var __FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION__: string;
+declare var __FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION_STR__: string;
+declare var __FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION_STR__: string;
+declare var __FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION_STR__: string;
+declare var __FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION_STR__: string;
 
 declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
   inject: ?((stuff: Object) => void)

scripts/jest/setupEnvironment.js

@@ -1,5 +1,12 @@
 /* eslint-disable */
 
+const {
+  completeSegmentFunction,
+  completeBoundaryFunction,
+  styleInsertionFunction,
+  clientRenderFunction,
+} = require('../../packages/react-dom/src/server/ReactDOMFizzClientInstructionSet.js');
+
 const NODE_ENV = process.env.NODE_ENV;
 if (NODE_ENV !== 'development' && NODE_ENV !== 'production') {
   throw new Error('NODE_ENV must either be set to development or production.');
@@ -9,6 +16,10 @@ global.__EXTENSION__ = false;
 global.__TEST__ = NODE_ENV === 'test';
 global.__PROFILE__ = NODE_ENV === 'development';
 global.__UMD__ = false;
+global.__FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION_STR__ = completeSegmentFunction;
+global.__FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION_STR__ = completeBoundaryFunction;
+global.__FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION_STR__ = styleInsertionFunction;
+global.__FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION_STR__ = clientRenderFunction;
 
 const RELEASE_CHANNEL = process.env.RELEASE_CHANNEL;
 

scripts/rollup/build.js

@@ -25,10 +25,10 @@ const Wrappers = require('./wrappers');
 
 // TODO: Ideally these would be built as part of the regular build step.
 const {
-  completeSegmentFunction,
-  completeBoundaryFunction,
-  styleInsertionFunction,
-  clientRenderFunction,
+  completeSegmentFunctionStr,
+  completeBoundaryFunctionStr,
+  styleInsertionFunctionStr,
+  clientRenderFunctionStr,
 } = require('../../packages/react-dom/src/server/ReactDOMFizzClientInstructionSet');
 
 const RELEASE_CHANNEL = process.env.RELEASE_CHANNEL;
@@ -373,10 +373,10 @@ function getPlugins(
       // NOTE: I did not put much thought into how to configure this.
       __VARIANT__: bundle.enableNewReconciler === true,
 
-      __FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION__: completeSegmentFunction,
-      __FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION__: completeBoundaryFunction,
-      __FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION__: styleInsertionFunction,
-      __FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION__: clientRenderFunction,
+      __FIZZ_INSTRUCTION_SET_COMPLETE_SEGMENT_FUNCTION_STR__: completeSegmentFunctionStr,
+      __FIZZ_INSTRUCTION_SET_COMPLETE_BOUNDARY_FUNCTION_STR__: completeBoundaryFunctionStr,
+      __FIZZ_INSTRUCTION_SET_STYLE_INSERTION_FUNCTION_STR__: styleInsertionFunctionStr,
+      __FIZZ_INSTRUCTION_SET_CLIENT_RENDER_FUNCTION_STR__: clientRenderFunctionStr,
     }),
     // The CommonJS plugin *only* exists to pull "art" into "react-art".
     // I'm going to port "art" to ES modules to avoid this problem.