From owner-svn-ports-all@freebsd.org Tue Jan 30 09:10:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AB92EEE3D7C; Tue, 30 Jan 2018 09:10:38 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 168DD83223; Tue, 30 Jan 2018 09:10:37 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD218152D9; Tue, 30 Jan 2018 09:10:36 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0U9Aa1s044918; Tue, 30 Jan 2018 09:10:36 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0U9AZLf044909; Tue, 30 Jan 2018 09:10:35 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201801300910.w0U9AZLf044909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Tue, 30 Jan 2018 09:10:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460377 - in head/net-im/mastodon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/net-im/mastodon: . files X-SVN-Commit-Revision: 460377 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jan 2018 09:10:39 -0000 Author: jrm Date: Tue Jan 30 09:10:35 2018 New Revision: 460377 URL: https://svnweb.freebsd.org/changeset/ports/460377 Log: net-im/mastodon: Update to 2.2.0 Upstream changes: https://github.com/tootsuite/mastodon/releases/tag/v2.2.0 Modified: head/net-im/mastodon/Makefile (contents, props changed) head/net-im/mastodon/distinfo (contents, props changed) head/net-im/mastodon/files/patch-Gemfile (contents, props changed) head/net-im/mastodon/files/patch-config_boot.rb (contents, props changed) head/net-im/mastodon/files/patch-config_sidekiq.yml (contents, props changed) head/net-im/mastodon/files/patch-package.json (contents, props changed) head/net-im/mastodon/files/yarn.lock.in head/net-im/mastodon/pkg-message (contents, props changed) head/net-im/mastodon/pkg-plist (contents, props changed) Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/Makefile Tue Jan 30 09:10:35 2018 (r460377) @@ -2,8 +2,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 2.1.3 -PORTREVISION= 2 +DISTVERSION= 2.2.0 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org @@ -35,11 +34,12 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-paperclip-av-transcoder>=0.6:multimedia/rubygem-paperclip-av-transcoder \ rubygem-active_model_serializers>=0.10:databases/rubygem-active_model_serializers \ rubygem-addressable>=2.5:www/rubygem-addressable \ + rubygem-bootsnap>=0:devel/rubygem-bootsnap \ rubygem-browser>=2.4.0:www/rubygem-browser \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-iso-639>=0.2.8:textproc/rubygem-iso-639 \ rubygem-cld3>=3.2.0:textproc/rubygem-cld3 \ - rubygem-devise-rails5>=4.3:devel/rubygem-devise-rails5 \ + rubygem-devise-rails5>=4.4:devel/rubygem-devise-rails5 \ rubygem-devise-two-factor-rails5>=3.0:security/rubygem-devise-two-factor-rails5 \ rubygem-doorkeeper-rails5>=4.2:security/rubygem-doorkeeper-rails5 \ rubygem-fast_blank>=1.0:devel/rubygem-fast_blank \ @@ -60,6 +60,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ rubygem-ostatus2>=2.0:www/rubygem-ostatus2 \ rubygem-ox>=2.8:textproc/rubygem-ox \ rubygem-pundit>=1.1:security/rubygem-pundit \ + rubygem-premailer-rails-rails5>=0:mail/rubygem-premailer-rails-rails5 \ rubygem-rack-attack>=5.0:www/rubygem-rack-attack \ rubygem-rack-cors0>=0.4:www/rubygem-rack-cors0 \ rubygem-rack-timeout>=0.4:www/rubygem-rack-timeout \ @@ -92,7 +93,7 @@ USES= gmake gnome pgsql python:build,2 shebangfix USE_GITHUB= yes GH_ACCOUNT= tootsuite jehops:mn GH_PROJECT= mastodon_node:mn -GH_TAGNAME= 2.1.2:mn +GH_TAGNAME= 2.2.0:mn USE_GNOME= libxml2 libxslt USE_RC_SUBR= mastodon_stream mastodon_web mastodon_workers USE_RUBY= yes @@ -119,8 +120,11 @@ do-build: 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 \ +# ./node_modules/.bin/webpack --config config/webpack/production.js) (cd ${WRKSRC} && \ - NODE_ENV=production RAILS_ENV=production \ + NODE_ENV=production \ ./node_modules/.bin/webpack --config config/webpack/production.js) do-install: @@ -138,8 +142,9 @@ do-install: ${WRKSRC}/node_modules/.bin/node-sass \ ${WRKSRC}/node_modules/uws/build_log.txt ${STRIP_CMD} ${WRKSRC}/node_modules/uws/uws_freebsd_${NODE_ABI}.node - ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}/var/run/${PORTNAME} \ - ${STAGEDIR}/var/log/${PORTNAME} + ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}/var/cache/${PORTNAME} \ + ${STAGEDIR}/var/log/${PORTNAME} \ + ${STAGEDIR}/var/run/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/nginx.conf \ ${STAGEDIR}${WWWDIR}/nginx.conf.sample ${INSTALL_DATA} ${WRKDIR}/nginx-include.conf \ Modified: head/net-im/mastodon/distinfo ============================================================================== --- head/net-im/mastodon/distinfo Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/distinfo Tue Jan 30 09:10:35 2018 (r460377) @@ -1,5 +1,5 @@ -TIMESTAMP = 1515587639 -SHA256 (tootsuite-mastodon-v2.1.3_GH0.tar.gz) = ff5e7554a5f0e8a7422dd55aaaee4aff4d8e061f10561328397ac122ef1e5bda -SIZE (tootsuite-mastodon-v2.1.3_GH0.tar.gz) = 12455937 -SHA256 (jehops-mastodon_node-2.1.2_GH0.tar.gz) = c6c2c09dd2be4db1d313c6230844ed7ea4cbea8963a03e6bac87a69e11019c8a -SIZE (jehops-mastodon_node-2.1.2_GH0.tar.gz) = 27194814 +TIMESTAMP = 1517266218 +SHA256 (tootsuite-mastodon-v2.2.0_GH0.tar.gz) = 050eccea6950a7f84eaaa39fb4c69b6a559a7d41b477229acb1b8153cdd5180e +SIZE (tootsuite-mastodon-v2.2.0_GH0.tar.gz) = 12303890 +SHA256 (jehops-mastodon_node-2.2.0_GH0.tar.gz) = 4fd0192c9a17dc68c6e32addc8707d6bf8d2a09924a401789b82bbff6c6bb4e5 +SIZE (jehops-mastodon_node-2.2.0_GH0.tar.gz) = 26948964 Modified: head/net-im/mastodon/files/patch-Gemfile ============================================================================== --- head/net-im/mastodon/files/patch-Gemfile Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/files/patch-Gemfile Tue Jan 30 09:10:35 2018 (r460377) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-01-09 18:35:10 UTC +--- Gemfile.orig 2018-01-24 12:29:46 UTC +++ Gemfile @@ -11,11 +11,11 @@ gem 'uglifier', '~> 3.2' @@ -14,32 +14,16 @@ gem 'fog-local', '~> 0.4', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 5.1' -@@ -23,7 +23,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 'iso-639' -@@ -32,13 +31,13 @@ gem 'devise', '~> 4.3' - gem 'devise-two-factor', '~> 3.0' - gem 'doorkeeper', '~> 4.2' - gem 'fast_blank', '~> 1.0' --gem 'goldfinger', '~> 2.0' -+gem 'goldfinger', '~> 2.1' - gem 'hiredis', '~> 0.6' - gem 'redis-namespace', '~> 1.5' +@@ -38,7 +38,7 @@ gem 'redis-namespace', '~> 1.5' gem 'htmlentities', '~> 4.3' --gem 'http', '~> 2.2' -+gem 'http', '~> 3.0' + gem 'http', '~> 3.0' gem 'http_accept_language', '~> 2.1' -gem 'httplog', '~> 0.99' +gem 'httplog', '>= 0.99' gem 'idn-ruby', require: 'idn' gem 'kaminari', '~> 1.1' gem 'link_header', '~> 0.0' -@@ -54,11 +53,11 @@ gem 'rack-cors', '~> 0.4', require: 'rac +@@ -55,11 +55,11 @@ gem 'rack-cors', '~> 0.4', require: 'rac gem 'rack-timeout', '~> 0.4' gem 'rails-i18n', '~> 5.0' gem 'rails-settings-cached', '~> 0.6' @@ -49,11 +33,11 @@ gem 'rqrcode', '~> 0.10' gem 'ruby-oembed', '~> 0.12', require: 'oembed' -gem 'ruby-progressbar', '~> 1.4' -+gem 'progressbar', '~> 1.4' ++gem 'progressbar', '>= 1.4' gem 'sanitize', '~> 4.4' gem 'sidekiq', '~> 5.0' gem 'sidekiq-scheduler', '~> 2.1' -@@ -76,45 +75,6 @@ gem 'webpush' +@@ -77,45 +77,6 @@ gem 'webpush' gem 'json-ld-preloaded', '~> 2.2.1' gem 'rdf-normalize', '~> 0.3.1' Modified: head/net-im/mastodon/files/patch-config_boot.rb ============================================================================== --- head/net-im/mastodon/files/patch-config_boot.rb Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/files/patch-config_boot.rb Tue Jan 30 09:10:35 2018 (r460377) @@ -1,27 +1,11 @@ ---- config/boot.rb.orig 2017-05-20 22:05:08 UTC +--- config/boot.rb.orig 2018-01-24 12:29:46 UTC +++ config/boot.rb -@@ -1,14 +1,14 @@ - ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +@@ -4,7 +4,7 @@ require 'bundler/setup' # Set up gems li + require 'bootsnap' - require 'bundler/setup' # Set up gems listed in the Gemfile. --require 'bootsnap' -+#require 'bootsnap' - --Bootsnap.setup( + Bootsnap.setup( - cache_dir: 'tmp/cache', -- development_mode: ENV['RAILS_ENV'] == 'development', -- load_path_cache: true, -- autoload_paths_cache: true, -- disable_trace: true, -- compile_cache_iseq: false, -- compile_cache_yaml: false --) -+# Bootsnap.setup( -+# cache_dir: 'tmp/cache', -+# development_mode: ENV['RAILS_ENV'] == 'development', -+# load_path_cache: true, -+# autoload_paths_cache: true, -+# disable_trace: true, -+# compile_cache_iseq: false, -+# compile_cache_yaml: false -+# ) ++ cache_dir: '/var/cache/mastodon', + development_mode: ENV['RAILS_ENV'] == 'development', + load_path_cache: true, + autoload_paths_cache: true, Modified: head/net-im/mastodon/files/patch-config_sidekiq.yml ============================================================================== --- head/net-im/mastodon/files/patch-config_sidekiq.yml Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/files/patch-config_sidekiq.yml Tue Jan 30 09:10:35 2018 (r460377) @@ -1,7 +1,7 @@ ---- config/sidekiq.yml.orig 2017-09-17 13:23:44 UTC +--- config/sidekiq.yml.orig 2018-01-24 12:29:46 UTC +++ config/sidekiq.yml -@@ -27,3 +27,4 @@ - ip_cleanup_scheduler: - cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *' - class: Scheduler::IpCleanupScheduler +@@ -30,3 +30,4 @@ + email_scheduler: + cron: '0 10 * * 2' + class: Scheduler::EmailScheduler +:pidfile: /var/run/mastodon/mastodon_workers.pid Modified: head/net-im/mastodon/files/patch-package.json ============================================================================== --- head/net-im/mastodon/files/patch-package.json Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/files/patch-package.json Tue Jan 30 09:10:35 2018 (r460377) @@ -1,8 +1,8 @@ ---- package.json.orig 2017-12-15 18:14:57 UTC +--- package.json.orig 2018-01-24 12:29:46 UTC +++ package.json -@@ -2,15 +2,9 @@ - "name": "mastodon", - "license": "AGPL-3.0", +@@ -5,15 +5,9 @@ + "node": ">=6" + }, "scripts": { - "postversion": "git push --tags", - "build:development": "cross-env RAILS_ENV=development ./bin/webpack", @@ -10,26 +10,26 @@ "manage:translations": "node ./config/webpack/translationRunner.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:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/", - "test:jest": "cross-env NODE_ENV=test jest --coverage", - "postinstall": "npm rebuild node-sass" + "start": "node ./streaming/index.js" }, "repository": { "type": "git", -@@ -115,24 +109,5 @@ +@@ -118,24 +112,5 @@ "webpack-manifest-plugin": "^1.2.1", "webpack-merge": "^4.1.1", "websocket.js": "^0.1.12" - }, - "devDependencies": { -- "babel-eslint": "^7.2.3", +- "babel-eslint": "^8.2.1", - "enzyme": "^3.2.0", - "enzyme-adapter-react-16": "^1.1.0", -- "eslint": "^3.19.0", +- "eslint": "^4.15.0", - "eslint-plugin-import": "^2.8.0", -- "eslint-plugin-jsx-a11y": "^4.0.0", -- "eslint-plugin-react": "^6.10.3", +- "eslint-plugin-jsx-a11y": "^5.1.1", +- "eslint-plugin-react": "^7.5.1", - "jest": "^21.2.1", - "raf": "^3.4.0", - "react-intl-translations-manager": "^5.0.0", Modified: head/net-im/mastodon/files/yarn.lock.in ============================================================================== --- head/net-im/mastodon/files/yarn.lock.in Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/files/yarn.lock.in Tue Jan 30 09:10:35 2018 (r460377) @@ -2,54 +2,53 @@ # yarn lockfile v1 -"@babel/code-frame@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35" +"@babel/code-frame@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4" dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/helper-function-name@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57" +"@babel/helper-function-name@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d" dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.31" - "@babel/template" "7.0.0-beta.31" - "@babel/traverse" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" + "@babel/helper-get-function-arity" "7.0.0-beta.36" + "@babel/template" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" -"@babel/helper-get-function-arity@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493" +"@babel/helper-get-function-arity@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8" dependencies: - "@babel/types" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.36" -"@babel/template@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda" +"@babel/template@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00" dependencies: - "@babel/code-frame" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" - babylon "7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" lodash "^4.2.0" -"@babel/traverse@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df" +"@babel/traverse@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261" dependencies: - "@babel/code-frame" "7.0.0-beta.31" - "@babel/helper-function-name" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" - babylon "7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/helper-function-name" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" debug "^3.0.1" - globals "^10.0.0" + globals "^11.1.0" invariant "^2.2.0" lodash "^4.2.0" -"@babel/types@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4" +"@babel/types@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23" dependencies: esutils "^2.0.2" lodash "^4.2.0" @@ -281,14 +280,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^7.1.6: - version "7.2.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.4.tgz#29b367c03876a29bfd3721260d945e3545666c8d" + version "7.2.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192" dependencies: - browserslist "^2.10.2" - caniuse-lite "^1.0.30000784" + browserslist "^2.11.1" + caniuse-lite "^1.0.30000791" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.15" + postcss "^6.0.16" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -343,13 +342,13 @@ babel-core@^6.25.0, babel-core@^6.26.0: source-map "^0.5.6" babel-eslint@^8.0.1: - version "8.1.2" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.1.2.tgz#a39230b0c20ecbaa19a35d5633bf9b9ca2c8116f" + version "8.2.1" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951" dependencies: - "@babel/code-frame" "7.0.0-beta.31" - "@babel/traverse" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" - babylon "7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/traverse" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" eslint-scope "~3.7.1" eslint-visitor-keys "^1.0.0" @@ -513,10 +512,10 @@ babel-plugin-lodash@^3.3.2: require-package-name "^2.0.1" babel-plugin-macros@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.0.0.tgz#fd3aee135f7dec0b82898b7c8f1aed6fa75f9af9" + version "2.1.0" + resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.1.0.tgz#e978fd4c5ee9cca73a809c176524c2e9f4dcccbf" dependencies: - cosmiconfig "3.1.0" + cosmiconfig "^4.0.0" babel-plugin-preval@^1.6.1: version "1.6.3" @@ -528,8 +527,8 @@ babel-plugin-preval@^1.6.1: require-from-string "^2.0.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" + version "2.4.0" + resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-2.4.0.tgz#292fca8030603a9e0476973290836aa0c7da17e2" dependencies: babel-runtime "^6.2.0" intl-messageformat-parser "^1.2.0" @@ -955,9 +954,9 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@ lodash "^4.17.4" to-fast-properties "^1.0.3" -babylon@7.0.0-beta.31: - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f" +babylon@7.0.0-beta.36: + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e" babylon@^6.18.0: version "6.18.0" @@ -1118,11 +1117,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2, browserslist@^2.10.2: - version "2.11.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d" +browserslist@^2.1.2, browserslist@^2.11.1: + version "2.11.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" dependencies: - caniuse-lite "^1.0.30000784" + caniuse-lite "^1.0.30000792" electron-to-chromium "^1.3.30" buffer-writer@1.0.1: @@ -1154,8 +1153,8 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" cacache@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.1.tgz#3e05f6e616117d9b54665b1b20c8aeb93ea5d36f" + version "10.0.2" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.2.tgz#105a93a162bbedf3a25da42e1939ed99ffb145f8" dependencies: bluebird "^3.5.0" chownr "^1.0.1" @@ -1208,12 +1207,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000787" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000787.tgz#ca07a281be536a88bd7fac96ba895f3cf53f811b" + version "1.0.30000798" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000798.tgz#92f26f77f89cc2a4d60487f41e0b3d2a6c3fe341" -caniuse-lite@^1.0.30000784: - version "1.0.30000787" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000787.tgz#a76c4fa1d6ac00640447ec83c1e7c6b33dd615c5" +caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792: + version "1.0.30000792" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332" caseless@~0.11.0: version "0.11.0" @@ -1372,16 +1371,16 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: delayed-stream "~1.0.0" commander@^2.9.0: - version "2.12.2" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + version "2.13.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" compression-webpack-plugin@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.3.tgz#4b936c627eda09304e3153499ece7830289ab95a" + version "1.1.6" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.6.tgz#450808fe143b4c5216a14f0c315c47bec3d83cec" dependencies: async "^2.4.1" cacache "^10.0.1" @@ -1462,15 +1461,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -cosmiconfig@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397" - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^3.0.0" - require-from-string "^2.0.1" - cosmiconfig@^2.1.0, cosmiconfig@^2.1.1: version "2.2.2" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892" @@ -1483,6 +1473,15 @@ cosmiconfig@^2.1.0, cosmiconfig@^2.1.1: parse-json "^2.2.0" require-from-string "^1.1.0" +cosmiconfig@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc" + dependencies: + is-directory "^0.3.1" + js-yaml "^3.9.0" + parse-json "^4.0.0" + require-from-string "^2.0.1" + create-ecdh@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" @@ -1608,8 +1607,8 @@ css-list-helpers@^1.0.1: tcomb "^2.5.0" css-loader@^0.28.4: - version "0.28.8" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5" + version "0.28.9" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.9.tgz#68064b85f4e271d7ce4c48a58300928e535d1c95" dependencies: babel-code-frame "^6.26.0" css-selector-tokenizer "^0.7.0" @@ -1619,7 +1618,7 @@ css-loader@^0.28.4: lodash.camelcase "^4.3.0" object-assign "^4.1.1" postcss "^5.0.6" - postcss-modules-extract-imports "^1.1.0" + postcss-modules-extract-imports "^1.2.0" postcss-modules-local-by-default "^1.2.0" postcss-modules-scope "^1.1.0" postcss-modules-values "^1.3.0" @@ -1760,10 +1759,14 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@1.1.1, depd@~1.1.1: +depd@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" +depd@~1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -1802,8 +1805,8 @@ dom-helpers@^3.2.0, dom-helpers@^3.2.1: resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" domain-browser@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" dotenv@^4.0.0: version "4.0.0" @@ -1817,9 +1820,9 @@ duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" -duplexify@^3.1.2, duplexify@^3.4.2: - version "3.5.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd" +duplexify@^3.4.2, duplexify@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e" dependencies: end-of-stream "^1.0.0" inherits "^2.0.1" @@ -1834,15 +1837,9 @@ ejs@^2.3.4, ejs@^2.5.6: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" -electron-releases@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" - electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: - version "1.3.30" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" - dependencies: - electron-releases "^2.1.0" + version "1.3.31" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f" elliptic@^6.0.0: version "6.4.0" @@ -1865,8 +1862,8 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" encodeurl@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" encoding@^0.1.11: version "0.1.12" @@ -1875,8 +1872,8 @@ encoding@^0.1.11: iconv-lite "~0.4.13" end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206" + version "1.4.1" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" dependencies: once "^1.4.0" @@ -1920,13 +1917,13 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.37" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" + version "0.10.38" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3" dependencies: - es6-iterator "~2.0.1" + es6-iterator "~2.0.3" es6-symbol "~3.1.1" -es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: @@ -2223,8 +2220,8 @@ flush-write-stream@^1.0.0: readable-stream "^2.0.4" follow-redirects@^1.2.3: - version "1.3.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.3.0.tgz#f684871fc116d2e329fda55ef67687f4fabc905c" + version "1.4.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa" dependencies: debug "^3.1.0" @@ -2420,9 +2417,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, gl once "^1.3.0" path-is-absolute "^1.0.0" -globals@^10.0.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7" +globals@^11.1.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.2.0.tgz#aa2ece052a787563ba70a3dcd9dc2eb8a9a0488c" globals@^9.18.0: version "9.18.0" @@ -2937,8 +2934,8 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" js-base64@^2.1.8, js-base64@^2.1.9: - version "2.4.0" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" + version "2.4.3" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" js-string-escape@1.0.1: version "1.0.1" @@ -2974,6 +2971,10 @@ json-loader@^0.5.4: version "0.5.7" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" +json-parse-better-errors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" + json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -3377,8 +3378,8 @@ minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" mississippi@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.0.tgz#d201583eb12327e3c5c1642a404a9cacf94e34f5" + version "1.3.1" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e" dependencies: concat-stream "^1.5.0" duplexify "^3.4.2" @@ -3753,11 +3754,12 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13" +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" dependencies: error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" parseurl@~1.3.2: version "1.3.2" @@ -4137,9 +4139,9 @@ postcss-mixins@^6.0.1: postcss-simple-vars "^4.1.0" sugarss "^1.0.0" -postcss-modules-extract-imports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" +postcss-modules-extract-imports@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" dependencies: postcss "^6.0.1" @@ -4338,7 +4340,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, pos source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.15, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.15, postcss@^6.0.16, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9: version "6.0.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" dependencies: @@ -4471,13 +4473,20 @@ pump@^1.0.0: end-of-stream "^1.1.0" once "^1.3.1" +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + pumpify@^1.3.3: - version "1.3.5" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.5.tgz#1b671c619940abcaeac0ad0e3a3c164be760993b" + version "1.4.0" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb" dependencies: - duplexify "^3.1.2" - inherits "^2.0.1" - pump "^1.0.0" + duplexify "^3.5.3" + inherits "^2.0.3" + pump "^2.0.0" punycode@1.3.2: version "1.3.2" @@ -4544,8 +4553,8 @@ randomatic@^1.1.3: kind-of "^4.0.0" randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" + version "2.0.6" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" dependencies: safe-buffer "^5.1.0" @@ -4570,8 +4579,8 @@ raw-body@2.3.2: unpipe "1.0.0" rc@^1.1.7: - version "1.2.2" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" + version "1.2.4" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -4792,7 +4801,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.3.3: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5160,8 +5169,8 @@ scss-tokenizer@^0.2.3: source-map "^0.4.2" "semver@2 || 3 || 4 || 5", semver@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" semver@4.3.2: version "4.3.2" @@ -5223,8 +5232,8 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.9" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d" + version "2.4.10" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -5351,8 +5360,8 @@ sshpk@^1.7.0: getpass "^0.1.1" ssri@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.0.0.tgz#13c19390b606c821f2a10d02b351c1729b94d8cf" + version "5.1.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.1.0.tgz#2cbf1df36b74d0fc91fcf89640a4b3e1d10b1899" dependencies: safe-buffer "^5.1.0" @@ -5385,12 +5394,12 @@ stream-each@^1.1.0: stream-shift "^1.0.0" stream-http@^2.7.2: - version "2.7.2" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" + version "2.8.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.2.6" + readable-stream "^2.3.3" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -5519,8 +5528,8 @@ svgo@^0.7.0: whet.extend "~0.9.9" symbol-observable@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32" + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" tapable@^0.2.7: version "0.2.8" @@ -5569,8 +5578,8 @@ through@2: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" timers-browserify@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" + version "2.0.6" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae" dependencies: setimmediate "^1.0.4" @@ -5722,8 +5731,8 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" uuid@^3.0.0, uuid@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + version "3.2.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" uws@^8.14.0: version "8.14.1" @@ -5779,8 +5788,8 @@ watchpack@^1.4.0: graceful-fs "^4.1.2" webpack-bundle-analyzer@^2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.1.tgz#c2c8e03e8e5768ed288b39ae9e27a8b8d7b9d476" + version "2.9.2" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449" dependencies: acorn "^5.1.1" chalk "^1.1.3" @@ -5792,7 +5801,7 @@ webpack-bundle-analyzer@^2.9.1: lodash "^4.17.4" mkdirp "^0.5.1" opener "^1.4.3" - ws "^3.3.1" + ws "^4.0.0" webpack-manifest-plugin@^1.2.1: version "1.3.2" @@ -5894,9 +5903,9 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -ws@^3.3.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" +ws@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-4.0.0.tgz#bfe1da4c08eeb9780b986e0e4d10eccd7345999f" dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" Modified: head/net-im/mastodon/pkg-message ============================================================================== --- head/net-im/mastodon/pkg-message Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/pkg-message Tue Jan 30 09:10:35 2018 (r460377) @@ -1,16 +1,17 @@ ############################################################ -Version 2.1.0 includes database migrations and changes to -some preview cards. +Version 2.2.0 includes database migrations and a step "to +fix a past issue with bugged out home timelines." + As the mastodon user, run % RAILS_ENV=production rails db:migrate % RAILS_ENV=production rails \ - mastodon:maintenance:migrate_photo_preview_cards + mastodon:maintenance:remove_regeneration_markers -Some options may now be set in /etc/rc.conf. See the -comments in the rc scripts (mastodon_web, mastodon_workers, -and mastodon_stream) for details. +Some options may now be set in rc.conf. See the comments in +the rc scripts (mastodon_web, mastodon_workers, and +mastodon_stream) for details. Visit this URL to get started with Mastodon. http://ftfl.ca/blog/2017-05-23-mastodon-freebsd.html Modified: head/net-im/mastodon/pkg-plist ============================================================================== --- head/net-im/mastodon/pkg-plist Tue Jan 30 09:10:30 2018 (r460376) +++ head/net-im/mastodon/pkg-plist Tue Jan 30 09:10:35 2018 (r460377) @@ -29,6 +29,7 @@ @dir %%WWWDIR%%/app/javascript/fonts/roboto @dir %%WWWDIR%%/app/javascript/fonts/roboto-mono @dir %%WWWDIR%%/app/javascript/images +@dir %%WWWDIR%%/app/javascript/images/mailer @dir %%WWWDIR%%/app/javascript/mastodon @dir %%WWWDIR%%/app/javascript/mastodon/actions @dir %%WWWDIR%%/app/javascript/mastodon/actions/push_notifications @@ -254,7 +255,30 @@ @dir %%WWWDIR%%/node_modules/@babel/traverse/node_modules/globals @dir %%WWWDIR%%/node_modules/@babel/types @dir %%WWWDIR%%/node_modules/@babel/types/lib +@dir %%WWWDIR%%/node_modules/@babel/types/lib/asserts +@dir %%WWWDIR%%/node_modules/@babel/types/lib/asserts/generated +@dir %%WWWDIR%%/node_modules/@babel/types/lib/builders +@dir %%WWWDIR%%/node_modules/@babel/types/lib/builders/flow +@dir %%WWWDIR%%/node_modules/@babel/types/lib/builders/generated +@dir %%WWWDIR%%/node_modules/@babel/types/lib/builders/react +@dir %%WWWDIR%%/node_modules/@babel/types/lib/clone +@dir %%WWWDIR%%/node_modules/@babel/types/lib/comments +@dir %%WWWDIR%%/node_modules/@babel/types/lib/constants +@dir %%WWWDIR%%/node_modules/@babel/types/lib/constants/generated +@dir %%WWWDIR%%/node_modules/@babel/types/lib/converters @dir %%WWWDIR%%/node_modules/@babel/types/lib/definitions +@dir %%WWWDIR%%/node_modules/@babel/types/lib/modifications +@dir %%WWWDIR%%/node_modules/@babel/types/lib/modifications/flow +@dir %%WWWDIR%%/node_modules/@babel/types/lib/retrievers +@dir %%WWWDIR%%/node_modules/@babel/types/lib/traverse +@dir %%WWWDIR%%/node_modules/@babel/types/lib/utils +@dir %%WWWDIR%%/node_modules/@babel/types/lib/utils/react +@dir %%WWWDIR%%/node_modules/@babel/types/lib/validators +@dir %%WWWDIR%%/node_modules/@babel/types/lib/validators/generated +@dir %%WWWDIR%%/node_modules/@babel/types/lib/validators/react +@dir %%WWWDIR%%/node_modules/@babel/types/scripts +@dir %%WWWDIR%%/node_modules/@babel/types/scripts/generators +@dir %%WWWDIR%%/node_modules/@babel/types/scripts/utils @dir %%WWWDIR%%/node_modules/abbrev @dir %%WWWDIR%%/node_modules/accepts @dir %%WWWDIR%%/node_modules/acorn @@ -817,6 +841,7 @@ @dir %%WWWDIR%%/node_modules/dom-helpers/transition @dir %%WWWDIR%%/node_modules/dom-helpers/util @dir %%WWWDIR%%/node_modules/domain-browser +@dir %%WWWDIR%%/node_modules/domain-browser/source @dir %%WWWDIR%%/node_modules/dotenv @dir %%WWWDIR%%/node_modules/dotenv/lib @dir %%WWWDIR%%/node_modules/double-ended-queue @@ -826,8 +851,6 @@ @dir %%WWWDIR%%/node_modules/ee-first @dir %%WWWDIR%%/node_modules/ejs @dir %%WWWDIR%%/node_modules/ejs/lib -@dir %%WWWDIR%%/node_modules/electron-releases -@dir %%WWWDIR%%/node_modules/electron-releases/script @dir %%WWWDIR%%/node_modules/electron-to-chromium @dir %%WWWDIR%%/node_modules/elliptic @dir %%WWWDIR%%/node_modules/elliptic/lib @@ -1177,6 +1200,7 @@ @dir %%WWWDIR%%/node_modules/isstream @dir %%WWWDIR%%/node_modules/js-base64 @dir %%WWWDIR%%/node_modules/js-base64/old +@dir %%WWWDIR%%/node_modules/js-base64/test-moment @dir %%WWWDIR%%/node_modules/js-string-escape @dir %%WWWDIR%%/node_modules/js-tokens @dir %%WWWDIR%%/node_modules/js-yaml @@ -1190,6 +1214,7 @@ @dir %%WWWDIR%%/node_modules/jsesc @dir %%WWWDIR%%/node_modules/jsesc/bin @dir %%WWWDIR%%/node_modules/json-loader +@dir %%WWWDIR%%/node_modules/json-parse-better-errors @dir %%WWWDIR%%/node_modules/json-schema @dir %%WWWDIR%%/node_modules/json-schema-traverse @dir %%WWWDIR%%/node_modules/json-schema-traverse/spec @@ -2000,6 +2025,7 @@ @dir %%WWWDIR%%/vendor/assets @dir %%WWWDIR%%/vendor/assets/javascripts @dir %%WWWDIR%%/vendor/assets/stylesheets +@dir /var/cache/mastodon @dir /var/log/mastodon @dir /var/run/mastodon @sample %%WWWDIR%%/.env.production.sample @@ -2138,6 +2164,7 @@ %%WWWDIR%%/app/helpers/home_helper.rb %%WWWDIR%%/app/helpers/instance_helper.rb %%WWWDIR%%/app/helpers/jsonld_helper.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***