Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Oct 2017 18:31:56 +0000 (UTC)
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r452460 - in head/net-im/mastodon: . files
Message-ID:  <201710191831.v9JIVu99086991@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jrm
Date: Thu Oct 19 18:31:56 2017
New Revision: 452460
URL: https://svnweb.freebsd.org/changeset/ports/452460

Log:
  net-im/mastodon: Update to version 2.0.0.
  
  Upstream changes:https://github.com/tootsuite/mastodon/releases/tag/v2.0.0

Added:
  head/net-im/mastodon/files/yarn.lock.in   (contents, props changed)
Deleted:
  head/net-im/mastodon/files/patch-yarn.lock
Modified:
  head/net-im/mastodon/Makefile
  head/net-im/mastodon/distinfo
  head/net-im/mastodon/files/mastodon_stream.in   (contents, props changed)
  head/net-im/mastodon/files/mastodon_web.in   (contents, props changed)
  head/net-im/mastodon/files/mastodon_workers.in   (contents, props changed)
  head/net-im/mastodon/files/patch-.env.production.sample
  head/net-im/mastodon/files/patch-Gemfile
  head/net-im/mastodon/files/patch-package.json
  head/net-im/mastodon/pkg-message
  head/net-im/mastodon/pkg-plist

Modified: head/net-im/mastodon/Makefile
==============================================================================
--- head/net-im/mastodon/Makefile	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/Makefile	Thu Oct 19 18:31:56 2017	(r452460)
@@ -2,8 +2,7 @@
 
 PORTNAME=	mastodon
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.1
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 CATEGORIES=	net-im www
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -53,6 +52,7 @@ BR_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
 		rubygem-link_header>=0.0.8:www/rubygem-link_header \
 		rubygem-mime-types>=3.1:misc/rubygem-mime-types \
 		rubygem-nokogiri>=1.8.0_1:textproc/rubygem-nokogiri \
+		rubygem-nsa-rails5>=0.2:devel/rubygem-nsa-rails5 \
 		rubygem-oj>=3.3.4:devel/rubygem-oj \
 		rubygem-ostatus2>=2.0.1:www/rubygem-ostatus2 \
 		rubygem-ox>=2.5.0:textproc/rubygem-ox \
@@ -75,7 +75,7 @@ BR_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
 		rubygem-simple-navigation>=4.0.5_1:devel/rubygem-simple-navigation \
 		rubygem-simple_form-rails5>=3.5.0:devel/rubygem-simple_form-rails5 \
 		rubygem-sprockets-rails-rails5>=3.2.0:devel/rubygem-sprockets-rails-rails5 \
-		rubygem-statsd-instrument>=2.1.4:devel/rubygem-statsd-instrument \
+		rubygem-strong_migrations>=0.1.9:devel/rubygem-strong_migrations \
 		rubygem-twitter-text>=1.14.7:textproc/rubygem-twitter-text \
 		rubygem-tzinfo-data>=1.2017.2:devel/rubygem-tzinfo-data \
 		rubygem-webpacker-rails5>=2.0:devel/rubygem-webpacker-rails5 \
@@ -89,7 +89,7 @@ USES=		gmake gnome pgsql python:build,2 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	tootsuite jehops:mn
 GH_PROJECT=	mastodon_node:mn
-GH_TAGNAME=	1.6.0:mn
+GH_TAGNAME=	2.0.0:mn
 USE_GNOME=	libxml2 libxslt
 USE_RC_SUBR=	mastodon_stream mastodon_web mastodon_workers
 USE_RUBY=	yes
@@ -114,6 +114,7 @@ do-build:
 	@${RM} ${WRKSRC}/Gemfile.lock
 	HOME=${WRKSRC_mn} yarn config set yarn-offline-mirror ${WRKSRC_mn} --offline
 	HOME=${WRKSRC_mn} yarn config set nodedir ${LOCALBASE} --offline
