From aa0bae090ae743b13c2f49bc504517b23e44105a Mon Sep 17 00:00:00 2001
From: Yannick Assogba <yassogba@google.com>
Date: Thu, 3 Sep 2020 11:11:32 -0400
Subject: [PATCH 1/3] fix converter node build

---
 e2e/scripts/test-ci.sh          | 3 ++-
 tfjs-converter/rollup.config.js | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/e2e/scripts/test-ci.sh b/e2e/scripts/test-ci.sh
index b14b57101cf..670c44d256e 100755
--- a/e2e/scripts/test-ci.sh
+++ b/e2e/scripts/test-ci.sh
@@ -17,7 +17,8 @@
 set -e
 
 # Smoke tests run in PR and nightly builds.
-TAGS="#SMOKE"
+# TEMP remove after regression tests pass with this PR
+TAGS="#SMOKE,#REGRESSION"
 
 # Regression tests run in nightly builds.
 if [[ "$NIGHTLY" = true || "$RELEASE" = true ]]; then
diff --git a/tfjs-converter/rollup.config.js b/tfjs-converter/rollup.config.js
index 3a9eef155f1..cd5aba691f4 100644
--- a/tfjs-converter/rollup.config.js
+++ b/tfjs-converter/rollup.config.js
@@ -107,6 +107,15 @@ module.exports = cmdOptions => {
 
   // Node
   bundles.push(config({
+    plugins: [
+      // replace dist import with tfjs-core because our modules are not
+      // es5 commonjs modules
+      replace({
+        '@tensorflow/tfjs-core/dist/ops/ops_for_converter':
+            '@tensorflow/tfjs-core',
+        delimiters: ['', '']
+      })
+    ],
     output: {
       format: 'cjs',
       name,

From 61aad0a37832cfda9e27a6e258af1ecb82776309 Mon Sep 17 00:00:00 2001
From: Yannick Assogba <yassogba@google.com>
Date: Thu, 3 Sep 2020 12:52:00 -0400
Subject: [PATCH 2/3] revert back to regular tests

---
 e2e/scripts/test-ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/scripts/test-ci.sh b/e2e/scripts/test-ci.sh
index 670c44d256e..6570065968b 100755
--- a/e2e/scripts/test-ci.sh
+++ b/e2e/scripts/test-ci.sh
@@ -18,7 +18,7 @@ set -e
 
 # Smoke tests run in PR and nightly builds.
 # TEMP remove after regression tests pass with this PR
-TAGS="#SMOKE,#REGRESSION"
+TAGS="#SMOKE"
 
 # Regression tests run in nightly builds.
 if [[ "$NIGHTLY" = true || "$RELEASE" = true ]]; then

From 77bd8f388de18eb70a82c7e2386295a9edaa905b Mon Sep 17 00:00:00 2001
From: Yannick Assogba <yassogba@google.com>
Date: Thu, 3 Sep 2020 12:52:52 -0400
Subject: [PATCH 3/3] save

---
 e2e/scripts/test-ci.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/e2e/scripts/test-ci.sh b/e2e/scripts/test-ci.sh
index 6570065968b..b14b57101cf 100755
--- a/e2e/scripts/test-ci.sh
+++ b/e2e/scripts/test-ci.sh
@@ -17,7 +17,6 @@
 set -e
 
 # Smoke tests run in PR and nightly builds.
-# TEMP remove after regression tests pass with this PR
 TAGS="#SMOKE"
 
 # Regression tests run in nightly builds.