From cd5ecb67ee9f2c052925deb4e1e915e82027daa2 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Mon, 7 Dec 2020 10:34:47 -0500
Subject: [PATCH] Add neo-async to dependencies

---
 packages/react-transport-dom-webpack/package.json     |  1 +
 .../src/ReactFlightWebpackPlugin.js                   | 11 +++++------
 scripts/rollup/bundles.js                             |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/react-transport-dom-webpack/package.json b/packages/react-transport-dom-webpack/package.json
index 8e2db02610eff..e2666f94809fc 100644
--- a/packages/react-transport-dom-webpack/package.json
+++ b/packages/react-transport-dom-webpack/package.json
@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "acorn": "^6.2.1",
+    "neo-async": "^2.6.1",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.1"
   },
diff --git a/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js
index 78d1c0fb7375d..f86f965e11e98 100644
--- a/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-transport-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -11,13 +11,12 @@ import {mkdirSync, writeFileSync} from 'fs';
 import {dirname, resolve, join} from 'path';
 import {pathToFileURL} from 'url';
 
-// This can't be loaded as an ESM module.
-const asyncLib = require('neo-async');
+import asyncLib from 'neo-async';
 
-const ModuleDependency = require('webpack/lib/dependencies/ModuleDependency');
-const NullDependency = require('webpack/lib/dependencies/NullDependency');
-const AsyncDependenciesBlock = require('webpack/lib/AsyncDependenciesBlock');
-const Template = require('webpack/lib/Template');
+import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency';
+import NullDependency from 'webpack/lib/dependencies/NullDependency';
+import AsyncDependenciesBlock from 'webpack/lib/AsyncDependenciesBlock';
+import Template from 'webpack/lib/Template';
 
 class ClientReferenceDependency extends ModuleDependency {
   constructor(request) {
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 2ee1ab74a402c..47a004ed4e120 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -301,7 +301,7 @@ const bundles = [
     moduleType: RENDERER_UTILS,
     entry: 'react-transport-dom-webpack/plugin',
     global: 'ReactFlightWebpackPlugin',
-    externals: ['fs', 'path', 'url'],
+    externals: ['fs', 'path', 'url', 'neo-async'],
   },
 
   /******* React Transport DOM Webpack Node.js Loader *******/