reactioncommerce · aaronjudd · Jun 21, 2017 · Apr 17, 2017 · Apr 17, 2017 · Apr 17, 2017
diff --git a/.babelrc b/.babelrc
diff --git a/.bithoundrc b/.bithoundrc
@@ -59,7 +59,6 @@
     "mute": [
       "wdio-mocha-framework",
       "griddle-react",
-      "nodemailer",
       "twilio",
       "react-addons-create-fragment",
       "react-addons-pure-render-mixin",

diff --git a/.circleci/build.sh b/.circleci/build.sh
@@ -5,17 +5,21 @@ set -e
 DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
 
 # if we're not on a deployment branch or a Docker related PR branch, skip the Docker build/test
-if [[ -z "$CIRCLE_TAG" && "$CIRCLE_BRANCH" != "development" && "$CIRCLE_BRANCH" != *"docker"* ]]; then
+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
 
 # build new image
-reaction build $DOCKER_NAMESPACE:latest
+docker build --build-arg TOOL_NODE_FLAGS="--max-old-space-size=4096" -t reactioncommerce/reaction:latest .
 
 # run the container and wait for it to boot
-docker run --name reaction -p 3000:3000 -d $DOCKER_NAMESPACE:latest
+docker-compose -f .circleci/docker-compose.yml up -d
 sleep 30
 
 # use curl to ensure the app returns 200's
-docker exec reaction curl --retry 10 --retry-delay 10 -v http://localhost:3000
+docker exec reaction bash -c "apt-get update && apt-get install -y curl && \
+  curl --retry 10 --retry-delay 10 -v http://localhost:3000"
+
+# now change the image tag to the configured name
+docker tag reactioncommerce/reaction:latest $DOCKER_NAMESPACE:latest
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,8 @@ jobs:
       - image: node:7
 
     environment:
+      - DOCKER_VERSION: 17.03.1-ce
+      - DOCKER_COMPOSE_VERSION: 1.13.0
       - METEOR_ALLOW_SUPERUSER: true
 
     steps:

diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 ## Required environment variables in your CircleCI dashboard
 # (used to push to Docker Hub)
 #
@@ -25,6 +23,8 @@ fi
 
 ## Development
 if [[ "$CIRCLE_BRANCH" == "development" ]]; then
+  set -e
+
   DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
   DOCKER_NAMESPACE_DEV=${DOCKER_NAMESPACE_DEV:-"reactioncommerce/prequel"}
 
@@ -43,6 +43,8 @@ if [[ "$CIRCLE_BRANCH" == "master" ]]; then
   VERSION=$(git describe --tags | grep "^v[0-9]\+\.[0-9]\+\.[0-9]\+$")
 
   if [[ "$VERSION" ]]; then
+    set -e
+
     DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
 
     docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$VERSION

diff --git a/.circleci/docker-compose.yml b/.circleci/docker-compose.yml
@@ -0,0 +1,17 @@
+# Usage:
+# docker-compose up -d
+
+reaction:
+  container_name: reaction
+  image: reactioncommerce/reaction:latest
+  links:
+    - mongo
+  ports:
+    - "3000:3000"
+  environment:
+    ROOT_URL: "http://localhost"
+    MONGO_URL: "mongodb://mongo:27017/reaction"
+
+mongo:
+  image: mongo:latest
+  command: mongod --storageEngine=wiredTiger
diff --git a/.circleci/install.sh b/.circleci/install.sh
@@ -14,13 +14,16 @@ localedef -i en_GB -f UTF-8 en_US.UTF-8
 
 
 # install Docker client
-DOCKER_VERSION="17.03.1-ce"
 curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION.tgz
 tar -xz -C /tmp -f /tmp/docker-$DOCKER_VERSION.tgz
 mv /tmp/docker/* /usr/bin
 docker -v
 
 
+# install Docker Compose
+curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+
 
 # install Meteor if it's not already
 if [[ -f ~/.meteor/meteor ]]; then

diff --git a/.editorconfig b/.editorconfig
@@ -12,7 +12,7 @@ insert_final_newline = true
 trim_trailing_whitespace = false
 
 [*.js]
-max_line_length = 160
+max_line_length = 120
 indent_brace_style = 1TBS
 spaces_around_operators = true
 quote_type = double
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
@@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
 1.4.0-remove-old-dev-bundle-link
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
diff --git a/.meteor/packages b/.meteor/packages
@@ -7,21 +7,21 @@
 # Core Meteor Packages
 ###
 
-meteor-base@1.0.4             # Packages every Meteor app needs to have
+meteor-base@1.1.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.7.3              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.8.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)
-abernix:standard-minifier-js  # a minifier plugin used for Meteor apps by default
+standard-minifier-js          # a minifier plugin used for Meteor apps by default
 [email protected]                 # ReactiveDict whose contents are preserved across Hot Code Push
 [email protected]                 # Meteor transparent reactive programming library
-[email protected].17
+[email protected].18
 [email protected]
 [email protected]
-[email protected].8
+[email protected].9
 [email protected]
 [email protected]
 [email protected]
@@ -34,17 +34,19 @@ [email protected]
 amplify
 mdg:validated-method
 [email protected]
+dynamic-import
 
 # Meteor Auth Packages
-accounts-base@1.2.17
+accounts-base@1.3.0
 [email protected]
-accounts-facebook@1.1.1
-accounts-google@1.1.2
-accounts-twitter@1.2.1
+accounts-facebook@1.2.0
+accounts-google@1.2.0
+accounts-twitter@1.3.0
 [email protected]
-# accounts-github
-# accounts-weibo
-# accounts-oauth
+[email protected]
+[email protected]
+[email protected]
+
 
 # Community Packages
 alanning:roles
@@ -59,7 +61,6 @@ cfs:standard-packages
 cfs:storage-adapter
 cfs:ui
 dispatch:run-as-user
-jeremy:stripe
 jparker:gravatar
 juliancwirko:s-alert
 juliancwirko:s-alert-stackslide
@@ -72,8 +73,8 @@ ongoworks:security
 raix:ui-dropped-event
 risul:moment-timezone
 tmeasday:publish-counts
-vsivsi:[email protected]
-react-meteor-data
+vsivsi:job-collection@=1.4.0
+react-meteor-data@=0.2.9
 percolate:migrations
 gadicc:blaze-react-component
 
@@ -94,6 +95,3 @@ johanbrook:publication-collector
 # meteorhacks:sikka                         # additional ddp, login security
 
 # Custom Packages
-[email protected]
-[email protected]
-[email protected]
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.4.2
+METEOR@1.5
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,11 +1,9 @@
-abernix:[email protected]
-abernix:[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
-[email protected].6
-accounts-twitter@1.2.1
+[email protected].7
+accounts-twitter@1.3.0
 alanning:[email protected]
 aldeed:[email protected]
 aldeed:[email protected]
@@ -19,14 +17,14 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-babel-compiler@6.18.2
+babel-compiler@6.19.2
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.0.11
+boilerplate-generator@1.1.0
 [email protected]
 [email protected]
 [email protected]
@@ -66,13 +64,16 @@ [email protected]
 [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
-[email protected].1
+[email protected].3
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 gadicc:[email protected]
 [email protected]
@@ -83,7 +84,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-jeremy:[email protected]
 johanbrook:[email protected]
 jparker:[email protected]
 jparker:[email protected]
@@ -96,28 +96,29 @@ kadira:[email protected]
 [email protected]
 [email protected]
 [email protected]
-localstorage@1.0.12
+localstorage@1.1.0
 [email protected]
 matb33:[email protected]
 mdg:[email protected]
 mdg:[email protected]
 [email protected]
-meteor-base@1.0.4
+meteor-base@1.1.0
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-[email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
-modules@0.8.2
-modules-runtime@0.7.10
-momentjs:moment@2.17.1
-[email protected].17
+modules@0.9.1
+modules-runtime@0.8.0
+momentjs:moment@2.18.1
+[email protected].18
 [email protected]
 [email protected]
 mrt:[email protected]
 natestrauser:[email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -130,13 +131,13 @@ percolate:[email protected]
 practicalmeteor:[email protected]_1
 practicalmeteor:[email protected]
 practicalmeteor:[email protected]_2
-[email protected].8
+[email protected].9
 raix:[email protected]
 raix:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].8
+[email protected].9
 [email protected]
 [email protected]
 [email protected]
@@ -149,6 +150,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -162,5 +164,5 @@ [email protected]
 [email protected]
 [email protected]
 vsivsi:[email protected]
-[email protected].15
+[email protected].16
 [email protected]
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v1.4.0
+FROM reactioncommerce/base:v2.0.0
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"

diff --git a/README.md b/README.md
@@ -82,3 +82,7 @@ Integration tests can be run at the command line with `reaction test`.
 We ensure that all releases are deployable as [Docker](https://www.docker.com/) containers.  While we don't regularly test other methods of deployment, our community has documented deployment strategies for AWS, [Digital Ocean](https://gist.github.com/jshimko/745ca66748846551692e24c267a56060), and Galaxy.
 
 For an introduction to Docker deployment, [the Reaction deployment guide](https://docs.reactioncommerce.com/reaction-docs/master/deploying) has detailed examples. Reaction Commerce also offers a managed deployment platform integrated with the Reaction command line.
+
+### License
+
+Copyright © [GNU General Public License v3.0](./LICENSE.md)
diff --git a/client/lib/buffer.js b/client/lib/buffer.js
@@ -0,0 +1,7 @@
+// this is an expensive polyfill for clientside Buffer usage
+// TODO refactor to remove this buffer dependency
+global.Buffer = global.Buffer || require("buffer").Buffer; // eslint-disable-line
+
+// how to refactor
+// you can easily drop a breakpoint on the error in your browser's inspector, then refresh the page to hit the breakpoint and see via the call stack which package is trying to use Buffer
+// https://github.com/meteor/meteor/issues/8645
diff --git a/client/modules/accounts/components/auth/index.js b/client/modules/accounts/components/auth/index.js
@@ -0,0 +1,3 @@
+export LoginButtons from "./loginButtons";
+export SignIn from "./signIn";
+export SignUp from "./signUp";