From 616710a8479c050213dc0e25ab9bf43ac3de0044 Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Thu, 8 Mar 2018 09:22:29 -0800
Subject: [PATCH] build: use tsc importHelpers flag to remove duplicate helpers
 from esm5 and esm2015 builds (#3416)

I intentionally didn't use the flag for cjs builds because that would
make cjs builds incompatible with SystemJS without further configuration
on the client-side - this would be highly undesirable.
---
 package.json                   | 4 +++-
 tsconfig/tsconfig.esm2015.json | 2 ++
 tsconfig/tsconfig.esm5.json    | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 481003c4a9..4cbe945ba0 100644
--- a/package.json
+++ b/package.json
@@ -167,6 +167,9 @@
     "url": "https://github.com/ReactiveX/RxJS/issues"
   },
   "homepage": "https://github.com/ReactiveX/RxJS",
+  "dependencies": {
+    "tslib": "^1.9.0"
+  },
   "devDependencies": {
     "@angular-devkit/build-optimizer": "0.0.24",
     "@types/chai": "4.1.2",
@@ -226,7 +229,6 @@
     "symbol-observable": "1.0.1",
     "systemjs": "^0.21.0",
     "ts-node": "4.1.0",
-    "tslib": "1.5.0",
     "tslint": "5.9.1",
     "tslint-no-unused-expression-chai": "0.0.3",
     "typescript": "latest",
diff --git a/tsconfig/tsconfig.esm2015.json b/tsconfig/tsconfig.esm2015.json
index 8af3692089..d974ef0120 100644
--- a/tsconfig/tsconfig.esm2015.json
+++ b/tsconfig/tsconfig.esm2015.json
@@ -2,6 +2,8 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "module": "es2015",
+    "importHelpers": true,
+    "moduleResolution": "node",
     "target": "es2015",
     "outDir": "../dist/esm2015"
   }
diff --git a/tsconfig/tsconfig.esm5.json b/tsconfig/tsconfig.esm5.json
index 9ab8769a95..d2c71f9f8f 100644
--- a/tsconfig/tsconfig.esm5.json
+++ b/tsconfig/tsconfig.esm5.json
@@ -2,6 +2,8 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "module": "es2015",
+    "importHelpers": true,
+    "moduleResolution": "node",
     "target": "es5",
     "outDir": "../dist/esm5"
   }