Merge pull request #4296 from reactioncommerce/release-1.13.0

Release 1.13.0

.circleci/bin/docker-tags

@@ -33,11 +33,18 @@ if [[ "$BRANCH" == "master" ]]; then
       | grep "^${SHA1}" \
       | sed -e 's,.* refs/tags/,,' -e 's/\^{}//' \
       | grep "^v[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+$" \
+      | sed 's/v//g' \
       | sort \
   )
 
   # Find the highest tagged version number
-  HIGHEST_TAG=$(git --no-pager tag | grep "^v[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+$" | sort -r | head -n 1)
+  HIGHEST_TAG=$( \
+    git --no-pager tag \
+      | grep "^v[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+$" \
+      | sed 's/v//g' \
+      | sort -r --version-sort \
+      | head -n 1 \
+  )
 
   # We tag :latest only if
   # 1. We have a current tag
@@ -47,4 +54,4 @@ if [[ "$BRANCH" == "master" ]]; then
       echo "latest"
     fi
   fi
-fi
+fi

.circleci/config.yml

@@ -196,7 +196,7 @@ jobs:
   dockerfile-lint:
     <<: *defaults
     docker:
-      - image: hadolint/hadolint
+      - image: hadolint/hadolint:v1.6.6-6-g254b4ff
     steps:
       - checkout
       - setup_remote_docker
@@ -218,8 +218,25 @@ jobs:
       - run:
           name: Snyk Test
           command: |
-            PATH=$PATH:$CIRCLE_WORKING_DIRECTORY/node_modules/.bin && \
-              snyk test
+            CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}" # Determine PR number from pull request link
+            if [ -n ${CIRCLE_PR_NUMBER} ]; then
+              url="https://api.github.com/repos/${DOCKER_REPOSITORY}/pulls/$CIRCLE_PR_NUMBER" # Get PR from github API
+              TARGET_BRANCH=$(curl "$url" | jq '.base.ref' | tr -d '"') # Determine target/base branch from API response
+            fi
+            # If target branch does not exist or is master, run snyk tests
+            if [ ${TARGET_BRANCH} == "master" ] || [ -z "${TARGET_BRANCH/[ ]*\n/}" ]; then
+              PATH=$PATH:$CIRCLE_WORKING_DIRECTORY/node_modules/.bin && \
+                snyk test
+            else
+              # If package.json is different from the base branch, run snyk
+              if git diff origin/$CIRCLE_BRANCH..origin/$TARGET_BRANCH package.json | grep diff; then
+                echo "package.json different. Running Snyk."
+                PATH=$PATH:$CIRCLE_WORKING_DIRECTORY/node_modules/.bin && \
+                snyk test
+              else
+                echo "package.json identical to target branch. Skipping Snyk."
+              fi
+            fi
 
 workflows:
   version: 2

.meteor/.finished-upgraders

@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base

.meteor/packages

@@ -7,36 +7,36 @@
 # Core Meteor Packages
 ###
 
-meteor-base@1.3.0             # Packages every Meteor app needs to have
+meteor-base@1.4.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
-es5-shim@4.7.0               # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.10.0              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.8.0               # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.11.0              # Enable ECMAScript2015+ syntax in app code
 [email protected]   # ensure meteor method argument validation
 [email protected]          # security-related policies enforced by newer browsers
 juliancwirko:[email protected]    # CSS post-processing plugin (replaces standard-minifier-css)
 [email protected]                 # ReactiveDict whose contents are preserved across Hot Code Push
-tracker@1.1.3                 # Meteor transparent reactive programming library
-mongo@1.4.2
+tracker@1.2.0                 # Meteor transparent reactive programming library
+mongo@1.5.0
 [email protected]
 [email protected]
-[email protected].0
-[email protected].0
+[email protected].1
+[email protected].1
 [email protected]
 [email protected]
-[email protected].19
+[email protected].20
 [email protected]
 [email protected]
-[email protected].11
+[email protected].12
 [email protected]
 mdg:validated-method
 [email protected]
-dynamic-import@0.3.0
-[email protected].1
+dynamic-import@0.4.0
+[email protected].4
 
 # Meteor Auth Packages
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]

