Switch to CJS mode

Author: gaearon

fixtures/flight/package.json

@@ -1,6 +1,5 @@
 {
   "name": "flight",
-  "type": "module",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

fixtures/flight/server/cli.server.js

@@ -18,9 +18,9 @@ const app = express();
 app.get('/', function(req, res) {
   if (process.env.NODE_ENV === 'development') {
     // This doesn't work in ESM mode.
-    // for (var key in require.cache) {
-    //   delete require.cache[key];
-    // }
+    for (var key in require.cache) {
+      delete require.cache[key];
+    }
   }
   require('./handler.server.js')(req, res);
 });

fixtures/flight/server/handler.server.js

@@ -3,24 +3,24 @@
 import {pipeToNodeWritable} from 'react-transport-dom-webpack/server';
 import {readFile} from 'fs';
 import {resolve} from 'path';
+import * as React from 'react';
 
 module.exports = function(req, res) {
-  // const m = require('../src/App.server.js');
-  import('../src/App.server.js').then(m => {
-    const dist = process.env.NODE_ENV === 'development' ? 'dist' : 'build';
-    readFile(
-      resolve(__dirname, `../${dist}/react-transport-manifest.json`),
-      'utf8',
-      (err, data) => {
-        if (err) {
-          throw err;
-        }
-
-        const App = m.default.default || m.default;
-        res.setHeader('Access-Control-Allow-Origin', '*');
-        const moduleMap = JSON.parse(data);
-        pipeToNodeWritable(<App />, res, moduleMap);
+  const m = require('../src/App.server.js');
+  // import('../src/App.server.js').then(m => {
+  const dist = process.env.NODE_ENV === 'development' ? 'dist' : 'build';
+  readFile(
+    resolve(__dirname, `../${dist}/react-transport-manifest.json`),
+    'utf8',
+    (err, data) => {
+      if (err) {
+        throw err;
       }
-    );
-  });
+
+      const App = m.default.default || m.default;
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      const moduleMap = JSON.parse(data);
+      pipeToNodeWritable(<App />, res, moduleMap);
+    }
+  );
 };