Merge ~mpontillo/maas:dns-ui--add-record into maas:master

[Mike Pontillo]

Add form to create new DNS records.

 * Change karma configuration to use built JavaScript.
 * Reorganize YUI code into a specific directory.
 * Remove react and react-dom from vendor bundle.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b dns-ui--add-record lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1876/console
COMMIT: 0bc51c7dacfb0c0a403c6918718914ac07fe94ae

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Just one thing in line I think it needs fixing.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Mike Pontillo (mpontillo)]

Combining this branch with the branch it depends on.

review: Approve

[Mike Pontillo (mpontillo)]

And again, this time without the prerequisite (so it'll land).

review: Approve

diff --git a/Makefile b/Makefile
index 533934d..b5ba5ea 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 # Python enum modules.
 py_enums := $(wildcard src/*/enum.py)
 # JavaScript enum module (not modules).
-js_enums := src/maasserver/static/js/enums.js
+js_enums := src/maasserver/static/js/yui/enums.js
 
 # MAAS SASS stylesheets. The first input file (maas-styles.css) imports
 # the others, so is treated specially in the target definitions.
@@ -40,6 +40,8 @@ javascript_deps := \
 javascript_output := \
   src/maasserver/static/js/bundle/maas-min.js \
   src/maasserver/static/js/bundle/maas-min.js.map \
+  src/maasserver/static/js/bundle/maas-yui-min.js \
+  src/maasserver/static/js/bundle/maas-yui-min.js.map \
   src/maasserver/static/js/bundle/vendor-min.js \
   src/maasserver/static/js/bundle/vendor-min.js.map
 
@@ -249,6 +251,7 @@ define node_packages
   karma-ng-html2js-preprocessor
   karma-opera-launcher
   karma-phantomjs-launcher
+  karma-sourcemap-loader
   node-sass
   phantomjs-prebuilt
   prop-types
@@ -286,6 +289,9 @@ test: bin/test.parallel bin/coverage
 	@bin/test.parallel --with-coverage --subprocess-per-core
 	@bin/coverage combine
 
+test-js: bin/test.js javascript
+	@bin/test.js
+
 test-serial: $(strip $(test-scripts))
 	@bin/maas-region makemigrations --dry-run --exit && exit 1 ||:
 	@$(RM) .coverage .coverage.* .failed
diff --git a/debian/rules b/debian/rules
index 36c7be7..2f83647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ override_dh_auto_install:
 	rm -rf $(CURDIR)/debian/tmp/usr/share/maas/web/scss
 
 	# Install built enums.js file.
-	cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/
+	cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/yui
 
 	# install the apparmor profile
 	install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d
diff --git a/package.json b/package.json
index dd52b6d..2398e05 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "@babel/preset-react": "^7.0.0-beta.40",
     "@types/prop-types": "^15.5.2",
     "@types/react": "^16.0.40",
-    "@types/react-dom": "^16.0.4",
+    "@types/react-dom": "^15.5.7",
     "babel-loader": "^8.0.0-beta.0",
     "glob": "^7.1.2",
     "jasmine-core": "=2.99.1",
@@ -17,6 +17,7 @@
     "karma-ng-html2js-preprocessor": "^1.0.0",
     "karma-opera-launcher": "^1.0.0",
     "karma-phantomjs-launcher": "^1.0.4",
+    "karma-sourcemap-loader": "^0.3.7",
     "node-sass": "^4.7.2",
     "phantomjs-prebuilt": "^2.1.16",
     "prop-types": "^15.6.1",
@@ -27,7 +28,7 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "vanilla-framework": "^1.6.6",
     "vanilla-framework-react": "^0.1.2",
-    "webpack": "^4.0.1",
+    "webpack": "^4.1.1",
     "webpack-cli": "^2.0.10",
     "webpack-merge": "^4.1.2"
   }
diff --git a/setup.py b/setup.py
index cd6ad7a..8e35adb 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ class EnumJSCommand(Command):
         py_files = glob('src/*/enum.py')
         jsenums = import_jsenums()
         js_content = jsenums.dump(py_files)
-        with open('src/maasserver/static/js/enums.js', 'w') as fp:
+        with open('src/maasserver/static/js/yui/enums.js', 'w') as fp:
             fp.write(js_content)
 
 
diff --git a/src/maasserver/static/js/angular/controllers/domain_details.js b/src/maasserver/static/js/angular/controllers/domain_details.js
index d8e50e5..fb0c4a2 100644
--- a/src/maasserver/static/js/angular/controllers/domain_details.js
+++ b/src/maasserver/static/js/angular/controllers/domain_details.js
@@ -23,6 +23,14 @@ angular.module('MAAS').controller('DomainDetailsController', [
         $scope.domain = null;
         $scope.predicate = "name";
         $scope.reverse = false;
+        $scope.action = null;
+
+        $scope.domainsManager = DomainsManager;
+        $scope.newObject = {};
+
+        $scope.supportedRecordTypes = [
+            'A', 'AAAA', 'CNAME', 'MX', 'NS', 'SRV', 'SSHFP', 'TXT'
+        ];
 
         // Updates the page title.
         function updateTitle() {
@@ -61,18 +69,26 @@ angular.module('MAAS').controller('DomainDetailsController', [
         // Called when the delete domain button is pressed.
         $scope.deleteButton = function() {
             $scope.error = null;
-            $scope.confirmingDelete = true;
+            $scope.actionInProgress = true;
+            $scope.action = 'delete';
+        };
+
+        // Called when the add record button is pressed.
+        $scope.addRecordButton = function() {
+            $scope.error = null;
+            $scope.actionInProgress = true;
+            $scope.action = 'add_record';
         };
 
         // Called when the cancel delete domain button is pressed.
-        $scope.cancelDeleteButton = function() {
-            $scope.confirmingDelete = false;
+        $scope.cancelAction = function() {
+            $scope.actionInProgress = false;
         };
 
         // Called when the confirm delete domain button is pressed.
         $scope.deleteConfirmButton = function() {
             DomainsManager.deleteDomain($scope.domain).then(function() {
-                $scope.confirmingDelete = false;
+                $scope.actionInProgress = false;
                 $location.path("/domains");
             }, function(error) {
                 $scope.error =
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_domain_details.js b/src/maasserver/static/js/angular/controllers/tests/test_domain_details.js
index d1cfcb1..391efea 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_domain_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_domain_details.js
@@ -186,7 +186,7 @@ describe("DomainDetailsController", function() {
         it("confirms delete", function() {
             var controller = makeControllerResolveSetActiveItem();
             $scope.deleteButton();
-            expect($scope.confirmingDelete).toBe(true);
+            expect($scope.actionInProgress).toBe(true);
         });
 
         it("clears error", function() {
@@ -197,13 +197,13 @@ describe("DomainDetailsController", function() {
         });
     });
 
-    describe("cancelDeleteButton", function() {
+    describe("cancelAction", function() {
 
         it("cancels delete", function() {
             var controller = makeControllerResolveSetActiveItem();
             $scope.deleteButton();
-            $scope.cancelDeleteButton();
-            expect($scope.confirmingDelete).toBe(false);
+            $scope.cancelAction();
+            expect($scope.actionInProgress).toBe(false);
         });
     });
 
diff --git a/src/maasserver/static/js/angular/directives/maas_obj_form.js b/src/maasserver/static/js/angular/directives/maas_obj_form.js
index da907f9..7de2337 100644
--- a/src/maasserver/static/js/angular/directives/maas_obj_form.js
+++ b/src/maasserver/static/js/angular/directives/maas_obj_form.js
@@ -543,10 +543,10 @@ angular.module('MAAS').directive('maasObjField', ['$compile',
 
                 // type and key required.
                 var missingAttrs = [];
-                if(!angular.isString(attrs.type) && attrs.type.length === 0) {
+                if(!angular.isString(attrs.type) || attrs.type.length === 0) {
                     missingAttrs.push("type");
                 }
-                if(!angular.isString(attrs.key) && attrs.key.length === 0) {
+                if(!angular.isString(attrs.key) || attrs.key.length === 0) {
                     missingAttrs.push("key");
                 }
                 if(missingAttrs.length > 0) {
@@ -561,7 +561,8 @@ angular.module('MAAS').directive('maasObjField', ['$compile',
                 // Render the label.
                 var label = attrs.label || attrs.key;
 
-                if(attrs.disableLabel !== "true") {
+                if(attrs.disableLabel !== "true" &&
+                        !(attrs.type === "hidden")) {
                     var labelElement = angular.element('<label/>');
                     labelElement.attr('for', attrs.key);
                     labelElement.text(label);
@@ -830,6 +831,19 @@ angular.module('MAAS').directive('maasObjField', ['$compile',
                                 return val.text;
                             });
                     };
+                } else if(attrs.type === "hidden") {
+                    var hiddenScope = scope.$new();
+                    hiddenScope._toggle = controller.registerField(
+                        attrs.key, scope);
+                    inputElement = angular.element([
+                        '<input type="hidden" name="' + attrs.key + '" ',
+                        'id="' + attrs.key + '" ',
+                        'value="' + attrs.value + '">',
+                        '</input>'
+                    ].join(''));
+                    inputElement = $compile(inputElement)(hiddenScope);
+                    scope.getValue = () => attrs.value;
+                    scope.updateValue = () => null;
                 } else if(attrs.type === "onoffswitch") {
                     var switchScope = scope.$new();
                     switchScope._toggle = controller.registerField(
diff --git a/src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js b/src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js
index d37b891..031c881 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_maas_obj_form.js
@@ -442,6 +442,31 @@ describe("maasObjForm", function() {
         });
     });
 
+    describe("hidden", function() {
+
+        var directive, options;
+        beforeEach(function() {
+            $scope.obj = {
+                key: false
+            };
+            $scope.manager = {};
+            var html = [
+                '<maas-obj-form obj="obj" manager="manager">',
+                    '<maas-obj-field type="hidden" key="key" label="Key" ',
+                        'value="value">',
+                    '</maas-obj-field>',
+                '</maas-obj-form>'
+                ].join('');
+            directive = compileDirective(html);
+        });
+
+        it("creates hidden input field", function() {
+            var onoff = angular.element(directive.find("input"));
+            expect(onoff.length).toBe(1);
+        });
+    });
+
+
     describe("single field", function() {
 
         var directive, updateItemMethod, saveDefer;
diff --git a/src/maasserver/static/js/angular/factories/domains.js b/src/maasserver/static/js/angular/factories/domains.js
index 0d3fdf2..2662db8 100644
--- a/src/maasserver/static/js/angular/factories/domains.js
+++ b/src/maasserver/static/js/angular/factories/domains.js
@@ -42,6 +42,18 @@ angular.module('MAAS').factory(
             return RegionConnection.callMethod("domain.delete", domain);
         };
 
+        // Create a DNS record.
+        DomainsManager.prototype.createDNSRecord = function(record) {
+            if(record.rrtype === 'A' || record.rrtype === 'AAAA') {
+                record.ip_addresses = record.rrdata.split(/[ ,]+/);
+                return RegionConnection.callMethod(
+                    "domain.create_dnsresource", record);
+            } else {
+                return RegionConnection.callMethod(
+                    "domain.create_dnsdata", record);
+            }
+        };
+
         DomainsManager.prototype.getDefaultDomain = function() {
             if(this._items.length === 0) {
                 return null;
diff --git a/src/maasserver/static/js/angular/factories/tests/test_domains.js b/src/maasserver/static/js/angular/factories/tests/test_domains.js
index b740939..7988f01 100644
--- a/src/maasserver/static/js/angular/factories/tests/test_domains.js
+++ b/src/maasserver/static/js/angular/factories/tests/test_domains.js
@@ -14,6 +14,7 @@ describe("DomainsManager", function() {
     var DomainsManager;
     beforeEach(inject(function($injector) {
         DomainsManager = $injector.get("DomainsManager");
+        RegionConnection = $injector.get("RegionConnection");
     }));
 
     // Make a random domain.
@@ -60,6 +61,52 @@ describe("DomainsManager", function() {
         });
     });
 
+    describe("createDNSRecord", function() {
+        it("calls create_dnsresource for A record", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'A',
+                'rrdata': '192.168.0.1'
+            };
+            DomainsManager.createDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.create_dnsresource", record);
+        });
+
+        it("calls create_dnsresource for AAAA record", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'AAAA',
+                'rrdata': '2001:db8:1'
+            };
+            DomainsManager.createDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.create_dnsresource", record);
+        });
+
+        it("converts rrdata into list for A and AAAA", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'AAAA',
+                'rrdata': '2001:db8::1, 10.0.0.1 127.0.0.1'
+            };
+            DomainsManager.createDNSRecord(record);
+            expect(record.ip_addresses).toEqual([
+                '2001:db8::1', '10.0.0.1', '127.0.0.1'
+            ]);
+        });
+
+        it("calls create_dnsdata for other types", function() {
+            spyOn(RegionConnection, "callMethod");
+            var record = {
+                'rrtype': 'SRV'
+            };
+            DomainsManager.createDNSRecord(record);
+            expect(RegionConnection.callMethod).toHaveBeenCalledWith(
+                "domain.create_dnsdata", record);
+        });
+    });
+
     describe("getDomainByName", function() {
         it("returns null when no domains", function() {
             expect(DomainsManager.getDomainByName('meh')).toBe(null);
diff --git a/src/maasserver/static/js/io.js b/src/maasserver/static/js/yui/io.js
index 86b15ef..86b15ef 100644
--- a/src/maasserver/static/js/io.js
+++ b/src/maasserver/static/js/yui/io.js
diff --git a/src/maasserver/static/js/os_distro_select.js b/src/maasserver/static/js/yui/os_distro_select.js
index 2fe0958..2fe0958 100644
--- a/src/maasserver/static/js/os_distro_select.js
+++ b/src/maasserver/static/js/yui/os_distro_select.js
diff --git a/src/maasserver/static/js/prefs.js b/src/maasserver/static/js/yui/prefs.js
index cff5636..cff5636 100644
--- a/src/maasserver/static/js/prefs.js
+++ b/src/maasserver/static/js/yui/prefs.js
diff --git a/src/maasserver/static/js/reveal.js b/src/maasserver/static/js/yui/reveal.js
index 7ab922a..7ab922a 100644
--- a/src/maasserver/static/js/reveal.js
+++ b/src/maasserver/static/js/yui/reveal.js
diff --git a/src/maasserver/static/js/shortpoll.js b/src/maasserver/static/js/yui/shortpoll.js
index 886ba93..886ba93 100644
--- a/src/maasserver/static/js/shortpoll.js
+++ b/src/maasserver/static/js/yui/shortpoll.js
diff --git a/src/maasserver/static/partials/domain-details.html b/src/maasserver/static/partials/domain-details.html
index 451a203..31343c0 100644
--- a/src/maasserver/static/partials/domain-details.html
+++ b/src/maasserver/static/partials/domain-details.html
@@ -13,14 +13,17 @@
             </p>
         </div>
         <div class="col-4">
-            <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !isDefaultDomain() && !loading">
+            <div class="page-header__controls ng-hide" data-ng-show="isSuperUser() && !loading">
                 <button class="p-button--negative"
                     data-ng-click="deleteButton()"
-                    data-ng-hide="confirmingDelete">Delete domain</button>
+                    data-ng-hide="actionInProgress || isDefaultDomain()">Delete domain</button>
+                <button class="p-button"
+                        data-ng-click="addRecordButton()"
+                        data-ng-hide="actionInProgress">Add record</button>
             </div>
         </div>
     </div>
-    <div data-ng-if="confirmingDelete">
+    <div data-ng-if="actionInProgress && action === 'delete'">
         <div class="row u-no-margin--top ng-hide" data-ng-hide="canBeDeleted()">
             <hr />
             <div class="row">
@@ -30,7 +33,7 @@
                     </p>
                 </div>
                 <div class="col-4 u-align--right">
-                    <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
+                    <button class="p-button--base" type="button" data-ng-click="cancelAction()">Cancel</button>
                 </div>
             </div>
         </div>
@@ -43,7 +46,7 @@
                     </p>
                 </div>
                 <div class="col-4 u-align--right">
-                    <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
+                    <button class="p-button--base" type="button" data-ng-click="cancelAction()">Cancel</button>
                     <button class="p-button--negative" data-ng-click="deleteConfirmButton()">Delete domain</button>
                 </div>
             </div>
@@ -57,12 +60,51 @@
                     </p>
                 </div>
                 <div class="col-4 u-align--right">
-                    <button class="p-button--base" type="button" data-ng-click="cancelDeleteButton()">Cancel</button>
+                    <button class="p-button--base" type="button" data-ng-click="cancelAction()">Cancel</button>
                     <button class="p-button--neutral" data-ng-click="deleteConfirmButton()">Retry</button>
                 </div>
             </div>
         </div>
     </div>
+    <div data-ng-if="actionInProgress && action === 'add_record'">
+        <maas-obj-form obj="newObject" manager="domainsManager" manager-method="createDNSRecord" class="p-form--stacked"
+            table-form="true" save-on-blur="false" after-save="cancelAction">
+            <!-- pre-process="actionDNSRecordPreSave" -->
+            <section class="row">
+              <div class="col-6">
+                <maas-obj-field
+                    subtle="false" type="text" key="name" label="Name" placeholder="Name"
+                    label-width="two" input-width="three"></maas-obj-field>
+                <maas-obj-field
+                    subtle="false" type="options" key="rrtype" label="Type"
+                    options="type as type for type in supportedRecordTypes"
+                    label-width="two" input-width="three"></maas-obj-field>
+              </div>
+              <div class="col-6">
+                <maas-obj-field
+                    subtle="false" type="text" key="rrdata" label="Data"
+                    placeholder="Data"
+                    label-width="two" input-width="three"></maas-obj-field>
+                <maas-obj-field
+                    subtle="false" type="text" key="ttl" label="TTL"
+                    placeholder="TTL in seconds (optional)"
+                    label-width="two" input-width="three"></maas-obj-field>
+                <maas-obj-field type="hidden" key="domain" value="{$ domain.id $}" />
+              </div>
+            </section>
+            <section class="row">
+                <div class="col-8">
+                    <maas-obj-errors class="page-header__message page-header__message--error"></maas-obj-errors>
+                </div>
+                <div class="col-4">
+                    <div class="u-align--right">
+                        <button class="p-button" data-ng-click="cancelAction()">Cancel</button>
+                        <button class="p-button--positive" maas-obj-save>Add record</button>
+                    </div>
+                </div>
+            </div>
+        </maas-obj-form>
+    </div>
 </header>
 <div class="p-strip" data-ng-show="!loading">
     <section class="row">
diff --git a/src/maasserver/templates/maasserver/js-conf.html b/src/maasserver/templates/maasserver/js-conf.html
index 9999281..cae0420 100644
--- a/src/maasserver/templates/maasserver/js-conf.html
+++ b/src/maasserver/templates/maasserver/js-conf.html
@@ -47,6 +47,9 @@ var MAAS_config = {
 <script type="text/javascript"
         src="{{STATIC_URL}}/js/bundle/maas-min.js?v={{files_version}}">
 </script>
+<script type="text/javascript"
+        src="{{STATIC_URL}}/js/bundle/maas-yui-min.js?v={{files_version}}">
+</script>
 
 {% if global_options.enable_analytics %}
 <script async src='https://www.google-analytics.com/analytics.js'></script>
diff --git a/src/maastesting/karma.conf.js b/src/maastesting/karma.conf.js
index 79a25a0..abc1026 100644
--- a/src/maastesting/karma.conf.js
+++ b/src/maastesting/karma.conf.js
@@ -21,10 +21,9 @@ module.exports = function(config) {
       '/usr/share/javascript/angular.js/angular-mocks.js',
       '/usr/share/javascript/angular.js/angular-cookies.js',
       '/usr/share/javascript/angular.js/angular-sanitize.js',
-      '../../src/maasserver/static/js/ui/maas-ui.js',
-      '../../src/maasserver/static/js/angular/maas.js',
+      '../../src/maasserver/static/js/bundle/vendor-min.js',
+      '../../src/maasserver/static/js/bundle/maas-min.js',
       '../../src/maasserver/static/js/angular/testing/*.js',
-      '../../src/maasserver/static/js/angular/*/*.js',
       '../../src/maasserver/static/js/angular/*/tests/test_*.js',
       '../../src/maasserver/static/partials/*.html'
     ],
@@ -38,7 +37,8 @@ module.exports = function(config) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-        '../../src/maasserver/static/partials/*.html': ['ng-html2js']
+        '../../src/maasserver/static/partials/*.html': ['ng-html2js'],
+        '**/*.js': ['sourcemap']
     },
 
     ngHtml2JsPreprocessor: {
@@ -91,7 +91,8 @@ module.exports = function(config) {
       'karma-opera-launcher',
       'karma-phantomjs-launcher',
       'karma-failed-reporter',
-      'karma-ng-html2js-preprocessor'
+      'karma-ng-html2js-preprocessor',
+      'karma-sourcemap-loader'
     ]
   });
 };
diff --git a/webpack.config.js b/webpack.config.js
index e8613b5..549f1f9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,8 +5,10 @@ const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 module.exports = {
     entry: {
         vendor: [].concat(
-            glob.sync('./src/maasserver/static/js/angular/3rdparty/*.js'),
-            ['react', 'react-dom']
+            glob.sync('./src/maasserver/static/js/angular/3rdparty/*.js')
+        ),
+        'maas-yui': [].concat(
+            glob.sync('./src/maasserver/static/js/yui/*.js')
         ),
         maas: [].concat(
             glob.sync('./src/maasserver/static/js/*.js'),
diff --git a/yarn.lock b/yarn.lock
index 90c4cea..3804cfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -393,10 +393,6 @@
   version "4.14.104"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80"
 
-"@types/node@*":
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
-
 "@types/node@^6.0.46":
   version "6.0.101"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.101.tgz#0c5911cfb434af4a51c0a499931fe6423207d921"
@@ -409,14 +405,17 @@
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
 
-"@types/react-dom@^16.0.4":
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.4.tgz#2e8fd45f5443780ed49bf2cdd9809e6091177a7d"
+"@types/react-dom@^15.5.7":
+  version "15.5.7"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-15.5.7.tgz#a5c1c8b315e925d84d59db5ee88ca7e31c5030f9"
   dependencies:
-    "@types/node" "*"
-    "@types/react" "*"
+    "@types/react" "^15"
+
+"@types/react@^15":
+  version "15.6.14"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-15.6.14.tgz#fe176209b9de3514f9782fa41a239bffd26a3b56"
 
-"@types/react@*", "@types/react@^16.0.40":
+"@types/react@^16.0.40":
   version "16.0.40"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9"
 
@@ -460,8 +459,8 @@ acorn@^4.0.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
 acorn@^5.0.0, acorn@^5.2.1, acorn@^5.4.1:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.1.tgz#84e05a9ea0acbe131227da50301e62464dc9c1d8"
 
 addressparser@1.0.1:
   version "1.0.1"
@@ -507,8 +506,8 @@ ajv@^5.1.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
@@ -552,9 +551,9 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
@@ -1786,12 +1785,12 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
   dependencies:
-    ansi-styles "^3.2.0"
+    ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
+    supports-color "^5.3.0"
 
 chalk@~0.4.0:
   version "0.4.0"
@@ -1934,12 +1933,12 @@ clone@^2.1.1:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
 
 cloneable-readable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.1.tgz#c27a4f3a943ca37bed9b01c7d572ee61b1302b15"
   dependencies:
     inherits "^2.0.1"
-    process-nextick-args "^1.0.6"
-    through2 "^2.0.1"
+    process-nextick-args "^2.0.0"
+    readable-stream "^2.3.5"
 
 co@^4.6.0:
   version "4.6.0"
@@ -2021,8 +2020,8 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
     delayed-stream "~1.0.0"
 
 commander@^2.9.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322"
 
 commander@~2.13.0:
   version "2.13.0"
@@ -2200,8 +2199,8 @@ cross-spawn@^5.0.1:
     which "^1.2.9"
 
 cross-spawn@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.4.tgz#bbf44ccb30fb8314a08f178b62290c669c36d808"
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2430,8 +2429,8 @@ diff@^2.1.2:
   resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99"
 
 diff@^3.3.0, diff@^3.3.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
@@ -2477,8 +2476,8 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
 
 duplexify@^3.4.2, duplexify@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2934,8 +2933,8 @@ first-chunk-stream@^2.0.0:
     readable-stream "^2.0.2"
 
 flow-parser@^0.*:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.66.0.tgz#be583fefb01192aa5164415d31a6241b35718983"
+  version "0.67.1"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.67.1.tgz#191fed56ccfd8d097dc9d487f2da3b0dae745849"
 
 flush-write-stream@^1.0.0:
   version "1.0.2"
@@ -3494,8 +3493,8 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 htmlescape@^1.1.0:
   version "1.1.1"
@@ -4219,6 +4218,12 @@ karma-phantomjs-launcher@^1.0.4:
     lodash "^4.0.1"
     phantomjs-prebuilt "^2.1.7"
 
+karma-sourcemap-loader@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  dependencies:
+    graceful-fs "^4.1.2"
+
 karma@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.0.tgz#a02698dd7f0f05ff5eb66ab8f65582490b512e58"
@@ -5529,14 +5534,14 @@ private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
-process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-process-nextick-args@~2.0.0:
+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
 process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -5802,9 +5807,9 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -6743,9 +6748,9 @@ string-width@^2.0.0, string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -6753,6 +6758,12 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
+string_decoder@~1.0.0, string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -6814,9 +6825,9 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
+supports-color@^5.2.0, supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
   dependencies:
     has-flag "^3.0.0"
 
@@ -6878,7 +6889,7 @@ throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
 
-through2@^2.0.0, through2@^2.0.1:
+through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -7292,7 +7303,7 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-watchpack@^1.4.0:
+watchpack@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed"
   dependencies:
@@ -7376,9 +7387,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.0.1.tgz#768d708beeca4c5f77f6c2d38a240fb6ff50ba5d"
+webpack@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.1.1.tgz#44e4d6a869dd36fdfc0b227f9bd865a4bccfd81c"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^3.0.0"
@@ -7397,7 +7408,7 @@ webpack@^4.0.1:
     schema-utils "^0.4.2"
     tapable "^1.0.0"
     uglifyjs-webpack-plugin "^1.1.1"
-    watchpack "^1.4.0"
+    watchpack "^1.5.0"
     webpack-sources "^1.0.1"
 
 whatwg-fetch@>=0.10.0: