reactioncommerce · spencern · Jul 17, 2017 · Apr 3, 2017 · Apr 3, 2017 · Apr 3, 2017
diff --git a/.circleci/build.sh b/.circleci/build.sh
@@ -4,12 +4,9 @@ set -e
 
 DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
 
-shopt -s nocasematch
-
-# if we're not on a deployment branch or a Docker/Release related PR branch, skip the Docker build/test
-if ! [[ "$CIRCLE_BRANCH" == "master" || "$CIRCLE_BRANCH" == "development" ||
-        "$CIRCLE_BRANCH" =~ "docker" || "$CIRCLE_BRANCH" =~ "release" ]]; then
-  echo "Not running a Docker build test branch. Skipping the build."
+# if we're not on a deployment branch or a Docker related PR branch, skip the Docker build/test
+if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" && "$CIRCLE_BRANCH" != *"docker"* ]]; then
+  echo "Not running a deployment branch. Skipping the Docker build test."
   exit 0
 fi
 

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,14 +41,15 @@ jobs:
       - run: npm test
       - run: reaction test
 
-
       - save_cache:
           name: Saving Meteor dev_bundle to cache
           key: dev_bundle
           paths:
             - /home/reaction/.meteor/local
 
-      - run: .circleci/build.sh
+      - run:
+          command: .circleci/build.sh
+          no_output_timeout: 30m
 
       # deploy the build (if on a deployment branch)
       - deploy:

