From 98a61bee85af20f2c6c7bb0e144b9d0a06697f37 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Wed, 7 Jun 2017 14:34:18 +0200
Subject: [PATCH] Use bundle version of Rxjs.

---
 webapp/gulp.conf.js           |  2 +-
 webapp/package.json           |  1 +
 webapp/src/systemjs.config.js | 22 +++++++++++++++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/webapp/gulp.conf.js b/webapp/gulp.conf.js
index 0de52f9..0529c02 100644
--- a/webapp/gulp.conf.js
+++ b/webapp/gulp.conf.js
@@ -10,7 +10,7 @@ module.exports = {
         node_modules_libs: [
             'core-js/client/shim.min.js',
             'reflect-metadata/Reflect.js',
-            'rxjs/**/*.js',
+            'rxjs-system-bundle/*.min.js',
             'socket.io-client/dist/socket.io*.js',
             'systemjs/dist/system-polyfills.js',
             'systemjs/dist/system.src.js',
diff --git a/webapp/package.json b/webapp/package.json
index e3de00f..f2e1d30 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -38,6 +38,7 @@
     "ngx-cookie": "^1.0.0",
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.0.3",
+    "rxjs-system-bundle": "5.0.3",
     "socket.io-client": "^1.7.3",
     "socketio": "^1.0.0",
     "systemjs": "0.20.0",
diff --git a/webapp/src/systemjs.config.js b/webapp/src/systemjs.config.js
index e6139b0..68edd18 100644
--- a/webapp/src/systemjs.config.js
+++ b/webapp/src/systemjs.config.js
@@ -4,6 +4,19 @@
             // paths serve as alias
             'npm:': 'lib/'
         },
+        bundles: {
+            "npm:rxjs-system-bundle/Rx.system.min.js": [
+                "rxjs",
+                "rxjs/*",
+                "rxjs/operator/*",
+                "rxjs/observable/*",
+                "rxjs/scheduler/*",
+                "rxjs/symbol/*",
+                "rxjs/add/operator/*",
+                "rxjs/add/observable/*",
+                "rxjs/util/*"
+            ]
+        },
         // map tells the System loader where to look for things
         map: {
             // our app is within the app folder
@@ -26,19 +39,18 @@
             'ngx-bootstrap/carousel': 'npm:ngx-bootstrap/bundles/ngx-bootstrap.umd.min.js',
             'ngx-bootstrap/dropdown': 'npm:ngx-bootstrap/bundles/ngx-bootstrap.umd.min.js',
             // other libraries
-            'rxjs': 'npm:rxjs',
             'socket.io-client': 'npm:socket.io-client/dist/socket.io.min.js'
         },
         // packages tells the System loader how to load when no filename and/or no extension
         packages: {
-            app: {
+            'app': {
                 main: './main.js',
                 defaultExtension: 'js'
             },
-            rxjs: {
-                defaultExtension: 'js'
+            'rxjs': {
+                defaultExtension: false
             },
-            "socket.io-client": {
+            'socket.io-client': {
                 defaultExtension: 'js'
             },
             'ngx-bootstrap': {
-- 
2.16.6