conflicts should be resolved

.babelrc

@@ -0,0 +1,9 @@
+{
+    "presets": ["meteor"],
+    "plugins": [
+        [
+          "styled-components",
+          { "ssr": true, "displayName": true, "preprocess": false }
+        ]
+    ]
+  }

.meteor/.versions

@@ -60,7 +60,6 @@ [email protected]
 [email protected]
 matb33:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]

.meteor/cordova-plugins

@@ -1,10 +1,12 @@
 com.telerik.plugins.healthkit@https://github.com/rossmartin/HealthKit.git
-[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
+
+[email protected]
 [email protected]
 
 [email protected]

.meteor/packages

@@ -4,14 +4,20 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-[email protected]
-[email protected]             # Packages every Meteor app needs to have
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]                # ECMAScript 5 compatibility for older browsers
+# hot-code-push               # Doesnt belong on every deployment.  
+
 
 # SECURITY  
 alanning:roles
 
 # DATA INFRASTRUCTURE
-[email protected].0                   # The database Meteor supports right now
+[email protected].1                   # The database Meteor supports right now
 [email protected]            # Reactive variable for tracker
 [email protected]        # React higher-order component for reactively tracking Meteor data
 [email protected]
@@ -20,12 +26,11 @@ [email protected]
 simple:[email protected]
 
 # RENDERING  
-[email protected]                # ECMAScript 5 compatibility for older browsers
 static-html                   # Define static page content in .html files
-standard-minifier-css@1.6.1   # CSS minifier run for production mode
+standard-minifier-css@1.7.2   # CSS minifier run for production mode
 [email protected]    # JS minifier run for production mode
 [email protected]       # Packages for a great mobile UX
-ecmascript@0.14.3             # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.15.0             # Enable ECMAScript2015+ syntax in app code
 [email protected]            # Server-side component of the `meteor shell` command
 [email protected]
 npdev:react-loadable
@@ -35,7 +40,7 @@ fourseven:scss
 clinical:[email protected]
 clinical:[email protected]
 clinical:[email protected]
-clinical:hl7-fhir-data-infrastructure
+clinical:hl7-fhir-data-infrastructure 
 
 # TESTING
 # meteortesting:mocha
@@ -62,4 +67,7 @@ clinical:hl7-fhir-data-infrastructure
 # symptomatic:data-management
 
 # datarobot:waters
+# symptomatic:data-management
+# symptomatic:healthkit-importer  
+# symptomatic:immunization-card
 

.meteor/platforms

@@ -1,2 +1,3 @@
 browser
+ios
 server

.meteor/release

@@ -1 +1 @@
-METEOR@1.11.1
+METEOR@2.0

.meteor/versions

@@ -1,9 +1,8 @@
-accounts-base@1.7.0
+accounts-base@1.8.0
 alanning:[email protected]
 aldeed:[email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -17,20 +16,24 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-clinical:[email protected].0
+clinical:[email protected].1
 clinical:[email protected]
+<<<<<<< HEAD
 clinical:[email protected]
+=======
+clinical:[email protected]
+>>>>>>> development
 clinical:[email protected]
 datarobot:[email protected]
 [email protected]
-ddp-client@2.3.3
+ddp-client@2.4.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-dynamic-import@0.5.3
-ecmascript@0.14.3
+dynamic-import@0.6.0
+ecmascript@0.15.0
 [email protected]
 [email protected]
 [email protected]
@@ -39,7 +42,7 @@ [email protected]
 [email protected]
 fourseven:[email protected]
 [email protected]
-[email protected]
+goinvo:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -48,21 +51,19 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-logging@1.1.20
+logging@1.2.0
 matb33:[email protected]
 [email protected]
-[email protected]
-meteorhacks:[email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
-modules@0.15.0
+modules@0.16.0
 [email protected]
-[email protected].0
-[email protected].1
+[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 npdev:[email protected]
@@ -72,10 +73,11 @@ [email protected]
 raix:[email protected]
 [email protected]
 [email protected]
-[email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -85,7 +87,7 @@ [email protected]
 simple:[email protected]
 [email protected]
 [email protected]
-standard-minifier-css@1.6.1
+standard-minifier-css@1.7.2
 [email protected]
 [email protected]
 symptomatic:[email protected]
@@ -94,8 +96,8 @@ symptomatic:[email protected]
 [email protected]
 tmeasday:[email protected]
 [email protected]
-typescript@3.7.6
+typescript@4.1.2
 [email protected]
 [email protected]
-webapp@1.9.1
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0

app/Logger.js

@@ -2,7 +2,8 @@
 import { createLogger, addColors, format, transports } from 'winston';
 import { get } from 'lodash';
 import { Meteor } from 'meteor/meteor';
-import 'setimmediate';
+
+import "setimmediate";
 
 
   // some functions that do log level filtering
@@ -106,4 +107,8 @@ logger.on('error', function (error) {
   console.error('Winston just blew up.', error)
 });
 
+if(Meteor.isClient){
+  window.logger = logger;
+}
+
 export default logger;