+	@${CP} ${FILESDIR}/yarn.lock.in ${WRKSRC}/yarn.lock
 	(cd ${WRKSRC} && HOME=${WRKSRC_mn} yarn --offline)
 	(cd ${WRKSRC} && \
 		NODE_ENV=production RAILS_ENV=production \

Modified: head/net-im/mastodon/distinfo
==============================================================================
--- head/net-im/mastodon/distinfo	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/distinfo	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1505726996
-SHA256 (tootsuite-mastodon-v1.6.1_GH0.tar.gz) = f7db6526e7238a6c1ec373aa84584ca9db9a481ff98ba54ec7037dd8cb54c8c5
-SIZE (tootsuite-mastodon-v1.6.1_GH0.tar.gz) = 10331458
-SHA256 (jehops-mastodon_node-1.6.0_GH0.tar.gz) = 833ff93c656ef08c0b97cfcd116ebf77ffa5dee3a343b9fcb60439b48dcff443
-SIZE (jehops-mastodon_node-1.6.0_GH0.tar.gz) = 121167009
+TIMESTAMP = 1508351570
+SHA256 (tootsuite-mastodon-v2.0.0_GH0.tar.gz) = f61368d2f13257eb4a0d94ddc9e4cf37954f8cf07ea7980002136b051b27e6fb
+SIZE (tootsuite-mastodon-v2.0.0_GH0.tar.gz) = 12254619
+SHA256 (jehops-mastodon_node-2.0.0_GH0.tar.gz) = 29926725a12c61faec23d6192c5755b42d9a4c929fd6b66181c67eaa5259939c
+SIZE (jehops-mastodon_node-2.0.0_GH0.tar.gz) = 28504279

Modified: head/net-im/mastodon/files/mastodon_stream.in
==============================================================================
--- head/net-im/mastodon/files/mastodon_stream.in	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/mastodon_stream.in	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,33 +1,59 @@
-#! /bin/sh
+#!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: mastodon_stream
 # REQUIRE: LOGIN postgresql nginx redis
 # KEYWORD: shutdown
 
-#
 # Add the following line to /etc/rc.conf to enable the Mastodon streaming
 # service.
 #
-#  mastodon_stream_enable="YES"
+# mastodon_stream_enable="YES"
+#
+# mastodon_stream_port:       default 4000
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
 
 . /etc/rc.subr
 
+desc="Mastodon streaming server"
 name=mastodon_stream
-rcvar="${name}_enable"
+rcvar=mastodon_stream_enable
 
-sig_stop="HUP"
+load_rc_config $name
 
-load_rc_config "$name"
+: ${mastodon_stream_enable:=NO}
+: ${mastodon_stream_port=4000}
 
-: ${mastodon_stream_enable:="NO"}
-: ${mastodon_stream_port="4000"}
-
+sig_stop=HUP
 mastodon_stream_chdir="%%WWWDIR%%"
 mastodon_stream_env="HOME=%%WWWDIR%% \
 NODE_ENV=production \
 PORT=\"${mastodon_stream_port}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"} \
 USER=mastodon"
-mastodon_stream_user="mastodon"
+mastodon_stream_user=mastodon
 
 command="%%PREFIX%%/bin/node"
 command_args="./streaming/index.js \

Modified: head/net-im/mastodon/files/mastodon_web.in
==============================================================================
--- head/net-im/mastodon/files/mastodon_web.in	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/mastodon_web.in	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,5 +1,7 @@
-#! /bin/sh
+#!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: mastodon_web
 # REQUIRE: LOGIN postgresql nginx redis
 # KEYWORD: shutdown
@@ -8,28 +10,58 @@
 # Add the following line to /etc/rc.conf to enable the Mastodon web server.
 #
 #  mastodon_web_enable="YES"
+#
+# mastodon_web_concurrency:    default: 2
+# mastodon_web_loglevel:       debug or error, default: error
+# mastodon_web_port:           default: 3000
+# mastodon_web_threads:        default: 5
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
 
+
 . /etc/rc.subr
 
+desc="Mastodon web workers server"
 name=mastodon_web
-rcvar="${name}_enable"
+rcvar=mastodon_web_enable
 
-load_rc_config "$name"
+load_rc_config $name
 
-: ${mastodon_web_enable:="NO"}
+: ${mastodon_web_enable:=NO}
+: ${mastodon_web_concurrency:=2}
+: ${mastodon_web_loglevel:=error}
+: ${mastodon_web_port:=3000}
+: ${mastodon_web_threads:=5}
 
