Merge branch 'develop' of github.com:jonnybarnes/jonnybarnes.uk into develop

.gitignore

@@ -1,12 +1,12 @@
-/vendor
 /node_modules
-/bower_components
 /public/storage
+/public/hot
+/storage/*.key
+/vendor
+/.idea
 Homestead.yaml
 Homestead.json
 .env
-/.sass-cache
 /public/files
 /public/keybase.txt
 /coverage
-/storage/*.key

.travis.yml

@@ -14,7 +14,7 @@ env:
     - setup=basic
 
 php:
-  - 7.0.13 # trusty comes with 7.0.7 by default which segfaults with phpdbg
+  - 7.0.15
   - 7.1
   - nightly
 matrix:

app/Http/Controllers/MicropubClientController.php

@@ -159,10 +159,10 @@ class MicropubClientController extends Controller
                 'contents' => $request->input('in-reply-to'),
             ];
         }
-        if ($request->input('syndicate-to')) {
-            foreach ($request->input('syndicate-to') as $syn) {
+        if ($request->input('mp-syndicate-to')) {
+            foreach ($request->input('mp-syndicate-to') as $syn) {
                 $multipart[] = [
-                    'name' => 'syndicate-to[]',
+                    'name' => 'mp-syndicate-to[]',
                     'contents' => $syn,
                 ];
             }

app/Http/Kernel.php

@@ -15,6 +15,9 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        \App\Http\Middleware\TrimStrings::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -50,6 +53,7 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'myauth' => \App\Http\Middleware\MyAuthMiddleware::class,

app/Http/Middleware/TrimStrings.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+
+class TrimStrings extends BaseTrimmer
+{
+    /**
+     * The names of the attributes that should not be trimmed.
+     *
+     * @var array
+     */
+    protected $except = [
+        'password',
+        'password_confirmation',
+    ];
+}

app/Note.php

@@ -6,6 +6,7 @@ use Normalizer;
 use Laravel\Scout\Searchable;
 use Jonnybarnes\IndieWeb\Numbers;
 use Illuminate\Database\Eloquent\Model;
+use Jonnybarnes\EmojiA11y\EmojiModifier;
 use League\CommonMark\CommonMarkConverter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
@@ -119,11 +120,13 @@ class Note extends Model implements HasMedia
     public function getNoteAttribute($value)
     {
         $markdown = new CommonMarkConverter();
+        $emoji = new EmojiModifier();
         $html = $markdown->convertToHtml($value);
         $hcards = $this->makeHCards($html);
         $hashtags = $this->autoLinkHashtag($hcards);
+        $modified = $emoji->makeEmojiAccessible($hashtags);
 
-        return $hashtags;
+        return $modified;
     }
 
     /**

app/Providers/BroadcastServiceProvider.php

@@ -16,11 +16,6 @@ class BroadcastServiceProvider extends ServiceProvider
     {
         Broadcast::routes();
 
-        /*
-         * Authenticate the user's personal channel...
-         */
-        Broadcast::channel('App.User.*', function ($user, $userId) {
-            return (int) $user->id === (int) $userId;
-        });
+        require base_path('routes/channels.php');
     }
 }

app/Providers/RouteServiceProvider.php

@@ -36,10 +36,10 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map()
     {
-        $this->mapWebRoutes();
-
         $this->mapApiRoutes();
 
+        $this->mapWebRoutes();
+
         //
     }
 
@@ -52,12 +52,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapWebRoutes()
     {
-        Route::group([
-            'middleware' => 'web',
-            'namespace' => $this->namespace,
-        ], function ($router) {
-            require base_path('routes/web.php');
-        });
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -69,12 +66,9 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::group([
-            'middleware' => 'api',
-            'namespace' => $this->namespace,
-            'prefix' => 'api',
-        ], function ($router) {
-            require base_path('routes/api.php');
-        });
+        Route::prefix('api')
+             ->middleware('api')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/api.php'));
     }
 }

app/Services/NoteService.php

@@ -81,8 +81,8 @@ class NoteService
         }
         //from a micropub request
         $targets = array_pluck(config('syndication.targets'), 'uid', 'service.name');
-        if (is_string($request->input('syndicate-to'))) {
-            $service = array_search($request->input('syndicate-to'));
+        if (is_string($request->input('mp-syndicate-to'))) {
+            $service = array_search($request->input('mp-syndicate-to'));
             if ($service == 'Twitter') {
                 dispatch(new SyndicateToTwitter($note));
             }
@@ -90,9 +90,9 @@ class NoteService
                 dispatch(new SyndicateToFacebook($note));
             }
         }