diff --git a/.eslintrc b/.eslintrc
@@ -3,33 +3,44 @@
   "env": {
     "browser": true,
     "node": true,
-    "es6": true
+    "es6": true,
+    "mocha": true
+  },
+  "globals": {
+    "browser": true,
+    "Assets": true, // Meteor global
+    "Package": true, // Meteor global
+    "FS": true, // gridFS,
+    "Alerts": true,  // this needs to get cleaned up, but ignoring for now
+    "jest": true,
+    "expect": true,
+    "test": true
   },
   "parserOptions": {
      "ecmaVersion": 6,
      "sourceType": "module",
+      "ecmaFeatures": {
+        "arrowFunctions": true,
+        "blockBindings": true,
+        "classes": true,
+        "defaultParams": true,
+        "destructuring": true,
+        "forOf": true,
+        "generators": false,
+        "modules": true,
+        "objectLiteralComputedProperties": true,
+        "objectLiteralDuplicateProperties": false,
+        "objectLiteralShorthandMethods": true,
+        "objectLiteralShorthandProperties": true,
+        "spread": true,
+        "superInFunctions": true,
+        "templateStrings": true,
+        "jsx": true
+      },
      "allowImportExportEverywhere": true
   },
   "plugins": ["react"],
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": false,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": false,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "spread": true,
-    "superInFunctions": true,
-    "templateStrings": true,
-    "jsx": true
-  },
-  // NOTE: We're now using eslint-3
+  // NOTE: We're now using eslint-4
   "rules": {
     /**
      * Strict mode
@@ -160,7 +171,8 @@
     "no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
     "no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
     "no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
-    "no-with": 2, // http://eslint.org/docs/rules/no-with
+    "no-with": 2, // http://eslint.org/docs/rules/no-with,
+    "no-undef": 2,
     "radix": 2, // http://eslint.org/docs/rules/radix
     "vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
     "wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife

diff --git a/.meteor/packages b/.meteor/packages
@@ -11,13 +11,13 @@ [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
 [email protected]    # Compile .html files into Meteor Blaze views
 [email protected]               # ECMAScript 5 compatibility for older browsers.
-[email protected].0              # Enable ECMAScript2015+ syntax in app code
+[email protected].1              # Enable ECMAScript2015+ syntax in app code
 [email protected]   # ensure meteor method argument validation
 [email protected]          # security-related policies enforced by newer browsers
 juliancwirko:postcss          # CSS post-processing plugin (replaces standard-minifier-css)
 [email protected]                 # ReactiveDict whose contents are preserved across Hot Code Push
 [email protected]                 # Meteor transparent reactive programming library
-[email protected].18
+[email protected].19
 [email protected]
 [email protected]
 [email protected]
@@ -30,15 +30,14 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-amplify
 mdg:validated-method
-[email protected].3
-dynamic-import
+[email protected].4
+dynamic-import@0.1.1
 
 # Meteor Auth Packages
-[email protected].0
-accounts-password@1.3.6
-[email protected].0
+[email protected].1
+accounts-password@1.4.0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -70,7 +69,6 @@ meteorhacks:subs-manager
 natestrauser:select2
 ongoworks:security
 raix:ui-dropped-event
-risul:moment-timezone
 tmeasday:publish-counts
 vsivsi:job-collection@=1.4.0
 react-meteor-data@=0.2.9

diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,10 +1,10 @@
-abernix:[email protected]-beta.0
-abernix:[email protected]-beta.0
-[email protected].0
-[email protected].0
+abernix:[email protected]
+abernix:[email protected]
+[email protected].1
+[email protected].1
 [email protected]
 [email protected]
-accounts-password@1.3.7
+accounts-password@1.4.0
 [email protected]
 alanning:[email protected]
 aldeed:[email protected]
@@ -15,18 +15,17 @@ aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -57,25 +56,25 @@ cfs:[email protected]
 [email protected]
 [email protected]_1
 dburles:[email protected]
-ddp@1.2.5
-ddp-client@1.3.4
-[email protected].8
+ddp@1.3.0
+ddp-client@2.0.0
+[email protected].9
 [email protected]
-ddp-server@1.3.14
+ddp-server@2.0.0
 [email protected]
 [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 gadicc:[email protected]
 [email protected]
@@ -86,7 +85,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-johanbrook:[email protected].8
+johanbrook:[email protected].9
 jparker:[email protected]
 jparker:[email protected]
 jparker:[email protected]
@@ -98,12 +97,12 @@ kadira:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
 mdg:[email protected]
-meteor@1.6.1
+meteor@1.7.0
 [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
@@ -114,7 +113,7 @@ [email protected]
 [email protected]
 [email protected]
 momentjs:[email protected]
-[email protected].18
+[email protected].19
 [email protected]
 [email protected]
 mrt:[email protected]
@@ -142,12 +141,11 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-risul:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
@@ -164,5 +162,5 @@ [email protected]
 [email protected]
 [email protected]
 vsivsi:[email protected]
-[email protected].16
+[email protected].17
 [email protected]
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v2.0.0
+FROM reactioncommerce/base:v2.0.2
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"

diff --git a/client/config/defaults.js b/client/config/defaults.js
@@ -1,4 +1,5 @@
 import { Session } from "meteor/session";
+import { AutoForm } from "meteor/aldeed:autoform";
 
 /**
  * Misc. App. Configuration

diff --git a/client/modules/accounts/components/auth/loginButtons.js b/client/modules/accounts/components/auth/loginButtons.js
@@ -46,7 +46,7 @@ class LoginButtons extends Component {
                 &nbsp;
                 <Translation defaultValue={this.props.capitalizeName(service.name)} i18nKey={`social.${service.name}`} />
               </span>
-          </Button>
+            </Button>
           ))
         }
       </div>

diff --git a/client/modules/accounts/components/auth/signIn.js b/client/modules/accounts/components/auth/signIn.js
@@ -135,7 +135,7 @@ class SignIn extends Component {
               value={this.state.email}
               onChange={this.handleFieldChange}
             />
-          {this.renderEmailErrors()}
+            {this.renderEmailErrors()}
           </div>
 
           <div className={passwordClasses}>
@@ -149,7 +149,7 @@ class SignIn extends Component {
               value={this.state.password}
               onChange={this.handleFieldChange}
             />
-          {this.renderPasswordErrors()}
+            {this.renderPasswordErrors()}
           </div>
 
           <div className="form-group">

diff --git a/client/modules/accounts/components/auth/signUp.js b/client/modules/accounts/components/auth/signUp.js
@@ -133,7 +133,7 @@ class SignUp extends Component {
               value={this.state.password}
               onChange={this.handleFieldChange}
             />
-          {this.renderPasswordErrors()}
+            {this.renderPasswordErrors()}
           </div>
 
           <div className="form-group">
@@ -170,14 +170,14 @@ class SignUp extends Component {
     return (
       <div>
         <div className="loginForm-title">
-        <h2>
-          <Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
-        </h2>
-      </div>
+          <h2>
+            <Translation defaultValue="Create an Account" i18nKey="accountsUI.createAccount" />
+          </h2>
+        </div>
 
-      {this.renderForm(emailClasses, passwordClasses)}
+        {this.renderForm(emailClasses, passwordClasses)}
 
-    </div>
+      </div>
     );
   }
 }

diff --git a/client/modules/accounts/components/dropdown/mainDropdown.js b/client/modules/accounts/components/dropdown/mainDropdown.js
@@ -104,14 +104,14 @@ class MainDropdown extends Component {
       <div>
         {this.props.currentUser ?
           <div style={{ paddingRight: 5 }}>
-              <DropDownMenu
-                buttonElement={this.buttonElement()}
-                attachment="bottom right"
-                targetAttachment="top right"
-                menuStyle={menuStyle}
-                className="accounts-li-tag"
-                onChange={this.props.handleChange}
-              >
+            <DropDownMenu
+              buttonElement={this.buttonElement()}
+              attachment="bottom right"
+              targetAttachment="top right"
+              menuStyle={menuStyle}
+              className="accounts-li-tag"
+              onChange={this.props.handleChange}
+            >
 
               {this.renderUserIcons()}
               {this.renderAdminIcons()}

diff --git a/client/modules/accounts/components/passwordReset/forgot.js b/client/modules/accounts/components/passwordReset/forgot.js
@@ -129,7 +129,7 @@ class Forgot extends Component {
               data-event-category="accounts"
               onClick={this.props.onSignInClick}
             >
-            <Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
+              <Translation defaultValue="Sign In" i18nKey="accountsUI.signIn" />
             </a>
           </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ class LoginButtons extends Component { @@
                     &nbsp;
                     <Translation defaultValue={this.props.capitalizeName(service.name)} i18nKey={`social.${service.name}`} />
                   </span>
-              </Button>
+                </Button>
               ))
             }
           </div>
@@ Expand Down @@