Merge pull request #3357 from reactioncommerce/release-1.6.0

Release 1.6.0

.bithoundrc

@@ -59,7 +59,9 @@
   "dependencies": {
     "mute": [
       "enzyme",
-      "jsdoc"
+      "jsdoc",
+      "react",
+      "react-dom"
     ],
     "unused-ignores": [
       "sweetalert2",

.circleci/config.yml

@@ -62,7 +62,12 @@ jobs:
           name: Deploy to S3 if tests pass and branch is Master
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              aws s3 sync /tmp/reaction-docs ${API_DOC_BUCKET} --delete --region ${API_DOC_BUCKET_REGION}
+              if [[ "${API_DOC_BUCKET}" && "${API_DOC_BUCKET_REGION}" ]]; then
+                aws s3 sync /tmp/reaction-docs ${API_DOC_BUCKET} --delete --region ${API_DOC_BUCKET_REGION}
+              else
+                echo "S3 bucket configuration not found for jsdocs"
+                echo "Set API_DOC_BUCKET and API_DOC_BUCKET_REGION to build and deploy jsdocs to S3"
+              fi
             else
               echo "Not master branch so not deploying"
             fi

.meteor/packages

@@ -7,40 +7,40 @@
 # Core Meteor Packages
 ###
 
-meteor-base@1.1.0             # Packages every Meteor app needs to have
+meteor-base@1.2.0             # 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.
-ecmascript@0.8.2              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.9.0              # 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
-mongo@1.2.2
+mongo@1.3.0
 [email protected]
 [email protected]
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 [email protected]
-http@1.2.12
+http@1.3.0
 [email protected]
 [email protected]
-[email protected].17
+[email protected].19
 [email protected]
-ejson@1.0.14
-[email protected].9
+ejson@1.1.0
+[email protected].11
 [email protected]
 mdg:validated-method
-shell-server@0.2.4
-dynamic-import@0.1.3
+shell-server@0.3.0
+dynamic-import@0.2.0
 
 # Meteor Auth Packages
-accounts-base@1.3.3
-accounts-password@1.4.0
-accounts-facebook@1.2.1
-accounts-google@1.2.0
-accounts-twitter@1.3.0
-oauth-encryption@1.2.1
+accounts-base@1.4.0
+accounts-password@1.5.0
+accounts-facebook@1.3.0
+accounts-google@1.3.0
+accounts-twitter@1.4.0
+oauth-encryption@1.3.0
 [email protected]
 [email protected]
 [email protected]

.meteor/release

@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6

.meteor/versions

@@ -1,11 +1,11 @@
 abernix:[email protected]
 abernix:[email protected]
-accounts-base@1.3.6
-accounts-facebook@1.2.1
-accounts-google@1.2.0
+accounts-base@1.4.0
+accounts-facebook@1.3.0
+accounts-google@1.3.0
 [email protected]
-accounts-password@1.4.2
-accounts-twitter@1.3.0
+accounts-password@1.5.0
+accounts-twitter@1.4.0
 alanning:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
@@ -15,17 +15,17 @@ aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
-allow-deny@1.0.9
+allow-deny@1.1.0
 [email protected]
 [email protected]
-babel-compiler@6.20.0
-babel-runtime@1.0.1
+babel-compiler@6.24.7
+babel-runtime@1.1.1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.2.0
+boilerplate-generator@1.3.1
 bozhao:[email protected]
 [email protected]
 [email protected]
@@ -58,33 +58,33 @@ [email protected]
 [email protected]_3
 [email protected]_3
 dburles:[email protected]
-ddp@1.3.1
-ddp-client@2.1.3
-ddp-common@1.2.9
+ddp@1.4.0
+ddp-client@2.2.0
+ddp-common@1.3.0
 [email protected]
-ddp-server@2.0.2
+ddp-server@2.1.1
 [email protected]
 [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
-dynamic-import@0.1.3
-ecmascript@0.8.3
-ecmascript-runtime@0.4.1
-ecmascript-runtime-client@0.4.3
-ecmascript-runtime-server@0.4.1
-ejson@1.0.14
+dynamic-import@0.2.1
+ecmascript@0.9.0
+ecmascript-runtime@0.5.0
+ecmascript-runtime-client@0.5.0
+ecmascript-runtime-server@0.5.0
+ejson@1.1.0
 [email protected]
 [email protected]
-[email protected].0
-facebook-oauth@1.3.2
+[email protected].1
+facebook-oauth@1.4.0
 gadicc:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-http@1.2.12
+http@1.3.0
 [email protected]
 johanbrook:[email protected]
 jparker:[email protected]
@@ -96,58 +96,58 @@ juliancwirko:[email protected]
 juliancwirko:[email protected]
 kadira:[email protected]
 [email protected]
-[email protected].9
+[email protected].11
 [email protected]
-localstorage@1.1.1
+localstorage@1.2.0
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
 mdg:[email protected]
-meteor@1.7.2
-meteor-base@1.1.0
+meteor@1.8.1
+meteor-base@1.2.0
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-minimongo@1.3.3
+minimongo@1.4.1
 [email protected]
 [email protected]
-modules@0.10.0
-modules-runtime@0.8.0
-momentjs:moment@2.18.1
-mongo@1.2.2
-mongo-dev-server@1.0.1
+modules@0.11.0
+modules-runtime@0.9.0
+momentjs:moment@2.19.2
+mongo@1.3.0
+mongo-dev-server@1.1.0
 [email protected]
 [email protected]
 mrt:[email protected]
 natestrauser:[email protected]
 [email protected]
 [email protected]
-oauth@1.1.13
-oauth-encryption@1.2.1
-oauth1@1.1.11
-oauth2@1.1.11
+oauth@1.2.0
+oauth-encryption@1.3.0
+oauth1@1.2.0
+oauth2@1.2.0
 [email protected]
 ongoworks:[email protected]
 [email protected]
 percolate:[email protected]
 practicalmeteor:[email protected]_1
 practicalmeteor:[email protected]
 practicalmeteor:[email protected]_2
-promise@0.9.0
+promise@0.10.0
 raix:[email protected]
 raix:[email protected]
 [email protected]
 [email protected]
 [email protected]
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-shell-server@0.2.4
+shell-server@0.3.0
 [email protected]
 [email protected]
 [email protected]
@@ -164,5 +164,5 @@ [email protected]
 [email protected]
 [email protected]
 vsivsi:[email protected]
-webapp@1.3.19
+webapp@1.4.0
 [email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v2.2.0
+FROM reactioncommerce/base:v3.0.0
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"

imports/plugins/core/accounts/client/components/adminInviteForm.js

@@ -111,8 +111,8 @@ class AdminInviteForm extends Component {
       <Components.DropDownMenu
         buttonElement={buttonElement(dropOptions)}
         onChange={this.handleGroupSelect}
-        attachment="bottom right"
-        targetAttachment="top right"
+        attachment="top right"
+        targetAttachment="bottom right"
       >
         {dropOptions
           .map((grp, index) => (

imports/plugins/core/router/lib/router.js

@@ -14,7 +14,6 @@ import { Counts } from "meteor/tmeasday:publish-counts";
 import { Tracker } from "meteor/tracker";
 import { Packages, Shops } from "/lib/collections";
 import { getComponent } from "@reactioncommerce/reaction-components/components";
-import BlazeLayout from "/imports/plugins/core/layout/lib/blazeLayout";
 import Hooks from "./hooks";
 
 export let history;
@@ -542,15 +541,8 @@ export function ReactionLayout(options = {}) {
           structure: structure
         });
       } catch (e) {
-        // Otherwise fallback to a blaze template
-        if (Template[layoutName]) {
-          return (
-            <BlazeLayout
-              {...structure}
-              blazeTemplate={layoutName}
-            />
-          );
-        }
+        // eslint-disable-next-line
+        console.warn(e, "Failed to create a React layout element");
       }
       // If all else fails, render a not found page
       return <Blaze template={structure.notFound} />;

imports/plugins/core/versions/server/migrations/1_rebuild_account_and_order_search_collections.js

@@ -5,17 +5,17 @@ import { buildOrderSearch,
 
 Migrations.add({
   version: 1,
-  up: function () {
+  up() {
     OrderSearch.remove({});
-    AccountSearch.remove();
+    AccountSearch.remove({});
     buildOrderSearch();
     buildAccountSearch();
   },
-  down: function () {
+  down() {
     // whether we are going up or down we just want to update the search collections
     // to match whatever the current code in the build methods are.
     OrderSearch.remove({});
-    AccountSearch.remove();
+    AccountSearch.remove({});
     buildOrderSearch();
     buildAccountSearch();
   }