-        if (is_array($request->input('syndicate-to'))) {
+        if (is_array($request->input('mp-syndicate-to'))) {
             foreach ($targets as $service => $target) {
-                if (in_array($target, $request->input('syndicate-to'))) {
+                if (in_array($target, $request->input('mp-syndicate-to'))) {
                     if ($service == 'Twitter') {
                         dispatch(new SyndicateToTwitter($note));
                     }

bootstrap/autoload.php

@@ -15,20 +15,3 @@ define('LARAVEL_START', microtime(true));
 */
 
 require __DIR__.'/../vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Include The Compiled Class File
-|--------------------------------------------------------------------------
-|
-| To dramatically increase your application's performance, you may use a
-| compiled class file which contains all of the classes commonly used
-| by a request. The Artisan "optimize" is used to create this file.
-|
-*/
-
-$compiledPath = __DIR__.'/cache/compiled.php';
-
-if (file_exists($compiledPath)) {
-    require $compiledPath;
-}

changelog.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## Version {next}
+  - Make embedded youtube iframe a dynamic size
+
+## Version 0.2.3 (2017-02-05)
+  - Autolink/embed youtube videos and spotify links
+
+## Version 0.2.2 (2017-02-05)
+  - Fix: allow syndication to work again (issue#42)
+
+## Version 0.2.1 (2017-02-03)
+  - Add css for emoji labels
+
+## Version 0.2 (2017-02-03)
+  - Update `syndicate-to` property to `mp-syndicate-to`
+  - Add my emoji-a11y dependency
+  - Upgrade to Laravel 5.4
+
 ## Version 0.1.7 (2017-01-27)
   - Add a rel=me link to my own domain in my h-card.
 

composer.json

@@ -1,13 +1,13 @@
 {
     "name": "jonnybarnes/jonnybarnes.uk",
-    "description": "The code for jonnybanres.uk, based on Laravel 5.3",
+    "description": "The code for jonnybanres.uk, based on Laravel 5.4",
     "keywords": ["framework", "laravel", "indieweb"],
     "license": "CC0-1.0",
     "type": "project",
     "require": {
         "ext-intl": "*",
         "php": ">=7.0.0",
-        "laravel/framework": "5.3.*",
+        "laravel/framework": "5.4.*",
         "jonnybarnes/indieweb": "dev-master",
         "jonnybarnes/webmentions-parser": "0.4.*",
         "guzzlehttp/guzzle": "~6.0",
@@ -23,17 +23,20 @@
         "phaza/laravel-postgis": "~3.1",
         "lcobucci/jwt": "^3.1",
         "sensiolabs/security-checker": "^4.0",
-        "laravel/scout": "^1.1",
-        "pmatseykanets/laravel-scout-postgres": "^0.2.0"
+        "laravel/scout": "^3.0",
+        "pmatseykanets/laravel-scout-postgres": "^0.5.0",
+        "jonnybarnes/emoji-a11y": "^0.1.1",
+        "laravel/tinker": "^1.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.0",
+        "phpunit/phpunit": "~5.7",
         "symfony/css-selector": "3.1.*",
         "symfony/dom-crawler": "3.1.*",
         "barryvdh/laravel-debugbar": "~2.0",
-        "jakub-onderka/php-parallel-lint": "^0.9.2"
+        "jakub-onderka/php-parallel-lint": "^0.9.2",
+        "laravel/browser-kit-testing": "^1.0"
     },
     "autoload": {
         "classmap": [
@@ -45,12 +48,13 @@
     },
     "autoload-dev": {
         "classmap": [
-            "tests/TestCase.php"
+            "tests/TestCase.php",
+            "tests/BrowserKitTest.php"
         ]
     },
     "scripts": {
         "post-root-package-install": [
-            "php -r \"copy('.env.example', '.env');\""
+            "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
             "php artisan key:generate"
@@ -65,6 +69,7 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true
     }
 }

config/app.php

@@ -213,6 +213,11 @@ return [
          */
         ScoutEngines\Postgres\PostgresEngineServiceProvider::class,
 
+        /*
+         * Laravel Tinker
+         */
+        Laravel\Tinker\TinkerServiceProvider::class,
+
     ],
 
     /*

config/broadcasting.php

@@ -32,8 +32,8 @@ return [
 
         'pusher' => [
             'driver' => 'pusher',
-            'key' => env('PUSHER_KEY'),
-            'secret' => env('PUSHER_SECRET'),
+            'key' => env('PUSHER_APP_KEY'),
+            'secret' => env('PUSHER_APP_SECRET'),
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 //

config/cache.php

@@ -46,7 +46,7 @@ return [
 
         'file' => [
             'driver' => 'file',
-            'path' => storage_path('framework/cache'),
+            'path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [

config/compile.php

@@ -1,35 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Additional Compiled Classes
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify additional classes to include in the compiled file
-    | generated by the `artisan optimize` command. These should be classes
-    | that are included on basically every request into the application.
-    |
-    */
-
-    'files' => [
-        //
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Compiled File Providers
-    |--------------------------------------------------------------------------
-    |
-    | Here you may list service providers which define a "compiles" function
-    | that returns additional files that should be compiled, providing an
-    | easy way to get common files from any packages you are utilizing.
-    |
-    */
-
-    'providers' => [
-        //
-    ],
-
-];

config/database.php

@@ -2,19 +2,6 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | PDO Fetch Style
-    |--------------------------------------------------------------------------
-    |
-    | By default, database results will be returned as instances of the PHP
-    | stdClass object; however, you may desire to retrieve records in an
-    | array format for simplicity. Here you can tweak the fetch style.
-    |
-    */
-
-    'fetch' => PDO::FETCH_CLASS,
-
     /*
     |--------------------------------------------------------------------------
     | Default Database Connection Name

config/filesystems.php

@@ -11,8 +11,6 @@ return [
     | by the framework. A "local" driver, as well as a variety of cloud
     | based drivers are available for your choosing. Just store away!
     |
-    | Supported: "local", "ftp", "s3", "rackspace"
-    |
     */
 
     'default' => 'local',
@@ -39,6 +37,8 @@ return [
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
+    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    |
     */
 
     'disks' => [
@@ -51,12 +51,13 @@ return [
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
+            'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
         ],
 
         's3' => [
             'driver' => 's3',
-            'key'    => env('AWS_S3_KEY'),
+            'key' => env('AWS_S3_KEY'),
             'secret' => env('AWS_S3_SECRET'),
             'region' => env('AWS_S3_REGION'),
             'bucket' => env('AWS_S3_BUCKET'),

config/mail.php

@@ -11,8 +11,8 @@ return [
     | sending of e-mail. You may specify which one you're using throughout
     | your application here. By default, Laravel is setup for SMTP mail.
     |
-    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
-    |            "ses", "sparkpost", "log"
+    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses"
+    |            "sparkpost", "log", "array"
     |
     */
 
@@ -55,8 +55,8 @@ return [
     |
     */
     'from' => [
-        'address' => 'hello@example.com',
-        'name' => 'Example',
+        'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
     /*
@@ -85,17 +85,6 @@ return [
 
     'username' => env('MAIL_USERNAME'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Password
-    |--------------------------------------------------------------------------
-    |
-    | Here you may set the password required by your SMTP server to send out
-    | messages from your application. This will be given to the server on
-    | connection so that the application will be able to send messages.
-    |
-    */
-
     'password' => env('MAIL_PASSWORD'),
 
     /*
@@ -111,4 +100,22 @@ return [
 
     'sendmail' => '/usr/sbin/sendmail -bs',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Markdown Mail Settings
+    |--------------------------------------------------------------------------
+    |
+    | If you are using Markdown based email rendering, you may configure your
+    | theme and component paths here, allowing you to customize the design
+    | of the emails. Or, you may simply stick with the Laravel defaults!
+    |
+    */
+
+    'markdown' => [
+        'theme' => 'default',
+        'paths' => [
+            resource_path('views/vendor/mail'),
+        ],
+    ],
+
 ];

config/queue.php

@@ -7,7 +7,7 @@ return [
     | Default Queue Driver
     |--------------------------------------------------------------------------
     |
-    | The Laravel queue API supports a variety of back-ends via an unified
+    | Laravel's queue API supports an assortment of back-ends via a single
     | API, giving you convenient access to each back-end using the same
     | syntax for each one. Here you may set the default queue driver.
     |

config/session.php

@@ -85,6 +85,19 @@ return [
 
     'table' => 'sessions',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cache Store
+    |--------------------------------------------------------------------------
+    |
+    | When using the "apc" or "memcached" session drivers, you may specify a
+    | cache store that should be used for these sessions. This value must
+    | correspond with one of the application's configured cache stores.
+    |
+    */
+
+    'store' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Session Sweeping Lottery

database/seeds/NotesTableSeeder.php

@@ -13,7 +13,7 @@ class NotesTableSeeder extends Seeder
     {
         factory(App\Note::class, 10)->create();
         $noteWithPlace = App\Note::create([
-            'note' => 'Having a #beer at the local.',
+            'note' => 'Having a #beer at the local. 🍺',
             'tweet_id' => '123456789',
         ]);
         $place = App\Place::find(1);

package.json

@@ -5,12 +5,10 @@
   "license": "CC0-1.0",
   "dependencies": {
     "alertify.js": "^1.0.12",
-    "autolinker": "^1.2.0",
-    "mapbox-gl": "^0.29.0",
+    "mapbox-gl": "^0.32.0",
     "marked": "^0.3.6",
     "normalize.css": "^5.0.0",
-    "webStorage": "^1.2.2",
-    "whatwg-fetch": "^1.0.0"
+    "webStorage": "^1.2.2"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
@@ -21,7 +19,7 @@
     "babel-runtime": "^6.20.0",
     "lint-staged": "^3.2.1",
     "pre-commit": "^1.1.3",
-    "stylelint-config-standard": "^14.0.0",
+    "stylelint-config-standard": "^16.0.0",
     "webpack": "^2.2.0"
   },
   "private": true,

public/assets/css/app.css.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../resources/assets/sass/app.scss","../../../resources/assets/sass/layout.scss","../../../resources/assets/sass/styles.scss","../../../resources/assets/sass/pagination.scss","../../../resources/assets/sass/note-form.scss","../../../resources/assets/sass/mapbox.scss","../../../resources/assets/sass/contacts.scss"],"names":[],"mappings":"AAIA,KACI,sBACA,cAAe,CAClB,qBAKG,kBAAmB,CACtB,KCVG,eACA,cACA,iBACA,kBACA,oBAAqB,CACxB,WAGG,iBAAkB,CACrB,SAGG,gBAAiB,CACpB,MAGG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,eAGG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,gBAAiB,CACpB,cAGG,oBACA,AADA,aACA,yBAAmB,AAAnB,kBAAmB,CACtB,kBAGG,gBAAiB,CACpB,iBAGG,qBACA,WAAY,CACf,aAGG,eACA,yBAA0B,CAC7B,OAGG,eAAgB,CACnB,cAGG,eAAgB,CACnB,WAGG,eACA,cACA,iBAAkB,CACrB,sBAGG,cAAe,CAClB,sBAGG,iBACA,cAAe,CAClB,KClEG,6JAWc,CACjB,EAGG,qBACA,wBACA,UAAW,CACd,gBAGG,kBAAmB,CACtB,MAGG,WACA,UAAW,CACd,OAGG,iBACA,iBAAkB,CACrB,WAGG,kBAAmB,CACtB,UAGG,YACA,WAAY,CACf,YC1CG,WACA,YACA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,yBAAmB,AAAnB,kBAAmB,CACtB,eAGG,oBAAqB,CACxB,SCVG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,0BAGG,aACI,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,cAAe,CAClB,CAGL,0BACI,sBACI,UAAW,CACd,CAGL,eACI,UACA,oBACA,gBAAiB,CACpB,oDAIG,mBAAO,AAAP,MAAO,CACV,kBAGG,qBAAsB,CACzB,QAGG,mBAAoB,CACvB,KCnCG,eACA,YAAa,CAChB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,SCtBG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,eACA,6BAA8B,CACjC,aAGG,oBACA,YACA,YAAa,CAChB","file":"app.css"}
+{"version":3,"sources":["../../../resources/assets/sass/app.scss","../../../resources/assets/sass/layout.scss","../../../resources/assets/sass/styles.scss","../../../resources/assets/sass/pagination.scss","../../../resources/assets/sass/note-form.scss","../../../resources/assets/sass/mapbox.scss","../../../resources/assets/sass/contacts.scss","../../../resources/assets/sass/emoji.scss"],"names":[],"mappings":"AAIA,KACI,sBACA,cAAe,CAClB,qBAKG,kBAAmB,CACtB,KCVG,eACA,cACA,iBACA,kBACA,oBAAqB,CACxB,WAGG,iBAAkB,CACrB,SAGG,gBAAiB,CACpB,MAGG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,eAGG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,gBAAiB,CACpB,cAGG,oBACA,AADA,aACA,yBAAmB,AAAnB,kBAAmB,CACtB,kBAGG,gBAAiB,CACpB,iBAGG,qBACA,WAAY,CACf,aAGG,eACA,yBAA0B,CAC7B,OAGG,eAAgB,CACnB,cAGG,eAAgB,CACnB,WAGG,eACA,cACA,iBAAkB,CACrB,sBAGG,cAAe,CAClB,sBAGG,iBACA,cAAe,CAClB,WAGG,kBACA,WACA,SACA,qBAAsB,CACzB,SAGG,kBACA,MACA,OACA,WACA,WAAY,CACf,KCjFG,6JAWc,CACjB,EAGG,qBACA,wBACA,UAAW,CACd,gBAGG,kBAAmB,CACtB,MAGG,WACA,UAAW,CACd,OAGG,iBACA,iBAAkB,CACrB,WAGG,kBAAmB,CACtB,UAGG,YACA,WAAY,CACf,YC1CG,WACA,YACA,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,yBACA,AADA,8BACA,yBAAmB,AAAnB,kBAAmB,CACtB,eAGG,oBAAqB,CACxB,SCVG,oBACA,AADA,aACA,4BAAsB,AAAtB,6BAAsB,AAAtB,qBAAsB,CACzB,0BAGG,aACI,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,cAAe,CAClB,CAGL,0BACI,sBACI,UAAW,CACd,CAGL,eACI,UACA,oBACA,gBAAiB,CACpB,oDAIG,mBAAO,AAAP,MAAO,CACV,kBAGG,qBAAsB,CACzB,QAGG,mBAAoB,CACvB,KCnCG,eACA,YAAa,CAChB,QAGG,y4HACA,wBACA,WACA,WAAY,CACf,UAGG,kBACA,MACA,OACA,iBACA,cAAe,CAClB,gBAGG,gBACA,gBAAiB,CACpB,SCtBG,oBACA,AADA,aACA,8BACA,AADA,6BACA,AADA,mBACA,eACA,6BAA8B,CACjC,aAGG,oBACA,YACA,YAAa,CAChB,sDCPG,iBAAkB,CACrB,gFAIG,kBACA,cACA,UACA,aACA,OACA,cACA,qBACA,yBACA,oBACA,oCACA,yBACA,kCACA,WACA,cACA,0CAAkC,AAAlC,iCAAkC,CACrC,2BAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,AApBC,mBAGG,KACI,aACA,6BACA,wCACA,0BACA,qBAAkC,CAGtC,GACI,aACA,kCACA,yBACA,WACA,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CAAA","file":"app.css"}

public/assets/js/links.js

@@ -0,0 +1 @@
+!function(t){function e(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var r={};return e.m=t,e.c=r,e.i=function(t){return t},e.d=function(t,r,n){e.o(t,r)||Object.defineProperty(t,r,{configurable:!1,enumerable:!0,get:n})},e.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(r,"a",r),r},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=18)}({18:function(t,e){var r=/watch\?v=([A-Za-z0-9\-_]+)\b/,n=/https\:\/\/play\.spotify\.com\/(.*)\b/,o=document.querySelectorAll(".e-content"),a=!0,i=!1,u=void 0;try{for(var c,l=o[Symbol.iterator]();!(a=(c=l.next()).done);a=!0){var s=c.value,d=s.textContent.match(r);if(d){var f=document.createElement("div");f.classList.add("container");var p=document.createElement("iframe");p.classList.add("youtube"),p.setAttribute("src","https://www.youtube.com/embed/"+d[1]),p.setAttribute("frameborder",0),p.setAttribute("allowfullscreen","true"),f.appendChild(p),s.appendChild(f)}var m=s.textContent.match(n);if(m){var b=m[1].replace("/",":"),y=document.createElement("iframe");y.classList.add("spotify"),y.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+b),y.setAttribute("frameborder",0),y.setAttribute("allowtransparency","true"),s.appendChild(y)}console.log(s.innerHTML)}}catch(t){i=!0,u=t}finally{try{!a&&l.return&&l.return()}finally{if(i)throw u}}}});

public/index.php

@@ -4,7 +4,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @author   Taylor Otwell <taylorotwell@gmail.com>
+ * @author   Taylor Otwell <taylor@laravel.com>
  */
 
 /*

resources/assets/es6/links.js

@@ -0,0 +1,31 @@
+//links.js
+
+let youtubeRegex = /watch\?v=([A-Za-z0-9\-_]+)\b/;
+let spotifyRegex = /https\:\/\/play\.spotify\.com\/(.*)\b/;
+
+let notes = document.querySelectorAll('.e-content');
+
+for (let note of notes) {
+    let ytid = note.textContent.match(youtubeRegex);
+    if (ytid) {
+        let ytcontainer = document.createElement('div');
+        ytcontainer.classList.add('container');
+        let ytiframe = document.createElement('iframe');
+        ytiframe.classList.add('youtube');
+        ytiframe.setAttribute('src', 'https://www.youtube.com/embed/' + ytid[1]);
+        ytiframe.setAttribute('frameborder', 0);
+        ytiframe.setAttribute('allowfullscreen', 'true');
+        ytcontainer.appendChild(ytiframe)
+        note.appendChild(ytcontainer);
+    }
+    let spotifyid = note.textContent.match(spotifyRegex);
+    if (spotifyid) {
+        let sid = spotifyid[1].replace('/', ':');
+        let siframe = document.createElement('iframe');
+        siframe.classList.add('spotify');
+        siframe.setAttribute('src', 'https://embed.spotify.com/?uri=spotify:' + sid);
+        siframe.setAttribute('frameborder', 0);
+        siframe.setAttribute('allowtransparency', 'true');
+        note.appendChild(siframe);
+    }
+}

resources/assets/sass/app.scss

@@ -19,3 +19,4 @@ html {
 @import "note-form";
 @import "mapbox";
 @import "contacts";
+@import "emoji";

resources/assets/sass/emoji.scss

@@ -0,0 +1,51 @@
+//emoji.scss
+
+//thanks to http://adrianroselli.com/2016/12/accessible-emoji-tweaked.html
+
+span[role=img][aria-label],
+span[role=img][aria-label] {
+    position: relative;
+}
+
+span[role=img][aria-label]:focus::after,
+span[role=img][aria-label]:hover::after {
+    position: absolute;
+    display: block;
+    z-index: 1;
+    bottom: 1.5em;
+    left: 0;
+    max-width: 5em;
+    padding: 0.5em 0.75em;
+    border: 0.05em solid rgba(255, 255, 255, 1);
+    border-radius: 0.2em;
+    box-shadow: 0.15em 0.15em 0.5em rgba(0, 0, 0, 1);
+    content: attr(aria-label);
+    background-color: rgba(0, 0, 0, 0.85);
+    color: rgba(255, 255, 255, 1);
+    font-size: 80%;
+    animation: TOOLTIP 0.1s ease-out 1;
+}
+
+@keyframes TOOLTIP {
+    from {
+        bottom: 0.5em;
+        background-color: rgba(0, 0, 0, 0);
+        border: 0.05em solid rgba(255, 255, 255, 0);
+        color: rgba(255, 255, 255, 0);
+        box-shadow: 0 0 0 rgba(0, 0, 0, 1);
+    }
+
+    to {
+        bottom: 1.5em;
+        background-color: rgba(0, 0, 0, 0.85);
+        border: 0.05em solid rgba(255, 255, 255, 1);
+        color: rgba(255, 255, 255, 1);
+        box-shadow: 0.15em 0.15em 0.5em rgba(0, 0, 0, 1);
+    }
+}
+
+@media print {
+    span[role=img][aria-label]::after {
+        content: " (" attr(aria-label) ") ";
+    }
+}

resources/assets/sass/layout.scss

@@ -69,3 +69,18 @@ footer button {
     margin-top: 0.5em;
     font-size: 1rem;
 }
+
+.container {
+    position: relative;
+    width: 100%;
+    height: 0;
+    padding-bottom: 56.25%;
+}
+
+.youtube {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}

resources/views/allnotes.blade.php

@@ -20,12 +20,11 @@ Notes «
 
 @section('scripts')
 
-<!--<script src="/assets/frontend/Autolinker.min.js"></script>
-<script src="/assets/js/links.js"></script>-->
+<script defer src="/assets/js/links.js"></script>
 <link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
 <script defer src="/assets/js/maps.js"></script>
 
-<script src="/assets/prism/prism.js"></script>
+<script defer src="/assets/prism/prism.js"></script>
 <link rel="stylesheet" href="/assets/prism/prism.css">
 @stop
 

resources/views/singlenote.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ strip_tags($note->note) }} « Notes « 
+{{ strip_tags($note->note) }} « Notes «
 @stop
 
 @section('content')
@@ -34,11 +34,10 @@
 @stop
 
 @section('scripts')
-@include('templates.mapbox-links')
 
-<script src="/assets/frontend/Autolinker.min.js"></script>
-<script src="/assets/js/links.js"></script>
-<script src="/assets/js/maps.js"></script>
+<script defer src="/assets/js/links.js"></script>
+<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
+<script defer src="/assets/js/maps.js"></script>
 
 <script src="/assets/prism/prism.js"></script>
 <link rel="stylesheet" href="/assets/prism/prism.css">

resources/views/templates/new-note-form.blade.php

@@ -25,7 +25,7 @@
       <ul class="syndication-targets-list" name="syndication">
         @foreach($syndication as $syn)
         <li><input type="checkbox"
-                   name="syndicate-to[]"
+                   name="mp-syndicate-to[]"
                    id="{{ $syn['target'] }}"
                    value="{{ $syn['target'] }}"
                    checked="checked"

routes/api.php

@@ -13,6 +13,6 @@ use Illuminate\Http\Request;
 |
 */
 
-Route::get('/user', function (Request $request) {
+Route::middleware('auth:api')->get('/user', function (Request $request) {
     return $request->user();
-})->middleware('auth:api');
+});

routes/channels.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Broadcast Channels
+|--------------------------------------------------------------------------
+|
+| Here you may register all of the event broadcasting channels that your
+| application supports. The given channel authorization callbacks are
+| used to check if an authenticated user can listen to the channel.
+|
+*/
+
+Broadcast::channel('App.User.{id}', function ($user, $id) {
+    return (int) $user->id === (int) $id;
+});

routes/web.php

@@ -5,9 +5,9 @@
 | Web Routes
 |--------------------------------------------------------------------------
 |
-| This file is where you may define all of the routes that are handled
-| by your application. Just tell Laravel the URIs it should respond
-| to using a Closure or controller method. Build something great!
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
 |
 */
 

tests/ArticlesTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ArticlesTest extends TestCase
+class ArticlesTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/BrowserKitTest.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Contracts\Console\Kernel;
+use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
+
+abstract class BrowserKitTest extends BaseTestCase
+{
+    /**
+     * The base URL to use while testing the application.
+     *
+     * @var string
+     */
+    protected $baseUrl = 'http://localhost';
+
+    /**
+     * Creates the application.
+     *
+     * @return \Illuminate\Foundation\Application
+     */
+    public function createApplication()
+    {
+        $app = require __DIR__.'/../bootstrap/app.php';
+
+        $app->make(Kernel::class)->bootstrap();
+
+        return $app;
+    }
+}

tests/ContactsTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ContactsTest extends TestCase
+class ContactsTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/ExampleTest.php

@@ -1,19 +0,0 @@
-<?php
-
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic functional test example.
-     *
-     * @return void
-     */
-    public function testBasicExample()
-    {
-        $this->visit(config('app.url') . '/')
-             ->see('Jonny Barnes');
-    }
-}

tests/IndieAuthTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class IndieAuthTest extends TestCase
+class IndieAuthTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/MicropubClientTest.php

@@ -2,14 +2,14 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Lcobucci\JWT\Builder;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class MicropubClientTest extends TestCase
+class MicropubClientTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/MicropubTest.php

@@ -2,14 +2,14 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Lcobucci\JWT\Builder;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class MicropubTest extends TestCase
+class MicropubTest extends BrowserKitTest
 {
     use DatabaseTransactions;
 

tests/NotesAdminTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class NotesAdminTest extends TestCase
+class NotesAdminTest extends BrowserKitTest
 {
     use DatabaseTransactions;
 

tests/NotesTest.php

@@ -3,12 +3,12 @@
 namespace App\Tests;
 
 use Cache;
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class NotesTest extends TestCase
+class NotesTest extends BrowserKitTest
 {
     protected $appurl;
     protected $notesController;

tests/PlacesTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class PlacesTest extends TestCase
+class PlacesTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/TokenServiceTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class TokenServiceTest extends TestCase
+class TokenServiceTest extends BrowserKitTest
 {
     protected $appurl;
 

tests/WebMentionsTest.php

@@ -2,12 +2,12 @@
 
 namespace App\Tests;
 
-use TestCase;
+use BrowserKitTest;
 use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class WebMentionsTest extends TestCase
+class WebMentionsTest extends BrowserKitTest
 {
     protected $appurl;
 

webpack.config.js

@@ -4,6 +4,7 @@ const config = {
   context: __dirname + '/resources/assets/es6',
   entry: {
     //app: './app.js',
+    links: './links.js',
     maps: './maps.js',
     newnote: './newnote.js'
   },

yarn.lock

@@ -6,6 +6,10 @@
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@mapbox/gl-matrix/-/gl-matrix-0.0.1.tgz#e5126aab4d64c36b81c7a97d0ae0dddde5773d2b"
 
+"@mapbox/unitbezier@^0.0.0":
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e"
+
 "JSV@>= 4.0.x":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
@@ -41,8 +45,8 @@ acorn@^3.0.4, acorn@^3.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^4.0.0, acorn@^4.0.3, acorn@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.9.tgz#2d2eb458fe3f0e31062d56cf0b1839c5dc7bd288"
 
 ajv-keywords@^1.1.1:
   version "1.5.1"
@@ -199,10 +203,6 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-autolinker@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-1.4.0.tgz#a158e90c82fc57f81232fd19c12b10eb538de881"
-
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -717,7 +717,7 @@ babel-types@^6.19.0, babel-types@^6.22.0:
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.11.0, babylon@^6.15.0, babylon@^6.8.4:
+babylon@^6.11.0, babylon@^6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
@@ -734,8 +734,8 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz#3ca76b85241c7170bf7d9703e7b9aa74630040d4"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -1347,8 +1347,8 @@ end-of-stream@1.0.0:
     once "~1.3.0"
 
 enhanced-resolve@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz#df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -1561,10 +1561,10 @@ find-up@^1.0.0:
     pinkie-promise "^2.0.0"
 
 flow-remove-types@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-1.1.2.tgz#4e31272b2ce111278866fcd135dc697760dc6951"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/flow-remove-types/-/flow-remove-types-1.2.0.tgz#c285516eabba72177a1b10bfb58f6ffb675a8877"
   dependencies:
-    babylon "^6.8.4"
+    babylon "^6.15.0"
     vlq "^0.2.1"
 
 for-in@^0.1.5:
@@ -1830,8 +1830,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5"
 
 http-signature@~1.1.0:
   version "1.1.1"
@@ -2066,8 +2066,8 @@ jodid25519@^1.0.0:
     jsbn "~0.1.0"
 
 js-tokens@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.0.tgz#a2f2a969caae142fb3cd56228358c89366957bd1"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
 js-yaml@^3.4.3, js-yaml@^3.5.3:
   version "3.7.0"
@@ -2173,13 +2173,13 @@ levn@~0.3.0:
     type-check "~0.3.2"
 
 lint-staged@^3.2.1:
-  version "3.2.8"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.2.8.tgz#95fd4eefda1eb0378a05e2f5cb0095d54b26b76e"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.3.0.tgz#29eb789b852208201a41fa85c3ac036f60606cd6"
   dependencies:
     app-root-path "^2.0.0"
     cosmiconfig "^1.1.0"
     execa "^0.6.0"
-    listr "^0.9.0"
+    listr "^0.10.0"
     minimatch "^3.0.0"
     npm-which "^3.0.1"
     staged-git-files "0.0.4"
@@ -2189,9 +2189,9 @@ listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
 
-listr-update-renderer@^0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.1.4.tgz#64262df6efa9da4f7e08e0bac5032895c738a183"
+listr-update-renderer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -2202,17 +2202,17 @@ listr-update-renderer@^0.1.1:
     log-update "^1.0.2"
     strip-ansi "^3.0.1"
 
-listr-verbose-renderer@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.2.1.tgz#99adf0c5346a28a5947e53140e9654763982b1fa"
+listr-verbose-renderer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.3.0.tgz#f4904400af29e938394a70f0647a08cdaa8dd840"
   dependencies:
     chalk "^1.1.3"
     cli-cursor "^1.0.2"
     figures "^1.7.0"
 
-listr@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.9.0.tgz#0ee78c5d95499f26042abe3334e10cacc9e81fcf"
+listr@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.10.0.tgz#342d7210966c0497a9193aaab5053e7bf619e3e2"
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -2221,8 +2221,8 @@ listr@^0.9.0:
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.1.1"
-    listr-verbose-renderer "^0.2.1"
+    listr-update-renderer "^0.2.0"
+    listr-verbose-renderer "^0.3.0"
     log-symbols "^1.0.2"
     log-update "^1.0.2"
     ora "^0.2.3"
@@ -2240,9 +2240,9 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-loader-runner@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
 loader-utils@^0.2.11, loader-utils@^0.2.16:
   version "0.2.16"
@@ -2360,13 +2360,13 @@ magic-string@^0.14.0:
   dependencies:
     vlq "^0.2.1"
 
-mapbox-gl-function@mapbox/mapbox-gl-function#9d81aa772c169eaaf0c8c8845d3d4f405c935111:
+"mapbox-gl-function@github:mapbox/mapbox-gl-function#41c6724e2bbd7bd1eb5991451bbf118b7d02b525":
   version "1.3.0"
-  resolved "https://codeload.github.com/mapbox/mapbox-gl-function/tar.gz/9d81aa772c169eaaf0c8c8845d3d4f405c935111"
+  resolved "https://codeload.github.com/mapbox/mapbox-gl-function/tar.gz/41c6724e2bbd7bd1eb5991451bbf118b7d02b525"
 
-mapbox-gl-style-spec@mapbox/mapbox-gl-style-spec#e85407a377510acb647161de6be6357ab4f606dd:
-  version "8.9.0"
-  resolved "https://codeload.github.com/mapbox/mapbox-gl-style-spec/tar.gz/e85407a377510acb647161de6be6357ab4f606dd"
+"mapbox-gl-style-spec@github:mapbox/mapbox-gl-style-spec#d11f6d2775bf5b22534b3b2fb3410755b2473cdf":
+  version "8.11.0"
+  resolved "https://codeload.github.com/mapbox/mapbox-gl-style-spec/tar.gz/d11f6d2775bf5b22534b3b2fb3410755b2473cdf"
   dependencies:
     csscolorparser "~1.0.2"
     fast-stable-stringify "^0.1.1"
@@ -2380,11 +2380,12 @@ mapbox-gl-supported@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mapbox-gl-supported/-/mapbox-gl-supported-1.2.0.tgz#cbd34df894206cadda9a33c8d9a4609f26bb1989"
 
-mapbox-gl@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.29.0.tgz#cfd3af67c4e9a471e5a2b5ba14beb4094a1d5d50"
+mapbox-gl@^0.32.0:
+  version "0.32.1"
+  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.32.1.tgz#fb12d33dc97a96ef5d2ad4f0b7827ccc247a8ad2"
   dependencies:
     "@mapbox/gl-matrix" "^0.0.1"
+    "@mapbox/unitbezier" "^0.0.0"
     brfs "^1.4.0"
     bubleify "^0.5.1"
     csscolorparser "^1.0.2"
@@ -2393,8 +2394,8 @@ mapbox-gl@^0.29.0:
     geojson-rewind "^0.1.0"
     geojson-vt "^2.4.0"
     grid-index "^1.0.0"
-    mapbox-gl-function mapbox/mapbox-gl-function#9d81aa772c169eaaf0c8c8845d3d4f405c935111
-    mapbox-gl-style-spec mapbox/mapbox-gl-style-spec#e85407a377510acb647161de6be6357ab4f606dd
+    mapbox-gl-function mapbox/mapbox-gl-function#41c6724e2bbd7bd1eb5991451bbf118b7d02b525
+    mapbox-gl-style-spec mapbox/mapbox-gl-style-spec#d11f6d2775bf5b22534b3b2fb3410755b2473cdf
     mapbox-gl-supported "^1.2.0"
     package-json-versionify "^1.0.2"
     pbf "^1.3.2"
@@ -2407,7 +2408,6 @@ mapbox-gl@^0.29.0:
     tinyqueue "^1.1.0"
     unassertify "^2.0.0"
     unflowify "^1.0.0"
-    unitbezier "^0.0.0"
     vector-tile "^1.3.0"
     vt-pbf "^2.0.2"
     webworkify "^1.4.0"
@@ -2558,8 +2558,8 @@ node-libs-browser@^2.0.0:
     vm-browserify "0.0.4"
 
 node-pre-gyp@^0.6.29:
-  version "0.6.32"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"
+  version "0.6.33"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz#640ac55198f6a925972e0c16c4ac26a034d5ecc9"
   dependencies:
     mkdirp "~0.5.1"
     nopt "~3.0.6"
@@ -2902,8 +2902,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 private@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -2941,11 +2941,11 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2, punycode@^1.2.4:
+punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.4.1:
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
@@ -3231,8 +3231,8 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
 rxjs@^5.0.0-beta.11:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.3.tgz#fc8bdf464ebf938812748e4196788f392fef9754"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720"
   dependencies:
     symbol-observable "^1.0.1"
 
@@ -3433,8 +3433,8 @@ source-list-map@~0.1.7:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
 source-map-support@^0.4.2:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.10.tgz#d7b19038040a14c0837a18e630a196453952b378"
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
   dependencies:
     source-map "^0.5.3"
 
@@ -3591,9 +3591,9 @@ strip-json-comments@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
 
-stylelint-config-standard@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-14.0.0.tgz#1164b79c3a1dd924ace1b756ad8ec00cbccb8132"
+stylelint-config-standard@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf"
 
 supercluster@^2.0.1:
   version "2.2.0"
@@ -3788,10 +3788,6 @@ unflowify@^1.0.0:
     flow-remove-types "^1.1.2"
     through "^2.3.8"
 
-unitbezier@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/unitbezier/-/unitbezier-0.0.0.tgz#33bf7f5d7284c5350bfc5c7f770fba7549c54a5e"
-
 unzip-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
@@ -3925,8 +3921,8 @@ webpack-sources@^0.1.4:
     source-map "~0.5.3"
 
 webpack@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.0.tgz#09246336b5581c9002353f75bcadb598a648f977"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
   dependencies:
     acorn "^4.0.4"
     acorn-dynamic-import "^2.0.0"
@@ -3936,7 +3932,7 @@ webpack@^2.2.0:
     enhanced-resolve "^3.0.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
-    loader-runner "^2.2.0"
+    loader-runner "^2.3.0"
     loader-utils "^0.2.16"
     memory-fs "~0.4.1"
     mkdirp "~0.5.0"
@@ -3957,10 +3953,6 @@ wgs84@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
 
-whatwg-fetch@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
-
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"