reactioncommerce · spencern · Oct 11, 2017 · Oct 4, 2017 · Oct 4, 2017 · Oct 4, 2017
diff --git a/.bithoundrc b/.bithoundrc
@@ -56,29 +56,11 @@
     "lint": {"engine": "eslint"}
   },
   "dependencies": {
-    "mute": [
-      "wdio-mocha-framework",
-      "griddle-react",
-      "twilio",
-      "react-addons-create-fragment",
-      "react-addons-pure-render-mixin",
-      "react-addons-test-utils",
-      "react-dom",
-      "react",
-      "transliteration",
-      "react-measure",
-      "react-onclickoutside",
-      "react-textarea-autosize",
-      "fibers"
-    ],
     "unused-ignores": [
-      "jquery",
       "sweetalert2",
       "font-awesome",
-      "bcrypt",
       "react-addons-pure-render-mixin",
       "url",
-      "griddle-react",
       "tether-tooltip",
       "react-textarea-autosize",
       "react-color",

diff --git a/.circleci/build.sh b/.circleci/build.sh
@@ -5,13 +5,16 @@ 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 [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" && "$CIRCLE_BRANCH" != *"docker"* ]]; then
-  echo "Not running a deployment branch. Skipping the Docker build test."
+if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != *"docker"* ]]; then
+  echo "Not running a build branch. Skipping the Docker build test."
   exit 0
 fi
 
 # build new image
-docker build --build-arg TOOL_NODE_FLAGS="--max-old-space-size=4096" -t reactioncommerce/reaction:latest .
+docker build \
+  --build-arg TOOL_NODE_FLAGS="--max-old-space-size=4096" \
+  --build-arg INSTALL_MONGO=true \
+  -t reactioncommerce/reaction:latest .
 
 # run the container and wait for it to boot
 docker-compose -f .circleci/docker-compose.yml up -d

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,12 +5,13 @@ jobs:
     working_directory: /home/reaction
 
     docker:
-      - image: node:7
+      - image: node:8
 
     environment:
-      - DOCKER_VERSION: 17.03.1-ce
-      - DOCKER_COMPOSE_VERSION: 1.13.0
+      - DOCKER_VERSION: 17.05.0-ce
+      - DOCKER_COMPOSE_VERSION: 1.15.0
       - METEOR_ALLOW_SUPERUSER: true
+      - TOOL_NODE_FLAGS: "--max-old-space-size=4096"
 
     steps:
       - setup_remote_docker
@@ -38,7 +39,7 @@ jobs:
           name: Restoring Meteor dev_bundle cache
           key: dev_bundle
 
-      - run: npm test
+      # - run: npm test
       - run: reaction test
 
       - save_cache:

diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
@@ -5,39 +5,17 @@
 #
 # $DOCKER_USER  - Docker Hub username
 # $DOCKER_PASS  - Docker Hub password
-# $DOCKER_EMAIL - Docker Hub email
-
 
 ## Optional Environment Variables
 # (used to customize the destination on Docker Hub without having to edit the CircleCI config)
 #
 # $DOCKER_NAMESPACE     - the image name for production deployments [Default]: reactioncommerce/reaction
-# $DOCKER_NAMESPACE_DEV - the image name for development deployments [Default]: reactioncommerce/prequel
-
 
-if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != "development" ]]; then
+if [[ "$CIRCLE_BRANCH" != "master" ]]; then
   echo "Not running a deployment branch."
   exit 0
 fi
 
-
-## Development
-if [[ "$CIRCLE_BRANCH" == "development" ]]; then
-  set -e
-
-  DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}
-  DOCKER_NAMESPACE_DEV=${DOCKER_NAMESPACE_DEV:-"reactioncommerce/prequel"}
-
-  docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE_DEV:latest
-  docker tag $DOCKER_NAMESPACE_DEV:latest $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM
-
-  docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-
-  docker push $DOCKER_NAMESPACE_DEV:$CIRCLE_BUILD_NUM
-  docker push $DOCKER_NAMESPACE_DEV:latest
-fi
-
-
 # Master branch deployment (only runs when a version git tag exists - syntax: "v1.2.3")
 if [[ "$CIRCLE_BRANCH" == "master" ]]; then
   VERSION=$(git describe --tags | grep "^v[0-9]\+\.[0-9]\+\.[0-9]\+$")