.meteor/release

@@ -1 +1 @@
-METEOR@1.6.1
+METEOR@1.7.0.1

.meteor/versions

@@ -2,7 +2,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 alanning:[email protected]
 aldeed:[email protected]
@@ -12,51 +12,51 @@ aldeed:[email protected]
 [email protected]
 [email protected]
 [email protected]
-babel-compiler@7.0.4
+babel-compiler@7.1.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-boilerplate-generator@1.4.0
+boilerplate-generator@1.5.0
 bozhao:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].11
+[email protected].12
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 dburles:[email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
-ddp-server@2.1.2
+ddp-server@2.2.0
 [email protected]
 [email protected]
 dispatch:[email protected]
-dynamic-import@0.3.0
-ecmascript@0.10.4
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.6.2
-ecmascript-runtime-server@0.5.0
+dynamic-import@0.4.0
+ecmascript@0.11.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.1
+ecmascript-runtime-server@0.7.0
 [email protected]
 [email protected]
-es5-shim@4.7.3
+es5-shim@4.8.0
 [email protected]
-facebook-oauth@1.4.0
+facebook-oauth@1.5.0
 gadicc:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 johanbrook:[email protected]
 [email protected]
@@ -65,28 +65,29 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].19
+[email protected].20
 mdg:[email protected]
-meteor@1.8.2
-meteor-base@1.3.0
+meteor@1.9.0
+meteor-base@1.4.0
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 meteortesting:[email protected]
 meteortesting:[email protected]
 [email protected]
-[email protected].2
-[email protected].3
+[email protected].5
+[email protected].4
 [email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
 momentjs:[email protected]
-mongo@1.4.3
+mongo@1.5.0
 [email protected]
-[email protected].6
+[email protected].7
 [email protected]
-npm-mongo@2.2.34
-[email protected].1
+npm-mongo@3.0.7
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -97,37 +98,35 @@ percolate:[email protected]
 practicalmeteor:[email protected]_1
 practicalmeteor:[email protected]
 practicalmeteor:[email protected]_2
-promise@0.10.2
+promise@0.11.1
 raix:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 tmeasday:[email protected]
 tmeasday:[email protected]
-tracker@1.1.3
+tracker@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-webapp@1.5.0
+webapp@1.6.0
 [email protected]

.snyk

@@ -5,19 +5,15 @@ ignore:
   'npm:hoek:20180212':
     - '*':
         reason: 'Possible false positive, waiting on requestjs to updated hawk version'
-        expires: 2018-06-20T00:00:00.000Z
-  'npm:shelljs:20140723':
-    - eslint-config-react-tools > eslint-plugin-class-property > eslint > shelljs:
-        reason: no patch available
-        expires: '2018-03-22T04:22:44.834Z'
+        expires: 2018-06-30T00:00:00.000Z
   'npm:bootstrap:20160627':
     - bootstrap:
         reason: We're not going to update to Bootstrap 4 any time soon
         expires: '2018-07-26T20:23:03.274Z'
   'npm:lodash:20180130':
     - '*':
         reason: no patch
-        expires: 2018-06-20T00:00:00.000Z
+        expires: 2018-06-30T00:00:00.000Z
   'npm:tunnel-agent:20170305':
     - '*':
         reason: No patch and we do not use this optional package
@@ -29,13 +25,13 @@ ignore:
   'npm:stringstream:20180511':
     - '*':
         reason: Awaiting dependency updates of request 2.83.0 to gte 2.86
-        expires: 2018-06-20T00:00:00.000Z
+        expires: 2018-06-30T00:00:00.000Z
   'npm:deep-extend:20180409':
     - '*':
         reason: No patch available https://github.com/unclechu/node-deep-extend/issues/41
-        expires: 2018-06-20T00:00:00.000Z
+        expires: 2018-06-30T00:00:00.000Z
   'npm:base64url:20180511':
    - '*':
        reason: Twillio and nexmo will be removed soon, file-collections isn't using any google-cloud stuff so this vuln doesn't apply
-       expires: 2018-06-20T00:00:00.000Z
+       expires: 2018-06-30T00:00:00.000Z
 patch: {}