-: ${mastodon_web_concurrency:="2"}
-: ${mastodon_web_loglevel:="error"}
-: ${mastodon_web_port:="3000"}
-: ${mastodon_web_threads:="5"}
-
 mastodon_web_chdir="%%WWWDIR%%"
 mastodon_web_env="MAX_THREADS=\"${mastodon_web_threads}\" \
 PORT=\"${mastodon_web_port}\" \
 RAILS_ENV=production \
 RAILS_LOG_LEVEL=\"${mastodon_web_loglevel}\" \
-WEB_CONCURRENCY=\"${mastodon_web_concurrency}\""
-mastodon_web_user="mastodon"
+WEB_CONCURRENCY=\"${mastodon_web_concurrency}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"}"
+
+mastodon_web_user=mastodon
 pidfile="%%WWWDIR%%/tmp/${name}.pid"
 procname="%%RUBY%%:"
 

Modified: head/net-im/mastodon/files/mastodon_workers.in
==============================================================================
--- head/net-im/mastodon/files/mastodon_workers.in	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/mastodon_workers.in	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,32 +1,62 @@
-#! /bin/sh
+#!/bin/sh
 
+# $FreeBSD$
+
 # PROVIDE: mastodon_workers
 # REQUIRE: LOGIN postgresql nginx redis
 # KEYWORD: shutdown
 
-#
-# Add the following line to /etc/rc.conf to enable the Mastodon background
+# Add the following lines to /etc/rc.conf to enable the Mastodon background
 # workers.
 #
-#  mastodon_workers_enable="YES"
+# mastodon_workers_enable="YES"
+#
+# mastodon_workers_dbpool:    default: 5
+# mastodon_workers_loglevel:  debug or error, default: error
+# mastodon_workers_threads:   default: 5
+#
+# The options below can be set in /etc/rc.conf.  If they are not set there, they
+# will be read from .env.production.
+#
+# mastodon_db_name:           e.g., mastodon_production
+# mastodon_db_host:           e.g., localhost
+# mastodon_db_user:           e.g., mastodon
+# mastodon_db_port:           e.g., 5432
+# mastodon_local_domain:      e.g., mastodon.mydomain.org (once set, do not change)
+# mastodon_smtp_from_address: e.g., mastodon@mydomain.org
+# mastodon_redis_host:        e.g., localhost
+# mastodon_redis_port:        e.g., 6397
+#
 
 . /etc/rc.subr
 
+desc="Mastodon background workers server"
 name=mastodon_workers
-rcvar="${name}_enable"
+rcvar=mastodon_workers_enable
 
-load_rc_config "$name"
+load_rc_config $name
 
-: ${mastodon_workers_enable:="NO"}
-: ${mastodon_workers_loglevel:="error"}
-: ${mastodon_workers_dbpool:="5"}
-: ${mastodon_workers_threads:="5"}
+: ${mastodon_workers_enable:=NO}
+: ${mastodon_workers_loglevel:=error}
+: ${mastodon_workers_dbpool:=5}
+: ${mastodon_workers_threads:=5}
 
 mastodon_workers_chdir="%%WWWDIR%%"
 mastodon_workers_env="DB_POOL=\"${mastodon_workers_dbpool}\" \
 RAILS_ENV=production \
-RAILS_LOG_LEVEL=\"${mastodon_workers_loglevel}\""
-mastodon_workers_user="mastodon"
+RAILS_LOG_LEVEL=\"${mastodon_workers_loglevel}\" \
+${mastodon_db_url:+DATABASE_URL=\"${mastodon_db_url}\"} \
+${mastodon_db_host:+DB_HOST=\"${mastodon_db_host}\"} \
+${mastodon_db_name:+DB_NAME=\"${mastodon_db_name}\"} \
+${mastodon_db_port:+DB_PORT=\"${mastodon_db_port}\"} \
+${mastodon_db_user:+DB_USER=\"${mastodon_db_user}\"} \
+${mastodon_db_password:+DB_PASS=\"${mastodon_db_password}\"} \
+${mastodon_local_domain:+LOCAL_DOMAIN=\"${mastodon_local_domain}\"} \
+${mastodon_smtp_from_address:+SMTP_FROM_ADDRESS=\"${mastodon_smtp_from_address}\"} \
+${mastodon_redis_host:+REDIS_HOST=\"${mastodon_redis_host}\"} \
+${mastodon_redis_port:+REDIS_PORT=\"${mastodon_redis_port}\"}"
+
+mastodon_workers_user=mastodon
 pidfile="%%WWWDIR%%/tmp/${name}.pid"
 procname="%%RUBY%%:"
 