@@ -49,7 +27,7 @@ if [[ "$CIRCLE_BRANCH" == "master" ]]; then
 
     docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$VERSION
 
-    docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    docker login -u $DOCKER_USER -p $DOCKER_PASS
 
     docker push $DOCKER_NAMESPACE:$VERSION
     docker push $DOCKER_NAMESPACE:latest

diff --git a/.eslintrc b/.eslintrc
@@ -239,6 +239,7 @@
     }], // http://eslint.org/docs/rules/space-before-function-paren
     "space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
     "space-in-parens": [2, "never"], // http://eslint.org/docs/rules/space-in-parens
-    "spaced-comment": [2, "always"] // http://eslint.org/docs/rules/spaced-comment
+    "spaced-comment": [2, "always"], // http://eslint.org/docs/rules/spaced-comment
+    "arrow-spacing": [2, { "before": true, "after": true }] // https://eslint.org/docs/rules/arrow-spacing
   }
 }
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -1,18 +1,18 @@
-For bugs, please fill out the three following sections completely. Failure to provide
-this information may result in your ticket being closed without comments.
+For bugs, please fill out the three following sections completely. For the ticket to be resolved, you'll want to provide as much information as possible.
 
-Are you looking for support for installation/getting started with Reaction? Please go
-to our [Gitter](https://gitter.im/reactioncommerce/reaction) channel instead.
+Are you looking for help with getting started on Reaction? Please go
+to our [Gitter room](https://gitter.im/reactioncommerce/reaction) instead.
 
 ### Expected behavior
 
-### Actual Behavior
+### Actual behavior
 
-### Steps to Reproduce the Behavior
+### Steps to reproduce the behavior
 
 ### Versions
 (run `reaction -v` from your reaction directory)
 
-For enhancements or other issues, please describe in as much detail as
-possible how the app should be changed and how this would benefit
-users/developers
+For enhancements or other issues, please describe, in as much detail as
+possible, how the app should be changed, and how this would benefit other users and developers. 
+
+We're giving away t-shirts, tote bags, and $500 gift cards to anyone who contributes a feature or fixes a bug. Learn more about the [Reaction Hack-a-bug-a-thon](https://blog.reactioncommerce.com/introducing-the-reaction-hack-a-bug-a-thon/). 
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .fileStorage/
 .vscode
 .idea
+.c9
 *.csv
 *.dat
 *.gz

diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-[email protected].1
+[email protected].2
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,6 +1,6 @@
 abernix:[email protected]
 abernix:[email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
@@ -68,7 +68,7 @@ [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -108,7 +108,7 @@ [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -8,30 +8,30 @@ Diversity is one of our huge strengths, but it can also lead to communication is
 
 This isn’t an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it’s intended - a guide to make it easier to enrich all of us and the broader communities in which we participate.
 
-This code of conduct applies to all spaces managed by Reaction Commerce. This includes our [development chat room](https://gitter.im/reactioncommerce/reaction), [forums](https://forums.reactioncommerce.com), [blog](https://blog.reactioncommerce.com), mailing lists, [issue tracker](https://github.com/reactioncommerce/reaction/issues), [project board](https://waffle.io/reactioncommerce/reaction), Reaction events and meetups, and any other forums or service created by the core project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.
+This code of conduct applies to all spaces managed by Reaction Commerce. This includes our [development chat room](https://gitter.im/reactioncommerce/reaction), [forums](https://forums.reactioncommerce.com), [blog](https://blog.reactioncommerce.com), mailing lists, [issue tracker](https://github.com/reactioncommerce/reaction/issues), [project boards](https://github.com/reactioncommerce/reaction/projects), Reaction events and meetups, and any other forums or service created by the core project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.
 
-If you believe someone is violating the code of conduct, we ask that you report it by emailing [[email protected]](mailto:[email protected]). For more details, please see our [Reporting Guidelines](https://docs.reactioncommerce.com/reaction-docs/master/reporting-guide).
+If you believe someone is violating the code of conduct, we ask that you report it by emailing <mailto:[email protected]>. For more details, please see our [Reporting Guidelines](https://docs.reactioncommerce.com/reaction-docs/master/reporting-guide).
 
-- **Be friendly and patient.**
+-   **Be friendly and patient.**
 
-- **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
+-   **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
 
-- **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
+-   **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
 
-- **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the Reaction community should be respectful when dealing with other members as well as with people outside the Reaction community.
+-   **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the Reaction community should be respectful when dealing with other members as well as with people outside the Reaction community.
 
-- **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
+-   **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
 
-  - Violent threats or language directed against another person.
-  - Discriminatory jokes and language.
-  - Posting sexually explicit or violent material.
-  - Posting (or threatening to post) other people's personally identifying information ("doxing").
-  - Personal insults, especially those using racist or sexist terms.
-  - Unwelcome sexual attention.
-  - Advocating for, or encouraging, any of the above behavior.
-  - Repeated harassment of others. In general, if someone asks you to stop, then stop.
+    -   Violent threats or language directed against another person.
+    -   Discriminatory jokes and language.
+    -   Posting sexually explicit or violent material.
+    -   Posting (or threatening to post) other people's personally identifying information ("doxing").
+    -   Personal insults, especially those using racist or sexist terms.
+    -   Unwelcome sexual attention.
+    -   Advocating for, or encouraging, any of the above behavior.
+    -   Repeated harassment of others. In general, if someone asks you to stop, then stop.
 
-- **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and Reaction is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of Reaction comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
+-   **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and Reaction is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of Reaction comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
 
 ## Questions?
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,7 +17,9 @@ Explore the interface and the code to give you a good overview of the product an
 
 **Step 3:**
 
-Explore the [GitHub issues already open on our main repo](https://waffle.io/reactioncommerce/reaction). If you find something you want to work on, let us know right there in the comments. If you are interested in a specific aspect of the project but aren't sure where to begin, feel free to ask. Start small and open up a dialogue with us. This will help to get your contributions accepted easily.
+Explore the [GitHub issues already open on our main repo](https://github.com/reactioncommerce/reaction/issues) and our [GitHub project boards](https://github.com/reactioncommerce/reaction/projects). If you find something you want to work on, let us know right there in the comments. [`Pull Requests Encouraged`](https://github.com/reactioncommerce/reaction/issues?q=is%3Aissue+is%3Aopen+label%3Apull-requests-encouraged) and [`Verified Reproducible`](https://github.com/reactioncommerce/reaction/issues?q=is%3Aopen+is%3Aissue+label%3Averified-reproducible) labeled issues are a great place to start.
+
+If you are interested in a specific aspect of the project but aren't sure where to begin, feel free to ask. Start small and open up a dialogue with us. This will help to get your contributions accepted easily.
 
 **Step 4:**
 
@@ -27,8 +29,8 @@ Let us know how we can make the contribution process easier. We want to find the
 
 [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) to propose and collaborate on changes to Reaction. These changes are proposed in a PR branch, and are reviewed before merge acceptance into `development` for release.
 
-- Should reference an issue if one exists, or provide detailed information on the goal of the PR.
-- Should pass CI / Tests. New functionality should include new tests.
-- Should passing a linter code review and follow Reaction style guidelines.
-- Contributors should review the CLA.
-- Code reviewed before merge acceptance.
+-   Should reference an issue if one exists, or provide detailed information on the goal of the PR.
+-   Pass both [acceptance tests and unit testing](https://docs.reactioncommerce.com/reaction-docs/master/testing-reaction). New functionality should include new tests.
+-   Lint and adhere to the [Reaction style guide](https://docs.reactioncommerce.com/reaction-docs/master/styleguide).
+-   Contributors should review the CLA.
+-   Code reviewed before merge acceptance.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v2.0.2
+FROM reactioncommerce/base:v2.2.0
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     .fileStorage/
     .vscode
     .idea
+    .c9
     *.csv
     *.dat
     *.gz
@@ Expand Down @@