Upgrade master to RC 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

@@ -201,7 +201,7 @@ jobs:
   dockerfile-lint:
     <<: *defaults
     docker:
-      - image: hadolint/hadolint
+      - image: hadolint/hadolint:v1.6.6-6-g254b4ff
     steps:
       - checkout
       - setup_remote_docker
@@ -223,8 +223,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
 mobile-experience@1.0.5       # Packages for a great mobile UX
 blaze-html-templates@1.0.4    # 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
 audit-argument-checks@1.0.7   # ensure meteor method argument validation
 browser-policy@1.1.0          # security-related policies enforced by newer browsers
 juliancwirko:postcss@1.3.0    # CSS post-processing plugin (replaces standard-minifier-css)
 session@1.1.7                 # 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
 reactive-var@1.0.11
 reactive-dict@1.2.0
-check@1.3.0
-http@1.4.0
+check@1.3.1
+http@1.4.1
 ddp-rate-limiter@1.0.7
 underscore@1.0.10
-logging@1.1.19
+logging@1.1.20
 reload@1.2.0
 ejson@1.1.0
-less@2.7.11
+less@2.7.12
 service-configuration@1.0.11
 mdg:validated-method
 shell-server@0.3.1
-dynamic-import@0.3.0
-standard-minifier-js@2.3.1
+dynamic-import@0.4.0
+standard-minifier-js@2.3.4
 
 # Meteor Auth Packages
 accounts-base@1.4.2
-accounts-password@1.5.0
+accounts-password@1.5.1
 accounts-facebook@1.3.1
 accounts-google@1.3.1
 accounts-twitter@1.4.1

.meteor/release

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

.meteor/versions

@@ -2,7 +2,7 @@ accounts-base@1.4.2
 accounts-facebook@1.3.1
 accounts-google@1.3.1
 accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-password@1.5.1
 accounts-twitter@1.4.1
 alanning:roles@1.2.16
 aldeed:autoform@6.2.0
@@ -12,51 +12,51 @@ aldeed:template-extension@4.1.0
 allow-deny@1.1.0
 audit-argument-checks@1.0.7
 autoupdate@1.4.0
-babel-compiler@7.0.4
+babel-compiler@7.1.0
 babel-runtime@1.2.2
 base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.4.0
+boilerplate-generator@1.5.0
 bozhao:accounts-instagram@0.2.2
 browser-policy@1.1.0
 browser-policy-common@1.0.11
 browser-policy-content@1.1.0
 browser-policy-framing@1.1.0
-caching-compiler@1.1.11
+caching-compiler@1.1.12
 caching-html-compiler@1.1.2
 callback-hook@1.1.0
-check@1.3.0
+check@1.3.1
 coffeescript@1.0.17
 dburles:factory@1.1.0
 ddp@1.4.0
-ddp-client@2.3.1
+ddp-client@2.3.2
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.2
+ddp-server@2.2.0
 deps@1.0.12
 diff-sequence@1.1.0
 dispatch:run-as-user@1.1.1
-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
 ejson@1.1.0
 email@1.2.3
-es5-shim@4.7.3
+es5-shim@4.8.0
 facebook-config-ui@1.0.1
-facebook-oauth@1.4.0
+facebook-oauth@1.5.0
 gadicc:blaze-react-component@1.4.0
 geojson-utils@1.0.10
 google-config-ui@1.0.0
 google-oauth@1.2.5
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.4.0
+http@1.4.1
 id-map@1.1.0
 johanbrook:publication-collector@1.1.0
 jquery@1.11.11
@@ -65,28 +65,29 @@ launch-screen@1.1.1
 less@2.7.12
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 mdg:validated-method@1.1.0
-meteor@1.8.2
-meteor-base@1.3.0
+meteor@1.9.0
+meteor-base@1.4.0
 meteorhacks:ssr@2.2.0
 meteorhacks:subs-manager@1.6.4
 meteortesting:browser-tests@0.1.2
 meteortesting:mocha@0.5.0
 minifier-css@1.3.1
-minifier-js@2.3.2
-minimongo@1.4.3
+minifier-js@2.3.5
+minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.4
-modules-runtime@0.9.2
+modern-browsers@0.1.1
+modules@0.12.0
+modules-runtime@0.10.0
 momentjs:moment@2.19.4
-mongo@1.4.3
+mongo@1.5.0
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 npm-bcrypt@0.9.3
-npm-mongo@2.2.34
-oauth@1.2.1
+npm-mongo@3.0.7
+oauth@1.2.3
 oauth-encryption@1.3.0
 oauth1@1.2.0
 oauth2@1.2.0
@@ -97,37 +98,35 @@ percolate:migrations@0.9.8
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:mocha-core@1.0.1
 practicalmeteor:sinon@1.14.1_2
-promise@0.10.2
+promise@0.11.1
 raix:eventemitter@0.1.3
 random@1.1.0
 rate-limit@1.0.9
 reactive-dict@1.2.0
 reactive-var@1.0.11
 reload@1.2.0
 retry@1.1.0
-routepolicy@1.0.12
-server-render@0.3.0
+routepolicy@1.0.13
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
 shell-server@0.3.1
-shim-common@0.1.0
-socket-stream-client@0.1.0
+socket-stream-client@0.2.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.3.2
+standard-minifier-js@2.3.4
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:check-npm-versions@0.3.2
 tmeasday:publish-counts@0.8.0
-tracker@1.1.3
+tracker@1.2.0
 twitter-config-ui@1.0.0
 twitter-oauth@1.2.0
 ui@1.0.13
 underscore@1.0.10
 url@1.2.0
-webapp@1.5.0
+webapp@1.6.0
 webapp-hashing@1.0.9

.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: {}