Modified: head/net-im/mastodon/files/patch-.env.production.sample
==============================================================================
--- head/net-im/mastodon/files/patch-.env.production.sample	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/patch-.env.production.sample	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,22 +1,67 @@
---- .env.production.sample.orig	2017-05-26 12:16:04 UTC
+--- .env.production.sample.orig	2017-10-18 18:36:47 UTC
 +++ .env.production.sample
-@@ -1,11 +1,11 @@
+@@ -1,19 +1,33 @@
++# The following entries can be set in /etc/rc.conf.  The entries in /etc/rc.conf will take priority over values set here.
++# 
++# mastodon_db_name=mastodon_production
++# mastodon_db_host=localhost
++# mastodon_db_user=mastodon
++# mastodon_db_port=5432
++#
++# mastodon_local_domain=mastodon.example.com
++# mastodon_smtp_from_address=mastodon@example.com
++#
++# mastodon_redis_host=localhost
++# mastodon_redis_port=6379
++#
++
  # Service dependencies
  # You may set REDIS_URL instead for more advanced options
+ # You may also set REDIS_NAMESPACE to share Redis between multiple Mastodon servers
 -REDIS_HOST=redis
-+REDIS_HOST=localhost
- REDIS_PORT=6379
+-REDIS_PORT=6379
++# REDIS_HOST=localhost
++# REDIS_PORT=6379
  # You may set DATABASE_URL instead for more advanced options
 -DB_HOST=db
 -DB_USER=postgres
 -DB_NAME=postgres
-+DB_HOST=localhost
-+DB_USER=mastodon
-+DB_NAME=mastodon_production
- DB_PASS=
- DB_PORT=5432
+-DB_PASS=
+-DB_PORT=5432
++# DB_HOST=localhost
++# DB_USER=mastodon
++# DB_NAME=mastodon_production
++# DB_PASS=
++# DB_PORT=5432
  
-@@ -47,16 +47,16 @@ OTP_SECRET=
+ # Federation
+ # Note: Changing LOCAL_DOMAIN or LOCAL_HTTPS at a later time will cause unwanted side effects.
+ # LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com.
+-LOCAL_DOMAIN=example.com 
++# LOCAL_DOMAIN=mastodon.example.com 
+ LOCAL_HTTPS=true
+ 
+ # Use this only if you need to run mastodon on a different domain than the one used for federation.
+@@ -26,8 +40,7 @@ LOCAL_HTTPS=true
+ # be added. Comma separated values
+ # ALTERNATE_DOMAINS=example1.com,example2.com
+ 
+-# Application secrets
+-# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
++# Application secrets; Generate each with the `RAILS_ENV=production rake secret`
+ PAPERCLIP_SECRET=
+ SECRET_KEY_BASE=
+ OTP_SECRET=
+@@ -37,7 +50,7 @@ OTP_SECRET=
+ # You should only generate this once per instance. If you later decide to change it, all push subscription will
+ # be invalidated, requiring the users to access the website again to resubscribe.
+ #
+-# Generate with `RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
++# Generate with `RAILS_ENV=production rake mastodon:webpush:generate_vapid_key`
+ #
+ # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
+ VAPID_PRIVATE_KEY=
+@@ -59,18 +72,18 @@ VAPID_PUBLIC_KEY=
  # If you want to use an SMTP server without authentication (e.g local Postfix relay)
  # then set SMTP_AUTH_METHOD and SMTP_OPENSSL_VERIFY_MODE to 'none' and 
  # *comment* SMTP_LOGIN and SMTP_PASSWORD (leaving them blank is not enough).
@@ -25,18 +70,25 @@
 -SMTP_LOGIN=
 -SMTP_PASSWORD=
 -SMTP_FROM_ADDRESS=notifications@example.com
-+#SMTP_SERVER=smtp.mailgun.org
-+#SMTP_PORT=587
-+#SMTP_LOGIN=
-+#SMTP_PASSWORD=
-+SMTP_FROM_ADDRESS=mastodon@example.com
- #SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
- #SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
+-#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
+-#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
 -#SMTP_AUTH_METHOD=plain
-+SMTP_AUTH_METHOD=none
- #SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
+-#SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 -#SMTP_OPENSSL_VERIFY_MODE=peer
+-#SMTP_ENABLE_STARTTLS_AUTO=true
+-#SMTP_TLS=true
++# SMTP_SERVER=smtp.mailgun.org
++# SMTP_PORT=587
++# SMTP_LOGIN=
++# SMTP_PASSWORD=
++# SMTP_FROM_ADDRESS=mastodon@example.com
++# SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
++# SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
++SMTP_AUTH_METHOD=none
++# SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 +SMTP_OPENSSL_VERIFY_MODE=none
- #SMTP_ENABLE_STARTTLS_AUTO=true
++# SMTP_ENABLE_STARTTLS_AUTO=true
++# SMTP_TLS=true
  
