Skip to content

Commit

Permalink
Release 1.3.0 (reactioncommerce#2417)
Browse files Browse the repository at this point in the history
## Features

-   **Meteor 1.5 (reactioncommerce#2371)**
-   **Order fulfillment UI updates (reactioncommerce#2400)**
-   **React Router updated (reactioncommerce#2123)**
-   **React Navbar (and deprecated Blaze navbar) (reactioncommerce#2306)**
-   **Re-introduce icon toolbar as shortcutBar (reactioncommerce#2261)**
-   **React unit testing example (reactioncommerce#2170)**
-   **[WIP] [Style guide](https://styleguide.reactioncommerce.com)**

## Changes / Fixes
- __Update current user&reactioncommerce#39;s name on Navbar and profile page when address is added. (reactioncommerce#2455)__
- __Fix reactioncommerce#2422 on email invite link leading to blank screen (reactioncommerce#2437)__
- __Fix reactioncommerce#2459 router range error fix (reactioncommerce#2476)__
- __Remove older Blaze based launchdock plugin (reactioncommerce#2467)__
- __Remove random regex checks on names. Fixes reactioncommerce#2461 (reactioncommerce#2471)__
- __Update media gallery new / deleted image indicators (reactioncommerce#2469)__
- __Fix reactioncommerce#2356 on tag menu-sidebar glitch (reactioncommerce#2472)__
- __Fix reactioncommerce#2452 on UI icon toolbar (reactioncommerce#2460)__
- __set css property overflow on horizontal to hidden (reactioncommerce#2458)__
- __Navbar hover issue (reactioncommerce#2451)__
- __update memory usage in CircleCI build (reactioncommerce#2462)__
- __refactor default admin user creation (reactioncommerce#2453)__
- __Bunyan and Loggly updates (reactioncommerce#2425)__
- __Updated chai package__
- __add missing &reactioncommerce#34;orders not found&reactioncommerce#34; text (reactioncommerce#2424)__
- __Add closeOnClick option to DropDownMenu component (reactioncommerce#2418)__
-   **Fixed console error when dragging product images (reactioncommerce#2443)**
-   **Remove unmaintained Browserstack acceptance tests (reactioncommerce#2430)**
-   **Add css style to differentiate read from unread notifications (reactioncommerce#2442)**
-   **Added module aliases @reactioncommerce/reaction-ui (reactioncommerce#2436)**
-   **Switch to Reaction’s new fork of Nodemailer (reactioncommerce#2427)**
-   **Admin should be able to invite a user with the same name (reactioncommerce#2386)**
-   **Updated yarn.lock and removed npm-shrinkwrap.json**
-   **use route permissions in register.js files (reactioncommerce#2388)**
-   **Updated, refreshed order/fulfillment UI (reactioncommerce#2400)**
-   **Change line width to match GH PR review width (reactioncommerce#2407)**
-   **Fix Improper Cart Merge (reactioncommerce#2387)**
-   **Implement missing router functions (reactioncommerce#2393)**
-   **Correct the way we record tax overrides**
-   **CollectionFS  cfs:tempstore and cfs:worker to Fix concurrency issues with GridFS uploads (reactioncommerce#2096)**
-   **Fix typo in inventory test description (reactioncommerce#2364)**
-   **Added Nigerian Naira to currency list in (reactioncommerce#2366)**
-   **Fix git tagging on CircleCI 2.0 (reactioncommerce#2362)**
-   **Adding the license description with link on README (reactioncommerce#2365)**
-   **Better handling for unique routes for React Router (reactioncommerce#2327)**
-   **Don't throwback a step if tax fails**
-   **Updated UI colors for styleguide (reactioncommerce#2339)**
-   **Add loading component to Fix error (reactioncommerce#2340)**
-   **Allow a MAIL_URL string without auth (reactioncommerce#2330)**
-   **Defer Fixture load until the default shop is loaded (reactioncommerce#2329)**
-   **Fix conditional in Circle deploy script (reactioncommerce#2338)**
-   **Fix refunds not showing (reactioncommerce#2317)**
-   **Add Verification Url to Welcome Email (reactioncommerce#2216)**
-   **CircleCI 2.0 and docker base update (reactioncommerce#2334)**
-   **i18n translation updates (reactioncommerce#2302 reactioncommerce#2420)**
-   **Change customer notification message when order is processed. (reactioncommerce#2290)**
-   **Allow loader to show when one is passed in and defined BUGFIX (reactioncommerce#2303)**
-   **Add the Vietnamese Dong as a supported currency (reactioncommerce#2248)**
-   **Updated shipping / payment error messages in checkout (reactioncommerce#2271)**
-   **Fix reactioncommerce#2203 Long Strings Handling in Product Option Title (reactioncommerce#2266)**
-   **Simplify core layout component (reactioncommerce#2257)**
-   **Fix multiple refunds for stripe (reactioncommerce#2260)**
  • Loading branch information
Aaron Judd authored Jun 22, 2017
1 parent df6739d commit db4e8d2
Show file tree
Hide file tree
Showing 632 changed files with 14,901 additions and 14,443 deletions.
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

1 change: 0 additions & 1 deletion .bithoundrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"mute": [
"wdio-mocha-framework",
"griddle-react",
"nodemailer",
"twilio",
"react-addons-create-fragment",
"react-addons-pure-render-mixin",
Expand Down
28 changes: 28 additions & 0 deletions .circleci/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

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."
exit 0
fi

# build new image
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-compose -f .circleci/docker-compose.yml up -d
sleep 30

# use curl to ensure the app returns 200's
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
56 changes: 56 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: 2

jobs:
build:
working_directory: /home/reaction

docker:
- image: node:7

environment:
- DOCKER_VERSION: 17.03.1-ce
- DOCKER_COMPOSE_VERSION: 1.13.0
- METEOR_ALLOW_SUPERUSER: true

steps:
- setup_remote_docker
- checkout

# install OS dependencies
- restore_cache:
name: Restoring Meteor cache
key: meteor

- run: .circleci/install.sh

- save_cache:
name: Saving Meteor to cache
key: meteor
paths:
- ~/.meteor

# install app dependencies

- run: meteor npm install

# run tests
- restore_cache:
name: Restoring Meteor dev_bundle cache
key: dev_bundle

- 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

# deploy the build (if on a deployment branch)
- deploy:
name: Docker Image Deploment
command: .circleci/deploy.sh
59 changes: 59 additions & 0 deletions .circleci/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

## Required environment variables in your CircleCI dashboard
# (used to push to Docker Hub)
#
# $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
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]\+$")

if [[ "$VERSION" ]]; then
set -e

DOCKER_NAMESPACE=${DOCKER_NAMESPACE:-"reactioncommerce/reaction"}

docker tag $DOCKER_NAMESPACE:latest $DOCKER_NAMESPACE:$VERSION

docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS

docker push $DOCKER_NAMESPACE:$VERSION
docker push $DOCKER_NAMESPACE:latest
else
echo "On the master branch, but no version tag was found. Skipping image deployment."
fi
fi
17 changes: 17 additions & 0 deletions .circleci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
39 changes: 39 additions & 0 deletions .circleci/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

set -x

# install OS dependencies
apt-get update
apt-get install -y locales


# fix Meteor/Mongo locale issue on Debian
# https://github.com/meteor/meteor/issues/4019
locale-gen en_US.UTF-8
localedef -i en_GB -f UTF-8 en_US.UTF-8


# install Docker client
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
printf "\nMeteor already installed. Creating symlink.\n"
ln -s ~/.meteor/meteor /usr/local/bin/meteor;
else
printf "\Installing Meteor\n"
curl https://install.meteor.com | /bin/sh
fi


# install Reaction CLI
yarn global add reaction-cli
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"args": "after-used"
}],
"no-use-before-define": [2, "nofunc"], // http://eslint.org/docs/rules/no-use-before-define
"no-implicit-globals": 2, // http://eslint.org/docs/rules/no-implicit-globals

/**
* Possible errors
Expand Down
1 change: 1 addition & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -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
34 changes: 16 additions & 18 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@
# 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
[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]
Expand All @@ -34,17 +33,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
Expand All @@ -59,7 +60,6 @@ cfs:standard-packages
cfs:storage-adapter
cfs:ui
dispatch:run-as-user
jeremy:stripe
jparker:gravatar
juliancwirko:s-alert
juliancwirko:s-alert-stackslide
Expand All @@ -72,8 +72,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

Expand All @@ -94,6 +94,4 @@ johanbrook:publication-collector
# meteorhacks:sikka # additional ddp, login security

# Custom Packages
[email protected]
[email protected]
[email protected]
abernix:[email protected]
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.4.2
METEOR@1.5
Loading

0 comments on commit db4e8d2

Please sign in to comment.