- 
+ # Optional user upload path and URL (images, avatars). Default is :rails_root/public/system. If you set this variable, you are responsible for making your HTTP server (eg. nginx) serve these files.
+ # PAPERCLIP_ROOT_PATH=/var/lib/mastodon/public-system

Modified: head/net-im/mastodon/files/patch-Gemfile
==============================================================================
--- head/net-im/mastodon/files/patch-Gemfile	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/patch-Gemfile	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,4 +1,4 @@
---- Gemfile.orig	2017-09-10 13:10:03 UTC
+--- Gemfile.orig	2017-10-13 19:06:23 UTC
 +++ Gemfile
 @@ -11,7 +11,7 @@ gem 'uglifier', '~> 3.2'
  
@@ -9,18 +9,15 @@
  gem 'dotenv-rails', '~> 2.2'
  
  gem 'aws-sdk', '~> 2.9'
-@@ -21,9 +21,8 @@ gem 'paperclip-av-transcoder', '~> 0.6'
+@@ -21,7 +21,6 @@ gem 'paperclip-av-transcoder', '~> 0.6'
  
  gem 'active_model_serializers', '~> 0.10'
  gem 'addressable', '~> 2.5'
 -gem 'bootsnap'
  gem 'browser'
--gem 'charlock_holmes', '~> 0.7.5'
-+gem 'charlock_holmes', '~> 0.7.3'
+ gem 'charlock_holmes', '~> 0.7.5'
  gem 'iso-639'
- gem 'cld3', '~> 3.1'
- gem 'devise', '~> 4.2'
-@@ -73,45 +72,6 @@ gem 'webpush'
+@@ -74,45 +73,6 @@ gem 'webpush'
  gem 'json-ld-preloaded', '~> 2.2.1'
  gem 'rdf-normalize', '~> 0.3.1'
  
@@ -53,8 +50,8 @@
 -  gem 'letter_opener', '~> 1.4'
 -  gem 'letter_opener_web', '~> 1.3'
 -  gem 'rubocop', require: false
--  gem 'brakeman', '~> 3.6', require: false
--  gem 'bundler-audit', '~> 0.5', require: false
+-  gem 'brakeman', '~> 4.0', require: false
+-  gem 'bundler-audit', '~> 0.6', require: false
 -  gem 'scss_lint', '~> 0.53', require: false
 -
 -  gem 'capistrano', '~> 3.8'

Modified: head/net-im/mastodon/files/patch-package.json
==============================================================================
--- head/net-im/mastodon/files/patch-package.json	Thu Oct 19 17:51:09 2017	(r452459)
+++ head/net-im/mastodon/files/patch-package.json	Thu Oct 19 18:31:56 2017	(r452460)
@@ -1,40 +1,60 @@
---- package.json.orig	2017-09-09 15:36:27 UTC
+--- package.json.orig	2017-10-17 10:02:47 UTC
 +++ package.json
-@@ -7,10 +7,9 @@
+@@ -2,15 +2,9 @@
+   "name": "mastodon",
+   "license": "AGPL-3.0",
+   "scripts": {
+-    "postversion": "git push --tags",
+-    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
      "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
      "manage:translations": "node ./config/webpack/translationRunner.js",
-     "start": "node ./streaming/index.js",
--    "test": "npm run test:lint && npm run test:mocha",
-+    "test": "yarn run test:lint && yarn run test:mocha",
-     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
--    "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js",
+-    "start": "node ./streaming/index.js",
+-    "test": "npm run test:lint && npm run test:jest",
+-    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/",
+-    "test:jest": "cross-env NODE_ENV=test jest --coverage",
 -    "postinstall": "npm rebuild node-sass"
-+    "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js"
++    "start": "node ./streaming/index.js"
    },
    "repository": {
      "type": "git",
-@@ -117,24 +116,5 @@
+@@ -116,40 +110,5 @@
      "webpack-manifest-plugin": "^1.2.1",
      "webpack-merge": "^4.1.0",
      "websocket.js": "^0.1.12"
 -  },
 -  "devDependencies": {
 -    "babel-eslint": "^7.2.3",
--    "chai": "^4.1.0",
--    "chai-enzyme": "^0.8.0",
--    "enzyme": "^2.9.1",
+-    "enzyme": "^3.0.0",
+-    "enzyme-adapter-react-16": "^1.0.0",
 -    "eslint": "^3.19.0",
+-    "eslint-plugin-import": "^2.7.0",
 -    "eslint-plugin-jsx-a11y": "^4.0.0",
 -    "eslint-plugin-react": "^6.10.3",
--    "jsdom": "^11.1.0",
--    "mocha": "^3.4.1",
+-    "jest": "^21.2.1",
+-    "raf": "^3.4.0",
 -    "react-intl-translations-manager": "^5.0.0",
--    "react-test-renderer": "^15.6.1",
--    "sinon": "^2.3.7",
+-    "react-test-renderer": "^16.0.0",
 -    "webpack-dev-server": "^2.6.1",
 -    "yargs": "^8.0.2"
 -  },
 -  "optionalDependencies": {
 -    "fsevents": "*"
+-  },
+-  "jest": {
+-    "projects": [
+-      "<rootDir>/app/javascript/mastodon"
+-    ],
+-    "testPathIgnorePatterns": [
+-      "<rootDir>/node_modules/",
+-      "<rootDir>/vendor/",
+-      "<rootDir>/config/",
+-      "<rootDir>/log/",
+-      "<rootDir>/public/",
+-      "<rootDir>/tmp/"
+-    ],
+-    "setupFiles": [
+-      "raf/polyfill"
+-    ],
+-    "setupTestFrameworkScriptFile": "<rootDir>/app/javascript/mastodon/test_setup.js"
    }
  }

Added: head/net-im/mastodon/files/yarn.lock.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/mastodon/files/yarn.lock.in	Thu Oct 19 18:31:56 2017	(r452460)
@@ -0,0 +1,5605 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+accepts@~1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+  dependencies:
+    mime-types "~2.1.16"
+    negotiator "0.6.1"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+acorn@^4.0.3:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+acorn@^5.0.0, acorn@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7"
+
+adjust-sourcemap-loader@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz#412d92404eb61e4113635012cba53a33d008e0e2"
+  dependencies:
+    assert "^1.3.0"
+    camelcase "^1.2.1"
+    loader-utils "^1.0.2"
+    lodash.assign "^4.0.1"
+    lodash.defaults "^3.1.2"
+    object-path "^0.9.2"
+    regex-parser "^2.2.1"
+
+ajv-keywords@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    json-schema-traverse "^0.3.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+any-promise@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1.js@^4.0.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1, assert@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+
+async@0.2.x:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+async@^2.1.2, async@^2.1.5:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  dependencies:
+    lodash "^4.14.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+atob@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^7.1.2:
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.5.tgz#d65d14b83c7cd1dd7bc801daa00557addf5a06b2"
+  dependencies:
+    browserslist "^2.5.0"
+    caniuse-lite "^1.0.30000744"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.13"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+axios@^0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+  dependencies:
+    follow-redirects "^1.2.3"
+    is-buffer "^1.1.5"
+
+babel-code-frame@^6.11.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.25.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-builder-react-jsx@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+
+babel-macros@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.1.1.tgz#9684edf6e85d568a88ff1ce9e487e9d1c8e46bdc"
+  dependencies:
+    cosmiconfig "3.1.0"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-lodash@^3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz#21c8fdec9fe1835efaa737873e3902bdd66d5701"
+  dependencies:
+    glob "^7.1.1"
+    lodash "^4.17.2"
+
+babel-plugin-preval@^1.3.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.5.1.tgz#e4f4466a71561a4aae3c79c0b44627e68a3ab9a6"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-macros "^1.0.0"
+    babel-register "^6.26.0"
+    babylon "^6.18.0"
+    require-from-string "^1.2.1"
+
+babel-plugin-react-intl@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz#3d43912e824da005e08e8e8239d5ba784374bb00"
+  dependencies:
+    babel-runtime "^6.2.0"
+    intl-messageformat-parser "^1.2.0"
+    mkdirp "^0.5.1"
+
+babel-plugin-react-transform@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-transform/-/babel-plugin-react-transform-2.0.2.tgz#515bbfa996893981142d90b1f9b1635de2995109"
+  dependencies:
+    lodash "^4.6.1"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710191831.v9JIVu99086991>