From d3b38e5e9761d23ff600f45c1c1b311e3a9fe770 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 14 Jul 2020 15:54:12 -0400
Subject: [PATCH 01/39] Initial Blueprints revamp ...

- Remove Blueprint::all()
- Add Blueprint::in() to get blueprints in a directory (namespace)
- Blueprint::find() can look in a directory
- Top level Blueprint CRUD is removed (except listing which will be repurposed) and added to Collections (eventually will get duplicated onto Taxonomies, Globals, Forms, etc)
- Collection entryBlueprints read from the directory instead of needing to be defined in its YAML file. The method is now only a getter.
- Remove editUrl and deleteUrl from Blueprint because it complicates things now that it'll be different depending on the usage. Just use the route helper.
- The "Links" toggle on the edit collection page will create/delete a link.yaml (not entry_link) blueprint, rather than add to the blueprints list.
---
 resources/blueprints/entry_link.yaml          |  11 --
 .../js/components/collections/Listing.vue     |   1 +
 resources/views/blueprints/index.blade.php    |  36 -----
 .../blueprints/create.blade.php               |   2 +-
 .../blueprints/edit.blade.php                 |   4 +-
 .../collections/blueprints/index.blade.php    |  26 ++++
 resources/views/collections/show.blade.php    |   3 +
 routes/cp.php                                 |   1 +
 src/Entries/Collection.php                    |  42 +++---
 src/Fields/Blueprint.php                      |  23 ++--
 src/Fields/BlueprintRepository.php            |  82 ++++++-----
 .../CollectionBlueprintsController.php        |  90 +++++++++++++
 .../CP/Collections/CollectionsController.php  |  56 +++++---
 .../CP/Collections/EntriesController.php      |   6 +-
 .../CP/Fields/BlueprintController.php         | 122 +----------------
 .../CP/Fields/ManagesBlueprints.php           | 103 ++++++++++++++
 src/Stache/Stores/CollectionsStore.php        |   1 -
 tests/Data/Entries/CollectionTest.php         |  48 +++++--
 tests/Data/Entries/EntryTest.php              |   8 +-
 tests/Fakes/FakeBlueprintRepository.php       |  39 ++++--
 .../Blueprints/CreateBlueprintTest.php        |  37 -----
 .../Feature/Blueprints/StoreBlueprintTest.php |  92 -------------
 .../Blueprints/CreateBlueprintTest.php        |  44 ++++++
 .../Blueprints/EditBlueprintTest.php          |  18 +--
 .../Blueprints/StoreBlueprintTest.php         | 127 ++++++++++++++++++
 .../Blueprints/UpdateBlueprintTest.php        |  80 ++++++-----
 .../Blueprints/ViewBlueprintListingTest.php   |  78 +++++++++++
 .../Collections/UpdateCollectionTest.php      |  56 ++++++--
 .../Collections/ViewCollectionListingTest.php |   2 +
 tests/Fields/BlueprintRepositoryTest.php      | 126 ++++++++---------
 tests/FrontendTest.php                        |   9 +-
 tests/Tags/Collection/CollectionTest.php      |   3 +-
 32 files changed, 843 insertions(+), 533 deletions(-)
 delete mode 100644 resources/blueprints/entry_link.yaml
 delete mode 100644 resources/views/blueprints/index.blade.php
 rename resources/views/{ => collections}/blueprints/create.blade.php (94%)
 rename resources/views/{ => collections}/blueprints/edit.blade.php (55%)
 create mode 100644 resources/views/collections/blueprints/index.blade.php
 create mode 100644 src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
 create mode 100644 src/Http/Controllers/CP/Fields/ManagesBlueprints.php
 delete mode 100644 tests/Feature/Blueprints/CreateBlueprintTest.php
 delete mode 100644 tests/Feature/Blueprints/StoreBlueprintTest.php
 create mode 100644 tests/Feature/Collections/Blueprints/CreateBlueprintTest.php
 rename tests/Feature/{ => Collections}/Blueprints/EditBlueprintTest.php (56%)
 create mode 100644 tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
 rename tests/Feature/{ => Collections}/Blueprints/UpdateBlueprintTest.php (71%)
 create mode 100644 tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php

diff --git a/resources/blueprints/entry_link.yaml b/resources/blueprints/entry_link.yaml
deleted file mode 100644
index 5c79573a60d..00000000000
--- a/resources/blueprints/entry_link.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-title: Link
-fields:
-  -
-    handle: title
-    field:
-      type: text
-  -
-    handle: redirect
-    field:
-      type: link
-      required: true
diff --git a/resources/js/components/collections/Listing.vue b/resources/js/components/collections/Listing.vue
index c958968ab09..34e74ebb4aa 100644
--- a/resources/js/components/collections/Listing.vue
+++ b/resources/js/components/collections/Listing.vue
@@ -8,6 +8,7 @@
                 <template slot="actions" slot-scope="{ row: collection, index }">
                     <dropdown-list>
                         <dropdown-item :text="__('Edit Collection')" :redirect="collection.edit_url" />
+                        <dropdown-item :text="__('Edit Blueprints')" :redirect="collection.blueprints_url" />
                         <dropdown-item :text="__('Scaffold Resources')" :redirect="collection.scaffold_url" />
                         <dropdown-item
                             v-if="collection.deleteable"
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
deleted file mode 100644
index 4a637d74b8d..00000000000
--- a/resources/views/blueprints/index.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-@extends('statamic::layout')
-@section('title', __('Blueprints'))
-
-@section('content')
-
-    @unless($blueprints->isEmpty())
-
-        <div class="flex mb-3">
-            <h1 class="flex-1">{{ __('Blueprints') }}</h1>
-
-            @can('create', 'Statamic\Fields\Blueprint')
-                <a href="{{ cp_route('blueprints.create') }}" class="btn-primary">{{ __('Create Blueprint') }}</a>
-            @endcan
-        </div>
-
-        <blueprint-listing :initial-rows="{{ json_encode($blueprints) }}"></blueprint-listing>
-
-    @else
-
-        @include('statamic::partials.empty-state', [
-            'title' => __('Blueprints'),
-            'description' => __('statamic::messages.blueprints_intro'),
-            'svg' => 'empty/form',
-            'button_text' => __('Create Blueprint'),
-            'button_url' => cp_route('blueprints.create'),
-            'can' => $user->can('create', 'Statamic\Fields\Blueprint')
-        ])
-
-    @endunless
-
-    @include('statamic::partials.docs-callout', [
-        'topic' => __('Blueprints'),
-        'url' => Statamic::docsUrl('blueprints')
-    ])
-
-@endsection
diff --git a/resources/views/blueprints/create.blade.php b/resources/views/collections/blueprints/create.blade.php
similarity index 94%
rename from resources/views/blueprints/create.blade.php
rename to resources/views/collections/blueprints/create.blade.php
index fa718b1be03..53447b6e3f2 100644
--- a/resources/views/blueprints/create.blade.php
+++ b/resources/views/collections/blueprints/create.blade.php
@@ -2,7 +2,7 @@
 @section('title', __('Create Blueprint'))
 
 @section('content')
-<form action="{{ cp_route('blueprints.store') }}" method="POST">
+<form action="{{ $action }}" method="POST">
     @csrf
     <div class="max-w-lg mt-2 mx-auto">
         <div class="rounded p-3 lg:px-7 lg:py-5 shadow bg-white">
diff --git a/resources/views/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
similarity index 55%
rename from resources/views/blueprints/edit.blade.php
rename to resources/views/collections/blueprints/edit.blade.php
index 46c93fad303..3c37e8073d3 100644
--- a/resources/views/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -4,8 +4,8 @@
 @section('content')
 
     <blueprint-builder
-        action="{{ cp_route('blueprints.update', $blueprint->handle()) }}"
-        breadcrumb-url="{{ cp_route('blueprints.index') }}"
+        action="{{ cp_route('collections.blueprints.update', [$collection, $blueprint]) }}"
+        breadcrumb-url="{{ cp_route('collections.blueprints.index', $collection) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/collections/blueprints/index.blade.php b/resources/views/collections/blueprints/index.blade.php
new file mode 100644
index 00000000000..01315b9c3a7
--- /dev/null
+++ b/resources/views/collections/blueprints/index.blade.php
@@ -0,0 +1,26 @@
+@extends('statamic::layout')
+@section('title', __('Blueprints'))
+
+@section('content')
+
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('collections.show', $collection->handle()),
+        'title' => $collection->title()
+    ])
+
+    <div class="flex justify-between items-center mb-3">
+        <h1>@yield('title')</h1>
+
+        @can('create', 'Statamic\Fields\Blueprint')
+            <a href="{{ cp_route('collections.blueprints.create', $collection) }}" class="btn-primary">{{ __('Create Blueprint') }}</a>
+        @endcan
+    </div>
+
+    <blueprint-listing :initial-rows="{{ json_encode($blueprints) }}"></blueprint-listing>
+
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
+@endsection
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index e0b6ee3cbbd..ef087ab9783 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -32,6 +32,9 @@
             @can('edit', $collection)
                 <dropdown-item :text="__('Edit Collection')" redirect="{{ $collection->editUrl() }}"></dropdown-item>
             @endcan
+            @can('configure fields', $collection)
+                <dropdown-item :text="__('Edit Blueprints')" redirect="{{ cp_route('collections.blueprints.index', $collection) }}"></dropdown-item>
+            @endcan
             @can('edit', $collection)
                 <dropdown-item :text="__('Scaffold Resources')" redirect="{{ cp_route('collections.scaffold', $collection->handle()) }}"></dropdown-item>
             @endcan
diff --git a/routes/cp.php b/routes/cp.php
index 4a0a626a3f9..984b5436f77 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -36,6 +36,7 @@
         Route::post('collections/{collection}/structure', 'CollectionStructureController@update')->name('collections.structure.update');
         Route::get('collections/{collection}/scaffold', 'ScaffoldCollectionController@index')->name('collections.scaffold');
         Route::post('collections/{collection}/scaffold', 'ScaffoldCollectionController@create')->name('collections.scaffold.create');
+        Route::resource('collections.blueprints', 'CollectionBlueprintsController');
 
         Route::group(['prefix' => 'collections/{collection}/entries'], function () {
             Route::get('/', 'EntriesController@index')->name('collections.entries.index');
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 8e9063512a7..5f5b8f78b02 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -191,35 +191,39 @@ public function queryEntries()
         return Facades\Entry::query()->where('collection', $this->handle());
     }
 
-    public function entryBlueprints($blueprints = null)
+    public function entryBlueprints()
     {
-        return $this
-            ->fluentlyGetOrSet('blueprints')
-            ->getter(function ($blueprints) {
-                $blueprints = $blueprints ?? [$this->fallbackEntryBlueprint()->handle()];
+        $blueprints = Blueprint::in('collections/'.$this->handle());
 
-                return collect($blueprints)->map(function ($handle) {
-                    throw_unless($blueprint = Blueprint::find($handle), new \Exception("Blueprint [$handle] not found"));
+        if ($blueprints->isEmpty()) {
+            $blueprints = collect([$this->fallbackEntryBlueprint()]);
+        }
 
-                    return $this->ensureEntryBlueprintFields($blueprint);
-                });
-            })
-            ->setter(function ($blueprints) {
-                return empty($blueprints) ? null : $blueprints;
-            })
-            ->args(func_get_args());
+        return $blueprints->values()->map(function ($blueprint) {
+            return $this->ensureEntryBlueprintFields($blueprint);
+        });
     }
 
-    public function entryBlueprint()
+    public function entryBlueprint($blueprint = null)
     {
-        return $this->ensureEntryBlueprintFields(
-            $this->entryBlueprints()->first() ?? $this->fallbackEntryBlueprint()
-        );
+        $blueprint = is_null($blueprint)
+            ? $this->entryBlueprints()->first()
+            : $this->entryBlueprints()->keyBy->handle()->get($blueprint);
+
+        return $blueprint ? $this->ensureEntryBlueprintFields($blueprint) : null;
     }
 
     public function fallbackEntryBlueprint()
     {
-        return Blueprint::find('default');
+        $blueprint = Blueprint::find('default')
+            ->setHandle($this->handle())
+            ->setNamespace('collections.'.$this->handle());
+
+        $contents = $blueprint->contents();
+        $contents['title'] = $this->title();
+        $blueprint->setContents($contents);
+
+        return $blueprint;
     }
 
     public function ensureEntryBlueprintFields($blueprint)
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 04e62661c67..ee223dbacbb 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -19,6 +19,7 @@ class Blueprint implements Augmentable
     use HasAugmentedData;
 
     protected $handle;
+    protected $namespace;
     protected $contents = [];
     protected $fieldsCache;
 
@@ -34,6 +35,18 @@ public function handle(): ?string
         return $this->handle;
     }
 
+    public function setNamespace(?string $namespace)
+    {
+        $this->namespace = $namespace;
+
+        return $this;
+    }
+
+    public function namespace(): ?string
+    {
+        return $this->namespace;
+    }
+
     public function setContents(array $contents)
     {
         if ($fields = array_pull($contents, 'fields')) {
@@ -134,16 +147,6 @@ public function toPublishArray()
         ];
     }
 
-    public function editUrl()
-    {
-        return $this->handle() ? cp_route('blueprints.edit', $this->handle()) : null;
-    }
-
-    public function deleteUrl()
-    {
-        return $this->handle() ? cp_route('blueprints.destroy', $this->handle()) : null;
-    }
-
     public function save()
     {
         BlueprintRepository::save($this);
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 63a499cfbe6..1515d4b4fdd 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -2,10 +2,10 @@
 
 namespace Statamic\Fields;
 
-use Illuminate\Support\Collection;
 use Statamic\Facades\File;
 use Statamic\Facades\Path;
 use Statamic\Facades\YAML;
+use Statamic\Support\Str;
 
 class BlueprintRepository
 {
@@ -28,66 +28,60 @@ public function setFallbackDirectory(string $directory)
         return $this;
     }
 
-    public function find($handle): ?Blueprint
+    public function find($blueprint): ?Blueprint
     {
-        if (! $handle) {
+        if (! $blueprint) {
             return null;
         }
 
-        if ($cached = array_get($this->blueprints, $handle)) {
+        $path = str_replace('.', '/', $blueprint);
+
+        if ($cached = array_get($this->blueprints, $path)) {
             return $cached;
         }
 
-        if (! File::exists($path = "{$this->directory}/{$handle}.yaml")) {
-            if (! File::exists($path = "{$this->fallbackDirectory}/{$handle}.yaml")) {
+        if (! File::exists($file = "{$this->directory}/{$path}.yaml")) {
+            if (! File::exists($file = "{$this->fallbackDirectory}/{$path}.yaml")) {
                 return null;
             }
         }
 
+        $str = str_replace('/', '.', $path);
+        $parts = explode('.', $str);
+        $handle = array_pop($parts);
+        $namespace = implode('.', $parts);
+
         $blueprint = (new Blueprint)
             ->setHandle($handle)
-            ->setContents(YAML::parse(File::get($path)));
+            ->setNamespace(empty($namespace) ? null : $namespace)
+            ->setContents(YAML::file($file)->parse());
 
         $this->blueprints[$handle] = $blueprint;
 
         return $blueprint;
     }
 
-    public function all(): Collection
-    {
-        if (! File::exists($this->directory)) {
-            return collect();
-        }
-
-        return File::withAbsolutePaths()
-            ->getFilesByTypeRecursively($this->directory, 'yaml')
-            ->map(function ($file) {
-                $basename = str_after($file, str_finish($this->directory, '/'));
-                $handle = str_before($basename, '.yaml');
-                $handle = str_replace('/', '.', $handle);
-
-                return (new Blueprint)
-                    ->setHandle($handle)
-                    ->setContents(YAML::file($file)->parse());
-            })
-            ->keyBy->handle();
-    }
-
     public function save(Blueprint $blueprint)
     {
         if (! File::exists($this->directory)) {
             File::makeDirectory($this->directory);
         }
 
-        File::put(
-            "{$this->directory}/{$blueprint->handle()}.yaml",
-            YAML::dump($blueprint->contents())
-        );
+        File::put($this->path($blueprint), YAML::dump($blueprint->contents()));
     }
 
     public function delete(Blueprint $blueprint)
     {
-        File::delete("{$this->directory}/{$blueprint->handle()}.yaml");
+        File::delete($this->path($blueprint));
+    }
+
+    private function path($blueprint)
+    {
+        return Path::tidy(vsprintf('%s/%s/%s.yaml', [
+            $this->directory,
+            str_replace('.', '/', $blueprint->namespace()),
+            $blueprint->handle(),
+        ]));
     }
 
     public function make($handle = null)
@@ -124,4 +118,28 @@ public function makeFromSections($sections)
 
         return (new Blueprint)->setContents(compact('sections'));
     }
+
+    public function in(string $namespace)
+    {
+        $namespace = str_replace('/', '.', $namespace);
+        $dir = str_replace('.', '/', $namespace);
+        $path = $this->directory.'/'.$dir;
+
+        if (! File::exists($path)) {
+            return collect();
+        }
+
+        return File::withAbsolutePaths()
+            ->getFilesByType($path, 'yaml')
+            ->map(function ($file) use ($dir, $namespace) {
+                $basename = Str::after($file, Str::finish($dir, '/'));
+                $handle = Str::before($basename, '.yaml');
+
+                return (new Blueprint)
+                    ->setHandle($handle)
+                    ->setNamespace($namespace)
+                    ->setContents(YAML::file($file)->parse());
+            })
+            ->keyBy->handle();
+    }
 }
diff --git a/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
new file mode 100644
index 00000000000..84e41220864
--- /dev/null
+++ b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Collections;
+
+use Illuminate\Http\Request;
+use Statamic\Contracts\Entries\Collection as CollectionContract;
+use Statamic\Facades\Blueprint;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class CollectionBlueprintsController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function index(CollectionContract $collection)
+    {
+        $blueprints = $this->indexItems($collection->entryBlueprints(), $collection);
+
+        return view('statamic::collections.blueprints.index', compact('collection', 'blueprints'));
+    }
+
+    private function editUrl($collection, $blueprint)
+    {
+        return cp_route('collections.blueprints.edit', [$collection, $blueprint]);
+    }
+
+    private function deleteUrl($collection, $blueprint)
+    {
+        return cp_route('collections.blueprints.destroy', [$collection, $blueprint]);
+    }
+
+    public function edit($collection, $blueprint)
+    {
+        $blueprint = $collection->entryBlueprint($blueprint);
+
+        return view('statamic::collections.blueprints.edit', [
+            'collection' => $collection,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $collection, $blueprint)
+    {
+        $blueprint = $collection->entryBlueprint($blueprint);
+
+        $this->updateBlueprint($request, $blueprint);
+
+        $blueprint->save();
+    }
+
+    public function create($collection)
+    {
+        return view('statamic::collections.blueprints.create', [
+            'action' => cp_route('collections.blueprints.store', $collection),
+        ]);
+    }
+
+    public function store(Request $request, $collection)
+    {
+        $request->validate(['title' => 'required']);
+
+        // If there are no user-defined blueprints, save the default one.
+        // To the user, it would have looked like the default one existed since it's in the listing.
+        // The new one the user is about to create should be considered the second one.
+        if (Blueprint::in('collections/'.$collection->handle())->count() === 0) {
+            $collection->entryBlueprint()->save();
+        }
+
+        $blueprint = $this->storeBlueprint($request, 'collections.'.$collection->handle());
+
+        return redirect()
+            ->cpRoute('collections.blueprints.edit', [$collection, $blueprint])
+            ->with('success', __('Blueprint created'));
+    }
+
+    public function destroy($collection, $blueprint)
+    {
+        $blueprint = $collection->entryBlueprint($blueprint);
+
+        $this->authorize('delete', $blueprint);
+
+        $blueprint->delete();
+    }
+}
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index efcdf63313b..6cde8a94c9f 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -30,6 +30,7 @@ public function index()
                 'edit_url' => $collection->editUrl(),
                 'delete_url' => $collection->deleteUrl(),
                 'entries_url' => cp_route('collections.show', $collection->handle()),
+                'blueprints_url' => cp_route('collections.blueprints.index', $collection->handle()),
                 'scaffold_url' => cp_route('collections.scaffold', $collection->handle()),
                 'deleteable' => User::current()->can('delete', $collection),
             ];
@@ -120,10 +121,7 @@ public function edit($collection)
             'sort_direction' => $collection->sortDirection(),
             'max_depth' => optional($collection->structure())->maxDepth(),
             'expects_root' => optional($collection->structure())->expectsRoot(),
-            'blueprints' => $collection->entryBlueprints()->map->handle()->reject(function ($handle) {
-                return $handle == 'entry_link';
-            })->all(),
-            'links' => $collection->entryBlueprints()->map->handle()->contains('entry_link'),
+            'links' => $collection->entryBlueprints()->map->handle()->contains('link'),
             'taxonomies' => $collection->taxonomies()->map->handle()->all(),
             'default_publish_state' => $collection->defaultPublishState(),
             'template' => $collection->template(),
@@ -189,12 +187,7 @@ public function update(Request $request, $collection)
 
         $values = $fields->process()->values()->all();
 
-        $blueprints = collect($values['blueprints']);
-        if ($values['links']) {
-            $blueprints->push('entry_link')->unique();
-        } elseif ($blueprints->contains('entry_link')) {
-            $blueprints->diff(['entry_link'])->values();
-        }
+        $this->updateLinkBlueprint($values['links'], $collection);
 
         $collection
             ->title($values['title'])
@@ -205,7 +198,6 @@ public function update(Request $request, $collection)
             ->defaultPublishState($values['default_publish_state'])
             ->sortDirection($values['sort_direction'])
             ->ampable($values['amp'])
-            ->entryBlueprints($blueprints->all())
             ->mount($values['mount'] ?? null)
             ->taxonomies($values['taxonomies'] ?? [])
             ->futureDateBehavior(array_get($values, 'future_date_behavior'))
@@ -227,6 +219,34 @@ public function update(Request $request, $collection)
         return $collection->toArray();
     }
 
+    protected function updateLinkBlueprint($shouldExist, $collection)
+    {
+        $namespace = 'collections.'.$collection->handle();
+        $alreadyExists = Blueprint::in($namespace)->has('link');
+
+        if ($shouldExist && ! $alreadyExists) {
+            $this->createLinkBlueprint($namespace);
+        }
+
+        if (! $shouldExist && $alreadyExists) {
+            Blueprint::find($namespace.'.link')->delete();
+        }
+    }
+
+    protected function createLinkBlueprint($namespace)
+    {
+        Blueprint::make('link')
+            ->setNamespace($namespace)
+            ->setContents([
+                'title' => __('Link'),
+                'fields' => [
+                    ['handle' => 'title', 'field' => ['type' => 'text']],
+                    ['handle' => 'redirect', 'field' => ['type' => 'link', 'required' => true]],
+                ],
+            ])
+            ->save();
+    }
+
     protected function makeStructure($collection, $maxDepth, $expectsRoot, $sites)
     {
         if (! $structure = $collection->structure()) {
@@ -330,13 +350,13 @@ protected function editFormBlueprint()
             'content_model' => [
                 'display' => __('Content Model'),
                 'fields' => [
-                    'blueprints' => [
-                        'display' => __('Blueprints'),
-                        'instructions' => __('statamic::messages.collections_blueprint_instructions'),
-                        'type' => 'blueprints',
-                        'validate' => 'array',
-                        'mode' => 'select',
-                    ],
+                    // 'blueprints' => [
+                    //     'display' => __('Blueprints'),
+                    //     'instructions' => __('statamic::messages.collections_blueprint_instructions'),
+                    //     'type' => 'blueprints',
+                    //     'validate' => 'array',
+                    //     'mode' => 'select',
+                    // ],
                     'links' => [
                         'display' => __('Links'),
                         'instructions' => __('statamic::messages.collections_links_instructions'),
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 8cf08047896..ec1817b5fc6 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -96,7 +96,7 @@ public function edit(Request $request, $collection, $entry)
                 'revisions' => $entry->revisionsUrl(),
                 'restore' => $entry->restoreRevisionUrl(),
                 'createRevision' => $entry->createRevisionUrl(),
-                'editBlueprint' => $blueprint->editUrl(),
+                'editBlueprint' => cp_route('collections.blueprints.edit', [$collection, $blueprint]),
             ],
             'values' => array_merge($values, ['id' => $entry->id()]),
             'meta' => $meta,
@@ -206,9 +206,7 @@ public function create(Request $request, $collection, $site)
     {
         $this->authorize('create', [EntryContract::class, $collection]);
 
-        $blueprint = $request->blueprint
-            ? $collection->ensureEntryBlueprintFields(Blueprint::find($request->blueprint))
-            : $collection->entryBlueprint();
+        $blueprint = $collection->entryBlueprint($request->blueprint);
 
         if (! $blueprint) {
             throw new \Exception(__('A valid blueprint is required.'));
diff --git a/src/Http/Controllers/CP/Fields/BlueprintController.php b/src/Http/Controllers/CP/Fields/BlueprintController.php
index 0eabab4d8cb..be9846e513c 100644
--- a/src/Http/Controllers/CP/Fields/BlueprintController.php
+++ b/src/Http/Controllers/CP/Fields/BlueprintController.php
@@ -2,12 +2,7 @@
 
 namespace Statamic\Http\Controllers\CP\Fields;
 
-use Illuminate\Http\Request;
-use Statamic\Facades;
-use Statamic\Fields\Blueprint;
-use Statamic\Fields\FieldTransformer;
 use Statamic\Http\Controllers\CP\CpController;
-use Statamic\Support\Str;
 
 class BlueprintController extends CpController
 {
@@ -18,123 +13,8 @@ public function __construct()
 
     public function index()
     {
-        $blueprints = Facades\Blueprint::all()->map(function ($blueprint) {
-            return [
-                'id' => $blueprint->handle(),
-                'handle' => $blueprint->handle(),
-                'title' => $blueprint->title(),
-                'sections' => $blueprint->sections()->count(),
-                'fields' => $blueprint->fields()->all()->count(),
-                'edit_url' => $blueprint->editUrl(),
-                'delete_url' => $blueprint->deleteUrl(),
-            ];
-        })->values();
+        // TODO
 
         return view('statamic::blueprints.index', compact('blueprints'));
     }
-
-    public function create()
-    {
-        return view('statamic::blueprints.create');
-    }
-
-    public function store(Request $request)
-    {
-        $request->validate([
-            'title' => 'required',
-        ]);
-
-        $handle = Str::snake($request->title);
-
-        if (Facades\Blueprint::find($handle)) {
-            return back()->withInput()->with('error', __('A blueprint with that name already exists.'));
-        }
-
-        $blueprint = (new Blueprint)
-            ->setHandle($handle)
-            ->setContents([
-                'title' => $request->title,
-                'sections' => [
-                    'main' => [
-                        'display' => __('Main'),
-                        'fields' => [],
-                    ],
-                ],
-            ])->save();
-
-        return redirect($blueprint->editUrl())->with('success', __('Blueprint created'));
-    }
-
-    public function edit($blueprint)
-    {
-        $blueprint = Facades\Blueprint::find($blueprint);
-
-        return view('statamic::blueprints.edit', [
-            'blueprint' => $blueprint,
-            'blueprintVueObject' => $this->toVueObject($blueprint),
-        ]);
-    }
-
-    public function update(Request $request, $blueprint)
-    {
-        $blueprint = Facades\Blueprint::find($blueprint);
-
-        $request->validate([
-            'title' => 'required',
-            'sections' => 'array',
-        ]);
-
-        $sections = collect($request->sections)->mapWithKeys(function ($section) {
-            return [array_pull($section, 'handle') => [
-                'display' => $section['display'],
-                'fields' => $this->sectionFields($section['fields']),
-            ]];
-        })->all();
-        $blueprint->setContents([
-            'title' => $request->title,
-            'sections' => $sections,
-        ])->save();
-
-        return response('', 204);
-    }
-
-    private function sectionFields(array $fields)
-    {
-        return collect($fields)->map(function ($field) {
-            return FieldTransformer::fromVue($field);
-        })->all();
-    }
-
-    private function toVueObject(Blueprint $blueprint): array
-    {
-        return [
-            'title' => $blueprint->title(),
-            'handle' => $blueprint->handle(),
-            'sections' => $blueprint->sections()->map(function ($section, $i) {
-                return array_merge($this->sectionToVue($section), ['_id' => $i]);
-            })->values()->all(),
-        ];
-    }
-
-    private function sectionToVue($section): array
-    {
-        return [
-            'handle' => $section->handle(),
-            'display' => $section->display(),
-            'fields' => collect($section->contents()['fields'])->map(function ($field, $i) {
-                return array_merge(FieldTransformer::toVue($field), ['_id' => $i]);
-            })->all(),
-        ];
-    }
-
-    public function destroy($blueprint)
-    {
-        $blueprint = Facades\Blueprint::find($blueprint);
-
-        $this->authorize('delete', $blueprint);
-
-        $blueprint->delete();
-
-        return response('');
-    }
 }
diff --git a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
new file mode 100644
index 00000000000..45a9daae9fc
--- /dev/null
+++ b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Fields;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Illuminate\Validation\ValidationException;
+use Statamic\Facades;
+use Statamic\Fields\Blueprint;
+use Statamic\Fields\FieldTransformer;
+use Statamic\Support\Str;
+
+trait ManagesBlueprints
+{
+    private function indexItems(Collection $blueprints, $item)
+    {
+        return $blueprints->map(function ($blueprint) use ($item) {
+            return [
+                'id' => $blueprint->handle(),
+                'handle' => $blueprint->handle(),
+                'title' => $blueprint->title(),
+                'sections' => $blueprint->sections()->count(),
+                'fields' => $blueprint->fields()->all()->count(),
+                'edit_url' => $this->editUrl($item, $blueprint),
+                'delete_url' => $this->deleteUrl($item, $blueprint),
+            ];
+        })->values();
+    }
+
+    private function updateBlueprint(Request $request, Blueprint $blueprint)
+    {
+        $request->validate([
+            'title' => 'required',
+            'sections' => 'array',
+        ]);
+
+        $sections = collect($request->sections)->mapWithKeys(function ($section) {
+            return [array_pull($section, 'handle') => [
+                'display' => $section['display'],
+                'fields' => $this->sectionFields($section['fields']),
+            ]];
+        })->all();
+        $blueprint->setContents([
+            'title' => $request->title,
+            'sections' => $sections,
+        ])->save();
+    }
+
+    private function sectionFields(array $fields)
+    {
+        return collect($fields)->map(function ($field) {
+            return FieldTransformer::fromVue($field);
+        })->all();
+    }
+
+    private function toVueObject(Blueprint $blueprint): array
+    {
+        return [
+            'title' => $blueprint->title(),
+            'handle' => $blueprint->handle(),
+            'sections' => $blueprint->sections()->map(function ($section, $i) {
+                return array_merge($this->sectionToVue($section), ['_id' => $i]);
+            })->values()->all(),
+        ];
+    }
+
+    private function sectionToVue($section): array
+    {
+        return [
+            'handle' => $section->handle(),
+            'display' => $section->display(),
+            'fields' => collect($section->contents()['fields'])->map(function ($field, $i) {
+                return array_merge(FieldTransformer::toVue($field), ['_id' => $i]);
+            })->all(),
+        ];
+    }
+
+    private function storeBlueprint(Request $request, string $namespace)
+    {
+        $handle = Str::snake($request->title);
+
+        if (Facades\Blueprint::find($handle)) {
+            throw ValidationException::withMessages([__('A blueprint with that name already exists.')]);
+        }
+
+        $blueprint = (new Blueprint)
+            ->setHandle($handle)
+            ->setNamespace($namespace)
+            ->setContents([
+                'title' => $request->title,
+                'sections' => [
+                    'main' => [
+                        'display' => __('Main'),
+                        'fields' => [],
+                    ],
+                ],
+            ]);
+
+        $blueprint->save();
+
+        return $blueprint;
+    }
+}
diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index a8e38fe5b13..171c1e52640 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -46,7 +46,6 @@ public function makeItemFromFile($path, $contents)
             ->template(array_get($data, 'template'))
             ->layout(array_get($data, 'layout'))
             ->cascade(array_get($data, 'inject', []))
-            ->entryBlueprints(array_get($data, 'blueprints'))
             ->searchIndex(array_get($data, 'search_index'))
             ->revisionsEnabled(array_get($data, 'revisions', false))
             ->defaultPublishState($this->getDefaultPublishState($data))
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index d4b13524c62..aa89e5955a4 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -208,24 +208,50 @@ public function it_gets_values_from_the_cascade_with_fallbacks()
     }
 
     /** @test */
-    public function it_gets_and_sets_entry_blueprints()
+    public function it_gets_entry_blueprints()
     {
-        BlueprintRepository::shouldReceive('find')->with('default')->andReturn($default = new Blueprint);
-        BlueprintRepository::shouldReceive('find')->with('one')->andReturn($blueprintOne = new Blueprint);
-        BlueprintRepository::shouldReceive('find')->with('two')->andReturn($blueprintTwo = new Blueprint);
-
-        $collection = new Collection;
-        $this->assertCount(0, $collection->entryBlueprints());
-        $this->assertEquals($default, $collection->entryBlueprint());
+        $collection = (new Collection)->handle('blog');
 
-        $return = $collection->entryBlueprints(['one', 'two']);
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect([
+            'one' => $blueprintOne = (new Blueprint)->setHandle('one'),
+            'two' => $blueprintTwo = (new Blueprint)->setHandle('two'),
+        ]));
 
-        $this->assertEquals($collection, $return);
         $blueprints = $collection->entryBlueprints();
         $this->assertCount(2, $blueprints);
         $this->assertEveryItemIsInstanceOf(Blueprint::class, $blueprints);
-        $this->assertEquals([$blueprintOne, $blueprintTwo], $blueprints->values()->all());
+        $this->assertEquals([$blueprintOne, $blueprintTwo], $blueprints->all());
+
         $this->assertEquals($blueprintOne, $collection->entryBlueprint());
+        $this->assertEquals($blueprintOne, $collection->entryBlueprint('one'));
+        $this->assertEquals($blueprintTwo, $collection->entryBlueprint('two'));
+        $this->assertNull($collection->entryBlueprint('three'));
+    }
+
+    /** @test */
+    public function no_existing_blueprints_will_fall_back_to_a_default_named_after_the_collection()
+    {
+        $collection = (new Collection)->handle('blog');
+
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect());
+        BlueprintRepository::shouldReceive('find')->with('default')->andReturn(
+            $blueprint = (new Blueprint)
+                ->setHandle('thisll_change')
+                ->setContents(['title' => 'This will change'])
+        );
+
+        $blueprints = $collection->entryBlueprints();
+        $this->assertCount(1, $blueprints);
+        $this->assertEquals([$blueprint], $blueprints->all());
+
+        tap($collection->entryBlueprint(), function ($default) use ($blueprint) {
+            $this->assertEquals($blueprint, $default);
+            $this->assertEquals('blog', $default->handle());
+            $this->assertEquals('Blog', $default->title());
+        });
+
+        $this->assertEquals($blueprint, $collection->entryBlueprint('blog'));
+        $this->assertNull($collection->entryBlueprint('two'));
     }
 
     /** @test */
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 6ddd1cc4ee6..183d28218a8 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -539,10 +539,12 @@ public function it_gets_the_blueprint_when_defined_on_itself()
     /** @test */
     public function it_gets_the_blueprint_based_on_the_collection()
     {
-        BlueprintRepository::shouldReceive('find')->with('test')->andReturn($blueprint = new Blueprint);
-        BlueprintRepository::shouldReceive('find')->with('another')->andReturn(new Blueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/test')->andReturn(collect([
+            $blueprint = new Blueprint,
+            new Blueprint,
+        ]));
 
-        $collection = tap(Collection::make('test')->entryBlueprints(['test', 'another']))->save();
+        $collection = tap(Collection::make('test'))->save();
         $entry = (new Entry)->collection($collection);
 
         $this->assertEquals($blueprint, $entry->blueprint());
diff --git a/tests/Fakes/FakeBlueprintRepository.php b/tests/Fakes/FakeBlueprintRepository.php
index a518e3fd3d2..213aff7fbef 100644
--- a/tests/Fakes/FakeBlueprintRepository.php
+++ b/tests/Fakes/FakeBlueprintRepository.php
@@ -3,33 +3,52 @@
 namespace Tests\Fakes;
 
 use Statamic\Fields\Blueprint;
+use Statamic\Fields\BlueprintRepository;
+use Statamic\Support\Arr;
 
-class FakeBlueprintRepository
+class FakeBlueprintRepository extends BlueprintRepository
 {
+    protected $repo;
     protected $blueprints;
 
-    public function __construct()
+    public function __construct($repo)
     {
-        $this->blueprints = collect();
+        $this->blueprints = [];
+
+        $this->repo = $repo->setDirectory(__DIR__.'/../__fixtures__/dev-null/blueprints');
     }
 
-    public function find(string $handle): ?Blueprint
+    public function find($blueprint): ?Blueprint
     {
-        if ($blueprint = array_get($this->blueprints, $handle)) {
+        $parts = explode('.', $blueprint);
+        $handle = array_pop($parts);
+        $namespace = implode('.', $parts);
+        $namespace = empty($namespace) ? '*' : $namespace;
+
+        if ($found = Arr::get($this->blueprints[$namespace] ?? [], $handle)) {
             // Return a clone so that modifications to the object will only be updated when saving.
-            return clone $blueprint;
+            return clone $found;
         }
 
-        return null;
+        // Fall back to the actual repo, so it can find fallbacks.
+        return $this->repo->find($handle);
     }
 
     public function save(Blueprint $blueprint)
     {
-        $this->blueprints[$blueprint->handle()] = $blueprint;
+        $this->blueprints[$blueprint->namespace() ?? '*'][$blueprint->handle()] = $blueprint;
+    }
+
+    public function delete(Blueprint $blueprint)
+    {
+        $namespace = $blueprint->namespace() ?? '*';
+        $blueprints = $this->blueprints[$namespace];
+        unset($blueprints[$blueprint->handle()]);
+        $this->blueprints = $blueprints;
     }
 
-    public function all()
+    public function in($namespace)
     {
-        return $this->blueprints;
+        return collect($this->blueprints[str_replace('/', '.', $namespace)] ?? []);
     }
 }
diff --git a/tests/Feature/Blueprints/CreateBlueprintTest.php b/tests/Feature/Blueprints/CreateBlueprintTest.php
deleted file mode 100644
index 98b4b27dfb9..00000000000
--- a/tests/Feature/Blueprints/CreateBlueprintTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Tests\Feature\Blueprints;
-
-use Facades\Statamic\Fields\BlueprintRepository;
-use Statamic\Facades;
-use Tests\Fakes\FakeBlueprintRepository;
-use Tests\FakesRoles;
-use Tests\PreventSavingStacheItemsToDisk;
-use Tests\TestCase;
-
-class CreateBlueprintTest extends TestCase
-{
-    use FakesRoles;
-    use PreventSavingStacheItemsToDisk;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        BlueprintRepository::swap(new FakeBlueprintRepository);
-    }
-
-    /** @test */
-    public function it_denies_access_if_you_dont_have_permission()
-    {
-        $this->setTestRoles(['test' => ['access cp']]);
-        $user = tap(Facades\User::make()->assignRole('test'))->save();
-
-        $this
-            ->from('/original')
-            ->actingAs($user)
-            ->get(cp_route('blueprints.create'))
-            ->assertRedirect('/original')
-            ->assertSessionHas('error');
-    }
-}
diff --git a/tests/Feature/Blueprints/StoreBlueprintTest.php b/tests/Feature/Blueprints/StoreBlueprintTest.php
deleted file mode 100644
index 31e6f89d81d..00000000000
--- a/tests/Feature/Blueprints/StoreBlueprintTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Tests\Feature\Blueprints;
-
-use Facades\Statamic\Fields\BlueprintRepository;
-use Statamic\Facades;
-use Tests\Fakes\FakeBlueprintRepository;
-use Tests\FakesRoles;
-use Tests\PreventSavingStacheItemsToDisk;
-use Tests\TestCase;
-
-class StoreBlueprintTest extends TestCase
-{
-    use FakesRoles;
-    use PreventSavingStacheItemsToDisk;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        BlueprintRepository::swap(new FakeBlueprintRepository);
-    }
-
-    /** @test */
-    public function it_denies_access_if_you_dont_have_permission()
-    {
-        $this->setTestRoles(['test' => ['access cp']]);
-        $user = tap(Facades\User::make()->assignRole('test'))->save();
-        $this->assertCount(0, Facades\Blueprint::all());
-
-        $this
-            ->from('/original')
-            ->actingAs($user)
-            ->submit()
-            ->assertRedirect('/original')
-            ->assertSessionHas('error');
-
-        $this->assertCount(0, Facades\Blueprint::all());
-    }
-
-    /** @test */
-    public function blueprint_gets_saved()
-    {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $this->assertCount(0, Facades\Blueprint::all());
-
-        $this
-            ->actingAs($user)
-            ->submit(['title' => 'My Test Blueprint'])
-            ->assertRedirect('/cp/fields/blueprints/my_test_blueprint/edit');
-
-        $this->assertCount(1, Facades\Blueprint::all());
-        $blueprint = Facades\Blueprint::all()->first();
-        $this->assertEquals('my_test_blueprint', $blueprint->handle());
-        $this->assertEquals([
-            'title' => 'My Test Blueprint',
-            'sections' => [
-                'main' => [
-                    'display' => 'Main',
-                    'fields' => [],
-                ],
-            ],
-        ], $blueprint->contents());
-    }
-
-    /** @test */
-    public function title_is_required()
-    {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-
-        $this
-            ->from('/original')
-            ->actingAs($user)
-            ->submit(['title' => ''])
-            ->assertRedirect('/original')
-            ->assertSessionHasErrors('title');
-
-        $this->assertCount(0, Facades\Blueprint::all());
-    }
-
-    private function submit($params = [])
-    {
-        return $this->post(cp_route('blueprints.store'), $this->validParams($params));
-    }
-
-    private function validParams($overrides = [])
-    {
-        return array_merge([
-            'title' => 'Test',
-        ], $overrides);
-    }
-}
diff --git a/tests/Feature/Collections/Blueprints/CreateBlueprintTest.php b/tests/Feature/Collections/Blueprints/CreateBlueprintTest.php
new file mode 100644
index 00000000000..adf25eb3c4d
--- /dev/null
+++ b/tests/Feature/Collections/Blueprints/CreateBlueprintTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Feature\Collections\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Facades\Collection;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CreateBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_shows_the_form()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Collection::make('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('collections.blueprints.create', 'test'))
+            ->assertOk()
+            ->assertViewIs('statamic::collections.blueprints.create');
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Collection::make('test'))->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->get(cp_route('collections.blueprints.create', 'test'))
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+}
diff --git a/tests/Feature/Blueprints/EditBlueprintTest.php b/tests/Feature/Collections/Blueprints/EditBlueprintTest.php
similarity index 56%
rename from tests/Feature/Blueprints/EditBlueprintTest.php
rename to tests/Feature/Collections/Blueprints/EditBlueprintTest.php
index cc4cd233c35..fa536278da7 100644
--- a/tests/Feature/Blueprints/EditBlueprintTest.php
+++ b/tests/Feature/Collections/Blueprints/EditBlueprintTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Feature\Blueprints;
+namespace Tests\Feature\Collections\Blueprints;
 
 use Statamic\Facades;
-use Statamic\Fields\Blueprint;
+use Statamic\Facades\Collection;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -18,12 +18,13 @@ public function it_denies_access_if_you_dont_have_permission()
     {
         $this->setTestRoles(['test' => ['access cp']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
-        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $collection = tap(Collection::make('test'))->save();
+        $blueprint = $collection->entryBlueprint();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->get($blueprint->editUrl())
+            ->get(cp_route('collections.blueprints.edit', [$collection, $blueprint]))
             ->assertRedirect('/original')
             ->assertSessionHas('error');
     }
@@ -31,13 +32,14 @@ public function it_denies_access_if_you_dont_have_permission()
     /** @test */
     public function it_provides_the_blueprint()
     {
-        $this->withoutExceptionHandling();
-        $user = Facades\User::make()->makeSuper()->save();
-        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $blueprint = $collection->entryBlueprint();
 
         $this
             ->actingAs($user)
-            ->get($blueprint->editUrl())
+            ->get(cp_route('collections.blueprints.edit', [$collection, $blueprint]))
             ->assertStatus(200)
             ->assertViewHas('blueprint', $blueprint);
     }
diff --git a/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php b/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
new file mode 100644
index 00000000000..862f04e9ee5
--- /dev/null
+++ b/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Tests\Feature\Collections\Blueprints;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Statamic\Facades;
+use Statamic\Facades\Collection;
+use Tests\Fakes\FakeBlueprintRepository;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class StoreBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection)
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+    }
+
+    /** @test */
+    public function blueprint_gets_created()
+    {
+        $this->withoutExceptionHandling();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+
+        Facades\Blueprint::make('existing')->setNamespace('collections.test')->save();
+        $this->assertCount(1, Facades\Blueprint::in('collections/test'));
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, ['title' => 'My Test Blueprint'])
+            ->assertRedirect('/cp/collections/test/blueprints/my_test_blueprint/edit');
+
+        $this->assertCount(2, Facades\Blueprint::in('collections/test'));
+        $blueprint = Facades\Blueprint::in('collections/test')->last();
+        $this->assertEquals('my_test_blueprint', $blueprint->handle());
+        $this->assertEquals([
+            'title' => 'My Test Blueprint',
+            'sections' => [
+                'main' => [
+                    'display' => 'Main',
+                    'fields' => [],
+                ],
+            ],
+        ], $blueprint->contents());
+    }
+
+    /** @test */
+    public function when_creating_the_first_blueprint_the_default_one_is_also_created()
+    {
+        // If there are no user-defined blueprints, save the default one.
+        // To the user, it would have looked like the default one existed since it's in the listing.
+        // The new one the user is about to create should be considered the second one.
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test_collection'))->save();
+
+        $this->assertCount(0, Facades\Blueprint::in('collections/test_collection'));
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, ['title' => 'My Test Blueprint'])
+            ->assertRedirect('/cp/collections/test_collection/blueprints/my_test_blueprint/edit');
+
+        $this->assertCount(2, Facades\Blueprint::in('collections/test_collection'));
+
+        $this->assertEquals(
+            ['test_collection', 'my_test_blueprint'],
+            Facades\Blueprint::in('collections/test_collection')->map->handle()->values()->all()
+        );
+    }
+
+    /** @test */
+    public function title_is_required()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, ['title' => ''])
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('title');
+
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+    }
+
+    private function submit($collection, $params = [])
+    {
+        return $this->post(cp_route('collections.blueprints.store', $collection), $this->validParams($params));
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Test',
+        ], $overrides);
+    }
+}
diff --git a/tests/Feature/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
similarity index 71%
rename from tests/Feature/Blueprints/UpdateBlueprintTest.php
rename to tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
index cf8f2acf0ff..97f32de8348 100644
--- a/tests/Feature/Blueprints/UpdateBlueprintTest.php
+++ b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Tests\Feature\Blueprints;
+namespace Tests\Feature\Collections\Blueprints;
 
 use Facades\Statamic\Fields\BlueprintRepository;
 use Statamic\Facades;
+use Statamic\Facades\Collection;
 use Statamic\Fields\Blueprint;
 use Tests\Fakes\FakeBlueprintRepository;
 use Tests\FakesRoles;
@@ -19,7 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        BlueprintRepository::swap(new FakeBlueprintRepository);
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
     }
 
     /** @test */
@@ -27,12 +28,13 @@ public function it_denies_access_if_you_dont_have_permission()
     {
         $this->setTestRoles(['test' => ['access cp']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
         $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($blueprint)
+            ->submit($collection, $blueprint)
             ->assertRedirect('/original')
             ->assertSessionHas('error');
 
@@ -43,12 +45,14 @@ public function it_denies_access_if_you_dont_have_permission()
     /** @test */
     public function blueprint_gets_saved()
     {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $blueprint = (new Blueprint)->setNamespace('collections.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
 
         $this
             ->actingAs($user)
-            ->submit($blueprint, [
+            ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
                 'sections' => [
                     [
@@ -80,7 +84,7 @@ public function blueprint_gets_saved()
                     ],
                 ],
             ])
-            ->assertStatus(204);
+            ->assertOk();
 
         $this->assertEquals([
             'title' => 'Updated title',
@@ -105,75 +109,79 @@ public function blueprint_gets_saved()
                     ],
                 ],
             ],
-        ], Facades\Blueprint::find('test')->contents());
+        ], Facades\Blueprint::find('collections.test.test')->contents());
     }
 
     /** @test */
     public function title_is_required()
     {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $this->assertCount(0, Facades\Blueprint::all());
-        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+        $blueprint = (new Blueprint)->setNamespace('collections.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($blueprint, ['title' => ''])
+            ->submit($collection, $blueprint, ['title' => ''])
             ->assertRedirect('/original')
             ->assertSessionHasErrors('title');
 
-        $this->assertEquals('Test', Facades\Blueprint::find('test')->title());
+        $this->assertEquals('Test', Facades\Blueprint::find('collections.test.test')->title());
     }
 
     /** @test */
     public function sections_are_required()
     {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $this->assertCount(0, Facades\Blueprint::all());
-        $blueprint = (new Blueprint)->setHandle('test')->setContents($originalContents = [
-            'title' => 'Test',
-            'sections' => ['foo' => 'bar'],
-        ])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+        $blueprint = tap($collection->entryBlueprint())->save();
+        $originalContents = $blueprint->contents();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($blueprint, ['sections' => ''])
+            ->submit($collection, $blueprint, ['sections' => ''])
             ->assertRedirect('/original')
             ->assertSessionHasErrors('sections');
 
-        $this->assertEquals($originalContents, Facades\Blueprint::find('test')->contents());
+        $this->assertEquals($originalContents, Facades\Blueprint::find('collections.test.test')->contents());
     }
 
     /** @test */
     public function sections_must_be_an_array()
     {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $this->assertCount(0, Facades\Blueprint::all());
-        $blueprint = (new Blueprint)->setHandle('test')->setContents($originalContents = [
-            'title' => 'Test',
-            'sections' => ['foo' => 'bar'],
-        ])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('collections/test'));
+        $blueprint = tap($collection->entryBlueprint())->save();
+        $originalContents = $blueprint->contents();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($blueprint, ['sections' => 'string'])
+            ->submit($collection, $blueprint, ['sections' => 'string'])
             ->assertRedirect('/original')
             ->assertSessionHasErrors('sections');
 
-        $this->assertEquals($originalContents, Facades\Blueprint::find('test')->contents());
+        $this->assertEquals($originalContents, Facades\Blueprint::find('collections.test.test')->contents());
     }
 
     /** @test */
     public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for_reference_fields_with_config_overrides()
     {
-        $user = tap(Facades\User::make()->makeSuper())->save();
-        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        $blueprint = (new Blueprint)->setNamespace('collections.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
 
         $this
             ->actingAs($user)
-            ->submit($blueprint, [
+            ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
                 'sections' => [
                     [
@@ -214,7 +222,7 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
                     ],
                 ],
             ])
-            ->assertStatus(204);
+            ->assertOk();
 
         $this->assertEquals([
             'title' => 'Updated title',
@@ -245,13 +253,13 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
                     ],
                 ],
             ],
-        ], Facades\Blueprint::find('test')->contents());
+        ], Facades\Blueprint::find('collections.test.test')->contents());
     }
 
-    private function submit($blueprint, $params = [])
+    private function submit($collection, $blueprint, $params = [])
     {
         return $this->patch(
-            cp_route('blueprints.update', $blueprint->handle()),
+            cp_route('collections.blueprints.update', [$collection, $blueprint]),
             $this->validParams($params)
         );
     }
diff --git a/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php
new file mode 100644
index 00000000000..2ce5570e74a
--- /dev/null
+++ b/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Feature\Collections\Blueprints;
+
+use Statamic\Auth\User;
+use Statamic\Facades;
+use Statamic\Facades\Collection;
+use Statamic\Fields\Blueprint;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ViewBlueprintListingTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_shows_a_list_of_blueprints()
+    {
+        // When the CP header loads the avatar it reaches for the user blueprint.
+        Facades\Blueprint::shouldReceive('find')->with('user')->andReturn(new Blueprint);
+
+        Facades\Blueprint::shouldReceive('in')->with('collections/test')->andReturn(collect([
+            'foo' => $blueprintA = $this->createBlueprint('foo'),
+            'bar' => $blueprintB = $this->createBlueprint('bar'),
+        ]));
+
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Collection::make('test'))->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->get(cp_route('collections.blueprints.index', 'test'))
+            ->assertSuccessful()
+            ->assertViewHas('blueprints', collect([
+                [
+                    'id' => 'foo',
+                    'handle' => 'foo',
+                    'title' => 'Foo',
+                    'sections' => 2,
+                    'fields' => 2,
+                    'edit_url' => 'http://localhost/cp/collections/test/blueprints/foo/edit',
+                    'delete_url' => 'http://localhost/cp/collections/test/blueprints/foo',
+                ],
+                [
+                    'id' => 'bar',
+                    'handle' => 'bar',
+                    'title' => 'Bar',
+                    'sections' => 2,
+                    'fields' => 2,
+                    'edit_url' => 'http://localhost/cp/collections/test/blueprints/bar/edit',
+                    'delete_url' => 'http://localhost/cp/collections/test/blueprints/bar',
+                ],
+            ]))
+            ->assertDontSee('no-results');
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Collection::make('test'))->save();
+
+        $response = $this
+            ->from('/cp/original')
+            ->actingAs($user)
+            ->get(cp_route('collections.blueprints.index', 'test'))
+            ->assertRedirect('/cp/original');
+    }
+
+    private function createBlueprint($handle)
+    {
+        return tap(new Blueprint)->setHandle($handle);
+    }
+}
diff --git a/tests/Feature/Collections/UpdateCollectionTest.php b/tests/Feature/Collections/UpdateCollectionTest.php
index c87ba1fe8e6..963b04e9aba 100644
--- a/tests/Feature/Collections/UpdateCollectionTest.php
+++ b/tests/Feature/Collections/UpdateCollectionTest.php
@@ -2,10 +2,11 @@
 
 namespace Tests\Feature\Collections;
 
+use Facades\Statamic\Fields\BlueprintRepository;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\User;
-use Statamic\Fields\BlueprintRepository;
+use Tests\Fakes\FakeBlueprintRepository;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -31,6 +32,7 @@ public function it_denies_access_if_you_dont_have_permission()
     /** @test */
     public function it_updates_a_collection()
     {
+        $this->withoutExceptionHandling();
         config(['statamic.amp.enabled' => true]);
 
         $collection = tap(
@@ -80,28 +82,58 @@ public function it_updates_a_collection()
         $this->assertFalse($updated->defaultPublishState());
         $this->assertEquals('desc', $updated->sortDirection());
         $this->assertTrue($updated->ampable());
-        // $this->assertEquals(['three', 'four'], $updated->entryBlueprints());
         // structure
     }
 
     /** @test */
-    public function it_updates_blueprints()
+    public function setting_links_to_true_will_create_a_blueprint_if_it_doesnt_already_exist()
     {
-        $mock = $this->partialMock(BlueprintRepository::class);
-        $mock->shouldReceive('find')->with('one')->andReturn(Blueprint::make('one'));
-        $mock->shouldReceive('find')->with('two')->andReturn(Blueprint::make('two'));
-        $mock->shouldReceive('find')->with('three')->andReturn(Blueprint::make('three'));
-        $mock->shouldReceive('find')->with('four')->andReturn(Blueprint::make('four'));
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
 
-        $collection = tap(Collection::make('test')->entryBlueprints(['one', 'two']))->save();
-        $this->assertEquals(['one', 'two'], $collection->entryBlueprints()->map->handle()->all());
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Blueprint::in('collections.test'));
 
         $this
             ->actingAs($this->userWithPermission())
-            ->update($collection, ['blueprints' => ['three', 'four']])
+            ->update($collection, ['links' => true])
             ->assertOk();
 
-        $this->assertEquals(['three', 'four'], Collection::all()->first()->entryBlueprints()->map->handle()->all());
+        $this->assertCount(1, Blueprint::in('collections.test'));
+    }
+
+    /** @test */
+    public function setting_links_to_true_will_do_nothing_if_a_blueprint_already_exists()
+    {
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+
+        $collection = tap(Collection::make('test'))->save();
+        Blueprint::make('link')->setNamespace('collections.test')->setContents(['title' => 'Existing'])->save();
+        $this->assertCount(1, Blueprint::in('collections.test'));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->update($collection, ['links' => true])
+            ->assertOk();
+
+        $this->assertCount(1, Blueprint::in('collections.test'));
+        $this->assertEquals('Existing', Blueprint::find('collections.test.link')->title());
+    }
+
+    /** @test */
+    public function setting_links_to_false_will_delete_the_blueprint_if_exists()
+    {
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+
+        $collection = tap(Collection::make('test'))->save();
+        Blueprint::make('link')->setNamespace('collections.test')->save();
+        $this->assertCount(1, Blueprint::in('collections.test'));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->update($collection, ['links' => false])
+            ->assertOk();
+
+        $this->assertCount(0, Blueprint::in('collections.test'));
     }
 
     private function userWithoutPermission()
diff --git a/tests/Feature/Collections/ViewCollectionListingTest.php b/tests/Feature/Collections/ViewCollectionListingTest.php
index ecd751a6a65..10abee6a596 100644
--- a/tests/Feature/Collections/ViewCollectionListingTest.php
+++ b/tests/Feature/Collections/ViewCollectionListingTest.php
@@ -36,6 +36,7 @@ public function it_shows_a_list_of_collections()
                     'edit_url' => 'http://localhost/cp/collections/foo/edit',
                     'delete_url' => 'http://localhost/cp/collections/foo',
                     'entries_url' => 'http://localhost/cp/collections/foo',
+                    'blueprints_url' => 'http://localhost/cp/collections/foo/blueprints',
                     'scaffold_url' => 'http://localhost/cp/collections/foo/scaffold',
                     'deleteable' => true,
                 ],
@@ -46,6 +47,7 @@ public function it_shows_a_list_of_collections()
                     'edit_url' => 'http://localhost/cp/collections/bar/edit',
                     'delete_url' => 'http://localhost/cp/collections/bar',
                     'entries_url' => 'http://localhost/cp/collections/bar',
+                    'blueprints_url' => 'http://localhost/cp/collections/bar/blueprints',
                     'scaffold_url' => 'http://localhost/cp/collections/bar/scaffold',
                     'deleteable' => true,
                 ],
diff --git a/tests/Fields/BlueprintRepositoryTest.php b/tests/Fields/BlueprintRepositoryTest.php
index e725ee4f34d..4785ff1fc6d 100644
--- a/tests/Fields/BlueprintRepositoryTest.php
+++ b/tests/Fields/BlueprintRepositoryTest.php
@@ -38,6 +38,36 @@ public function it_gets_a_blueprint()
 
         $this->assertInstanceOf(Blueprint::class, $blueprint);
         $this->assertEquals('test', $blueprint->handle());
+        $this->assertNull($blueprint->namespace());
+        $this->assertEquals([
+            'title' => 'Test',
+            'sections' => [
+                'main' => [
+                    'fields' => ['one', 'two'],
+                ],
+            ],
+        ], $blueprint->contents());
+    }
+
+    /** @test */
+    public function it_gets_a_blueprint_in_a_namespace()
+    {
+        $contents = <<<'EOT'
+title: Test
+sections:
+  main:
+    fields:
+      - one
+      - two
+EOT;
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/foo/bar/baz.yaml')->once()->andReturnTrue();
+        File::shouldReceive('get')->with('/path/to/resources/blueprints/foo/bar/baz.yaml')->once()->andReturn($contents);
+
+        $blueprint = $this->repo->find('foo.bar.baz');
+
+        $this->assertInstanceOf(Blueprint::class, $blueprint);
+        $this->assertEquals('baz', $blueprint->handle());
+        $this->assertEquals('foo.bar', $blueprint->namespace());
         $this->assertEquals([
             'title' => 'Test',
             'sections' => [
@@ -74,68 +104,6 @@ public function it_gets_fallback_blueprint()
         $this->assertEquals('Fallback Blueprint', $blueprint->title());
     }
 
-    /** @test */
-    public function it_gets_all_blueprints()
-    {
-        $firstContents = <<<'EOT'
-title: First Blueprint
-sections:
-  main:
-    fields:
-      - one
-      - two
-EOT;
-
-        $secondContents = <<<'EOT'
-title: Second Blueprint
-sections:
-  main:
-    fields:
-      - two
-      - one
-EOT;
-
-        $thirdContents = <<<'EOT'
-title: Third Blueprint
-sections:
-  main:
-    fields:
-      - two
-      - one
-EOT;
-
-        File::shouldReceive('withAbsolutePaths')->once()->andReturnSelf();
-        File::shouldReceive('exists')->with('/path/to/resources/blueprints')->once()->andReturnTrue();
-        File::shouldReceive('getFilesByTypeRecursively')->with('/path/to/resources/blueprints', 'yaml')->once()->andReturn(new FileCollection([
-            '/path/to/resources/blueprints/first.yaml',
-            '/path/to/resources/blueprints/second.yaml',
-            '/path/to/resources/blueprints/sub/third.yaml',
-        ]));
-        File::shouldReceive('get')->with('/path/to/resources/blueprints/first.yaml')->once()->andReturn($firstContents);
-        File::shouldReceive('get')->with('/path/to/resources/blueprints/second.yaml')->once()->andReturn($secondContents);
-        File::shouldReceive('get')->with('/path/to/resources/blueprints/sub/third.yaml')->once()->andReturn($thirdContents);
-
-        $all = $this->repo->all();
-
-        $this->assertInstanceOf(Collection::class, $all);
-        $this->assertCount(3, $all);
-        $this->assertEveryItemIsInstanceOf(Blueprint::class, $all);
-        $this->assertEquals(['first', 'second', 'sub.third'], $all->keys()->all());
-        $this->assertEquals(['first', 'second', 'sub.third'], $all->map->handle()->values()->all());
-        $this->assertEquals(['First Blueprint', 'Second Blueprint', 'Third Blueprint'], $all->map->title()->values()->all());
-    }
-
-    /** @test */
-    public function it_returns_empty_collection_if_blueprint_directory_doesnt_exist()
-    {
-        File::shouldReceive('exists')->with('/path/to/resources/blueprints')->once()->andReturnFalse();
-
-        $all = $this->repo->all();
-
-        $this->assertInstanceOf(Collection::class, $all);
-        $this->assertCount(0, $all);
-    }
-
     /** @test */
     public function it_saves_to_disk()
     {
@@ -193,4 +161,38 @@ public function it_saves_to_disk()
 
         $this->repo->save($blueprint);
     }
+
+    /** @test */
+    public function it_gets_blueprints_in_a_namespace()
+    {
+        $dir = '/path/to/resources/blueprints/collections/blog';
+        File::shouldReceive('withAbsolutePaths')->once()->andReturnSelf();
+        File::shouldReceive('exists')->with($dir)->once()->andReturnTrue();
+        File::shouldReceive('getFilesByType')->with($dir, 'yaml')->once()->andReturn(
+            new FileCollection([$dir.'/first.yaml', $dir.'/second.yaml'])
+        );
+        File::shouldReceive('get')->with($dir.'/first.yaml')->once()->andReturn('title: First Blueprint');
+        File::shouldReceive('get')->with($dir.'/second.yaml')->once()->andReturn('title: Second Blueprint');
+
+        $blueprints = $this->repo->in('collections.blog');
+
+        $this->assertInstanceOf(Collection::class, $blueprints);
+        $this->assertCount(2, $blueprints);
+        $this->assertEveryItemIsInstanceOf(Blueprint::class, $blueprints);
+        $this->assertEquals(['first', 'second'], $blueprints->keys()->all());
+        $this->assertEquals(['first', 'second'], $blueprints->map->handle()->values()->all());
+        $this->assertEquals(['collections.blog', 'collections.blog'], $blueprints->map->namespace()->values()->all());
+        $this->assertEquals(['First Blueprint', 'Second Blueprint'], $blueprints->map->title()->values()->all());
+    }
+
+    /** @test */
+    public function it_returns_empty_collection_if_directory_doesnt_exist()
+    {
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/test')->once()->andReturnFalse();
+
+        $all = $this->repo->in('test');
+
+        $this->assertInstanceOf(Collection::class, $all);
+        $this->assertCount(0, $all);
+    }
 }
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index 39f731a6f8f..be9d4d937d4 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -22,7 +22,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        Blueprint::shouldReceive('find')->with('empty')->andReturn(new \Statamic\Fields\Blueprint);
+        Blueprint::shouldReceive('in')->withAnyArgs()->andReturn(collect([new \Statamic\Fields\Blueprint]));
         $this->addToAssertionCount(-1);
 
         $this->withStandardFakeViews();
@@ -370,12 +370,12 @@ public function home_page_is_not_overridden_by_entries_in_another_structured_col
         // The bug would happen if the non-routable collection happened to be created first. It's not
         // really specific to the naming. However when reading from files, it goes in alphabetical
         // order which makes it seem like it could be an alphabetical problem.
-        Collection::make('services')->entryBlueprints(['empty'])->structureContents([
+        Collection::make('services')->structureContents([
             'root' => true,
             'tree' => [['entry' => '2']],
         ])->save();
 
-        Collection::make('pages')->entryBlueprints(['empty'])->routes('{slug}')->structureContents([
+        Collection::make('pages')->routes('{slug}')->structureContents([
             'root' => true,
             'tree' => [['entry' => '1']],
         ])->save();
@@ -407,7 +407,6 @@ private function makeCollection()
     {
         return Collection::make('pages')
             ->routes('{slug}')
-            ->template('default')
-            ->entryBlueprints(['empty']);
+            ->template('default');
     }
 }
diff --git a/tests/Tags/Collection/CollectionTest.php b/tests/Tags/Collection/CollectionTest.php
index 35c8ca7d25d..bba1f95a3c2 100644
--- a/tests/Tags/Collection/CollectionTest.php
+++ b/tests/Tags/Collection/CollectionTest.php
@@ -482,8 +482,7 @@ public function it_can_get_previous_and_next_entries_in_an_orderable_desc_collec
     public function it_adds_defaults_for_missing_items_based_on_blueprint()
     {
         $blueprint = Blueprint::make('test')->setContents(['fields' => [['handle' => 'title', 'field' => ['type' => 'text']]]]);
-        Blueprint::shouldReceive('find')->with('test')->andReturn($blueprint);
-        $this->foods->entryBlueprints(['test']);
+        Blueprint::shouldReceive('in')->with('collections/foods')->andReturn(collect([$blueprint]));
 
         $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
         $this->makeEntry($this->foods, 'b')->save();

From 75dd755744da5d7537aecf2d44baad0ec31288a9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 14 Jul 2020 15:54:46 -0400
Subject: [PATCH 02/39] Remove Blueprints fieldtype

---
 src/Fieldtypes/Blueprints.php              | 47 ----------------------
 src/Providers/ExtensionServiceProvider.php |  1 -
 2 files changed, 48 deletions(-)
 delete mode 100644 src/Fieldtypes/Blueprints.php

diff --git a/src/Fieldtypes/Blueprints.php b/src/Fieldtypes/Blueprints.php
deleted file mode 100644
index 899770b60bf..00000000000
--- a/src/Fieldtypes/Blueprints.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Statamic\Fieldtypes;
-
-use Statamic\CP\Column;
-use Statamic\Facades\Blueprint;
-
-class Blueprints extends Relationship
-{
-    protected $canEdit = false;
-    protected $canCreate = false;
-    protected $statusIcons = false;
-
-    protected function toItemArray($id, $site = null)
-    {
-        if ($blueprint = Blueprint::find($id)) {
-            return [
-                'title' => $blueprint->title(),
-                'id' => $blueprint->handle(),
-            ];
-        }
-
-        return $this->invalidItemArray($id);
-    }
-
-    public function getIndexItems($request)
-    {
-        return Blueprint::all()->map(function ($blueprint) {
-            return [
-                'id' => $blueprint->handle(),
-                'title' => $blueprint->title(),
-            ];
-        })->values();
-    }
-
-    public function augmentValue($value)
-    {
-        return Blueprint::find($value);
-    }
-
-    protected function getColumns()
-    {
-        return [
-            Column::make('title'),
-        ];
-    }
-}
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 9031fd59112..c2da388b109 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -37,7 +37,6 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\Bard::class,
         Fieldtypes\Bard\Buttons::class,
         Fieldtypes\ButtonGroup::class,
-        Fieldtypes\Blueprints::class,
         Fieldtypes\Checkboxes::class,
         Fieldtypes\Code::class,
         Fieldtypes\CollectionRoutes::class,

From ccd2354da9d0e82f0141948cbfdb0d7ecbf2f145 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 10:45:41 -0400
Subject: [PATCH 03/39] Fix blueprint method

---
 src/Entries/Entry.php            | 32 ++++++--------
 tests/Data/Entries/EntryTest.php | 75 ++++++++++++++++++++++++++------
 2 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 7aef45b73c8..81a67a0f687 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -85,13 +85,20 @@ public function collection($collection = null)
             ->args(func_get_args());
     }
 
-    public function blueprint()
+    public function blueprint($blueprint = null)
     {
-        return $this->fluentlyGetOrSet('blueprint')
-            ->getter(function ($blueprint) {
-                return $blueprint
-                    ? $this->collection()->ensureEntryBlueprintFields(Blueprint::find($blueprint))
-                    : $this->defaultBlueprint();
+        $key = "entry-{$this->id()}-default-blueprint";
+
+        return $this
+            ->fluentlyGetOrSet('blueprint')
+            ->getter(function ($blueprint) use ($key) {
+                return Blink::once($key, function () use ($blueprint) {
+                    return $this->collection()->entryBlueprint($blueprint ?? $this->value('blueprint'));
+                });
+            })
+            ->setter(function ($blueprint) use ($key) {
+                Blink::forget($key);
+                return $blueprint;
             })
             ->args(func_get_args());
     }
@@ -206,19 +213,6 @@ public function reference()
         return "entry::{$this->id()}";
     }
 
-    public function defaultBlueprint()
-    {
-        return Blink::once("entry-{$this->id()}-default-blueprint", function () {
-            if ($blueprint = $this->value('blueprint')) {
-                return $this->collection()->ensureEntryBlueprintFields(
-                    Blueprint::find($blueprint)
-                );
-            }
-
-            return $this->collection()->entryBlueprint();
-        });
-    }
-
     public function afterSave($callback)
     {
         $this->afterSaveCallbacks[] = $callback;
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 183d28218a8..656af1e6379 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -5,6 +5,7 @@
 use Facades\Statamic\Fields\BlueprintRepository;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Event;
+use Mockery;
 use Statamic\Entries\Collection;
 use Statamic\Entries\Entry;
 use Statamic\Events\Data\EntrySaved;
@@ -525,29 +526,77 @@ public function it_gets_and_sets_the_published_state()
     /** @test */
     public function it_gets_the_blueprint_when_defined_on_itself()
     {
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
         Collection::make('blog')->save();
-        BlueprintRepository::shouldReceive('find')->with('default')->andReturn($default = new Blueprint);
-        BlueprintRepository::shouldReceive('find')->with('test')->andReturn($blueprint = new Blueprint);
-        $entry = (new Entry)
-            ->collection('blog')
-            ->blueprint('test');
+        $entry = (new Entry)->collection('blog')->blueprint('second');
 
-        $this->assertSame($blueprint, $entry->blueprint());
-        $this->assertNotSame($default, $entry->blueprint());
+        $this->assertSame($second, $entry->blueprint());
+        $this->assertNotSame($first, $second);
     }
 
     /** @test */
-    public function it_gets_the_blueprint_based_on_the_collection()
+    public function it_gets_the_blueprint_when_defined_in_a_value()
     {
-        BlueprintRepository::shouldReceive('in')->with('collections/test')->andReturn(collect([
-            $blueprint = new Blueprint,
-            new Blueprint,
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
         ]));
+        Collection::make('blog')->save();
+        $entry = (new Entry)->collection('blog')->set('blueprint', 'second');
 
-        $collection = tap(Collection::make('test'))->save();
+        $this->assertSame($second, $entry->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function it_gets_the_blueprint_when_defined_in_an_origin_value()
+    {
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
+        Collection::make('blog')->save();
+        $origin = (new Entry)->collection('blog')->set('blueprint', 'second');
+        $entry = (new Entry)->collection('blog')->origin($origin);
+
+        $this->assertSame($second, $entry->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function it_gets_the_default_collection_blueprint_when_undefined()
+    {
+        BlueprintRepository::shouldReceive('in')->with('collections/blog')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
+        $collection = tap(Collection::make('blog'))->save();
         $entry = (new Entry)->collection($collection);
 
-        $this->assertEquals($blueprint, $entry->blueprint());
+        $this->assertSame($first, $entry->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function the_blueprint_is_blinked_when_getting_and_flushed_when_setting()
+    {
+        $collection = Mockery::mock(Collection::make('blog'));
+        $collection->shouldReceive('entryBlueprint')->with(null)->once()->andReturn('the old blueprint');
+        $collection->shouldReceive('entryBlueprint')->with('new')->once()->andReturn('the new blueprint');
+        Collection::shouldReceive('findByHandle')->with('blog')->andReturn($collection);
+
+        $entry = (new Entry)->collection('blog');
+
+        $this->assertEquals('the old blueprint', $entry->blueprint());
+        $this->assertEquals('the old blueprint', $entry->blueprint());
+
+        $entry->blueprint('new');
+
+        $this->assertEquals('the new blueprint', $entry->blueprint());
+        $this->assertEquals('the new blueprint', $entry->blueprint());
     }
 
     /** @test */

From 0ca90d2bae9d0ebf4c8cf79f6f1d715685cb21e3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 10:52:27 -0400
Subject: [PATCH 04/39] Unnecessary

---
 resources/views/collections/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index ef087ab9783..cd1862a54b6 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -32,7 +32,7 @@
             @can('edit', $collection)
                 <dropdown-item :text="__('Edit Collection')" redirect="{{ $collection->editUrl() }}"></dropdown-item>
             @endcan
-            @can('configure fields', $collection)
+            @can('configure fields')
                 <dropdown-item :text="__('Edit Blueprints')" redirect="{{ cp_route('collections.blueprints.index', $collection) }}"></dropdown-item>
             @endcan
             @can('edit', $collection)

From b748578f1f1da3a51bf8fa8d2ac5e3c814026e55 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:17:29 -0400
Subject: [PATCH 05/39] Apply blueprint changes to taxonomies

---
 .../js/components/taxonomies/Listing.vue      |   1 +
 .../taxonomies/blueprints/create.blade.php    |  29 ++
 .../taxonomies/blueprints/edit.blade.php      |  12 +
 .../taxonomies/blueprints/index.blade.php     |  26 ++
 resources/views/taxonomies/show.blade.php     |   3 +
 routes/cp.php                                 |   1 +
 .../CP/Taxonomies/TaxonomiesController.php    |  19 +-
 .../TaxonomyBlueprintsController.php          |  90 ++++++
 .../CP/Taxonomies/TermsController.php         |   8 +-
 src/Stache/Stores/TaxonomiesStore.php         |   1 -
 src/Taxonomies/Taxonomy.php                   |  49 ++--
 src/Taxonomies/Term.php                       |  19 +-
 tests/Data/Taxonomies/AugmentedTermTest.php   |   4 +-
 tests/Data/Taxonomies/TaxonomyTest.php        |  61 ++++
 tests/Data/Taxonomies/TermTest.php            |  77 +++++
 .../Blueprints/CreateBlueprintTest.php        |  44 +++
 .../Blueprints/EditBlueprintTest.php          |  46 +++
 .../Blueprints/StoreBlueprintTest.php         | 127 ++++++++
 .../Blueprints/UpdateBlueprintTest.php        | 274 ++++++++++++++++++
 .../Blueprints/ViewBlueprintListingTest.php   |  77 +++++
 .../Feature/Taxonomies/UpdateTaxonomyTest.php |  20 --
 21 files changed, 923 insertions(+), 65 deletions(-)
 create mode 100644 resources/views/taxonomies/blueprints/create.blade.php
 create mode 100644 resources/views/taxonomies/blueprints/edit.blade.php
 create mode 100644 resources/views/taxonomies/blueprints/index.blade.php
 create mode 100644 src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
 create mode 100644 tests/Data/Taxonomies/TaxonomyTest.php
 create mode 100644 tests/Data/Taxonomies/TermTest.php
 create mode 100644 tests/Feature/Taxonomies/Blueprints/CreateBlueprintTest.php
 create mode 100644 tests/Feature/Taxonomies/Blueprints/EditBlueprintTest.php
 create mode 100644 tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
 create mode 100644 tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
 create mode 100644 tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php

diff --git a/resources/js/components/taxonomies/Listing.vue b/resources/js/components/taxonomies/Listing.vue
index f1507c7ac39..391c6c95541 100644
--- a/resources/js/components/taxonomies/Listing.vue
+++ b/resources/js/components/taxonomies/Listing.vue
@@ -8,6 +8,7 @@
                 <template slot="actions" slot-scope="{ row: taxonomy, index }">
                     <dropdown-list>
                         <dropdown-item :text="__('Edit')" :redirect="taxonomy.edit_url" />
+                        <dropdown-item :text="__('Edit Blueprints')" :redirect="taxonomy.blueprints_url" />
                         <dropdown-item
                             v-if="taxonomy.deleteable"
                             :text="__('Delete')"
diff --git a/resources/views/taxonomies/blueprints/create.blade.php b/resources/views/taxonomies/blueprints/create.blade.php
new file mode 100644
index 00000000000..53447b6e3f2
--- /dev/null
+++ b/resources/views/taxonomies/blueprints/create.blade.php
@@ -0,0 +1,29 @@
+@extends('statamic::layout')
+@section('title', __('Create Blueprint'))
+
+@section('content')
+<form action="{{ $action }}" method="POST">
+    @csrf
+    <div class="max-w-lg mt-2 mx-auto">
+        <div class="rounded p-3 lg:px-7 lg:py-5 shadow bg-white">
+            <header class="text-center mb-6">
+                <h1 class="mb-3">{{ __('Create Blueprint') }}</h1>
+                <p class="text-grey">{{ __('statamic::messages.blueprints_intro') }}</p>
+            </header>
+            <div class="mb-5">
+                <label class="font-bold text-base mb-sm" for="name">{{ __('Title') }}</label>
+                <input type="text" name="title" value="{{ old('title') }}" class="input-text" autofocus required tabindex="1">
+                <div class="text-2xs text-grey-60 mt-1 flex items-center">
+                    {{ __('statamic::messages.blueprints_title_instructions') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="flex justify-center mt-4">
+            <button tabindex="4" class="btn-primary mx-auto btn-lg">
+                {{ __('Create Blueprint')}}
+            </button>
+        </div>
+    </div>
+</form>
+@stop
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
new file mode 100644
index 00000000000..e3df99ee1b6
--- /dev/null
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -0,0 +1,12 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    <blueprint-builder
+        action="{{ cp_route('taxonomies.blueprints.update', [$taxonomy, $blueprint]) }}"
+        breadcrumb-url="{{ cp_route('taxonomies.blueprints.index', $taxonomy) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+    ></blueprint-builder>
+
+@endsection
diff --git a/resources/views/taxonomies/blueprints/index.blade.php b/resources/views/taxonomies/blueprints/index.blade.php
new file mode 100644
index 00000000000..89e31456bb9
--- /dev/null
+++ b/resources/views/taxonomies/blueprints/index.blade.php
@@ -0,0 +1,26 @@
+@extends('statamic::layout')
+@section('title', __('Blueprints'))
+
+@section('content')
+
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('taxonomies.show', $taxonomy->handle()),
+        'title' => $taxonomy->title()
+    ])
+
+    <div class="flex justify-between items-center mb-3">
+        <h1>@yield('title')</h1>
+
+        @can('create', 'Statamic\Fields\Blueprint')
+            <a href="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}" class="btn-primary">{{ __('Create Blueprint') }}</a>
+        @endcan
+    </div>
+
+    <blueprint-listing :initial-rows="{{ json_encode($blueprints) }}"></blueprint-listing>
+
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
+@endsection
diff --git a/resources/views/taxonomies/show.blade.php b/resources/views/taxonomies/show.blade.php
index 5542c65b6bb..3d6b7d497e7 100644
--- a/resources/views/taxonomies/show.blade.php
+++ b/resources/views/taxonomies/show.blade.php
@@ -16,6 +16,9 @@
                 @can('edit', $taxonomy)
                     <dropdown-item :text="__('Edit Taxonomy')" redirect="{{ $taxonomy->editUrl() }}"></dropdown-item>
                 @endcan
+                @can('configure fields')
+                    <dropdown-item :text="__('Edit Blueprints')" redirect="{{ cp_route('taxonomies.blueprints.index', $taxonomy) }}"></dropdown-item>
+                @endcan
                 @can('delete', $taxonomy)
                     <dropdown-item :text="__('Delete Taxonomy')" class="warning" @click="$refs.deleter.confirm()">
                         <resource-deleter
diff --git a/routes/cp.php b/routes/cp.php
index 984b5436f77..8ec66113d96 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -68,6 +68,7 @@
 
     Route::group(['namespace' => 'Taxonomies'], function () {
         Route::resource('taxonomies', 'TaxonomiesController');
+        Route::resource('taxonomies.blueprints', 'TaxonomyBlueprintsController');
 
         Route::group(['prefix' => 'taxonomies/{taxonomy}/terms'], function () {
             Route::get('/', 'TermsController@index')->name('taxonomies.terms.index');
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
index 2f0fad6a28f..32a3c27f989 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -29,6 +29,7 @@ public function index()
                 'edit_url' => $taxonomy->editUrl(),
                 'delete_url' => $taxonomy->deleteUrl(),
                 'terms_url' => cp_route('taxonomies.show', $taxonomy->handle()),
+                'blueprints_url' => cp_route('taxonomies.blueprints.index', $taxonomy->handle()),
                 'deleteable' => User::current()->can('delete', $taxonomy),
             ];
         })->values();
@@ -142,9 +143,7 @@ public function update(Request $request, $taxonomy)
 
         $values = $fields->process()->values()->all();
 
-        $taxonomy
-            ->title($values['title'])
-            ->termBlueprints($values['blueprints']);
+        $taxonomy->title($values['title']);
 
         if ($sites = array_get($values, 'sites')) {
             $taxonomy->sites($sites);
@@ -205,13 +204,13 @@ protected function editFormBlueprint()
             'content_model' => [
                 'display' => __('Content Model'),
                 'fields' => [
-                    'blueprints' => [
-                        'display' => __('Blueprints'),
-                        'instructions' => __('statamic::messages.taxonomies_blueprints_instructions'),
-                        'type' => 'blueprints',
-                        'validate' => 'array',
-                        'mode' => 'select',
-                    ],
+                    // 'blueprints' => [
+                    //     'display' => __('Blueprints'),
+                    //     'instructions' => __('statamic::messages.taxonomies_blueprints_instructions'),
+                    //     'type' => 'blueprints',
+                    //     'validate' => 'array',
+                    //     'mode' => 'select',
+                    // ],
                     'collections' => [
                         'display' => __('Collections'),
                         'instructions' => __('statamic::messages.taxonomies_collections_instructions'),
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
new file mode 100644
index 00000000000..651c7451580
--- /dev/null
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Taxonomies;
+
+use Illuminate\Http\Request;
+use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
+use Statamic\Facades\Blueprint;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class TaxonomyBlueprintsController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function index(TaxonomyContract $taxonomy)
+    {
+        $blueprints = $this->indexItems($taxonomy->termBlueprints(), $taxonomy);
+
+        return view('statamic::taxonomies.blueprints.index', compact('taxonomy', 'blueprints'));
+    }
+
+    private function editUrl($taxonomy, $blueprint)
+    {
+        return cp_route('taxonomies.blueprints.edit', [$taxonomy, $blueprint]);
+    }
+
+    private function deleteUrl($taxonomy, $blueprint)
+    {
+        return cp_route('taxonomies.blueprints.destroy', [$taxonomy, $blueprint]);
+    }
+
+    public function edit($taxonomy, $blueprint)
+    {
+        $blueprint = $taxonomy->termBlueprint($blueprint);
+
+        return view('statamic::taxonomies.blueprints.edit', [
+            'taxonomy' => $taxonomy,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $taxonomy, $blueprint)
+    {
+        $blueprint = $taxonomy->termBlueprint($blueprint);
+
+        $this->updateBlueprint($request, $blueprint);
+
+        $blueprint->save();
+    }
+
+    public function create($taxonomy)
+    {
+        return view('statamic::taxonomies.blueprints.create', [
+            'action' => cp_route('taxonomies.blueprints.store', $taxonomy),
+        ]);
+    }
+
+    public function store(Request $request, $taxonomy)
+    {
+        $request->validate(['title' => 'required']);
+
+        // If there are no user-defined blueprints, save the default one.
+        // To the user, it would have looked like the default one existed since it's in the listing.
+        // The new one the user is about to create should be considered the second one.
+        if (Blueprint::in('taxonomies/'.$taxonomy->handle())->count() === 0) {
+            $taxonomy->termBlueprint()->save();
+        }
+
+        $blueprint = $this->storeBlueprint($request, 'taxonomies.'.$taxonomy->handle());
+
+        return redirect()
+            ->cpRoute('taxonomies.blueprints.edit', [$taxonomy, $blueprint])
+            ->with('success', __('Blueprint created'));
+    }
+
+    public function destroy($taxonomy, $blueprint)
+    {
+        $blueprint = $taxonomy->termBlueprint($blueprint);
+
+        $this->authorize('delete', $blueprint);
+
+        $blueprint->delete();
+    }
+}
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index ce29edbd315..08580002440 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -193,9 +193,7 @@ public function create(Request $request, $taxonomy, $site)
     {
         $this->authorize('create', [TermContract::class, $taxonomy]);
 
-        $blueprint = $request->blueprint
-            ? $taxonomy->ensureTermBlueprintFields(Blueprint::find($request->blueprint))
-            : $taxonomy->termBlueprint();
+        $blueprint = $taxonomy->termBlueprint($request->blueprint);
 
         if (! $blueprint) {
             throw new \Exception('A valid blueprint is required.');
@@ -245,9 +243,7 @@ public function store(Request $request, $taxonomy, $site)
     {
         $this->authorize('store', [TermContract::class, $taxonomy]);
 
-        $blueprint = $taxonomy->ensureTermBlueprintFields(
-            Blueprint::find($request->blueprint)
-        );
+        $blueprint = $taxonomy->termBlueprint($request->blueprint);
 
         $fields = $blueprint->fields()->addValues($request->all());
 
diff --git a/src/Stache/Stores/TaxonomiesStore.php b/src/Stache/Stores/TaxonomiesStore.php
index ce383465a30..b9f6978f00a 100644
--- a/src/Stache/Stores/TaxonomiesStore.php
+++ b/src/Stache/Stores/TaxonomiesStore.php
@@ -40,7 +40,6 @@ public function makeItemFromFile($path, $contents)
 
         return Taxonomy::make($handle)
             ->title(array_get($data, 'title'))
-            ->termBlueprints(array_get($data, 'blueprints'))
             ->revisionsEnabled(array_get($data, 'revisions', false))
             ->searchIndex(array_get($data, 'search_index'))
             ->defaultPublishState($this->getDefaultPublishState($data))
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index 6579d4cf24c..5a48dc653b8 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -74,30 +74,26 @@ public function path()
         ]);
     }
 
-    public function termBlueprints($blueprints = null)
+    public function termBlueprints()
     {
-        return $this
-            ->fluentlyGetOrSet('blueprints')
-            ->getter(function ($blueprints) {
-                if (is_null($blueprints)) {
-                    return collect([$this->fallbackTermBlueprint()]);
-                }
+        $blueprints = Blueprint::in('taxonomies/'.$this->handle());
 
-                return collect($blueprints)->map(function ($blueprint) {
-                    return Blueprint::find($blueprint);
-                });
-            })
-            ->setter(function ($blueprints) {
-                return empty($blueprints) ? null : $blueprints;
-            })
-            ->args(func_get_args());
+        if ($blueprints->isEmpty()) {
+            $blueprints = collect([$this->fallbackTermBlueprint()]);
+        }
+
+        return $blueprints->values()->map(function ($blueprint) {
+            return $this->ensureTermBlueprintFields($blueprint);
+        });
     }
 
-    public function termBlueprint()
+    public function termBlueprint($blueprint = null)
     {
-        return $this->ensureTermBlueprintFields(
-            $this->termBlueprints()->first() ?? $this->fallbackTermBlueprint()
-        );
+        $blueprint = is_null($blueprint)
+            ? $this->termBlueprints()->first()
+            : $this->termBlueprints()->keyBy->handle()->get($blueprint);
+
+        return $blueprint ? $this->ensureTermBlueprintFields($blueprint) : null;
     }
 
     public function ensureTermBlueprintFields($blueprint)
@@ -111,7 +107,15 @@ public function ensureTermBlueprintFields($blueprint)
 
     public function fallbackTermBlueprint()
     {
-        return Blueprint::find('default');
+        $blueprint = Blueprint::find('default')
+            ->setHandle($this->handle())
+            ->setNamespace('taxonomies.'.$this->handle());
+
+        $contents = $blueprint->contents();
+        $contents['title'] = $this->title();
+        $blueprint->setContents($contents);
+
+        return $blueprint;
     }
 
     public function sortField()
@@ -289,6 +293,11 @@ public static function __callStatic($method, $parameters)
         return Facades\Taxonomy::{$method}(...$parameters);
     }
 
+    public function __toString()
+    {
+        return $this->handle();
+    }
+
     public function augmentedArrayData()
     {
         return [
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 1323b6f0e58..9360c7778d9 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -72,13 +72,20 @@ public function path()
         ]);
     }
 
-    public function blueprint()
+    public function blueprint($blueprint = null)
     {
-        return $this->fluentlyGetOrSet('blueprint')
-            ->getter(function ($blueprint) {
-                return $blueprint
-                    ? $this->taxonomy()->ensureTermBlueprintFields(Blueprint::find($blueprint))
-                    : $this->taxonomy()->termBlueprint();
+        $key = "term-{$this->id()}-blueprint";
+
+        return $this
+            ->fluentlyGetOrSet('blueprint')
+            ->getter(function ($blueprint) use ($key) {
+                return Blink::once($key, function () use ($blueprint) {
+                    return $this->taxonomy()->termBlueprint($blueprint ?? $this->value('blueprint'));
+                });
+            })
+            ->setter(function ($blueprint) use ($key) {
+                Blink::forget($key);
+                return $blueprint;
             })
             ->args(func_get_args());
     }
diff --git a/tests/Data/Taxonomies/AugmentedTermTest.php b/tests/Data/Taxonomies/AugmentedTermTest.php
index 56b0cc44485..bf89c0a30a3 100644
--- a/tests/Data/Taxonomies/AugmentedTermTest.php
+++ b/tests/Data/Taxonomies/AugmentedTermTest.php
@@ -25,8 +25,8 @@ public function it_gets_values()
         $blueprint = Blueprint::makeFromFields([
             'two' => ['type' => 'text'],
             'unused_in_bp' => ['type' => 'text'],
-        ]);
-        Blueprint::shouldReceive('find')->with('test')->andReturn($blueprint);
+        ])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('taxonomies/test')->andReturn(collect(['test' => $blueprint]));
 
         $taxonomy = tap(Taxonomy::make('test'))->save();
 
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
new file mode 100644
index 00000000000..510f8571914
--- /dev/null
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Data\Taxonomies;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Statamic\Fields\Blueprint;
+use Statamic\Taxonomies\Taxonomy;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class TaxonomyTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_gets_term_blueprints()
+    {
+        $taxonomy = (new Taxonomy)->handle('tags');
+
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect([
+            'one' => $blueprintOne = (new Blueprint)->setHandle('one'),
+            'two' => $blueprintTwo = (new Blueprint)->setHandle('two'),
+        ]));
+
+        $blueprints = $taxonomy->termBlueprints();
+        $this->assertCount(2, $blueprints);
+        $this->assertEveryItemIsInstanceOf(Blueprint::class, $blueprints);
+        $this->assertEquals([$blueprintOne, $blueprintTwo], $blueprints->all());
+
+        $this->assertEquals($blueprintOne, $taxonomy->termBlueprint());
+        $this->assertEquals($blueprintOne, $taxonomy->termBlueprint('one'));
+        $this->assertEquals($blueprintTwo, $taxonomy->termBlueprint('two'));
+        $this->assertNull($taxonomy->termBlueprint('three'));
+    }
+
+    /** @test */
+    public function no_existing_blueprints_will_fall_back_to_a_default_named_after_the_taxonomy()
+    {
+        $taxonomy = (new Taxonomy)->handle('tags');
+
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect());
+        BlueprintRepository::shouldReceive('find')->with('default')->andReturn(
+            $blueprint = (new Blueprint)
+                ->setHandle('thisll_change')
+                ->setContents(['title' => 'This will change'])
+        );
+
+        $blueprints = $taxonomy->termBlueprints();
+        $this->assertCount(1, $blueprints);
+        $this->assertEquals([$blueprint], $blueprints->all());
+
+        tap($taxonomy->termBlueprint(), function ($default) use ($blueprint) {
+            $this->assertEquals($blueprint, $default);
+            $this->assertEquals('tags', $default->handle());
+            $this->assertEquals('Tags', $default->title());
+        });
+
+        $this->assertEquals($blueprint, $taxonomy->termBlueprint('tags'));
+        $this->assertNull($taxonomy->termBlueprint('two'));
+    }
+}
diff --git a/tests/Data/Taxonomies/TermTest.php b/tests/Data/Taxonomies/TermTest.php
new file mode 100644
index 00000000000..e2c9bfd49ca
--- /dev/null
+++ b/tests/Data/Taxonomies/TermTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Data\Taxonomies;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Mockery;
+use Statamic\Facades\Taxonomy;
+use Statamic\Fields\Blueprint;
+use Statamic\Taxonomies\Term;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class TermTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_gets_the_blueprint_when_defined_on_itself()
+    {
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
+        Taxonomy::make('tags')->save();
+        $term = (new Term)->taxonomy('tags')->blueprint('second');
+
+        $this->assertSame($second, $term->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function it_gets_the_blueprint_when_defined_in_a_value()
+    {
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
+        Taxonomy::make('tags')->save();
+        $term = (new Term)->taxonomy('tags')->set('blueprint', 'second');
+
+        $this->assertSame($second, $term->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function it_gets_the_default_taxonomy_blueprint_when_undefined()
+    {
+        BlueprintRepository::shouldReceive('in')->with('taxonomies/tags')->andReturn(collect([
+            'first' => $first = (new Blueprint)->setHandle('first'),
+            'second' => $second = (new Blueprint)->setHandle('second'),
+        ]));
+        $taxonomy = tap(Taxonomy::make('tags'))->save();
+        $term = (new Term)->taxonomy($taxonomy);
+
+        $this->assertSame($first, $term->blueprint());
+        $this->assertNotSame($first, $second);
+    }
+
+    /** @test */
+    public function the_blueprint_is_blinked_when_getting_and_flushed_when_setting()
+    {
+        $taxonomy = Mockery::mock(Taxonomy::make('tags'));
+        $taxonomy->shouldReceive('termBlueprint')->with(null)->once()->andReturn('the old blueprint');
+        $taxonomy->shouldReceive('termBlueprint')->with('new')->once()->andReturn('the new blueprint');
+        Taxonomy::shouldReceive('findByHandle')->with('tags')->andReturn($taxonomy);
+
+        $term = (new Term)->taxonomy('tags');
+
+        $this->assertEquals('the old blueprint', $term->blueprint());
+        $this->assertEquals('the old blueprint', $term->blueprint());
+
+        $term->blueprint('new');
+
+        $this->assertEquals('the new blueprint', $term->blueprint());
+        $this->assertEquals('the new blueprint', $term->blueprint());
+    }
+}
diff --git a/tests/Feature/Taxonomies/Blueprints/CreateBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/CreateBlueprintTest.php
new file mode 100644
index 00000000000..8223b8d68a8
--- /dev/null
+++ b/tests/Feature/Taxonomies/Blueprints/CreateBlueprintTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Feature\Taxonomies\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Facades\Taxonomy;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CreateBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_shows_the_form()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Taxonomy::make('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.create', 'test'))
+            ->assertOk()
+            ->assertViewIs('statamic::taxonomies.blueprints.create');
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Taxonomy::make('test'))->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.create', 'test'))
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+}
diff --git a/tests/Feature/Taxonomies/Blueprints/EditBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/EditBlueprintTest.php
new file mode 100644
index 00000000000..77fe23152c3
--- /dev/null
+++ b/tests/Feature/Taxonomies/Blueprints/EditBlueprintTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Feature\Taxonomies\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Facades\Taxonomy;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class EditBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $blueprint = $collection->termBlueprint();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.edit', [$collection, $blueprint]))
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+
+    /** @test */
+    public function it_provides_the_blueprint()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $blueprint = $collection->termBlueprint();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.edit', [$collection, $blueprint]))
+            ->assertStatus(200)
+            ->assertViewHas('blueprint', $blueprint);
+    }
+}
diff --git a/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
new file mode 100644
index 00000000000..201e1ca8af2
--- /dev/null
+++ b/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Tests\Feature\Taxonomies\Blueprints;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Statamic\Facades;
+use Statamic\Facades\Taxonomy;
+use Tests\Fakes\FakeBlueprintRepository;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class StoreBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection)
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+    }
+
+    /** @test */
+    public function blueprint_gets_created()
+    {
+        $this->withoutExceptionHandling();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+
+        Facades\Blueprint::make('existing')->setNamespace('taxonomies.test')->save();
+        $this->assertCount(1, Facades\Blueprint::in('taxonomies/test'));
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, ['title' => 'My Test Blueprint'])
+            ->assertRedirect('/cp/taxonomies/test/blueprints/my_test_blueprint/edit');
+
+        $this->assertCount(2, Facades\Blueprint::in('taxonomies/test'));
+        $blueprint = Facades\Blueprint::in('taxonomies/test')->last();
+        $this->assertEquals('my_test_blueprint', $blueprint->handle());
+        $this->assertEquals([
+            'title' => 'My Test Blueprint',
+            'sections' => [
+                'main' => [
+                    'display' => 'Main',
+                    'fields' => [],
+                ],
+            ],
+        ], $blueprint->contents());
+    }
+
+    /** @test */
+    public function when_creating_the_first_blueprint_the_default_one_is_also_created()
+    {
+        // If there are no user-defined blueprints, save the default one.
+        // To the user, it would have looked like the default one existed since it's in the listing.
+        // The new one the user is about to create should be considered the second one.
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test_collection'))->save();
+
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test_collection'));
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, ['title' => 'My Test Blueprint'])
+            ->assertRedirect('/cp/taxonomies/test_collection/blueprints/my_test_blueprint/edit');
+
+        $this->assertCount(2, Facades\Blueprint::in('taxonomies/test_collection'));
+
+        $this->assertEquals(
+            ['test_collection', 'my_test_blueprint'],
+            Facades\Blueprint::in('taxonomies/test_collection')->map->handle()->values()->all()
+        );
+    }
+
+    /** @test */
+    public function title_is_required()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, ['title' => ''])
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('title');
+
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+    }
+
+    private function submit($collection, $params = [])
+    {
+        return $this->post(cp_route('taxonomies.blueprints.store', $collection), $this->validParams($params));
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Test',
+        ], $overrides);
+    }
+}
diff --git a/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
new file mode 100644
index 00000000000..2d868de2fc6
--- /dev/null
+++ b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
@@ -0,0 +1,274 @@
+<?php
+
+namespace Tests\Feature\Taxonomies\Blueprints;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Statamic\Facades;
+use Statamic\Facades\Taxonomy;
+use Statamic\Fields\Blueprint;
+use Tests\Fakes\FakeBlueprintRepository;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $blueprint = (new Blueprint)->setHandle('test')->setContents(['title' => 'Test'])->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, $blueprint)
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+
+        $blueprint = Facades\Blueprint::find('test');
+        $this->assertEquals('Test', $blueprint->title());
+    }
+
+    /** @test */
+    public function blueprint_gets_saved()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $blueprint = (new Blueprint)->setNamespace('taxonomies.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, $blueprint, [
+                'title' => 'Updated title',
+                'sections' => [
+                    [
+                        '_id' => 'id-one',
+                        'handle' => 'one',
+                        'display' => 'Section One',
+                        'fields' => [
+                            [
+                                '_id' => 'id-s1-f1',
+                                'handle' => 'one-one',
+                                'type' => 'reference',
+                                'field_reference' => 'somefieldset.somefield',
+                                'config' => [
+                                    'foo' => 'bar',
+                                    'baz' => 'qux', // not in config_overrides so it shouldn't get saved
+                                ],
+                                'config_overrides' => ['foo'],
+                            ],
+                            [
+                                '_id' => 'id-s1-f1',
+                                'handle' => 'one-two',
+                                'type' => 'inline',
+                                'config' => [
+                                    'type' => 'text',
+                                    'foo' => 'bar',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertOk();
+
+        $this->assertEquals([
+            'title' => 'Updated title',
+            'sections' => [
+                'one' => [
+                    'display' => 'Section One',
+                    'fields' => [
+                        [
+                            'handle' => 'one-one',
+                            'field' => 'somefieldset.somefield',
+                            'config' => [
+                                'foo' => 'bar',
+                            ],
+                        ],
+                        [
+                            'handle' => 'one-two',
+                            'field' => [
+                                'type' => 'text',
+                                'foo' => 'bar',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], Facades\Blueprint::find('taxonomies.test.test')->contents());
+    }
+
+    /** @test */
+    public function title_is_required()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+        $blueprint = (new Blueprint)->setNamespace('taxonomies.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, $blueprint, ['title' => ''])
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('title');
+
+        $this->assertEquals('Test', Facades\Blueprint::find('taxonomies.test.test')->title());
+    }
+
+    /** @test */
+    public function sections_are_required()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+        $blueprint = tap($collection->termBlueprint())->save();
+        $originalContents = $blueprint->contents();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, $blueprint, ['sections' => ''])
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('sections');
+
+        $this->assertEquals($originalContents, Facades\Blueprint::find('taxonomies.test.test')->contents());
+    }
+
+    /** @test */
+    public function sections_must_be_an_array()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $this->assertCount(0, Facades\Blueprint::in('taxonomies/test'));
+        $blueprint = tap($collection->termBlueprint())->save();
+        $originalContents = $blueprint->contents();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->submit($collection, $blueprint, ['sections' => 'string'])
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('sections');
+
+        $this->assertEquals($originalContents, Facades\Blueprint::find('taxonomies.test.test')->contents());
+    }
+
+    /** @test */
+    public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for_reference_fields_with_config_overrides()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        $collection = tap(Taxonomy::make('test'))->save();
+        $blueprint = (new Blueprint)->setNamespace('taxonomies.test')->setHandle('test')->setContents(['title' => 'Test'])->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($collection, $blueprint, [
+                'title' => 'Updated title',
+                'sections' => [
+                    [
+                        '_id' => 'id-one',
+                        'handle' => 'one',
+                        'display' => 'Section One',
+                        'fields' => [
+                            [
+                                '_id' => 'id-s1-f1',
+                                'handle' => 'one-one',
+                                'type' => 'reference',
+                                'field_reference' => 'somefieldset.somefield',
+                                'config' => [
+                                    'foo' => 'bar',
+                                    'width' => 100,
+                                ],
+                                'config_overrides' => ['width'],
+                            ],
+                            [
+                                '_id' => 'id-s1-f2',
+                                'handle' => 'one-two',
+                                'type' => 'inline',
+                                'config' => [
+                                    'type' => 'text',
+                                    'width' => 100,
+                                ],
+                            ],
+                            [
+                                '_id' => 'id-s1-f3',
+                                'handle' => 'one-three',
+                                'type' => 'inline',
+                                'config' => [
+                                    'type' => 'text',
+                                    'width' => 50,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ])
+            ->assertOk();
+
+        $this->assertEquals([
+            'title' => 'Updated title',
+            'sections' => [
+                'one' => [
+                    'display' => 'Section One',
+                    'fields' => [
+                        [
+                            'handle' => 'one-one',
+                            'field' => 'somefieldset.somefield',
+                            'config' => [
+                                'width' => 100,
+                            ],
+                        ],
+                        [
+                            'handle' => 'one-two',
+                            'field' => [
+                                'type' => 'text',
+                            ],
+                        ],
+                        [
+                            'handle' => 'one-three',
+                            'field' => [
+                                'type' => 'text',
+                                'width' => 50,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], Facades\Blueprint::find('taxonomies.test.test')->contents());
+    }
+
+    private function submit($collection, $blueprint, $params = [])
+    {
+        return $this->patch(
+            cp_route('taxonomies.blueprints.update', [$collection, $blueprint]),
+            $this->validParams($params)
+        );
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Updated',
+            'sections' => [],
+        ], $overrides);
+    }
+}
diff --git a/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php
new file mode 100644
index 00000000000..362c1d8d59d
--- /dev/null
+++ b/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Feature\Taxonomies\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Facades\Taxonomy;
+use Statamic\Fields\Blueprint;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ViewBlueprintListingTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_shows_a_list_of_blueprints()
+    {
+        // When the CP header loads the avatar it reaches for the user blueprint.
+        Facades\Blueprint::shouldReceive('find')->with('user')->andReturn(new Blueprint);
+
+        Facades\Blueprint::shouldReceive('in')->with('taxonomies/test')->andReturn(collect([
+            'foo' => $blueprintA = $this->createBlueprint('foo'),
+            'bar' => $blueprintB = $this->createBlueprint('bar'),
+        ]));
+
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Taxonomy::make('test'))->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.index', 'test'))
+            ->assertSuccessful()
+            ->assertViewHas('blueprints', collect([
+                [
+                    'id' => 'foo',
+                    'handle' => 'foo',
+                    'title' => 'Foo',
+                    'sections' => 2,
+                    'fields' => 2,
+                    'edit_url' => 'http://localhost/cp/taxonomies/test/blueprints/foo/edit',
+                    'delete_url' => 'http://localhost/cp/taxonomies/test/blueprints/foo',
+                ],
+                [
+                    'id' => 'bar',
+                    'handle' => 'bar',
+                    'title' => 'Bar',
+                    'sections' => 2,
+                    'fields' => 2,
+                    'edit_url' => 'http://localhost/cp/taxonomies/test/blueprints/bar/edit',
+                    'delete_url' => 'http://localhost/cp/taxonomies/test/blueprints/bar',
+                ],
+            ]))
+            ->assertDontSee('no-results');
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+        tap(Taxonomy::make('test'))->save();
+
+        $response = $this
+            ->from('/cp/original')
+            ->actingAs($user)
+            ->get(cp_route('taxonomies.blueprints.index', 'test'))
+            ->assertRedirect('/cp/original');
+    }
+
+    private function createBlueprint($handle)
+    {
+        return tap(new Blueprint)->setHandle($handle);
+    }
+}
diff --git a/tests/Feature/Taxonomies/UpdateTaxonomyTest.php b/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
index aa07ce551d8..7c2490f66f2 100644
--- a/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
+++ b/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
@@ -50,26 +50,6 @@ public function it_updates_a_taxonomy()
         $this->assertEquals('Updated title', $taxonomy->title());
     }
 
-    /** @test */
-    public function it_updates_blueprints()
-    {
-        $mock = $this->partialMock(BlueprintRepository::class);
-        $mock->shouldReceive('find')->with('one')->andReturn(Blueprint::make('one'));
-        $mock->shouldReceive('find')->with('two')->andReturn(Blueprint::make('two'));
-        $mock->shouldReceive('find')->with('three')->andReturn(Blueprint::make('three'));
-        $mock->shouldReceive('find')->with('four')->andReturn(Blueprint::make('four'));
-
-        $taxonomy = tap(Taxonomy::make('test')->termBlueprints(['one', 'two']))->save();
-        $this->assertEquals(['one', 'two'], $taxonomy->termBlueprints()->map->handle()->all());
-
-        $this
-            ->actingAs($this->userWithPermission())
-            ->update($taxonomy, ['blueprints' => ['three', 'four']])
-            ->assertOk();
-
-        $this->assertEquals(['three', 'four'], Taxonomy::all()->first()->termBlueprints()->map->handle()->all());
-    }
-
     /** @test */
     public function it_associates_taxonomies_with_collections()
     {

From cbea3c01d45478d5054e69b7a44188b4914dad33 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:17:55 -0400
Subject: [PATCH 06/39] Fix fields filter not working on taxonomy term listing

---
 src/Query/Scopes/Filters/Fields.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Query/Scopes/Filters/Fields.php b/src/Query/Scopes/Filters/Fields.php
index c6c25a49445..d12eb508b96 100644
--- a/src/Query/Scopes/Filters/Fields.php
+++ b/src/Query/Scopes/Filters/Fields.php
@@ -4,6 +4,7 @@
 
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Taxonomy;
 use Statamic\Query\Scopes\Filter;
 use Statamic\Support\Arr;
 
@@ -73,6 +74,10 @@ protected function getBlueprints()
             return Collection::findByHandle($collection)->entryBlueprints();
         }
 
+        if ($taxonomy = Arr::get($this->context, 'taxonomy')) {
+            return Taxonomy::findByHandle($taxonomy)->termBlueprints();
+        }
+
         return collect($this->context['blueprints'])->map(function ($blueprint) {
             return Blueprint::find($blueprint);
         });

From e383356554916fed11e52eb5031834d7b14efa99 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:18:11 -0400
Subject: [PATCH 07/39] Support blueprint filter on taxonomy term listing

---
 src/Query/Scopes/Filters/Blueprint.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Query/Scopes/Filters/Blueprint.php b/src/Query/Scopes/Filters/Blueprint.php
index ad5a112e39f..112469ed2ba 100644
--- a/src/Query/Scopes/Filters/Blueprint.php
+++ b/src/Query/Scopes/Filters/Blueprint.php
@@ -3,7 +3,9 @@
 namespace Statamic\Query\Scopes\Filters;
 
 use Statamic\Facades\Collection;
+use Statamic\Facades\Taxonomy;
 use Statamic\Query\Scopes\Filter;
+use Statamic\Support\Arr;
 
 class Blueprint extends Filter
 {
@@ -35,12 +37,19 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return $key === 'entries' && $this->blueprints()->count() > 1;
+        return in_array($key, ['entries', 'terms'])
+            && $this->blueprints()->count() > 1;
     }
 
     public function blueprints()
     {
-        return Collection::findByHandle($this->context['collection'])->entryBlueprints();
+        if ($collection = Arr::get($this->context, 'collection')) {
+            return Collection::findByHandle($collection)->entryBlueprints();
+        }
+
+        if ($taxonomy = Arr::get($this->context, 'taxonomy')) {
+            return Taxonomy::findByHandle($taxonomy)->termBlueprints();
+        }
     }
 
     protected function options()

From fb41342fd3ee78383d6a6ce001c08a909d14a7ea Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:19:02 -0400
Subject: [PATCH 08/39] Compose on any blueprint edit view, now that it could
 be in collections/blueprints/edit, taxonomies/blueprints/edit, etc.

---
 src/Http/View/Composers/FieldComposer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/View/Composers/FieldComposer.php b/src/Http/View/Composers/FieldComposer.php
index c406c4f46ec..4d013e9e30c 100644
--- a/src/Http/View/Composers/FieldComposer.php
+++ b/src/Http/View/Composers/FieldComposer.php
@@ -10,7 +10,7 @@
 class FieldComposer
 {
     const VIEWS = [
-        'statamic::blueprints.edit',
+        'statamic::*.blueprints.edit',
         'statamic::fieldsets.edit',
     ];
 

From e77ac096e568d8634d51834285e5dc296ec220be Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:19:20 -0400
Subject: [PATCH 09/39] Adjust some tests

---
 tests/Data/Entries/AugmentedEntryTest.php |  4 ++--
 tests/FrontendTest.php                    | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/Data/Entries/AugmentedEntryTest.php b/tests/Data/Entries/AugmentedEntryTest.php
index 8f9565ab9da..6b14dc65e11 100644
--- a/tests/Data/Entries/AugmentedEntryTest.php
+++ b/tests/Data/Entries/AugmentedEntryTest.php
@@ -39,8 +39,8 @@ public function it_gets_values()
             'four' => ['type' => 'text'],
             'six' => ['type' => 'text'],
             'unused_in_bp' => ['type' => 'text'],
-        ]);
-        Blueprint::shouldReceive('find')->with('test')->andReturn($blueprint);
+        ])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('collections/test')->andReturn(collect(['test' => $blueprint]));
 
         $collection = tap(Collection::make('test')
             ->routes('/test/{slug}')
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index be9d4d937d4..2c58ed148e0 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -22,15 +22,19 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->withStandardFakeViews();
+    }
+
+    private function withStandardBlueprints()
+    {
         Blueprint::shouldReceive('in')->withAnyArgs()->andReturn(collect([new \Statamic\Fields\Blueprint]));
         $this->addToAssertionCount(-1);
-
-        $this->withStandardFakeViews();
     }
 
     /** @test */
     public function page_is_displayed()
     {
+        $this->withStandardBlueprints();
         $this->withoutExceptionHandling();
         $this->withFakeViews();
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
@@ -54,6 +58,7 @@ public function page_is_displayed()
     /** @test */
     public function page_is_displayed_with_query_string()
     {
+        $this->withStandardBlueprints();
         $this->withFakeViews();
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
         $this->viewShouldReturnRaw('some_template', '<h1>{{ title }}</h1> <p>{{ content }}</p>');
@@ -83,6 +88,7 @@ public function drafts_are_not_visible()
     /** @test */
     public function drafts_are_visible_if_using_live_preview()
     {
+        $this->withStandardBlueprints();
         $this->setTestRoles(['draft_viewer' => ['view drafts on frontend']]);
         $user = User::make()->assignRole('draft_viewer');
 
@@ -172,18 +178,20 @@ public function key_variables_key_added()
     /** @test */
     public function fields_gets_augmented()
     {
+        $this->withoutExceptionHandling();
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
         $this->viewShouldReturnRaw('default', '{{ augment_me }}{{ dont_augment_me }}');
-        Blueprint::shouldReceive('find')
-            ->with('test')
-            ->andReturn((new \Statamic\Fields\Blueprint)
+        Blueprint::shouldReceive('in')
+            ->with('collections/pages')
+            ->once()
+            ->andReturn(collect([(new \Statamic\Fields\Blueprint)
                 ->setHandle('test')
                 ->setContents(['fields' => [
                     [
                         'handle' => 'augment_me',
                         'field' => ['type' => 'markdown'],
                     ],
-                ]]));
+                ]])]));
 
         $this->createPage('about', [
             'path' => 'about.md',

From 2bcf33cc6c16d0de3eb9657e7e4659a2ca11371e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:19:26 -0400
Subject: [PATCH 10/39] Adjust key

---
 src/Entries/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 81a67a0f687..502ccdd865a 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -87,7 +87,7 @@ public function collection($collection = null)
 
     public function blueprint($blueprint = null)
     {
-        $key = "entry-{$this->id()}-default-blueprint";
+        $key = "entry-{$this->id()}-blueprint";
 
         return $this
             ->fluentlyGetOrSet('blueprint')

From da16be64b0393955fedad2d19f3c0aafe2223df4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 12:19:41 -0400
Subject: [PATCH 11/39] Don't find it, get it from the collection

---
 src/Http/Controllers/CP/Collections/EntriesController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index ec1817b5fc6..e49906027d1 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -269,9 +269,7 @@ public function store(Request $request, $collection, $site)
     {
         $this->authorize('store', [EntryContract::class, $collection]);
 
-        $blueprint = $collection->ensureEntryBlueprintFields(
-            Blueprint::find($request->blueprint)
-        );
+        $blueprint = $collection->entryBlueprint($request->blueprint);
 
         $fields = $blueprint->fields()->addValues($request->all());
 

From e8429d40dc05ce94eb61e0d8b30a2fc1ce1a47fb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 13:07:43 -0400
Subject: [PATCH 12/39] Apply blueprint changes to globals ...

- GlobalSet@blueprint is just a getter
- Global Variables@fallbackBlueprint uses array_values because it shouldn't be keyed by field handles
- Title is not required on a global set's blueprint because there will always be one. It's unnecessary. Move the validation inline for the collection and taxonomy controllers.
---
 .../views/globals/blueprints/edit.blade.php   | 12 +++++
 routes/cp.php                                 |  3 ++
 src/Globals/GlobalSet.php                     | 14 ++---
 src/Globals/Variables.php                     |  2 +-
 .../CollectionBlueprintsController.php        |  9 ++--
 .../CP/Fields/ManagesBlueprints.php           | 10 ++--
 .../CP/Globals/GlobalVariablesController.php  |  2 +-
 .../CP/Globals/GlobalsBlueprintController.php | 52 +++++++++++++++++++
 .../CP/Globals/GlobalsController.php          | 24 ++++-----
 .../TaxonomyBlueprintsController.php          |  9 ++--
 src/Stache/Stores/GlobalsStore.php            |  1 -
 11 files changed, 101 insertions(+), 37 deletions(-)
 create mode 100644 resources/views/globals/blueprints/edit.blade.php
 create mode 100644 src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php

diff --git a/resources/views/globals/blueprints/edit.blade.php b/resources/views/globals/blueprints/edit.blade.php
new file mode 100644
index 00000000000..9d498af9470
--- /dev/null
+++ b/resources/views/globals/blueprints/edit.blade.php
@@ -0,0 +1,12 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    <blueprint-builder
+        action="{{ cp_route('globals.blueprint.update', $set->handle()) }}"
+        breadcrumb-url="{{ cp_route('globals.variables.edit', $set->handle()) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+    ></blueprint-builder>
+
+@endsection
diff --git a/routes/cp.php b/routes/cp.php
index 8ec66113d96..6a304d399b3 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -106,6 +106,9 @@
 
         Route::get('globals/{global_set}', 'GlobalVariablesController@edit')->name('globals.variables.edit');
         Route::patch('globals/{global_set}/variables', 'GlobalVariablesController@update')->name('globals.variables.update');
+
+        Route::get('globals/{global_set}/blueprint', 'GlobalsBlueprintController@edit')->name('globals.blueprint.edit');
+        Route::patch('globals/{global_set}/blueprint', 'GlobalsBlueprintController@update')->name('globals.blueprint.update');
     });
 
     Route::group(['namespace' => 'Assets'], function () {
diff --git a/src/Globals/GlobalSet.php b/src/Globals/GlobalSet.php
index dfe7503a2ee..19b78f2ca26 100644
--- a/src/Globals/GlobalSet.php
+++ b/src/Globals/GlobalSet.php
@@ -19,7 +19,6 @@ class GlobalSet implements Contract
 
     protected $title;
     protected $handle;
-    protected $blueprint;
     protected $localizations;
 
     public function id()
@@ -42,13 +41,9 @@ public function title($title = null)
             ->args(func_get_args());
     }
 
-    public function blueprint($blueprint = null)
+    public function blueprint()
     {
-        return $this->fluentlyGetOrSet('blueprint')
-            ->getter(function ($blueprint) {
-                return Blueprint::find($blueprint);
-            })
-            ->args(func_get_args());
+        return Blueprint::find('globals.'.$this->handle());
     }
 
     public function path()
@@ -132,6 +127,11 @@ public function inCurrentSite()
         return $this->in(Site::current()->handle());
     }
 
+    public function inDefaultSite()
+    {
+        return $this->in(Site::default()->handle());
+    }
+
     public function existsIn($locale)
     {
         return $this->in($locale) !== null;
diff --git a/src/Globals/Variables.php b/src/Globals/Variables.php
index 170f3574ddd..824ee7ba5af 100644
--- a/src/Globals/Variables.php
+++ b/src/Globals/Variables.php
@@ -122,7 +122,7 @@ protected function fallbackBlueprint()
         return (new \Statamic\Fields\Blueprint)->setContents([
             'sections' => [
                 'main' => [
-                    'fields' => $fields->all(),
+                    'fields' => array_values($fields->all()),
                 ],
             ],
         ]);
diff --git a/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
index 84e41220864..0a1e0af4e7c 100644
--- a/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
@@ -47,11 +47,12 @@ public function edit($collection, $blueprint)
 
     public function update(Request $request, $collection, $blueprint)
     {
-        $blueprint = $collection->entryBlueprint($blueprint);
-
-        $this->updateBlueprint($request, $blueprint);
+        $request->validate([
+            'title' => 'required',
+            'sections' => 'array',
+        ]);
 
-        $blueprint->save();
+        $this->updateBlueprint($request, $collection->entryBlueprint($blueprint));
     }
 
     public function create($collection)
diff --git a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
index 45a9daae9fc..09ee44f9ead 100644
--- a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
+++ b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
@@ -29,21 +29,17 @@ private function indexItems(Collection $blueprints, $item)
 
     private function updateBlueprint(Request $request, Blueprint $blueprint)
     {
-        $request->validate([
-            'title' => 'required',
-            'sections' => 'array',
-        ]);
-
         $sections = collect($request->sections)->mapWithKeys(function ($section) {
             return [array_pull($section, 'handle') => [
                 'display' => $section['display'],
                 'fields' => $this->sectionFields($section['fields']),
             ]];
         })->all();
-        $blueprint->setContents([
+
+        $blueprint->setContents(array_filter([
             'title' => $request->title,
             'sections' => $sections,
-        ])->save();
+        ]))->save();
     }
 
     private function sectionFields(array $fields)
diff --git a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
index eb290cc923b..c878e5fde7c 100644
--- a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
@@ -42,7 +42,7 @@ public function edit(Request $request, $id)
             'editing' => true,
             'actions' => [
                 'save' => $variables->updateUrl(),
-                'editBlueprint' => $blueprint->editUrl(),
+                'editBlueprint' => cp_route('globals.blueprint.edit', $set->handle()),
             ],
             'values' => $values,
             'meta' => $meta,
diff --git a/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php b/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php
new file mode 100644
index 00000000000..cd1f83298e1
--- /dev/null
+++ b/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Globals;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalSet;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class GlobalsBlueprintController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function edit($set)
+    {
+        if (! $set = GlobalSet::find($set)) {
+            return $this->pageNotFound();
+        }
+
+        $blueprint = $this->blueprint($set);
+
+        return view('statamic::globals.blueprints.edit', [
+            'set' => $set,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $set)
+    {
+        if (! $set = GlobalSet::find($set)) {
+            return $this->pageNotFound();
+        }
+
+        $request->validate(['sections' => 'array']);
+
+        $this->updateBlueprint($request, $this->blueprint($set));
+    }
+
+    private function blueprint($set)
+    {
+        return tap($set->blueprint() ?? $set->inDefaultSite()->blueprint())
+            ->setHandle($set->handle())
+            ->setNamespace('globals');
+    }
+}
diff --git a/src/Http/Controllers/CP/Globals/GlobalsController.php b/src/Http/Controllers/CP/Globals/GlobalsController.php
index 5227a7dd4d6..b799a0bc962 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsController.php
@@ -166,18 +166,18 @@ protected function editFormBlueprint()
                     ],
                 ],
             ],
-            'content_model' => [
-                'display' => __('Content Model'),
-                'fields' => [
-                    'blueprint' => [
-                        'type' => 'blueprints',
-                        'instructions' => __('statamic::messages.globals_blueprint_instructions'),
-                        'validate' => 'array',
-                        'mode' => 'select',
-                        'max_items' => 1,
-                    ],
-                ],
-            ],
+            // 'content_model' => [
+            //     'display' => __('Content Model'),
+            //     'fields' => [
+            //         'blueprint' => [
+            //             'type' => 'blueprints',
+            //             'instructions' => __('statamic::messages.globals_blueprint_instructions'),
+            //             'validate' => 'array',
+            //             'mode' => 'select',
+            //             'max_items' => 1,
+            //         ],
+            //     ],
+            // ],
         ];
 
         if (Site::hasMultiple()) {
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
index 651c7451580..b70fb9e3756 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
@@ -47,11 +47,12 @@ public function edit($taxonomy, $blueprint)
 
     public function update(Request $request, $taxonomy, $blueprint)
     {
-        $blueprint = $taxonomy->termBlueprint($blueprint);
-
-        $this->updateBlueprint($request, $blueprint);
+        $request->validate([
+            'title' => 'required',
+            'sections' => 'array',
+        ]);
 
-        $blueprint->save();
+        $this->updateBlueprint($request, $taxonomy->termBlueprint($blueprint));
     }
 
     public function create($taxonomy)
diff --git a/src/Stache/Stores/GlobalsStore.php b/src/Stache/Stores/GlobalsStore.php
index 83bc22aa45f..bb6a85310b8 100644
--- a/src/Stache/Stores/GlobalsStore.php
+++ b/src/Stache/Stores/GlobalsStore.php
@@ -81,7 +81,6 @@ protected function makeBaseGlobalFromFile($handle, $path, $data)
         return GlobalSet::make()
             ->handle($handle)
             ->title($data['title'] ?? null)
-            ->blueprint($data['blueprint'] ?? null)
             ->initialPath($path);
     }
 

From ee397ddaabec41e997c90a0c8a76022956d74064 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 13:17:58 -0400
Subject: [PATCH 13/39] Don't need to save the blueprint to file

---
 src/Globals/GlobalSet.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Globals/GlobalSet.php b/src/Globals/GlobalSet.php
index 19b78f2ca26..c8fccc2af2c 100644
--- a/src/Globals/GlobalSet.php
+++ b/src/Globals/GlobalSet.php
@@ -77,7 +77,6 @@ public function fileData()
     {
         $data = [
             'title' => $this->title(),
-            'blueprint' => $this->blueprint,
         ];
 
         if (! Site::hasMultiple()) {

From 9e4e3ffb03f2f35e9175fb16ae1efb2affcd0ca1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 14:33:51 -0400
Subject: [PATCH 14/39] Apply blueprint changes to assets ...

- Remove PublishBlueprint route and controller. The asset editor was the only one that was using it. Just bring the blueprint directly into the resource now.
- Removed the fallback asset.yaml and hardcode it right into the AssetContainer class.
- Blueprint::makeFromFields() calls values to prevent them being keyed by handle.
---
 resources/blueprints/asset.yaml               |  7 ----
 .../js/components/assets/AssetManager.vue     |  4 +++
 .../js/components/assets/Editor/Editor.vue    | 14 +-------
 .../containers/blueprints/edit.blade.php      | 12 +++++++
 routes/cp.php                                 |  3 +-
 src/Assets/AssetContainer.php                 | 24 ++++++-------
 src/Contracts/Assets/AssetContainer.php       |  6 ++--
 src/Fields/BlueprintRepository.php            |  2 +-
 .../AssetContainerBlueprintController.php     | 35 +++++++++++++++++++
 .../CP/Assets/AssetContainersController.php   | 27 +++++++-------
 .../CP/Assets/BrowserController.php           |  1 +
 .../CP/Fields/PublishBlueprintController.php  | 18 ----------
 src/Http/Resources/CP/Assets/Asset.php        |  3 +-
 src/Stache/Stores/AssetContainersStore.php    |  1 -
 tests/Assets/AssetContainerTest.php           | 19 +++-------
 tests/Assets/AssetTest.php                    | 13 ++++---
 .../Stores/AssetContainersStoreTest.php       | 10 +-----
 17 files changed, 95 insertions(+), 104 deletions(-)
 delete mode 100644 resources/blueprints/asset.yaml
 create mode 100644 resources/views/assets/containers/blueprints/edit.blade.php
 create mode 100644 src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
 delete mode 100644 src/Http/Controllers/CP/Fields/PublishBlueprintController.php

diff --git a/resources/blueprints/asset.yaml b/resources/blueprints/asset.yaml
deleted file mode 100644
index a8b039c032d..00000000000
--- a/resources/blueprints/asset.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-fields:
-  -
-    handle: alt
-    field:
-      display: Alt Text
-      type: text
-      instructions: Description of the image
diff --git a/resources/js/components/assets/AssetManager.vue b/resources/js/components/assets/AssetManager.vue
index 937ea7436bf..16e1dcc0bf4 100644
--- a/resources/js/components/assets/AssetManager.vue
+++ b/resources/js/components/assets/AssetManager.vue
@@ -11,6 +11,10 @@
                     v-text="__('Edit Container')"
                     :redirect="container.edit_url">
                 </dropdown-item>
+                <dropdown-item
+                    v-text="__('Edit Blueprint')"
+                    :redirect="container.blueprint_url">
+                </dropdown-item>
                 <dropdown-item
                     v-if="container.can_delete"
                     v-text="__('Delete Container')"
diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 0b80d52479a..7e93e92a3d4 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -259,20 +259,8 @@ export default {
                 this.meta = data.meta;
                 this.runActionUrl = data.runActionUrl;
                 this.actions = data.actions;
-                this.getFieldset();
-            });
-        },
-
-        /**
-         * Load the fieldset
-         */
-        getFieldset() {
-            const url = cp_url(`fields/publish-blueprints/${this.asset.blueprint}`);
-
-            this.$axios.get(url).then(response => {
-                this.fieldset = response.data;
 
-                // Flatten fields from all sections into one array.
+                this.fieldset = data.blueprint;
                 this.fields = _.chain(this.fieldset.sections)
                     .map(section => section.fields)
                     .flatten(true)
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
new file mode 100644
index 00000000000..c1f4486c9a9
--- /dev/null
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -0,0 +1,12 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    <blueprint-builder
+        action="{{ cp_route('asset-containers.blueprint.update', $container->handle()) }}"
+        breadcrumb-url="{{ cp_route('assets.browse.index', $container->handle()) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+    ></blueprint-builder>
+
+@endsection
diff --git a/routes/cp.php b/routes/cp.php
index 6a304d399b3..2a2adb1f435 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -115,6 +115,8 @@
         Route::resource('asset-containers', 'AssetContainersController');
         Route::post('asset-containers/{asset_container}/folders', 'FoldersController@store');
         Route::patch('asset-containers/{asset_container}/folders/{path}', 'FoldersController@update')->where('path', '.*');
+        Route::get('asset-containers/{asset_container}/blueprint', 'AssetContainerBlueprintController@edit')->name('asset-containers.blueprint.edit');
+        Route::patch('asset-containers/{asset_container}/blueprint', 'AssetContainerBlueprintController@update')->name('asset-containers.blueprint.update');
         Route::post('assets/actions', 'ActionController@run')->name('assets.actions.run');
         Route::get('assets/actions', 'ActionController@bulkActions')->name('assets.actions.bulk');
         Route::get('assets/browse', 'BrowserController@index')->name('assets.browse.index');
@@ -139,7 +141,6 @@
         Route::post('fieldsets/{fieldset}/fields', 'FieldsetFieldController@store');
         Route::resource('blueprints', 'BlueprintController');
         Route::get('fieldtypes', 'FieldtypesController@index');
-        Route::get('publish-blueprints/{blueprint}', 'PublishBlueprintController@show');
     });
 
     Route::get('composer/check', 'ComposerOutputController@check');
diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index d7eae0a1d72..2799f53998e 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -28,7 +28,6 @@ class AssetContainer implements AssetContainerContract, Augmentable
     protected $title;
     protected $handle;
     protected $disk;
-    protected $blueprint;
     protected $private;
     protected $allowUploads;
     protected $allowDownloading;
@@ -104,7 +103,6 @@ public function toArray()
             'title' => $this->title,
             'handle' => $this->handle,
             'disk' => $this->disk,
-            'blueprint' => $this->blueprint,
             'search_index' => $this->searchIndex,
             'allow_uploads' => $this->allowUploads,
             'allow_downloading' => $this->allowDownloading,
@@ -152,19 +150,19 @@ public function apiUrl()
     }
 
     /**
-     * Get or set the blueprint to be used by assets in this container.
+     * Get the blueprint to be used by assets in this container.
      *
-     * @param string $blueprint
-     * @return \Statamic\Fields\Blueprint|$this
+     * @return \Statamic\Fields\Blueprint
      */
-    public function blueprint($blueprint = null)
-    {
-        return $this
-            ->fluentlyGetOrSet('blueprint')
-            ->getter(function ($blueprint) {
-                return Blueprint::find($blueprint ?? 'asset');
-            })
-            ->args(func_get_args());
+    public function blueprint()
+    {
+        return Blueprint::find('assets/'.$this->handle()) ?? Blueprint::makeFromFields([
+            'alt' => [
+                'type' => 'text',
+                'display' => 'Alt Text',
+                'instructions' => 'Description of the image',
+            ],
+        ])->setHandle($this->handle())->setNamespace('assets');
     }
 
     /**
diff --git a/src/Contracts/Assets/AssetContainer.php b/src/Contracts/Assets/AssetContainer.php
index ea352ee0332..2a4fb9aeab7 100644
--- a/src/Contracts/Assets/AssetContainer.php
+++ b/src/Contracts/Assets/AssetContainer.php
@@ -84,11 +84,9 @@ public function save();
     public function delete();
 
     /**
-     * Get or set the blueprint to be used by assets in this container.
-     *
-     * @param string $blueprint
+     * Get the blueprint to be used by assets in this container.
      */
-    public function blueprint($blueprint = null);
+    public function blueprint();
 
     /**
      * Whether the container's assets are web-accessible.
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 1515d4b4fdd..7491bde0c7c 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -99,7 +99,7 @@ public function makeFromFields($fields)
     {
         $fields = collect($fields)->map(function ($field, $handle) {
             return compact('handle', 'field');
-        });
+        })->values();
 
         return (new Blueprint)->setContents(['fields' => $fields]);
     }
diff --git a/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php b/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
new file mode 100644
index 00000000000..dce08fa3d6e
--- /dev/null
+++ b/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Assets;
+
+use Illuminate\Http\Request;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class AssetContainerBlueprintController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function edit($container)
+    {
+        $blueprint = $container->blueprint();
+
+        return view('statamic::assets.containers.blueprints.edit', [
+            'container' => $container,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $container)
+    {
+        $request->validate(['sections' => 'array']);
+
+        $this->updateBlueprint($request, $container->blueprint());
+    }
+}
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 13e679746af..13fe2d0b55a 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -31,6 +31,7 @@ public function index(Request $request)
                 'create_folders' => $container->createFolders(),
                 'edit_url' => $container->editUrl(),
                 'delete_url' => $container->deleteUrl(),
+                'blueprint_url' => cp_route('asset-containers.blueprint.edit', $container->handle()),
                 'can_edit' => User::current()->can('edit', $container),
                 'can_delete' => User::current()->can('delete', $container),
             ];
@@ -79,7 +80,6 @@ public function update(Request $request, $container)
         $container
             ->title($values['title'])
             ->disk($values['disk'])
-            ->blueprint($values['blueprint'])
             ->allowDownloading($values['allow_downloading'])
             ->allowRenaming($values['allow_renaming'])
             ->allowMoving($values['allow_moving'])
@@ -131,7 +131,6 @@ public function store(Request $request)
         $container = AssetContainer::make($values['handle'])
             ->title($values['title'])
             ->disk($values['disk'])
-            ->blueprint($values['blueprint'])
             ->allowUploads($values['allow_uploads'])
             ->createFolders($values['create_folders']);
 
@@ -191,18 +190,18 @@ protected function formBlueprint()
                     ],
                 ],
             ],
-            'fields' => [
-                'display' => __('Fields'),
-                'fields' => [
-                    'blueprint' => [
-                        'type' => 'blueprints',
-                        'display' => __('Blueprint'),
-                        'instructions' => __('statamic::messages.asset_container_blueprint_instructions'),
-                        'mode' => 'select',
-                        'max_items' => 1,
-                    ],
-                ],
-            ],
+            // 'fields' => [
+            //     'display' => __('Fields'),
+            //     'fields' => [
+            //         'blueprint' => [
+            //             'type' => 'blueprints',
+            //             'display' => __('Blueprint'),
+            //             'instructions' => __('statamic::messages.asset_container_blueprint_instructions'),
+            //             'mode' => 'select',
+            //             'max_items' => 1,
+            //         ],
+            //     ],
+            // ],
             'settings' => [
                 'display' => __('Settings'),
                 'fields' => [
diff --git a/src/Http/Controllers/CP/Assets/BrowserController.php b/src/Http/Controllers/CP/Assets/BrowserController.php
index 6b13b15e935..452f3d60ed2 100644
--- a/src/Http/Controllers/CP/Assets/BrowserController.php
+++ b/src/Http/Controllers/CP/Assets/BrowserController.php
@@ -36,6 +36,7 @@ public function show($container, $path = '/')
                 'title' => $container->title(),
                 'edit_url' => $container->editUrl(),
                 'delete_url' => $container->deleteUrl(),
+                'blueprint_url' => cp_route('asset-containers.blueprint.edit', $container->handle()),
                 'can_edit' => User::current()->can('edit', $container),
                 'can_delete' => User::current()->can('delete', $container),
             ],
diff --git a/src/Http/Controllers/CP/Fields/PublishBlueprintController.php b/src/Http/Controllers/CP/Fields/PublishBlueprintController.php
deleted file mode 100644
index 14ed2bf2a0b..00000000000
--- a/src/Http/Controllers/CP/Fields/PublishBlueprintController.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Statamic\Http\Controllers\CP\Fields;
-
-use Statamic\Facades\Blueprint;
-use Statamic\Http\Controllers\CP\CpController;
-
-class PublishBlueprintController extends CpController
-{
-    public function show($blueprint)
-    {
-        if (! $blueprint = Blueprint::find($blueprint)) {
-            return response('Blueprint not found.', 404);
-        }
-
-        return $blueprint->toPublishArray();
-    }
-}
diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
index 1395052c74d..22a940b971b 100644
--- a/src/Http/Resources/CP/Assets/Asset.php
+++ b/src/Http/Resources/CP/Assets/Asset.php
@@ -18,7 +18,6 @@ public function toArray($request)
             'url' => $this->url(),
             'permalink' => $this->absoluteUrl(),
             'extension' => $this->extension(),
-            'blueprint' => $this->blueprint()->handle(),
             'downloadUrl' => cp_route('assets.download', base64_encode($this->id())),
             'size' => Str::fileSizeForHumans($this->size()),
             'lastModified' => $this->lastModified()->inPreferredFormat(),
@@ -43,6 +42,8 @@ public function toArray($request)
             'allowDownloading' => $this->container()->allowDownloading(),
             'runActionUrl' => cp_route('assets.actions.run'),
             'actions' => Action::for($this->resource, ['container' => $this->container()->handle()]),
+
+            'blueprint' => $this->blueprint()->toPublishArray(),
         ];
     }
 
diff --git a/src/Stache/Stores/AssetContainersStore.php b/src/Stache/Stores/AssetContainersStore.php
index 2c494259927..d60040deb18 100644
--- a/src/Stache/Stores/AssetContainersStore.php
+++ b/src/Stache/Stores/AssetContainersStore.php
@@ -20,7 +20,6 @@ public function makeItemFromFile($path, $contents)
         return AssetContainer::make($handle)
             ->disk(array_get($data, 'disk'))
             ->title(array_get($data, 'title'))
-            ->blueprint(array_get($data, 'blueprint'))
             ->allowDownloading(array_get($data, 'allow_downloading'))
             ->allowMoving(array_get($data, 'allow_moving'))
             ->allowRenaming(array_get($data, 'allow_renaming'))
diff --git a/tests/Assets/AssetContainerTest.php b/tests/Assets/AssetContainerTest.php
index 94780ce6b1a..12d061a7abb 100644
--- a/tests/Assets/AssetContainerTest.php
+++ b/tests/Assets/AssetContainerTest.php
@@ -141,23 +141,12 @@ public function it_gets_and_sets_the_title()
     }
 
     /** @test */
-    public function it_gets_and_sets_blueprint()
+    public function it_gets_the_blueprint()
     {
-        BlueprintRepository::shouldReceive('find')
-            ->with('asset')
-            ->andReturn($defaultBlueprint = new Blueprint);
+        BlueprintRepository::shouldReceive('find')->with('assets/main')->andReturn($blueprint = new Blueprint);
 
-        BlueprintRepository::shouldReceive('find')
-            ->with('custom')
-            ->andReturn($customBlueprint = new Blueprint);
-
-        $container = new AssetContainer;
-        $this->assertEquals($defaultBlueprint, $container->blueprint());
-
-        $return = $container->blueprint('custom');
-
-        $this->assertEquals($container, $return);
-        $this->assertEquals($customBlueprint, $container->blueprint());
+        $container = (new AssetContainer)->handle('main');
+        $this->assertEquals($blueprint, $container->blueprint());
     }
 
     /** @test */
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 5c240c75059..61e9baf6865 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -31,7 +31,6 @@ public function setUp(): void
 
         $this->container = (new AssetContainer)
             ->handle('test_container')
-            ->blueprint('test_blueprint')
             ->disk('test');
 
         Storage::fake('test');
@@ -498,8 +497,8 @@ public function it_gets_file_size_in_bytes()
     public function it_compiles_augmented_array_data()
     {
         Facades\Blueprint::shouldReceive('find')
-            ->with('test_blueprint')
-            ->andReturn($blueprint = (new Blueprint)->setHandle('test_blueprint'));
+            ->with('assets/test_container')
+            ->andReturn($blueprint = (new Blueprint)->setHandle('test_container')->setNamespace('assets'));
 
         $asset = (new Asset)
             ->container($this->container)
@@ -537,8 +536,8 @@ public function it_compiles_augmented_array_data()
     public function data_keys_get_added_to_array()
     {
         Facades\Blueprint::shouldReceive('find')
-            ->with('test_blueprint')
-            ->andReturn((new Blueprint)->setHandle('test_blueprint'));
+            ->with('assets/test_container')
+            ->andReturn($blueprint = (new Blueprint)->setHandle('test_container')->setNamespace('assets'));
 
         $array = (new Asset)
             ->container($this->container)
@@ -556,8 +555,8 @@ public function data_keys_get_added_to_array()
     public function extra_keys_get_added_to_array_when_file_exists()
     {
         Facades\Blueprint::shouldReceive('find')
-            ->with('test_blueprint')
-            ->andReturn((new Blueprint)->setHandle('test_blueprint'));
+            ->with('assets/test_container')
+            ->andReturn($blueprint = (new Blueprint)->setHandle('test_container')->setNamespace('assets'));
 
         $container = $this->container;
         Storage::disk('test')->put('test.txt', '');
diff --git a/tests/Stache/Stores/AssetContainersStoreTest.php b/tests/Stache/Stores/AssetContainersStoreTest.php
index 661231586d2..0233d50c6b0 100644
--- a/tests/Stache/Stores/AssetContainersStoreTest.php
+++ b/tests/Stache/Stores/AssetContainersStoreTest.php
@@ -60,10 +60,6 @@ public function it_makes_asset_container_instances_from_files()
     {
         config(['filesystems.disks.test' => ['driver' => 'local', 'root' => __DIR__.'/../../Assets/__fixtures__/container']]);
 
-        Facades\Blueprint::shouldReceive('find')
-            ->with('test')->once()
-            ->andReturn($blueprint = new \Statamic\Fields\Blueprint);
-
         $contents = <<<'EOL'
 disk: test
 title: Example
@@ -75,7 +71,6 @@ public function it_makes_asset_container_instances_from_files()
         $this->assertEquals(File::disk('test'), $item->disk());
         $this->assertEquals('example', $item->handle());
         $this->assertEquals('Example', $item->title());
-        $this->assertEquals($blueprint, $item->blueprint());
         tap($item->assets(), function ($assets) {
             $this->assertEveryItemIsInstanceOf(Asset::class, $assets);
             $this->assertEquals([
@@ -111,14 +106,12 @@ public function it_saves_to_disk()
             ->andReturnTrue(); // irrelevant for this test but it gets called during saving
 
         $container = Facades\AssetContainer::make('new')
-            ->title('New Container')
-            ->blueprint('foo');
+            ->title('New Container');
 
         $this->store->save($container);
 
         $expected = <<<'EOT'
 title: 'New Container'
-blueprint: foo
 
 EOT;
         $this->assertStringEqualsFile($this->tempDir.'/new.yaml', $expected);
@@ -127,7 +120,6 @@ public function it_saves_to_disk()
 
         $expected = <<<'EOT'
 title: 'New Container'
-blueprint: foo
 allow_uploads: false
 create_folders: false
 

From 8b318d9889a7319c369c110f92a1d0678fe32551 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 14:33:57 -0400
Subject: [PATCH 15/39] Fix test

---
 tests/Feature/Globals/EditGlobalVariablesTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/Feature/Globals/EditGlobalVariablesTest.php b/tests/Feature/Globals/EditGlobalVariablesTest.php
index b3822d36f3f..fe25edf91c8 100644
--- a/tests/Feature/Globals/EditGlobalVariablesTest.php
+++ b/tests/Feature/Globals/EditGlobalVariablesTest.php
@@ -37,13 +37,12 @@ public function it_shows_the_form()
             ['handle' => 'unused', 'field' => ['type' => 'text']],
         ]]);
         $userBlueprint = Blueprint::make();
-        Blueprint::shouldReceive('find')->with('test')->andReturn($blueprint);
+        Blueprint::shouldReceive('find')->with('globals.test')->andReturn($blueprint);
         Blueprint::shouldReceive('find')->with('user')->andReturn($userBlueprint);
         $this->setTestRoles(['test' => ['access cp', 'edit test globals']]);
         $user = User::make()->assignRole('test')->save();
 
         $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->create();
-        $global->blueprint('test');
 
         $this
             ->actingAs($user)

From eea643590c6f2467ec3727e27e756cb74cd9edff Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 15:14:53 -0400
Subject: [PATCH 16/39] Apply blueprint changes to forms

---
 resources/js/components/forms/Listing.vue     |  1 +
 .../views/forms/blueprints/edit.blade.php     | 12 +++++++
 routes/cp.php                                 |  2 ++
 src/Contracts/Forms/Form.php                  |  5 ++-
 src/Forms/Form.php                            | 21 +++--------
 .../CP/Forms/FormBlueprintController.php      | 35 +++++++++++++++++++
 .../Controllers/CP/Forms/FormsController.php  | 14 ++++----
 .../ListAssetContainersTest.php               |  2 ++
 tests/Feature/Forms/UpdateFormTest.php        | 20 -----------
 tests/Forms/FormTest.php                      |  2 --
 tests/Git/GitEventTest.php                    |  6 +---
 tests/Tags/Form/FormCreateTest.php            |  4 +--
 12 files changed, 69 insertions(+), 55 deletions(-)
 create mode 100644 resources/views/forms/blueprints/edit.blade.php
 create mode 100644 src/Http/Controllers/CP/Forms/FormBlueprintController.php

diff --git a/resources/js/components/forms/Listing.vue b/resources/js/components/forms/Listing.vue
index 887af399432..b3b10e030f2 100644
--- a/resources/js/components/forms/Listing.vue
+++ b/resources/js/components/forms/Listing.vue
@@ -8,6 +8,7 @@
                 <template slot="actions" slot-scope="{ row: form, index }">
                     <dropdown-list>
                         <dropdown-item :text="__('Edit')" :redirect="form.edit_url" />
+                        <dropdown-item :text="__('Edit Blueprint')" :redirect="form.blueprint_url" />
                         <dropdown-item
                             v-if="form.deleteable"
                             :text="__('Delete')"
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
new file mode 100644
index 00000000000..45924ce7599
--- /dev/null
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -0,0 +1,12 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    <blueprint-builder
+        action="{{ cp_route('forms.blueprint.update', $form->handle()) }}"
+        breadcrumb-url="{{ cp_route('forms.show', $form->handle()) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+    ></blueprint-builder>
+
+@endsection
diff --git a/routes/cp.php b/routes/cp.php
index 2a2adb1f435..e0ce74a6506 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -164,6 +164,8 @@
         Route::resource('forms', 'FormsController');
         Route::resource('forms.submissions', 'FormSubmissionsController');
         Route::get('forms/{form}/export/{type}', 'FormExportController@export')->name('forms.export');
+        Route::get('forms/{form}/blueprint', 'FormBlueprintController@edit')->name('forms.blueprint.edit');
+        Route::patch('forms/{form}/blueprint', 'FormBlueprintController@update')->name('forms.blueprint.update');
     });
 
     Route::group(['namespace' => 'Users'], function () {
diff --git a/src/Contracts/Forms/Form.php b/src/Contracts/Forms/Form.php
index 5a7a4ba3ed5..1ee6020ba81 100644
--- a/src/Contracts/Forms/Form.php
+++ b/src/Contracts/Forms/Form.php
@@ -24,12 +24,11 @@ public function handle($handle = null);
     public function title($title = null);
 
     /**
-     * Get or set the blueprint.
+     * Get the blueprint.
      *
-     * @param mixed $blueprint
      * @return mixed
      */
-    public function blueprint($blueprint = null);
+    public function blueprint();
 
     /**
      * Get the submissions.
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index ee07df7bec4..12c5e73ee40 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -6,12 +6,11 @@
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Events\Data\FormDeleted;
 use Statamic\Events\Data\FormSaved;
-use Statamic\Facades;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
 use Statamic\Facades\Folder;
 use Statamic\Facades\YAML;
-use Statamic\Fields\Blueprint;
 use Statamic\Forms\Exceptions\BlueprintUndefinedException;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -52,21 +51,14 @@ public function title($title = null)
     }
 
     /**
-     * Get or set the blueprint.
+     * Get the blueprint.
      *
-     * @param mixed $blueprint
      * @return mixed
      */
-    public function blueprint($blueprint = null)
+    public function blueprint()
     {
-        return $this->fluentlyGetOrSet('blueprint')
-            ->getter(function ($blueprint) {
-                return Facades\Blueprint::find($blueprint);
-            })
-            ->setter(function ($blueprint) {
-                return $blueprint instanceof Blueprint ? $blueprint->handle() : $blueprint;
-            })
-            ->args(func_get_args());
+        return Blueprint::find('forms.'.$this->handle())
+            ?? Blueprint::makeFromFields([])->setHandle($this->handle())->setNamespace('forms');
     }
 
     /**
@@ -147,7 +139,6 @@ public function save()
     {
         $data = collect([
             'title' => $this->title,
-            'blueprint' => $this->blueprint,
             'honeypot' => $this->honeypot,
             'email' => collect($this->email)->map(function ($email) {
                 return Arr::removeNullValues($email);
@@ -187,7 +178,6 @@ public function hydrate()
             ->filter(function ($value, $property) {
                 return in_array($property, [
                     'title',
-                    'blueprint',
                     'honeypot',
                     'store',
                     'email',
@@ -343,7 +333,6 @@ public function toArray()
         return [
             'handle' => $this->handle,
             'title' => $this->title,
-            'blueprint' => $this->blueprint,
             'honeypot' => $this->honeypot(),
             'store' => $this->store(),
             'email' => $this->email,
diff --git a/src/Http/Controllers/CP/Forms/FormBlueprintController.php b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
new file mode 100644
index 00000000000..9fcdf1021d9
--- /dev/null
+++ b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Forms;
+
+use Illuminate\Http\Request;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class FormBlueprintController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function edit($form)
+    {
+        $blueprint = $form->blueprint();
+
+        return view('statamic::forms.blueprints.edit', [
+            'form' => $form,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $form)
+    {
+        $request->validate(['sections' => 'array']);
+
+        $this->updateBlueprint($request, $form->blueprint());
+    }
+}
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index ff285bec546..a85cae13c0f 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -28,6 +28,7 @@ public function index()
                     'show_url' => $form->showUrl(),
                     'edit_url' => $form->editUrl(),
                     'delete_url' => $form->deleteUrl(),
+                    'blueprint_url' => cp_route('forms.blueprint.edit', $form->handle()),
                     'deleteable' => User::current()->can('delete', $form),
                 ];
             })
@@ -137,7 +138,6 @@ public function update($form, Request $request)
 
         $form
             ->title($values['title'])
-            ->blueprint($values['blueprint'])
             ->honeypot($values['honeypot'])
             ->store($values['store'])
             ->email($values['email']);
@@ -172,12 +172,12 @@ protected function editFormBlueprint()
             'fields' => [
                 'display' => __('Fields'),
                 'fields' => [
-                    'blueprint' => [
-                        'type' => 'blueprints',
-                        'instructions' => __('statamic::messages.form_configure_blueprint_instructions'),
-                        'max_items' => 1,
-                        'mode' => 'select',
-                    ],
+                    // 'blueprint' => [
+                    //     'type' => 'blueprints',
+                    //     'instructions' => __('statamic::messages.form_configure_blueprint_instructions'),
+                    //     'max_items' => 1,
+                    //     'mode' => 'select',
+                    // ],
                     'honeypot' => [
                         'type' => 'text',
                         'instructions' => __('statamic::messages.form_configure_honeypot_instructions'),
diff --git a/tests/Feature/AssetContainers/ListAssetContainersTest.php b/tests/Feature/AssetContainers/ListAssetContainersTest.php
index d7aadf77f57..d7ecb657ae5 100644
--- a/tests/Feature/AssetContainers/ListAssetContainersTest.php
+++ b/tests/Feature/AssetContainers/ListAssetContainersTest.php
@@ -59,6 +59,7 @@ public function containerArray()
                 'create_folders' => true,
                 'edit_url' => 'http://localhost/cp/asset-containers/two/edit',
                 'delete_url' => 'http://localhost/cp/asset-containers/two',
+                'blueprint_url' => 'http://localhost/cp/asset-containers/two/blueprint',
                 'can_edit' => false,
                 'can_delete' => false,
             ],
@@ -72,6 +73,7 @@ public function containerArray()
                 'create_folders' => true,
                 'edit_url' => 'http://localhost/cp/asset-containers/three/edit',
                 'delete_url' => 'http://localhost/cp/asset-containers/three',
+                'blueprint_url' => 'http://localhost/cp/asset-containers/three/blueprint',
                 'can_edit' => false,
                 'can_delete' => false,
             ],
diff --git a/tests/Feature/Forms/UpdateFormTest.php b/tests/Feature/Forms/UpdateFormTest.php
index 9f25f45b57e..a4d4d8feca0 100644
--- a/tests/Feature/Forms/UpdateFormTest.php
+++ b/tests/Feature/Forms/UpdateFormTest.php
@@ -2,10 +2,8 @@
 
 namespace Tests\Feature\Forms;
 
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\Form;
 use Statamic\Facades\User;
-use Statamic\Fields\BlueprintRepository;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -60,24 +58,6 @@ public function it_updates_a_form()
         $this->assertFalse($updated->store());
     }
 
-    /** @test */
-    public function it_updates_blueprint()
-    {
-        $mock = $this->partialMock(BlueprintRepository::class);
-        $mock->shouldReceive('find')->with('one')->andReturn(Blueprint::make('one'));
-        $mock->shouldReceive('find')->with('two')->andReturn(Blueprint::make('two'));
-
-        $form = tap(Form::make('test')->blueprint('one'))->save();
-        $this->assertEquals('one', $form->blueprint()->handle());
-
-        $this
-            ->actingAs($this->userWithPermission())
-            ->update($form, ['blueprint' => ['two']])
-            ->assertOk();
-
-        $this->assertEquals('two', Form::all()->first()->blueprint()->handle());
-    }
-
     /** @test */
     public function it_updates_emails()
     {
diff --git a/tests/Forms/FormTest.php b/tests/Forms/FormTest.php
index a6217db9cec..c5851695ae4 100644
--- a/tests/Forms/FormTest.php
+++ b/tests/Forms/FormTest.php
@@ -22,7 +22,6 @@ public function it_saves_a_form()
 
         Form::make('contact_us')
             ->title('Contact Us')
-            ->blueprint($blueprint)
             ->honeypot('winnie')
             ->save();
 
@@ -30,7 +29,6 @@ public function it_saves_a_form()
 
         $this->assertEquals('contact_us', $form->handle());
         $this->assertEquals('Contact Us', $form->title());
-        $this->assertEquals('post', $form->blueprint()->handle());
         $this->assertEquals('winnie', $form->honeypot());
     }
 
diff --git a/tests/Git/GitEventTest.php b/tests/Git/GitEventTest.php
index aaaef7862c3..1be0b860d1c 100644
--- a/tests/Git/GitEventTest.php
+++ b/tests/Git/GitEventTest.php
@@ -227,15 +227,11 @@ public function it_commits_when_form_is_saved_and_deleted()
     /** @test */
     public function it_commits_when_form_submission_is_saved_and_deleted()
     {
-        Git::shouldReceive('dispatchCommit')->with('Blueprint saved')->once();
         Git::shouldReceive('dispatchCommit')->with('Form saved')->once();
         Git::shouldReceive('dispatchCommit')->with('Submission saved')->once();
         Git::shouldReceive('dispatchCommit')->with('Submission deleted')->once();
 
-        $blueprint = Facades\Blueprint::make('post');
-        $blueprint->save();
-
-        $form = Facades\Form::make('contact')->blueprint($blueprint);
+        $form = Facades\Form::make('contact');
 
         $form->save();
 
diff --git a/tests/Tags/Form/FormCreateTest.php b/tests/Tags/Form/FormCreateTest.php
index 26f3e262937..5ac06f834ff 100644
--- a/tests/Tags/Form/FormCreateTest.php
+++ b/tests/Tags/Form/FormCreateTest.php
@@ -255,10 +255,10 @@ private function createContactForm()
         ]);
 
         Blueprint::shouldReceive('find')
-            ->with('contact')
+            ->with('forms.contact')
             ->andReturn($blueprint);
 
-        $form = Form::make()->handle('contact')->blueprint('contact');
+        $form = Form::make()->handle('contact');
 
         Form::shouldReceive('find')
             ->with('contact')

From 0b5a3232cf12de4b37a7f1c71700da7db77d55ec Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 15:21:46 -0400
Subject: [PATCH 17/39] Mark incomplete

---
 .../Blueprints/ViewBlueprintListingTest.php   | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/tests/Feature/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
index 176b560107a..22092cf2eff 100644
--- a/tests/Feature/Blueprints/ViewBlueprintListingTest.php
+++ b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Feature\Blueprints;
 
-use Statamic\Auth\User;
 use Statamic\Facades;
 use Statamic\Fields\Blueprint;
 use Tests\FakesRoles;
@@ -15,43 +14,9 @@ class ViewBlueprintListingTest extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
-    public function it_shows_a_list_of_fieldsets()
+    public function it_shows_a_list_of_blueprints()
     {
-        // When the CP header loads the avatar it reaches for the user blueprint.
-        Facades\Blueprint::shouldReceive('find')->with('user')->andReturn(new Blueprint);
-
-        Facades\Blueprint::shouldReceive('all')->andReturn(collect([
-            'foo' => $blueprintA = $this->createBlueprint('foo'),
-            'bar' => $blueprintB = $this->createBlueprint('bar'),
-        ]));
-
-        $user = Facades\User::make()->makeSuper()->save();
-
-        $response = $this
-            ->actingAs($user)
-            ->get(cp_route('blueprints.index'))
-            ->assertSuccessful()
-            ->assertViewHas('blueprints', collect([
-                [
-                    'id' => 'foo',
-                    'handle' => 'foo',
-                    'title' => 'Foo',
-                    'sections' => 0,
-                    'fields' => 0,
-                    'edit_url' => 'http://localhost/cp/fields/blueprints/foo/edit',
-                    'delete_url' => 'http://localhost/cp/fields/blueprints/foo',
-                ],
-                [
-                    'id' => 'bar',
-                    'handle' => 'bar',
-                    'title' => 'Bar',
-                    'sections' => 0,
-                    'fields' => 0,
-                    'edit_url' => 'http://localhost/cp/fields/blueprints/bar/edit',
-                    'delete_url' => 'http://localhost/cp/fields/blueprints/bar',
-                ],
-            ]))
-            ->assertDontSee('no-results');
+        $this->markTestIncomplete();
     }
 
     /** @test */

From 7b3d37a180ebc80025eb46d9049c4724e2e19801 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 15:21:57 -0400
Subject: [PATCH 18/39] Just need the index

---
 routes/cp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/cp.php b/routes/cp.php
index e0ce74a6506..202717961d5 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -139,7 +139,7 @@
         Route::resource('fieldsets', 'FieldsetController');
         Route::post('fieldsets/quick', 'FieldsetController@quickStore');
         Route::post('fieldsets/{fieldset}/fields', 'FieldsetFieldController@store');
-        Route::resource('blueprints', 'BlueprintController');
+        Route::get('blueprints', 'BlueprintController@index')->name('blueprints.index');
         Route::get('fieldtypes', 'FieldtypesController@index');
     });
 

From 6fa49ce19514ff07ea8a5404edb8276f0d6979fc Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 15:25:26 -0400
Subject: [PATCH 19/39] Tidy

---
 src/Entries/Entry.php                             |  1 +
 .../CP/Collections/EntriesController.php          |  1 -
 .../Controllers/CP/Taxonomies/TermsController.php |  1 -
 src/Taxonomies/Term.php                           |  1 +
 tests/Feature/Taxonomies/UpdateTaxonomyTest.php   |  2 --
 tests/FrontendTest.php                            | 15 ++++-----------
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 502ccdd865a..5ab215b4b1b 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -98,6 +98,7 @@ public function blueprint($blueprint = null)
             })
             ->setter(function ($blueprint) use ($key) {
                 Blink::forget($key);
+
                 return $blueprint;
             })
             ->args(func_get_args());
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index e49906027d1..9c4f9c82a2b 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -7,7 +7,6 @@
 use Statamic\CP\Breadcrumbs;
 use Statamic\Events\PublishBlueprintFound;
 use Statamic\Facades\Asset;
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index 08580002440..6c285d8e812 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -6,7 +6,6 @@
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\Events\PublishBlueprintFound;
 use Statamic\Facades\Asset;
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\Site;
 use Statamic\Facades\Term;
 use Statamic\Facades\User;
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 9360c7778d9..f77d6a62111 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -85,6 +85,7 @@ public function blueprint($blueprint = null)
             })
             ->setter(function ($blueprint) use ($key) {
                 Blink::forget($key);
+
                 return $blueprint;
             })
             ->args(func_get_args());
diff --git a/tests/Feature/Taxonomies/UpdateTaxonomyTest.php b/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
index 7c2490f66f2..c516ec186c3 100644
--- a/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
+++ b/tests/Feature/Taxonomies/UpdateTaxonomyTest.php
@@ -2,11 +2,9 @@
 
 namespace Tests\Feature\Taxonomies;
 
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\User;
-use Statamic\Fields\BlueprintRepository;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index 2c58ed148e0..fd7d58234df 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -181,17 +181,10 @@ public function fields_gets_augmented()
         $this->withoutExceptionHandling();
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
         $this->viewShouldReturnRaw('default', '{{ augment_me }}{{ dont_augment_me }}');
-        Blueprint::shouldReceive('in')
-            ->with('collections/pages')
-            ->once()
-            ->andReturn(collect([(new \Statamic\Fields\Blueprint)
-                ->setHandle('test')
-                ->setContents(['fields' => [
-                    [
-                        'handle' => 'augment_me',
-                        'field' => ['type' => 'markdown'],
-                    ],
-                ]])]));
+        $blueprint = Blueprint::makeFromFields([
+            'augment_me' => ['type' => 'markdown'],
+        ])->setHandle('test');
+        Blueprint::shouldReceive('in')->with('collections/pages')->once()->andReturn(collect([$blueprint]));
 
         $this->createPage('about', [
             'path' => 'about.md',

From de4fe70150370fa2e7e3d22add3738f97ffe592f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 17:00:09 -0400
Subject: [PATCH 20/39] Blueprint index

---
 resources/views/blueprints/index.blade.php    | 135 ++++++++++++++++++
 .../CP/Fields/BlueprintController.php         |   4 +-
 .../Blueprints/ViewBlueprintListingTest.php   |   9 +-
 3 files changed, 144 insertions(+), 4 deletions(-)
 create mode 100644 resources/views/blueprints/index.blade.php

diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
new file mode 100644
index 00000000000..f1942dbbe92
--- /dev/null
+++ b/resources/views/blueprints/index.blade.php
@@ -0,0 +1,135 @@
+@extends('statamic::layout')
+@section('title', __('Blueprints'))
+
+@section('content')
+
+    <div class="flex justify-between items-center mb-3">
+        <h1>@yield('title')</h1>
+        <div v-cloak>
+        <dropdown-list class="inline-block">
+            <template v-slot:trigger>
+                <button class="button btn-primary flex items-center pr-2">
+                    {{ __('Create Blueprint') }}
+                    <svg-icon name="chevron-down-xs" class="w-2 ml-1" />
+                </button>
+            </template>
+
+            <h6 class="p-1">{{ __('Collections') }}</h6>
+            @foreach (Statamic\Facades\Collection::all() as $collection)
+                <dropdown-item redirect="{{ cp_route('collections.blueprints.create', $collection) }}">{{ $collection->title() }}</dropdown-item>
+            @endforeach
+
+            <h6 class="p-1 mt-2">{{ __('Taxonomies') }}</h6>
+            @foreach (Statamic\Facades\Taxonomy::all() as $taxonomy)
+                <dropdown-item redirect="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}">{{ $taxonomy->title() }}</dropdown-item>
+            @endforeach
+        </dropdown-list>
+        </div>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Collections') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            @foreach (Statamic\Facades\Collection::all() as $collection)
+                @foreach ($collection->entryBlueprints() as $blueprint)
+                    <tr>
+                        <td>
+                            <div class="flex items-center">
+                                <div class="w-4 h-4 mr-2">@svg('content-writing')</div>
+                                <a href="{{ cp_route('collections.blueprints.edit', [$collection, $blueprint]) }}">{{ $blueprint->title() }}</a>
+                            </div>
+                        </td>
+                        <td class="text-right text-2xs">{{ $collection->title() }}</td>
+                    </tr>
+                @endforeach
+            @endforeach
+        </table>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Taxonomies') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            @foreach (Statamic\Facades\Taxonomy::all() as $taxonomy)
+                @foreach ($taxonomy->termBlueprints() as $blueprint)
+                    <tr>
+                        <td>
+                            <div class="flex items-center">
+                                <div class="w-4 h-4 mr-2">@svg('tags')</div>
+                                <a href="{{ cp_route('taxonomies.blueprints.edit', [$taxonomy, $blueprint]) }}">{{ $blueprint->title() }}</a>
+                            </div>
+                        </td>
+                        <td class="text-right text-2xs">{{ $taxonomy->title() }}</td>
+                    </tr>
+                @endforeach
+            @endforeach
+        </table>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Globals') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            @foreach (Statamic\Facades\GlobalSet::all() as $set)
+                <tr>
+                    <td>
+                        <div class="flex items-center">
+                            <div class="w-4 h-4 mr-2">@svg('earth')</div>
+                            <a href="{{ cp_route('globals.blueprint.edit', $set->handle()) }}">{{ $set->title() }}</a>
+                        </div>
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Asset Containers') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            @foreach (Statamic\Facades\AssetContainer::all() as $container)
+                <tr>
+                    <td>
+                        <div class="flex items-center">
+                            <div class="w-4 h-4 mr-2">@svg('assets')</div>
+                            <a href="{{ cp_route('asset-containers.blueprint.edit', $container->handle()) }}">{{ $container->title() }}</a>
+                        </div>
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Forms') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            @foreach (Statamic\Facades\Form::all() as $form)
+                <tr>
+                    <td>
+                        <div class="flex items-center">
+                            <div class="w-4 h-4 mr-2">@svg('drawer-file')</div>
+                            <a href="{{ cp_route('forms.blueprint.edit', $form->handle()) }}">{{ $form->title() }}</a>
+                        </div>
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </div>
+
+    <h3 class="little-heading pl-0 mb-1">{{ __('Other') }}</h3>
+    <div class="card p-0 mb-2">
+        <table class="data-table">
+            <tr>
+                <td>
+                    <div class="flex items-center">
+                        <div class="w-4 h-4 mr-2">@svg('users')</div>
+                        <a href="">{{ __('User') }}</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
+@endsection
diff --git a/src/Http/Controllers/CP/Fields/BlueprintController.php b/src/Http/Controllers/CP/Fields/BlueprintController.php
index be9846e513c..ce2678b197d 100644
--- a/src/Http/Controllers/CP/Fields/BlueprintController.php
+++ b/src/Http/Controllers/CP/Fields/BlueprintController.php
@@ -13,8 +13,6 @@ public function __construct()
 
     public function index()
     {
-        // TODO
-
-        return view('statamic::blueprints.index', compact('blueprints'));
+        return view('statamic::blueprints.index');
     }
 }
diff --git a/tests/Feature/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
index 22092cf2eff..44203fa0db0 100644
--- a/tests/Feature/Blueprints/ViewBlueprintListingTest.php
+++ b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
@@ -16,7 +16,14 @@ class ViewBlueprintListingTest extends TestCase
     /** @test */
     public function it_shows_a_list_of_blueprints()
     {
-        $this->markTestIncomplete();
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('blueprints.index'))
+            ->assertOk()
+            ->assertViewIs('statamic::blueprints.index');
     }
 
     /** @test */

From cc72f706bac552fcaae19e09ee55db5febb64f83 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 17:00:44 -0400
Subject: [PATCH 21/39] Adjust link

---
 resources/views/widgets/getting-started.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/widgets/getting-started.blade.php b/resources/views/widgets/getting-started.blade.php
index 6ffcda68217..7721aacadb5 100644
--- a/resources/views/widgets/getting-started.blade.php
+++ b/resources/views/widgets/getting-started.blade.php
@@ -24,7 +24,7 @@
                 <p>{{ __('statamic::messages.getting_started_widget_collections') }}</p>
             </div>
         </a>
-        <a href="{{ cp_route('blueprints.create') }}" class="w-full lg:w-1/2 p-2 flex items-start hover:bg-grey-20 rounded-md group">
+        <a href="{{ cp_route('blueprints.index') }}" class="w-full lg:w-1/2 p-2 flex items-start hover:bg-grey-20 rounded-md group">
             <div class="h-8 w-8 mr-2 text-grey-80">
                 @svg('blueprints')
             </div>

From efc27da8514424a495b939ed787fda2ecee5bda6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 15 Jul 2020 17:32:12 -0400
Subject: [PATCH 22/39] Apply blueprint changes to users

---
 resources/blueprints/user.yaml                | 25 -------------
 resources/views/blueprints/index.blade.php    |  2 +-
 .../views/users/blueprints/edit.blade.php     | 12 +++++++
 routes/cp.php                                 |  2 ++
 src/Auth/User.php                             |  8 ++---
 src/Auth/UserRepository.php                   | 11 ++++++
 src/Auth/UserTags.php                         |  4 +--
 src/Console/Commands/MakeUser.php             |  3 +-
 src/Facades/User.php                          |  1 +
 src/Fields/BlueprintRepository.php            |  2 +-
 .../CP/Users/UserBlueprintController.php      | 35 +++++++++++++++++++
 .../Controllers/CP/Users/UsersController.php  |  7 ++--
 src/Http/Controllers/UserController.php       |  3 +-
 tests/Auth/AugmentedUserTest.php              |  2 +-
 tests/Feature/Entries/EntryRevisionsTest.php  |  7 ----
 15 files changed, 73 insertions(+), 51 deletions(-)
 delete mode 100644 resources/blueprints/user.yaml
 create mode 100644 resources/views/users/blueprints/edit.blade.php
 create mode 100644 src/Http/Controllers/CP/Users/UserBlueprintController.php

diff --git a/resources/blueprints/user.yaml b/resources/blueprints/user.yaml
deleted file mode 100644
index b7ef165a775..00000000000
--- a/resources/blueprints/user.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-hide: true
-fields:
-  -
-    handle: name
-    field:
-      type: text
-      display: Name
-  -
-    handle: email
-    field:
-      type: text
-      input_type: email
-      display: Email Address
-  -
-    handle: roles
-    field:
-      type: user_roles
-      width: 50
-      mode: select
-  -
-    handle: groups
-    field:
-      type: user_groups
-      width: 50
-      mode: select
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index f1942dbbe92..de55c191126 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -120,7 +120,7 @@
                 <td>
                     <div class="flex items-center">
                         <div class="w-4 h-4 mr-2">@svg('users')</div>
-                        <a href="">{{ __('User') }}</a>
+                        <a href="{{ cp_route('users.blueprint.edit') }}">{{ __('User') }}</a>
                     </div>
                 </td>
             </tr>
diff --git a/resources/views/users/blueprints/edit.blade.php b/resources/views/users/blueprints/edit.blade.php
new file mode 100644
index 00000000000..8797998d593
--- /dev/null
+++ b/resources/views/users/blueprints/edit.blade.php
@@ -0,0 +1,12 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    <blueprint-builder
+        action="{{ cp_route('users.blueprint.update') }}"
+        breadcrumb-url="{{ cp_route('users.index') }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+    ></blueprint-builder>
+
+@endsection
diff --git a/routes/cp.php b/routes/cp.php
index 202717961d5..338a7309b04 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -171,6 +171,8 @@
     Route::group(['namespace' => 'Users'], function () {
         Route::post('users/actions', 'UserActionController@run')->name('users.actions.run');
         Route::get('users/actions', 'UserActionController@bulkActions')->name('users.actions.bulk');
+        Route::get('users/blueprint', 'UserBlueprintController@edit')->name('users.blueprint.edit');
+        Route::patch('users/blueprint', 'UserBlueprintController@update')->name('users.blueprint.update');
         Route::resource('users', 'UsersController');
         Route::patch('users/{user}/password', 'PasswordController@update')->name('users.password.update');
         Route::get('account', 'AccountController')->name('account');
diff --git a/src/Auth/User.php b/src/Auth/User.php
index 9c939a6b964..1adcda34e5d 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -146,13 +146,9 @@ public function getAuthPassword()
      * @param string|null|bool
      * @return \Statamic\Fields\Blueprint
      */
-    public function blueprint($blueprint = null)
+    public function blueprint()
     {
-        if (is_null($blueprint)) {
-            return Blueprint::find('user');
-        }
-
-        $this->set('blueprint', $blueprint);
+        return Facades\User::blueprint();
     }
 
     public function save()
diff --git a/src/Auth/UserRepository.php b/src/Auth/UserRepository.php
index aa6e8b5f74a..ff46eb4956c 100644
--- a/src/Auth/UserRepository.php
+++ b/src/Auth/UserRepository.php
@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Auth\User;
 use Statamic\Contracts\Auth\UserRepository as RepositoryContract;
+use Statamic\Facades\Blueprint;
 
 abstract class UserRepository implements RepositoryContract
 {
@@ -42,4 +43,14 @@ public function userGroupRepository()
             $this->config['paths']['groups'] ?? resource_path('users/groups.yaml')
         );
     }
+
+    public function blueprint()
+    {
+        return Blueprint::find('user') ?? Blueprint::makeFromFields([
+            'name' => ['type' => 'text', 'display' => 'Name'],
+            'email' => ['type' => 'text', 'input_type' => 'email', 'display' => 'Email Address'],
+            'roles' => ['type' => 'user_roles', 'width' => 50],
+            'groups' => ['type' => 'user_groups', 'width' => 50],
+        ])->setHandle('user');
+    }
 }
diff --git a/src/Auth/UserTags.php b/src/Auth/UserTags.php
index ce6f96536ee..acdacf0ea67 100644
--- a/src/Auth/UserTags.php
+++ b/src/Auth/UserTags.php
@@ -462,7 +462,7 @@ protected function getRegistrationFields()
      */
     protected function getRequiredRegistrationFields()
     {
-        $blueprintFields = Blueprint::find('user')->fields()->all()
+        $blueprintFields = User::blueprint()->fields()->all()
             ->keyBy->handle()
             ->filter(function ($field, $handle) {
                 return in_array($handle, ['email', 'password']);
@@ -499,7 +499,7 @@ protected function getRequiredRegistrationFields()
      */
     protected function getAdditionalRegistrationFields()
     {
-        return Blueprint::find('user')->fields()->all()
+        return User::blueprint()->fields()->all()
             ->reject(function ($field) {
                 return in_array($field->handle(), ['email', 'password', 'password_confirmation', 'roles', 'groups']);
             })
diff --git a/src/Console/Commands/MakeUser.php b/src/Console/Commands/MakeUser.php
index 142b7a33ed6..2d95874646f 100644
--- a/src/Console/Commands/MakeUser.php
+++ b/src/Console/Commands/MakeUser.php
@@ -5,7 +5,6 @@
 use Illuminate\Console\Command;
 use Statamic\Console\RunsInPlease;
 use Statamic\Console\ValidatesInput;
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\User;
 use Statamic\Rules\EmailAvailable;
 use Statamic\Statamic;
@@ -174,7 +173,7 @@ protected function emailValidationFails()
      */
     protected function hasSeparateNameFields()
     {
-        $fields = Blueprint::find('user')->fields()->all();
+        $fields = User::blueprint()->fields()->all();
 
         return $fields->has('first_name') && $fields->has('last_name');
     }
diff --git a/src/Facades/User.php b/src/Facades/User.php
index 595ecf995e2..b39b044d1bd 100644
--- a/src/Facades/User.php
+++ b/src/Facades/User.php
@@ -15,6 +15,7 @@
  * @method static null|\Statamic\Contracts\Auth\User fromUser($user)
  * @method static void save(User $user);
  * @method static void delete(User $user);
+ * @method static \Statamic\Fields\Blueprint blueprint();
  *
  * @see \Statamic\Contracts\Auth\UserRepository
  */
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 7491bde0c7c..8a9fdd7d3f5 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -99,7 +99,7 @@ public function makeFromFields($fields)
     {
         $fields = collect($fields)->map(function ($field, $handle) {
             return compact('handle', 'field');
-        })->values();
+        })->values()->all();
 
         return (new Blueprint)->setContents(['fields' => $fields]);
     }
diff --git a/src/Http/Controllers/CP/Users/UserBlueprintController.php b/src/Http/Controllers/CP/Users/UserBlueprintController.php
new file mode 100644
index 00000000000..2db24862139
--- /dev/null
+++ b/src/Http/Controllers/CP/Users/UserBlueprintController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Users;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\User;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class UserBlueprintController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function edit()
+    {
+        $blueprint = User::make()->blueprint();
+
+        return view('statamic::users.blueprints.edit', [
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request)
+    {
+        $request->validate(['sections' => 'array']);
+
+        $this->updateBlueprint($request, User::make()->blueprint());
+    }
+}
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index a457e052547..7d82ba27eae 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -6,7 +6,6 @@
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\CP\Column;
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\Scope;
 use Statamic\Facades\User;
 use Statamic\Facades\UserGroup;
@@ -54,7 +53,7 @@ protected function json($request)
             ->paginate(request('perPage'));
 
         return (new Users($users))
-            ->blueprint(Blueprint::find('user'))
+            ->blueprint(User::blueprint())
             ->columns(collect([
                 Column::make('email')->label(__('Email')),
                 Column::make('name')->label(__('Name')),
@@ -76,7 +75,7 @@ public function create(Request $request)
         $this->authorizePro();
         $this->authorize('create', UserContract::class);
 
-        $blueprint = Blueprint::find('user');
+        $blueprint = User::blueprint();
 
         $fields = $blueprint->fields()->preProcess();
 
@@ -103,7 +102,7 @@ public function store(Request $request)
         $this->authorizePro();
         $this->authorize('create', UserContract::class);
 
-        $blueprint = Blueprint::find('user');
+        $blueprint = User::blueprint();
 
         $fields = $blueprint->fields()->only(['email', 'name'])->addValues($request->all());
 
diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
index 7d364a1c2ca..d57842338d6 100644
--- a/src/Http/Controllers/UserController.php
+++ b/src/Http/Controllers/UserController.php
@@ -6,7 +6,6 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\MessageBag;
 use Statamic\Contracts\Auth\User as UserContract;
-use Statamic\Facades\Blueprint;
 use Statamic\Facades\User;
 
 class UserController extends Controller
@@ -39,7 +38,7 @@ public function logout()
 
     public function register(Request $request)
     {
-        $blueprint = Blueprint::find('user');
+        $blueprint = User::blueprint();
 
         $fields = $blueprint->fields()->addValues($request->all());
 
diff --git a/tests/Auth/AugmentedUserTest.php b/tests/Auth/AugmentedUserTest.php
index 3960a3cc3d4..ea2c9160213 100644
--- a/tests/Auth/AugmentedUserTest.php
+++ b/tests/Auth/AugmentedUserTest.php
@@ -21,7 +21,7 @@ public function it_gets_values()
     {
         Carbon::setTestNow('2020-04-15 13:00:00');
 
-        $blueprint = Blueprint::find('user');
+        $blueprint = User::blueprint();
         $contents = $blueprint->contents();
         $contents['sections']['main']['fields'] = array_merge($contents['sections']['main']['fields'], [
             ['handle' => 'two', 'field' => ['type' => 'text']],
diff --git a/tests/Feature/Entries/EntryRevisionsTest.php b/tests/Feature/Entries/EntryRevisionsTest.php
index 04ef29643a1..c93e9a269a9 100644
--- a/tests/Feature/Entries/EntryRevisionsTest.php
+++ b/tests/Feature/Entries/EntryRevisionsTest.php
@@ -29,7 +29,6 @@ public function setUp(): void
         $this->dir = __DIR__.'/tmp';
         config(['statamic.revisions.enabled' => true]);
         config(['statamic.revisions.path' => $this->dir]);
-        $this->setTestUserBlueprint();
         $this->collection = Collection::make('blog')->revisionsEnabled(true)->save();
     }
 
@@ -337,10 +336,4 @@ private function setTestBlueprint($handle, $fields)
 
         BlueprintRepository::shouldReceive('find')->with('test')->andReturn($blueprint);
     }
-
-    private function setTestUserBlueprint()
-    {
-        $blueprint = \Statamic\Facades\Blueprint::find('user');
-        BlueprintRepository::shouldReceive('find')->with('user')->andReturn($blueprint);
-    }
 }

From 271f02cd22110fe34790745e78f14b81883e06f3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 13:42:18 -0400
Subject: [PATCH 23/39] Move breadcrumbs out of vue component

---
 resources/js/components/blueprints/Builder.vue              | 4 +---
 resources/views/assets/containers/blueprints/edit.blade.php | 6 +++++-
 resources/views/collections/blueprints/edit.blade.php       | 6 +++++-
 resources/views/forms/blueprints/edit.blade.php             | 6 +++++-
 resources/views/globals/blueprints/edit.blade.php           | 6 +++++-
 resources/views/taxonomies/blueprints/edit.blade.php        | 6 +++++-
 resources/views/users/blueprints/edit.blade.php             | 6 +++++-
 7 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index c3bbe55caed..523ba155fa2 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -3,8 +3,6 @@
     <div class="blueprint-builder">
 
         <header class="mb-3">
-            <breadcrumb :url="breadcrumbUrl" :title="__('Blueprints')" />
-
             <div class="flex items-center justify-between">
                 <h1>{{ initialTitle }}</h1>
                 <button type="submit" class="btn-primary" @click.prevent="save" v-text="__('Save')" />
@@ -45,7 +43,7 @@ export default {
         Sections,
     },
 
-    props: ['action', 'initialBlueprint', 'breadcrumbUrl'],
+    props: ['action', 'initialBlueprint'],
 
     data() {
         return {
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index c1f4486c9a9..d928baf90f3 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('assets.browse.index', $container->handle()),
+        'title' => $container->title(),
+    ])
+
     <blueprint-builder
         action="{{ cp_route('asset-containers.blueprint.update', $container->handle()) }}"
-        breadcrumb-url="{{ cp_route('assets.browse.index', $container->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/collections/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
index 3c37e8073d3..2872f0bd114 100644
--- a/resources/views/collections/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('collections.blueprints.index', $collection),
+        'title' => __('Blueprints')
+    ])
+
     <blueprint-builder
         action="{{ cp_route('collections.blueprints.update', [$collection, $blueprint]) }}"
-        breadcrumb-url="{{ cp_route('collections.blueprints.index', $collection) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 45924ce7599..54b7a09fea3 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('forms.show', $form->handle()),
+        'title' => $form->title(),
+    ])
+
     <blueprint-builder
         action="{{ cp_route('forms.blueprint.update', $form->handle()) }}"
-        breadcrumb-url="{{ cp_route('forms.show', $form->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/globals/blueprints/edit.blade.php b/resources/views/globals/blueprints/edit.blade.php
index 9d498af9470..8c097a345b0 100644
--- a/resources/views/globals/blueprints/edit.blade.php
+++ b/resources/views/globals/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('globals.variables.edit', $set->handle()),
+        'title' => $set->title(),
+    ])
+
     <blueprint-builder
         action="{{ cp_route('globals.blueprint.update', $set->handle()) }}"
-        breadcrumb-url="{{ cp_route('globals.variables.edit', $set->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
index e3df99ee1b6..d1505ad1f90 100644
--- a/resources/views/taxonomies/blueprints/edit.blade.php
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('taxonomies.blueprints.index', $taxonomy),
+        'title' => __('Blueprints')
+    ])
+
     <blueprint-builder
         action="{{ cp_route('taxonomies.blueprints.update', [$taxonomy, $blueprint]) }}"
-        breadcrumb-url="{{ cp_route('taxonomies.blueprints.index', $taxonomy) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
diff --git a/resources/views/users/blueprints/edit.blade.php b/resources/views/users/blueprints/edit.blade.php
index 8797998d593..81a3c599759 100644
--- a/resources/views/users/blueprints/edit.blade.php
+++ b/resources/views/users/blueprints/edit.blade.php
@@ -3,9 +3,13 @@
 
 @section('content')
 
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('users.index'),
+        'title' => __('Users'),
+    ])
+
     <blueprint-builder
         action="{{ cp_route('users.blueprint.update') }}"
-        breadcrumb-url="{{ cp_route('users.index') }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 

From 30574f826ed589b7df4d2518bd7c9ce9bfd5a5ef Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 13:44:33 -0400
Subject: [PATCH 24/39] Static title

---
 resources/js/components/blueprints/Builder.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 523ba155fa2..766c2e27684 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -4,7 +4,7 @@
 
         <header class="mb-3">
             <div class="flex items-center justify-between">
-                <h1>{{ initialTitle }}</h1>
+                <h1 v-text="__('Edit Blueprint')" />
                 <button type="submit" class="btn-primary" @click.prevent="save" v-text="__('Save')" />
             </div>
         </header>
@@ -49,7 +49,6 @@ export default {
         return {
             blueprint: clone(this.initialBlueprint),
             sections: [],
-            initialTitle: this.initialBlueprint.title,
             errors: {}
         }
     },

From de6cd125fc85d93e1e8019917a6e628ea817bb85 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 13:56:06 -0400
Subject: [PATCH 25/39] Opt in for title field

---
 resources/js/components/blueprints/Builder.vue | 18 +++++++++++++++---
 .../collections/blueprints/edit.blade.php      |  1 +
 .../views/taxonomies/blueprints/edit.blade.php |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 766c2e27684..9a888c0a1c8 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -9,7 +9,7 @@
             </div>
         </header>
 
-        <div class="publish-form card p-0">
+        <div class="publish-form card p-0" v-if="showTitle">
             <div class="form-group">
                 <label class="block">{{ __('Title') }}</label>
                 <small class="help-block">{{ __('messages.blueprints_title_instructions') }}</small>
@@ -43,11 +43,15 @@ export default {
         Sections,
     },
 
-    props: ['action', 'initialBlueprint'],
+    props: {
+        action: String,
+        initialBlueprint: Object,
+        showTitle: Boolean
+    },
 
     data() {
         return {
-            blueprint: clone(this.initialBlueprint),
+            blueprint: this.initializeBlueprint(),
             sections: [],
             errors: {}
         }
@@ -77,6 +81,14 @@ export default {
 
     methods: {
 
+        initializeBlueprint() {
+            let blueprint = clone(this.initialBlueprint);
+
+            if (! this.showTitle) delete blueprint.title;
+
+            return blueprint;
+        },
+
         sectionsUpdated(sections) {
             this.sections = sections;
         },
diff --git a/resources/views/collections/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
index 2872f0bd114..61cad3fe5f6 100644
--- a/resources/views/collections/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -9,6 +9,7 @@
     ])
 
     <blueprint-builder
+        show-title
         action="{{ cp_route('collections.blueprints.update', [$collection, $blueprint]) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
index d1505ad1f90..f938806fb8f 100644
--- a/resources/views/taxonomies/blueprints/edit.blade.php
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -9,6 +9,7 @@
     ])
 
     <blueprint-builder
+        show-title
         action="{{ cp_route('taxonomies.blueprints.update', [$taxonomy, $blueprint]) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>

From 9915261ee404447bb22b255f8ea1470f96765d6a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 14:13:08 -0400
Subject: [PATCH 26/39] Sections are optional (but used by default) and not
 used in forms and assets ...

Also closes #2008
---
 resources/js/components/blueprints/Builder.vue    |  6 ++++--
 resources/js/components/blueprints/Section.vue    | 15 ++++++++++++---
 resources/js/components/blueprints/Sections.vue   | 10 ++++++++--
 .../assets/containers/blueprints/edit.blade.php   |  1 +
 resources/views/forms/blueprints/edit.blade.php   |  1 +
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 9a888c0a1c8..f0f51657d78 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -20,12 +20,13 @@
             </div>
         </div>
 
-        <div class="content mt-5 mb-2">
+        <div class="content mt-5 mb-2" v-if="useSections">
             <h2>{{ __('Tab Sections') }}</h2>
             <p class="max-w-lg">{{ __('messages.tab_sections_instructions') }}</p>
         </div>
 
         <sections
+            :single-section="!useSections"
             :initial-sections="blueprint.sections"
             @updated="sectionsUpdated"
         />
@@ -46,7 +47,8 @@ export default {
     props: {
         action: String,
         initialBlueprint: Object,
-        showTitle: Boolean
+        showTitle: Boolean,
+        useSections: { type: Boolean, default: true }
     },
 
     data() {
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Section.vue
index bf8d3b24833..195f5849b15 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Section.vue
@@ -1,9 +1,14 @@
 <template>
 
-    <div class="blueprint-section w-full md:w-1/2 2xl:w-1/3" :class="{ 'w-full': isEditing }">
+    <div class="blueprint-section"
+        :class="{
+            'w-full md:w-1/2 2xl:w-1/3': !isEditing && !isSingle,
+            'w-full': isEditing || isSingle
+        }"
+    >
         <div class="blueprint-section-card card p-0 h-full flex flex-col">
 
-            <div class="bg-grey-20 border-b text-sm flex rounded-t;">
+            <div class="bg-grey-20 border-b text-sm flex rounded-t;" v-if="!isSingle">
                 <div class="blueprint-drag-handle blueprint-section-drag-handle w-4 border-r"></div>
                 <div class="p-1.5 py-1 flex-1">
                     <span class="font-medium mr-1">
@@ -25,7 +30,7 @@
                 class="p-2"
                 :fields="section.fields"
                 :editing-field="editingField"
-                :is-section-expanded="isEditing"
+                :is-section-expanded="isEditing || isSingle"
                 :suggestable-condition-fields="suggestableConditionFields"
                 @field-created="fieldCreated"
                 @field-updated="fieldUpdated"
@@ -60,6 +65,10 @@ export default {
         section: {
             type: Object,
             required: true
+        },
+        isSingle: {
+            type: Boolean,
+            default: false
         }
     },
 
diff --git a/resources/js/components/blueprints/Sections.vue b/resources/js/components/blueprints/Sections.vue
index c2a790a0636..a1201c705b3 100644
--- a/resources/js/components/blueprints/Sections.vue
+++ b/resources/js/components/blueprints/Sections.vue
@@ -9,11 +9,12 @@
                 v-for="(section, i) in sections"
                 :key="section._id"
                 :section="section"
+                :is-single="singleSection"
                 @updated="updateSection(i, $event)"
                 @deleted="deleteSection(i)"
             />
 
-            <div class="blueprint-add-section-container w-full md:w-1/2 2xl:w-1/3">
+            <div class="blueprint-add-section-container w-full md:w-1/2 2xl:w-1/3" v-if="!singleSection">
                 <button class="blueprint-add-section-button outline-none" @click="addSection">
                     <div class="text-center flex items-center leading-none">
                         <div class="text-2xl mr-1">+</div>
@@ -55,6 +56,10 @@ export default {
         newSectionText: {
             type: String,
             default: () => __('New Section')
+        },
+        singleSection: {
+            type: Boolean,
+            default: false
         }
     },
 
@@ -80,7 +85,8 @@ export default {
     methods: {
 
         makeSortable() {
-            this.makeSectionsSortable();
+            if (! this.singleSection) this.makeSectionsSortable();
+
             this.makeFieldsSortable();
         },
 
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index d928baf90f3..4df396a0bc8 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -11,6 +11,7 @@
     <blueprint-builder
         action="{{ cp_route('asset-containers.blueprint.update', $container->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+        :use-sections="false"
     ></blueprint-builder>
 
 @endsection
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 54b7a09fea3..034391b3ee3 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -11,6 +11,7 @@
     <blueprint-builder
         action="{{ cp_route('forms.blueprint.update', $form->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+        :use-sections="false"
     ></blueprint-builder>
 
 @endsection

From f4d086125149ec1896a1514463c05456c82c3a27 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 15:00:14 -0400
Subject: [PATCH 27/39] Add docs links

---
 resources/views/assets/containers/blueprints/edit.blade.php | 5 +++++
 resources/views/collections/blueprints/edit.blade.php       | 5 +++++
 resources/views/forms/blueprints/edit.blade.php             | 5 +++++
 resources/views/globals/blueprints/edit.blade.php           | 5 +++++
 resources/views/taxonomies/blueprints/edit.blade.php        | 5 +++++
 resources/views/users/blueprints/edit.blade.php             | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index 4df396a0bc8..0cc80b42ed1 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -14,4 +14,9 @@
         :use-sections="false"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection
diff --git a/resources/views/collections/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
index 61cad3fe5f6..cc3e4a51eda 100644
--- a/resources/views/collections/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -14,4 +14,9 @@
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 034391b3ee3..f9fe746037c 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -14,4 +14,9 @@
         :use-sections="false"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection
diff --git a/resources/views/globals/blueprints/edit.blade.php b/resources/views/globals/blueprints/edit.blade.php
index 8c097a345b0..d1f0e325781 100644
--- a/resources/views/globals/blueprints/edit.blade.php
+++ b/resources/views/globals/blueprints/edit.blade.php
@@ -13,4 +13,9 @@
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
index f938806fb8f..4f27e0686e1 100644
--- a/resources/views/taxonomies/blueprints/edit.blade.php
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -14,4 +14,9 @@
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection
diff --git a/resources/views/users/blueprints/edit.blade.php b/resources/views/users/blueprints/edit.blade.php
index 81a3c599759..69140ea1c54 100644
--- a/resources/views/users/blueprints/edit.blade.php
+++ b/resources/views/users/blueprints/edit.blade.php
@@ -13,4 +13,9 @@
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
     ></blueprint-builder>
 
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
 @endsection

From 7a0bd62384dc99008d119d690f560d7cfac5cda3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 15:00:26 -0400
Subject: [PATCH 28/39] Add blueprint link on users index

---
 resources/views/users/index.blade.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 92f6715048c..a06c5042de0 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -4,13 +4,19 @@
 
 @section('content')
 
-    <header class="flex mb-3">
+    <header class="flex items-center mb-3">
         <h1 class="flex-1">
             {{ __('Users') }}
         </h1>
 
+        @can('configure fields')
+            <dropdown-list class="mr-1">
+                <dropdown-item :text="__('Edit Blueprint')" redirect="{{ cp_route('users.blueprint.edit') }}"></dropdown-item>
+            </dropdown-list>
+        @endcan
+
         @if (Statamic::pro() && $user->can('create', 'Statamic\Contracts\Auth\User'))
-            <a href="{{ cp_route('users.create') }}" class="btn-primary">{{ __('Create User') }}</a>
+            <a href="{{ cp_route('users.create') }}" class="btn-primary ml-2">{{ __('Create User') }}</a>
         @endif
     </header>
 

From d401f1c6f6cce14f898af958bf191c6cdeb2b1ae Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 16 Jul 2020 15:05:55 -0400
Subject: [PATCH 29/39] Add edit blueprint dropdown link to user edit form

---
 resources/js/components/users/PublishForm.vue     | 5 +++++
 resources/views/users/edit.blade.php              | 1 +
 src/Http/Controllers/CP/Users/UsersController.php | 1 +
 3 files changed, 7 insertions(+)

diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 6063bdfd7a0..9b8901ddf38 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -6,6 +6,10 @@
             <breadcrumb :url="cp_url('users')" :title="__('Users')" />
             <div class="flex items-center">
                 <h1 class="flex-1" v-text="title" />
+                    <dropdown-list class="mr-2" v-if="canEditBlueprint">
+                        <dropdown-item :text="__('Edit Blueprint')" :redirect="actions.editBlueprint" />
+                    </dropdown-list>
+
                     <change-password
                         v-if="canEditPassword"
                         :save-url="actions.password"
@@ -67,6 +71,7 @@ export default {
         actions: Object,
         method: String,
         canEditPassword: Boolean,
+        canEditBlueprint: Boolean
     },
 
     data() {
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index e0bf4acb7fe..749cfe23551 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -13,6 +13,7 @@
         :initial-values="{{ json_encode($values) }}"
         :initial-meta="{{ json_encode($meta) }}"
         :can-edit-password="{{ Statamic\Support\Str::bool($canEditPassword) }}"
+        :can-edit-blueprint="{{ Statamic\Support\Str::bool($user->can('configure fields')) }}"
     ></user-publish-form>
 
 @endsection
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 7d82ba27eae..e8d30492f76 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -173,6 +173,7 @@ public function edit(Request $request, $user)
             'actions' => [
                 'save' => $user->updateUrl(),
                 'password' => cp_route('users.password.update', $user->id()),
+                'editBlueprint' => cp_route('users.blueprint.edit'),
             ],
             'canEditPassword' => User::fromUser($request->user())->can('editPassword', $user),
         ];

From 7121463e4d09bdac36a0a10198bd9339fd9b6040 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 11:26:53 -0400
Subject: [PATCH 30/39] More blueprint tweaks ...

- Clean things up using ExistsAsFile trait.
- Remove the fallback directory. Instead, bind fallbacks into the repo with closures.
- Blueprints can have orders defined inside the yaml
- In memory caching has been removed temporarily from blueprint repo. This will be redone nicer.
---
 resources/blueprints/default.yaml        |   8 --
 src/Fields/Blueprint.php                 |  52 +++++++++-
 src/Fields/BlueprintRepository.php       | 127 +++++++++++++----------
 src/Providers/AppServiceProvider.php     |   6 +-
 tests/Fields/BlueprintRepositoryTest.php |  63 ++++++++---
 5 files changed, 176 insertions(+), 80 deletions(-)
 delete mode 100644 resources/blueprints/default.yaml

diff --git a/resources/blueprints/default.yaml b/resources/blueprints/default.yaml
deleted file mode 100644
index 8928326a367..00000000000
--- a/resources/blueprints/default.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-title: Default
-fields:
-  -
-    handle: content
-    field:
-      type: markdown
-      display: Content
-      localizable: true
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index ee223dbacbb..d6ef31b88ec 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -7,19 +7,23 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\CP\Column;
 use Statamic\CP\Columns;
+use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\Data\BlueprintDeleted;
 use Statamic\Events\Data\BlueprintSaved;
 use Statamic\Facades;
+use Statamic\Facades\Path;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class Blueprint implements Augmentable
 {
-    use HasAugmentedData;
+    use HasAugmentedData, ExistsAsFile;
 
     protected $handle;
     protected $namespace;
+    protected $order;
+    protected $initialPath;
     protected $contents = [];
     protected $fieldsCache;
 
@@ -47,6 +51,43 @@ public function namespace(): ?string
         return $this->namespace;
     }
 
+    public function setOrder($order)
+    {
+        if (! is_null($order)) {
+            $order = (int) $order;
+        }
+
+        $this->order = $order;
+
+        return $this;
+    }
+
+    public function order()
+    {
+        return $this->order;
+    }
+
+    public function setInitialPath(string $path)
+    {
+        $this->initialPath = $path;
+
+        return $this;
+    }
+
+    public function initialPath()
+    {
+        return $this->initialPath;
+    }
+
+    public function path()
+    {
+        return Path::tidy(vsprintf('%s/%s/%s.yaml', [
+            Facades\Blueprint::directory(),
+            str_replace('.', '/', $this->namespace()),
+            $this->handle(),
+        ]));
+    }
+
     public function setContents(array $contents)
     {
         if ($fields = array_pull($contents, 'fields')) {
@@ -62,7 +103,14 @@ public function setContents(array $contents)
 
     public function contents(): array
     {
-        return $this->contents;
+        return array_filter(
+            array_merge(['order' => $this->order], $this->contents)
+        );
+    }
+
+    public function fileData()
+    {
+        return $this->contents();
     }
 
     public function sections(): Collection
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 8a9fdd7d3f5..58c1da5f88f 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -2,17 +2,17 @@
 
 namespace Statamic\Fields;
 
+use Closure;
 use Statamic\Facades\File;
 use Statamic\Facades\Path;
 use Statamic\Facades\YAML;
+use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class BlueprintRepository
 {
-    protected $blueprints = [];
-    protected $files;
     protected $directory;
-    protected $fallbackDirectory;
+    protected $fallbacks = [];
 
     public function setDirectory(string $directory)
     {
@@ -21,11 +21,9 @@ public function setDirectory(string $directory)
         return $this;
     }
 
-    public function setFallbackDirectory(string $directory)
+    public function directory()
     {
-        $this->fallbackDirectory = $directory;
-
-        return $this;
+        return $this->directory;
     }
 
     public function find($blueprint): ?Blueprint
@@ -34,54 +32,41 @@ public function find($blueprint): ?Blueprint
             return null;
         }
 
-        $path = str_replace('.', '/', $blueprint);
-
-        if ($cached = array_get($this->blueprints, $path)) {
-            return $cached;
-        }
-
-        if (! File::exists($file = "{$this->directory}/{$path}.yaml")) {
-            if (! File::exists($file = "{$this->fallbackDirectory}/{$path}.yaml")) {
-                return null;
-            }
-        }
+        $path = $this->directory.'/'.str_replace('.', '/', $blueprint).'.yaml';
 
-        $str = str_replace('/', '.', $path);
-        $parts = explode('.', $str);
-        $handle = array_pop($parts);
-        $namespace = implode('.', $parts);
+        return File::exists($path)
+            ? $this->makeBlueprintFromFile($path)
+            : $this->findFallback($blueprint);
+    }
 
-        $blueprint = (new Blueprint)
-            ->setHandle($handle)
-            ->setNamespace(empty($namespace) ? null : $namespace)
-            ->setContents(YAML::file($file)->parse());
+    public function setFallback($handle, Closure $blueprint)
+    {
+        $handle = str_replace('/', '.', $handle);
 
-        $this->blueprints[$handle] = $blueprint;
+        $this->fallbacks[$handle] = $blueprint;
 
-        return $blueprint;
+        return $this;
     }
 
-    public function save(Blueprint $blueprint)
+    public function findFallback($handle)
     {
-        if (! File::exists($this->directory)) {
-            File::makeDirectory($this->directory);
+        if (! $blueprint = $this->fallbacks[$handle] ?? null) {
+            return null;
         }
 
-        File::put($this->path($blueprint), YAML::dump($blueprint->contents()));
+        [$namespace, $handle] = $this->getNamespaceAndHandle($handle);
+
+        return $blueprint()->setHandle($handle)->setNamespace($namespace);
     }
 
-    public function delete(Blueprint $blueprint)
+    public function save(Blueprint $blueprint)
     {
-        File::delete($this->path($blueprint));
+        $blueprint->writeFile();
     }
 
-    private function path($blueprint)
+    public function delete(Blueprint $blueprint)
     {
-        return Path::tidy(vsprintf('%s/%s/%s.yaml', [
-            $this->directory,
-            str_replace('.', '/', $blueprint->namespace()),
-            $blueprint->handle(),
-        ]));
+        $blueprint->deleteFile();
     }
 
     public function make($handle = null)
@@ -120,26 +105,60 @@ public function makeFromSections($sections)
     }
 
     public function in(string $namespace)
+    {
+        return $this
+            ->filesIn($namespace)
+            ->map(function ($file) {
+                return $this->makeBlueprintFromFile($file);
+            })
+            ->sort(function ($a, $b) {
+                $orderA = $a->order() ?? 99999;
+                $orderB = $b->order() ?? 99999;
+
+                return $orderA === $orderB
+                    ? $a->title() <=> $b->title()
+                    : $orderA <=> $orderB;
+            })
+            ->keyBy->handle();
+    }
+
+    private function filesIn($namespace)
     {
         $namespace = str_replace('/', '.', $namespace);
-        $dir = str_replace('.', '/', $namespace);
-        $path = $this->directory.'/'.$dir;
+        $namespaceDir = str_replace('.', '/', $namespace);
+        $directory = $this->directory.'/'.$namespaceDir;
 
-        if (! File::exists($path)) {
+        if (! File::exists(Str::removeRight($directory, '/'))) {
             return collect();
         }
 
-        return File::withAbsolutePaths()
-            ->getFilesByType($path, 'yaml')
-            ->map(function ($file) use ($dir, $namespace) {
-                $basename = Str::after($file, Str::finish($dir, '/'));
-                $handle = Str::before($basename, '.yaml');
+        return File::withAbsolutePaths()->getFilesByType($directory, 'yaml');
+    }
 
-                return (new Blueprint)
-                    ->setHandle($handle)
-                    ->setNamespace($namespace)
-                    ->setContents(YAML::file($file)->parse());
-            })
-            ->keyBy->handle();
+    private function makeBlueprintFromFile($path)
+    {
+        [$namespace, $handle] = $this->getNamespaceAndHandle(
+            Str::after(Str::before($path, '.yaml'), $this->directory.'/')
+        );
+
+        $contents = YAML::file($path)->parse();
+
+        return (new Blueprint)
+            ->setOrder(Arr::pull($contents, 'order'))
+            ->setInitialPath($path)
+            ->setHandle($handle)
+            ->setNamespace($namespace ?? null)
+            ->setContents($contents);
+    }
+
+    private function getNamespaceAndHandle($blueprint)
+    {
+        $blueprint = str_replace('/', '.', $blueprint);
+        $parts = explode('.', $blueprint);
+        $handle = array_pop($parts);
+        $namespace = implode('.', $parts);
+        $namespace = empty($namespace) ? null : $namespace;
+
+        return [$namespace, $handle];
     }
 }
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index 518f73fda7e..a61a55c5df9 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -118,7 +118,11 @@ public function register()
         $this->app->bind(\Statamic\Fields\BlueprintRepository::class, function ($app) {
             return (new \Statamic\Fields\BlueprintRepository($app['files']))
                 ->setDirectory(resource_path('blueprints'))
-                ->setFallbackDirectory(__DIR__.'/../../resources/blueprints');
+                ->setFallback('default', function () {
+                    return \Statamic\Facades\Blueprint::makeFromFields([
+                        'content' => ['type' => 'markdown', 'localizable' => true],
+                    ]);
+                });
         });
 
         $this->app->bind(\Statamic\Fields\FieldsetRepository::class, function ($app) {
diff --git a/tests/Fields/BlueprintRepositoryTest.php b/tests/Fields/BlueprintRepositoryTest.php
index 4785ff1fc6d..917f3ca3092 100644
--- a/tests/Fields/BlueprintRepositoryTest.php
+++ b/tests/Fields/BlueprintRepositoryTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Fields;
 
 use Illuminate\Support\Collection;
+use Statamic\Facades;
 use Statamic\Facades\File;
 use Statamic\Fields\Blueprint;
 use Statamic\Fields\BlueprintRepository;
@@ -16,8 +17,9 @@ public function setUp(): void
         parent::setUp();
 
         $this->repo = app(BlueprintRepository::class)
-            ->setDirectory('/path/to/resources/blueprints')
-            ->setFallbackDirectory('/path/to/vendor/fallbacks');
+            ->setDirectory('/path/to/resources/blueprints');
+
+        Facades\Blueprint::swap($this->repo);
     }
 
     /** @test */
@@ -82,26 +84,59 @@ public function it_gets_a_blueprint_in_a_namespace()
     public function it_returns_null_if_blueprint_doesnt_exist()
     {
         File::shouldReceive('exists')->with('/path/to/resources/blueprints/unknown.yaml')->once()->andReturnFalse();
-        File::shouldReceive('exists')->with('/path/to/vendor/fallbacks/unknown.yaml')->once()->andReturnFalse();
 
         $this->assertNull($this->repo->find('unknown'));
     }
 
+    /** @test */
+    public function it_returns_null_if_blueprint_doesnt_exist_in_a_namespace()
+    {
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/foo/bar/unknown.yaml')->once()->andReturnFalse();
+
+        $this->assertNull($this->repo->find('foo.bar.unknown'));
+    }
+
     /** @test */
     public function it_gets_fallback_blueprint()
     {
-        $contents = <<<'EOT'
-title: Fallback Blueprint
-sections: []
-EOT;
-        File::shouldReceive('exists')->with('/path/to/resources/blueprints/test.yaml')->once()->andReturnFalse();
-        File::shouldReceive('exists')->with('/path/to/vendor/fallbacks/test.yaml')->once()->andReturnTrue();
-        File::shouldReceive('get')->with('/path/to/vendor/fallbacks/test.yaml')->once()->andReturn($contents);
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/unknown.yaml')->once()->andReturnFalse();
 
-        $blueprint = $this->repo->find('test');
+        $fallback = $this->repo->make();
+        $this->repo->setFallback('unknown', function () use ($fallback) {
+            return $fallback;
+        });
 
-        $this->assertInstanceOf(Blueprint::class, $blueprint);
-        $this->assertEquals('Fallback Blueprint', $blueprint->title());
+        $this->assertSame($fallback, $this->repo->find('unknown'));
+        $this->assertEquals('unknown', $fallback->handle());
+        $this->assertNull($fallback->namespace());
+    }
+
+    /** @test */
+    public function it_gets_namespaced_fallback_blueprint()
+    {
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/foo/bar/unknown.yaml')->once()->andReturnNull();
+
+        $fallback = $this->repo->make();
+        $this->repo->setFallback('foo.bar.unknown', function () use ($fallback) {
+            return $fallback;
+        });
+
+        $this->assertSame($fallback, $this->repo->find('foo.bar.unknown'));
+        $this->assertEquals('unknown', $fallback->handle());
+        $this->assertEquals('foo.bar', $fallback->namespace());
+    }
+
+    /** @test */
+    public function getting_a_non_existent_namespaced_blueprint_will_not_return_the_non_namespaced_fallback()
+    {
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/foo/bar/unknown.yaml')->once()->andReturnNull();
+
+        $fallback = $this->repo->make();
+        $this->repo->setFallback('unknown', function () use ($fallback) {
+            return $fallback;
+        });
+
+        $this->assertNull($this->repo->find('foo.bar.unknown'));
     }
 
     /** @test */
@@ -128,8 +163,6 @@ public function it_saves_to_disk()
 
 EOT;
 
-        File::shouldReceive('exists')->with('/path/to/resources/blueprints')->once()->andReturnFalse();
-        File::shouldReceive('makeDirectory')->with('/path/to/resources/blueprints')->once();
         File::shouldReceive('put')->with('/path/to/resources/blueprints/the_test_blueprint.yaml', $expectedYaml)->once();
 
         $blueprint = (new Blueprint)->setHandle('the_test_blueprint')->setContents([

From 5ca79289e9b0734451417713151ca737ff0378b1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 11:28:23 -0400
Subject: [PATCH 31/39] Collection blueprints can be reordered

---
 resources/js/app.js                           |  1 +
 .../js/components/blueprints/Listing.vue      | 17 ++++++--
 .../collections/BlueprintListing.vue          | 39 +++++++++++++++++++
 .../collections/blueprints/index.blade.php    | 35 +++++++++++++----
 routes/cp.php                                 |  1 +
 .../ReorderCollectionBlueprintsController.php | 24 ++++++++++++
 6 files changed, 107 insertions(+), 10 deletions(-)
 create mode 100644 resources/js/components/collections/BlueprintListing.vue
 create mode 100644 src/Http/Controllers/CP/Collections/ReorderCollectionBlueprintsController.php

diff --git a/resources/js/app.js b/resources/js/app.js
index e7e2231f05d..6019044947d 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -130,6 +130,7 @@ Statamic.app({
         CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
         CollectionEditForm: require('./components/collections/EditForm.vue').default,
         CollectionView: require('./components/collections/View.vue').default,
+        CollectionBlueprintListing:  require('./components/collections/BlueprintListing.vue').default,
         SessionExpiry: require('./components/SessionExpiry.vue').default,
         NavigationListing: require('./components/navigation/Listing.vue').default,
         NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
diff --git a/resources/js/components/blueprints/Listing.vue b/resources/js/components/blueprints/Listing.vue
index 90e026d21e2..ef6274aa613 100644
--- a/resources/js/components/blueprints/Listing.vue
+++ b/resources/js/components/blueprints/Listing.vue
@@ -1,7 +1,10 @@
 <template>
-    <data-list :visible-columns="columns" :columns="columns" :rows="rows">
+    <data-list :visible-columns="columns" :columns="columns" :rows="rows" :sort="false">
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
-            <data-list-table>
+            <data-list-table
+                :reorderable="reorderable"
+                @reordered="$emit('reordered', $event)"
+            >
                 <template slot="cell-title" slot-scope="{ row: blueprint }">
                     <a :href="blueprint.edit_url">{{ blueprint.title }}</a>
                 </template>
@@ -36,7 +39,7 @@ export default {
 
     mixins: [Listing],
 
-    props: ['initialRows'],
+    props: ['initialRows', 'reorderable'],
 
     data() {
         return {
@@ -47,6 +50,14 @@ export default {
                 { label: __('Fields'), field: 'fields' },
             ]
         }
+    },
+
+    watch: {
+
+        initialRows(rows) {
+            this.rows = rows;
+        }
+
     }
 
 }
diff --git a/resources/js/components/collections/BlueprintListing.vue b/resources/js/components/collections/BlueprintListing.vue
new file mode 100644
index 00000000000..71f010b2a05
--- /dev/null
+++ b/resources/js/components/collections/BlueprintListing.vue
@@ -0,0 +1,39 @@
+<script>
+import BlueprintListing from '../blueprints/Listing.vue';
+
+export default {
+
+    components: {
+        BlueprintListing
+    },
+
+    props: {
+        initialRows: Array,
+        reorderUrl: String
+    },
+
+    data() {
+        return {
+            rows: this.initialRows,
+            hasBeenReordered: false
+        }
+    },
+
+    methods: {
+        reordered(rows) {
+            this.rows = rows;
+            this.hasBeenReordered = true;
+        },
+
+        saveOrder() {
+            let order = this.rows.map(blueprint => blueprint.handle);
+
+            this.$axios
+                .post(this.reorderUrl, { order })
+                .then(response => this.$toast.success(__('Blueprints successfully reordered')))
+                .catch(error => this.$toast.error(__('Something went wrong')))
+        }
+    }
+
+}
+</script>
diff --git a/resources/views/collections/blueprints/index.blade.php b/resources/views/collections/blueprints/index.blade.php
index 01315b9c3a7..f12078e75f7 100644
--- a/resources/views/collections/blueprints/index.blade.php
+++ b/resources/views/collections/blueprints/index.blade.php
@@ -8,15 +8,36 @@
         'title' => $collection->title()
     ])
 
-    <div class="flex justify-between items-center mb-3">
-        <h1>@yield('title')</h1>
+    <collection-blueprint-listing
+        inline-template
+        :initial-rows="{{ json_encode($blueprints) }}"
+        reorder-url="{{ cp_route('collections.blueprints.reorder', $collection) }}"
+    >
+        <div>
+            <div class="flex justify-between items-center mb-3">
+                <h1>@yield('title')</h1>
 
-        @can('create', 'Statamic\Fields\Blueprint')
-            <a href="{{ cp_route('collections.blueprints.create', $collection) }}" class="btn-primary">{{ __('Create Blueprint') }}</a>
-        @endcan
-    </div>
+                <div>
+                    @if ($blueprints->count() > 1)
+                        <button
+                            class="btn"
+                            :class="{ 'disabled': !hasBeenReordered }"
+                            :disabled="!hasBeenReordered"
+                            @click="saveOrder"
+                        >{{ __('Save Order') }}</button>
+                    @endif
 
-    <blueprint-listing :initial-rows="{{ json_encode($blueprints) }}"></blueprint-listing>
+                    <a href="{{ cp_route('collections.blueprints.create', $collection) }}" class="btn-primary ml-1">{{ __('Create Blueprint') }}</a>
+                </div>
+            </div>
+
+            <blueprint-listing
+                :initial-rows="rows"
+                :reorderable="{{ $blueprints->count() > 1 ? 'true' : 'false' }}"
+                @reordered="reordered"
+            ></blueprint-listing>
+        </div>
+    </collection-blueprint-listing>
 
     @include('statamic::partials.docs-callout', [
         'topic' => __('Blueprints'),
diff --git a/routes/cp.php b/routes/cp.php
index 338a7309b04..a81e41582fb 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -37,6 +37,7 @@
         Route::get('collections/{collection}/scaffold', 'ScaffoldCollectionController@index')->name('collections.scaffold');
         Route::post('collections/{collection}/scaffold', 'ScaffoldCollectionController@create')->name('collections.scaffold.create');
         Route::resource('collections.blueprints', 'CollectionBlueprintsController');
+        Route::post('collections/{collection}/blueprints/reorder', 'ReorderCollectionBlueprintsController')->name('collections.blueprints.reorder');
 
         Route::group(['prefix' => 'collections/{collection}/entries'], function () {
             Route::get('/', 'EntriesController@index')->name('collections.entries.index');
diff --git a/src/Http/Controllers/CP/Collections/ReorderCollectionBlueprintsController.php b/src/Http/Controllers/CP/Collections/ReorderCollectionBlueprintsController.php
new file mode 100644
index 00000000000..0989a70e895
--- /dev/null
+++ b/src/Http/Controllers/CP/Collections/ReorderCollectionBlueprintsController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Collections;
+
+use Illuminate\Http\Request;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class ReorderCollectionBlueprintsController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function __invoke(Request $request, $collection)
+    {
+        foreach ($request->order as $index => $handle) {
+            $collection->entryBlueprint($handle)->setOrder($index + 1)->save();
+        }
+    }
+}

From bd5eda8111d9e0fbab50f8d87a36f414d80492a4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 11:33:03 -0400
Subject: [PATCH 32/39] Taxonomy blueprints can be reordered

---
 resources/js/app.js                           |  1 +
 .../taxonomies/BlueprintListing.vue           | 39 +++++++++++++++++++
 .../taxonomies/blueprints/index.blade.php     | 35 +++++++++++++----
 routes/cp.php                                 |  1 +
 .../ReorderTaxonomyBlueprintsController.php   | 24 ++++++++++++
 5 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 resources/js/components/taxonomies/BlueprintListing.vue
 create mode 100644 src/Http/Controllers/CP/Taxonomies/ReorderTaxonomyBlueprintsController.php

diff --git a/resources/js/app.js b/resources/js/app.js
index 6019044947d..f85a8ebe972 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -139,6 +139,7 @@ Statamic.app({
         Stacks: require('./components/stacks/Stacks.vue').default,
         TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
         TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
+        TaxonomyBlueprintListing:  require('./components/taxonomies/BlueprintListing.vue').default,
         AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
         AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
         Updater: require('./components/updater/Updater.vue').default,
diff --git a/resources/js/components/taxonomies/BlueprintListing.vue b/resources/js/components/taxonomies/BlueprintListing.vue
new file mode 100644
index 00000000000..71f010b2a05
--- /dev/null
+++ b/resources/js/components/taxonomies/BlueprintListing.vue
@@ -0,0 +1,39 @@
+<script>
+import BlueprintListing from '../blueprints/Listing.vue';
+
+export default {
+
+    components: {
+        BlueprintListing
+    },
+
+    props: {
+        initialRows: Array,
+        reorderUrl: String
+    },
+
+    data() {
+        return {
+            rows: this.initialRows,
+            hasBeenReordered: false
+        }
+    },
+
+    methods: {
+        reordered(rows) {
+            this.rows = rows;
+            this.hasBeenReordered = true;
+        },
+
+        saveOrder() {
+            let order = this.rows.map(blueprint => blueprint.handle);
+
+            this.$axios
+                .post(this.reorderUrl, { order })
+                .then(response => this.$toast.success(__('Blueprints successfully reordered')))
+                .catch(error => this.$toast.error(__('Something went wrong')))
+        }
+    }
+
+}
+</script>
diff --git a/resources/views/taxonomies/blueprints/index.blade.php b/resources/views/taxonomies/blueprints/index.blade.php
index 89e31456bb9..d1dddd91ff6 100644
--- a/resources/views/taxonomies/blueprints/index.blade.php
+++ b/resources/views/taxonomies/blueprints/index.blade.php
@@ -8,15 +8,36 @@
         'title' => $taxonomy->title()
     ])
 
-    <div class="flex justify-between items-center mb-3">
-        <h1>@yield('title')</h1>
+    <taxonomy-blueprint-listing
+        inline-template
+        :initial-rows="{{ json_encode($blueprints) }}"
+        reorder-url="{{ cp_route('taxonomies.blueprints.reorder', $taxonomy) }}"
+    >
+        <div>
+            <div class="flex justify-between items-center mb-3">
+                <h1>@yield('title')</h1>
 
-        @can('create', 'Statamic\Fields\Blueprint')
-            <a href="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}" class="btn-primary">{{ __('Create Blueprint') }}</a>
-        @endcan
-    </div>
+                <div>
+                    @if ($blueprints->count() > 1)
+                        <button
+                            class="btn"
+                            :class="{ 'disabled': !hasBeenReordered }"
+                            :disabled="!hasBeenReordered"
+                            @click="saveOrder"
+                        >{{ __('Save Order') }}</button>
+                    @endif
 
-    <blueprint-listing :initial-rows="{{ json_encode($blueprints) }}"></blueprint-listing>
+                    <a href="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}" class="btn-primary ml-1">{{ __('Create Blueprint') }}</a>
+                </div>
+            </div>
+
+            <blueprint-listing
+                :initial-rows="rows"
+                :reorderable="{{ $blueprints->count() > 1 ? 'true' : 'false' }}"
+                @reordered="reordered"
+            ></blueprint-listing>
+        </div>
+    </taxonomy-blueprint-listing>
 
     @include('statamic::partials.docs-callout', [
         'topic' => __('Blueprints'),
diff --git a/routes/cp.php b/routes/cp.php
index a81e41582fb..966bf8e53a3 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -70,6 +70,7 @@
     Route::group(['namespace' => 'Taxonomies'], function () {
         Route::resource('taxonomies', 'TaxonomiesController');
         Route::resource('taxonomies.blueprints', 'TaxonomyBlueprintsController');
+        Route::post('taxonomies/{taxonomy}/blueprints/reorder', 'ReorderTaxonomyBlueprintsController')->name('taxonomies.blueprints.reorder');
 
         Route::group(['prefix' => 'taxonomies/{taxonomy}/terms'], function () {
             Route::get('/', 'TermsController@index')->name('taxonomies.terms.index');
diff --git a/src/Http/Controllers/CP/Taxonomies/ReorderTaxonomyBlueprintsController.php b/src/Http/Controllers/CP/Taxonomies/ReorderTaxonomyBlueprintsController.php
new file mode 100644
index 00000000000..273437ac462
--- /dev/null
+++ b/src/Http/Controllers/CP/Taxonomies/ReorderTaxonomyBlueprintsController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Taxonomies;
+
+use Illuminate\Http\Request;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class ReorderTaxonomyBlueprintsController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function __invoke(Request $request, $taxonomy)
+    {
+        foreach ($request->order as $index => $handle) {
+            $taxonomy->termBlueprint($handle)->setOrder($index + 1)->save();
+        }
+    }
+}

From b96ef99ee5c6e984328d335edaa47303b6f52128 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 17:05:15 -0400
Subject: [PATCH 33/39] BlueprintFound events

---
 src/Assets/AssetContainer.php                   |  7 ++++++-
 src/Entries/Collection.php                      | 11 +++++++++--
 src/Entries/Entry.php                           |  2 +-
 src/Events/AssetContainerBlueprintFound.php     | 15 +++++++++++++++
 src/Events/EntryBlueprintFound.php              | 15 +++++++++++++++
 src/Events/FormBlueprintFound.php               | 15 +++++++++++++++
 src/Events/GlobalVariablesBlueprintFound.php    | 15 +++++++++++++++
 src/Events/PublishBlueprintFound.php            | 17 -----------------
 src/Events/TermBlueprintFound.php               | 15 +++++++++++++++
 src/Forms/Form.php                              |  9 +++++++--
 src/Globals/Variables.php                       |  7 ++++++-
 .../CP/Collections/EntriesController.php        |  3 ---
 .../CP/Globals/GlobalVariablesController.php    |  3 ---
 .../CP/Taxonomies/TermsController.php           |  3 ---
 src/Taxonomies/Taxonomy.php                     | 11 +++++++++--
 src/Taxonomies/Term.php                         |  2 +-
 16 files changed, 114 insertions(+), 36 deletions(-)
 create mode 100644 src/Events/AssetContainerBlueprintFound.php
 create mode 100644 src/Events/EntryBlueprintFound.php
 create mode 100644 src/Events/FormBlueprintFound.php
 create mode 100644 src/Events/GlobalVariablesBlueprintFound.php
 delete mode 100644 src/Events/PublishBlueprintFound.php
 create mode 100644 src/Events/TermBlueprintFound.php

diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index b68ac36d230..1d10008d2c7 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Events\AssetContainerBlueprintFound;
 use Statamic\Events\AssetContainerDeleted;
 use Statamic\Events\AssetContainerSaved;
 use Statamic\Facades;
@@ -156,13 +157,17 @@ public function apiUrl()
      */
     public function blueprint()
     {
-        return Blueprint::find('assets/'.$this->handle()) ?? Blueprint::makeFromFields([
+        $blueprint = Blueprint::find('assets/'.$this->handle()) ?? Blueprint::makeFromFields([
             'alt' => [
                 'type' => 'text',
                 'display' => 'Alt Text',
                 'instructions' => 'Description of the image',
             ],
         ])->setHandle($this->handle())->setNamespace('assets');
+
+        AssetContainerBlueprintFound::dispatch($blueprint, $this);
+
+        return $blueprint;
     }
 
     /**
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 47929440f49..48365579bb4 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -8,6 +8,7 @@
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\CollectionDeleted;
 use Statamic\Events\CollectionSaved;
+use Statamic\Events\EntryBlueprintFound;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
@@ -204,13 +205,19 @@ public function entryBlueprints()
         });
     }
 
-    public function entryBlueprint($blueprint = null)
+    public function entryBlueprint($blueprint = null, $entry = null)
     {
         $blueprint = is_null($blueprint)
             ? $this->entryBlueprints()->first()
             : $this->entryBlueprints()->keyBy->handle()->get($blueprint);
 
-        return $blueprint ? $this->ensureEntryBlueprintFields($blueprint) : null;
+        $blueprint = $blueprint ? $this->ensureEntryBlueprintFields($blueprint) : null;
+
+        if ($blueprint) {
+            EntryBlueprintFound::dispatch($blueprint, $entry);
+        }
+
+        return $blueprint;
     }
 
     public function fallbackEntryBlueprint()
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 0d2e13711ec..81a79b6f2fd 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -93,7 +93,7 @@ public function blueprint($blueprint = null)
             ->fluentlyGetOrSet('blueprint')
             ->getter(function ($blueprint) use ($key) {
                 return Blink::once($key, function () use ($blueprint) {
-                    return $this->collection()->entryBlueprint($blueprint ?? $this->value('blueprint'));
+                    return $this->collection()->entryBlueprint($blueprint ?? $this->value('blueprint'), $this);
                 });
             })
             ->setter(function ($blueprint) use ($key) {
diff --git a/src/Events/AssetContainerBlueprintFound.php b/src/Events/AssetContainerBlueprintFound.php
new file mode 100644
index 00000000000..a11d3af5357
--- /dev/null
+++ b/src/Events/AssetContainerBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class AssetContainerBlueprintFound extends Event
+{
+    public $blueprint;
+    public $container;
+
+    public function __construct($blueprint, $container = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->container = $container;
+    }
+}
diff --git a/src/Events/EntryBlueprintFound.php b/src/Events/EntryBlueprintFound.php
new file mode 100644
index 00000000000..324b7a49814
--- /dev/null
+++ b/src/Events/EntryBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class EntryBlueprintFound extends Event
+{
+    public $blueprint;
+    public $entry;
+
+    public function __construct($blueprint, $entry = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->entry = $entry;
+    }
+}
diff --git a/src/Events/FormBlueprintFound.php b/src/Events/FormBlueprintFound.php
new file mode 100644
index 00000000000..0603802a5a9
--- /dev/null
+++ b/src/Events/FormBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class FormBlueprintFound extends Event
+{
+    public $blueprint;
+    public $form;
+
+    public function __construct($blueprint, $form = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->form = $form;
+    }
+}
diff --git a/src/Events/GlobalVariablesBlueprintFound.php b/src/Events/GlobalVariablesBlueprintFound.php
new file mode 100644
index 00000000000..7f43cb43188
--- /dev/null
+++ b/src/Events/GlobalVariablesBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesBlueprintFound extends Event
+{
+    public $blueprint;
+    public $globals;
+
+    public function __construct($blueprint, $globals = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->globals = $globals;
+    }
+}
diff --git a/src/Events/PublishBlueprintFound.php b/src/Events/PublishBlueprintFound.php
deleted file mode 100644
index 375c40fa1ef..00000000000
--- a/src/Events/PublishBlueprintFound.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Statamic\Events;
-
-class PublishBlueprintFound extends Event
-{
-    public $blueprint;
-    public $type;
-    public $data;
-
-    public function __construct($blueprint, $type, $data = null)
-    {
-        $this->blueprint = $blueprint;
-        $this->type = $type;
-        $this->data = $data;
-    }
-}
diff --git a/src/Events/TermBlueprintFound.php b/src/Events/TermBlueprintFound.php
new file mode 100644
index 00000000000..2f35db5010a
--- /dev/null
+++ b/src/Events/TermBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class TermBlueprintFound extends Event
+{
+    public $blueprint;
+    public $term;
+
+    public function __construct($blueprint, $term = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->term = $term;
+    }
+}
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 6295127e067..238ee647269 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -4,10 +4,11 @@
 
 use Statamic\Contracts\Forms\Form as FormContract;
 use Statamic\Contracts\Forms\Submission;
-use Statamic\Facades\Blueprint;
+use Statamic\Events\FormBlueprintFound;
 use Statamic\Events\FormDeleted;
 use Statamic\Events\FormSaved;
 use Statamic\Facades;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
 use Statamic\Facades\Folder;
@@ -58,8 +59,12 @@ public function title($title = null)
      */
     public function blueprint()
     {
-        return Blueprint::find('forms.'.$this->handle())
+        $blueprint = Blueprint::find('forms.'.$this->handle())
             ?? Blueprint::makeFromFields([])->setHandle($this->handle())->setNamespace('forms');
+
+        FormBlueprintFound::dispatch($blueprint, $this);
+
+        return $blueprint;
     }
 
     /**
diff --git a/src/Globals/Variables.php b/src/Globals/Variables.php
index 824ee7ba5af..d331136e8f5 100644
--- a/src/Globals/Variables.php
+++ b/src/Globals/Variables.php
@@ -9,6 +9,7 @@
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Data\HasOrigin;
+use Statamic\Events\GlobalVariablesBlueprintFound;
 use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
@@ -105,7 +106,11 @@ public function sites()
 
     public function blueprint()
     {
-        return $this->globalSet()->blueprint() ?? $this->fallbackBlueprint();
+        $blueprint = $this->globalSet()->blueprint() ?? $this->fallbackBlueprint();
+
+        GlobalVariablesBlueprintFound::dispatch($blueprint, $this);
+
+        return $blueprint;
     }
 
     protected function fallbackBlueprint()
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 9c4f9c82a2b..b4bbd7e3a2c 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -5,7 +5,6 @@
 use Illuminate\Http\Request;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\CP\Breadcrumbs;
-use Statamic\Events\PublishBlueprintFound;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
@@ -76,8 +75,6 @@ public function edit(Request $request, $collection, $entry)
 
         $blueprint = $entry->blueprint();
 
-        event(new PublishBlueprintFound($blueprint, 'entry', $entry));
-
         [$values, $meta] = $this->extractFromFields($entry, $blueprint);
 
         if ($hasOrigin = $entry->hasOrigin()) {
diff --git a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
index c878e5fde7c..3373b67e815 100644
--- a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
@@ -3,7 +3,6 @@
 namespace Statamic\Http\Controllers\CP\Globals;
 
 use Illuminate\Http\Request;
-use Statamic\Events\PublishBlueprintFound;
 use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
@@ -27,8 +26,6 @@ public function edit(Request $request, $id)
 
         $blueprint = $variables->blueprint();
 
-        event(new PublishBlueprintFound($blueprint, 'globals', $variables));
-
         [$values, $meta] = $this->extractFromFields($variables, $blueprint);
 
         if ($hasOrigin = $variables->hasOrigin()) {
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index 6c285d8e812..0d69bcc1038 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Statamic\Contracts\Taxonomies\Term as TermContract;
-use Statamic\Events\PublishBlueprintFound;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Site;
 use Statamic\Facades\Term;
@@ -78,8 +77,6 @@ public function edit(Request $request, $taxonomy, $term)
 
         $blueprint = $term->blueprint();
 
-        event(new PublishBlueprintFound($blueprint, 'term', $term));
-
         [$values, $meta] = $this->extractFromFields($term, $blueprint);
 
         if ($hasOrigin = $term->hasOrigin()) {
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index 6268d5eaf31..d431a84076f 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -9,6 +9,7 @@
 use Statamic\Data\HasAugmentedData;
 use Statamic\Events\TaxonomyDeleted;
 use Statamic\Events\TaxonomySaved;
+use Statamic\Events\TermBlueprintFound;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades;
 use Statamic\Facades\Blueprint;
@@ -87,13 +88,19 @@ public function termBlueprints()
         });
     }
 
-    public function termBlueprint($blueprint = null)
+    public function termBlueprint($blueprint = null, $term = null)
     {
         $blueprint = is_null($blueprint)
             ? $this->termBlueprints()->first()
             : $this->termBlueprints()->keyBy->handle()->get($blueprint);
 
-        return $blueprint ? $this->ensureTermBlueprintFields($blueprint) : null;
+        $blueprint ? $this->ensureTermBlueprintFields($blueprint) : null;
+
+        if ($blueprint) {
+            TermBlueprintFound::dispatch($blueprint, $term);
+        }
+
+        return $blueprint;
     }
 
     public function ensureTermBlueprintFields($blueprint)
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 03860b130e0..aad055595dd 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -80,7 +80,7 @@ public function blueprint($blueprint = null)
             ->fluentlyGetOrSet('blueprint')
             ->getter(function ($blueprint) use ($key) {
                 return Blink::once($key, function () use ($blueprint) {
-                    return $this->taxonomy()->termBlueprint($blueprint ?? $this->value('blueprint'));
+                    return $this->taxonomy()->termBlueprint($blueprint ?? $this->value('blueprint'), $this);
                 });
             })
             ->setter(function ($blueprint) use ($key) {

From f9b3247fce635164bfe67ad8ecaca35a93ecf6ef Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 17:07:11 -0400
Subject: [PATCH 34/39] Apply fixes from StyleCI (#2107)

---
 src/Forms/Form.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 238ee647269..e13ef4dd818 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -7,7 +7,6 @@
 use Statamic\Events\FormBlueprintFound;
 use Statamic\Events\FormDeleted;
 use Statamic\Events\FormSaved;
-use Statamic\Facades;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;

From 156a4e7a07154a97e4f3a65c8e23d81480059012 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 17:18:52 -0400
Subject: [PATCH 35/39] Pass items into method

---
 tests/Data/Entries/EntryTest.php   | 7 +++----
 tests/Data/Taxonomies/TermTest.php | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index a83f083f1ec..78fecf1ae35 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -583,13 +583,12 @@ public function it_gets_the_default_collection_blueprint_when_undefined()
     /** @test */
     public function the_blueprint_is_blinked_when_getting_and_flushed_when_setting()
     {
+        $entry = (new Entry)->collection('blog');
         $collection = Mockery::mock(Collection::make('blog'));
-        $collection->shouldReceive('entryBlueprint')->with(null)->once()->andReturn('the old blueprint');
-        $collection->shouldReceive('entryBlueprint')->with('new')->once()->andReturn('the new blueprint');
+        $collection->shouldReceive('entryBlueprint')->with(null, $entry)->once()->andReturn('the old blueprint');
+        $collection->shouldReceive('entryBlueprint')->with('new', $entry)->once()->andReturn('the new blueprint');
         Collection::shouldReceive('findByHandle')->with('blog')->andReturn($collection);
 
-        $entry = (new Entry)->collection('blog');
-
         $this->assertEquals('the old blueprint', $entry->blueprint());
         $this->assertEquals('the old blueprint', $entry->blueprint());
 
diff --git a/tests/Data/Taxonomies/TermTest.php b/tests/Data/Taxonomies/TermTest.php
index e2c9bfd49ca..51496b1e1b9 100644
--- a/tests/Data/Taxonomies/TermTest.php
+++ b/tests/Data/Taxonomies/TermTest.php
@@ -59,13 +59,12 @@ public function it_gets_the_default_taxonomy_blueprint_when_undefined()
     /** @test */
     public function the_blueprint_is_blinked_when_getting_and_flushed_when_setting()
     {
+        $term = (new Term)->taxonomy('tags');
         $taxonomy = Mockery::mock(Taxonomy::make('tags'));
-        $taxonomy->shouldReceive('termBlueprint')->with(null)->once()->andReturn('the old blueprint');
-        $taxonomy->shouldReceive('termBlueprint')->with('new')->once()->andReturn('the new blueprint');
+        $taxonomy->shouldReceive('termBlueprint')->with(null, $term)->once()->andReturn('the old blueprint');
+        $taxonomy->shouldReceive('termBlueprint')->with('new', $term)->once()->andReturn('the new blueprint');
         Taxonomy::shouldReceive('findByHandle')->with('tags')->andReturn($taxonomy);
 
-        $term = (new Term)->taxonomy('tags');
-
         $this->assertEquals('the old blueprint', $term->blueprint());
         $this->assertEquals('the old blueprint', $term->blueprint());
 

From 0ff2381f01ade4c88969379e0f068b5f9bb5235d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 20:49:40 -0400
Subject: [PATCH 36/39] Save the default blueprint when you opt for links and
 there are no blueprints yet.

---
 .../CP/Collections/CollectionsController.php  |  6 ++++-
 .../Collections/UpdateCollectionTest.php      | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 6cde8a94c9f..3b175fdfaad 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -222,9 +222,13 @@ public function update(Request $request, $collection)
     protected function updateLinkBlueprint($shouldExist, $collection)
     {
         $namespace = 'collections.'.$collection->handle();
-        $alreadyExists = Blueprint::in($namespace)->has('link');
+        $blueprints = Blueprint::in($namespace);
+        $alreadyExists = $blueprints->has('link');
 
         if ($shouldExist && ! $alreadyExists) {
+            if ($blueprints->count() === 0) {
+                $collection->entryBlueprint()->save();
+            }
             $this->createLinkBlueprint($namespace);
         }
 
diff --git a/tests/Feature/Collections/UpdateCollectionTest.php b/tests/Feature/Collections/UpdateCollectionTest.php
index 963b04e9aba..4e9f81ee54a 100644
--- a/tests/Feature/Collections/UpdateCollectionTest.php
+++ b/tests/Feature/Collections/UpdateCollectionTest.php
@@ -91,18 +91,19 @@ public function setting_links_to_true_will_create_a_blueprint_if_it_doesnt_alrea
         BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
 
         $collection = tap(Collection::make('test'))->save();
-        $this->assertCount(0, Blueprint::in('collections.test'));
+        Blueprint::make('not_link')->setNamespace('collections.test')->save();
+        $this->assertCount(1, Blueprint::in('collections.test'));
 
         $this
             ->actingAs($this->userWithPermission())
             ->update($collection, ['links' => true])
             ->assertOk();
 
-        $this->assertCount(1, Blueprint::in('collections.test'));
+        $this->assertCount(2, Blueprint::in('collections.test'));
     }
 
     /** @test */
-    public function setting_links_to_true_will_do_nothing_if_a_blueprint_already_exists()
+    public function setting_links_to_true_will_do_nothing_if_an_existing_link_blueprint_already_exists()
     {
         BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
 
@@ -136,6 +137,25 @@ public function setting_links_to_false_will_delete_the_blueprint_if_exists()
         $this->assertCount(0, Blueprint::in('collections.test'));
     }
 
+    /** @test */
+    public function settings_links_to_true_will_also_create_the_default_blueprint_if_none_exist()
+    {
+        // this is so that you aren't left in awkward situation where there's only a links blueprint.
+
+        BlueprintRepository::swap(new FakeBlueprintRepository(BlueprintRepository::getFacadeRoot()));
+
+        $collection = tap(Collection::make('test'))->save();
+        $this->assertCount(0, Blueprint::in('collections.test'));
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->update($collection, ['links' => true])
+            ->assertOk();
+
+        $this->assertCount(2, $blueprints = Blueprint::in('collections.test'));
+        $this->assertEquals(['test', 'link'], $blueprints->map->handle()->values()->all());
+    }
+
     private function userWithoutPermission()
     {
         $this->setTestRoles(['test' => ['access cp']]);

From 44ff384e179e53e426fe693ab7dc661c41cbbd55 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 23:38:17 -0400
Subject: [PATCH 37/39] Simple html fieldtype, which is used to display links
 to edit blueprints from configure screens.

---
 resources/js/bootstrap/fieldtypes.js          |  1 +
 .../components/fieldtypes/HtmlFieldtype.vue   |  9 ++++
 src/Fieldtypes/Html.php                       | 10 +++++
 .../CP/Assets/AssetContainersController.php   | 42 ++++++++++++-------
 .../CP/Collections/CollectionsController.php  | 23 +++++-----
 .../Controllers/CP/Forms/FormsController.php  | 20 +++++----
 .../CP/Globals/GlobalsController.php          | 31 +++++++-------
 .../CP/Taxonomies/TaxonomiesController.php    | 23 +++++-----
 src/Providers/ExtensionServiceProvider.php    |  1 +
 9 files changed, 100 insertions(+), 60 deletions(-)
 create mode 100644 resources/js/components/fieldtypes/HtmlFieldtype.vue
 create mode 100644 src/Fieldtypes/Html.php

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index 983ae7136d1..774502d44be 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -34,6 +34,7 @@ Vue.component('global_set_sites-fieldtype', require('../components/globals/Sites
 Vue.component('grid-fieldtype', require('../components/fieldtypes/grid/Grid.vue').default);
 Vue.component('grid-fieldtype-index', require('../components/fieldtypes/grid/GridIndex.vue').default);
 Vue.component('hidden-fieldtype', require('../components/fieldtypes/HiddenFieldtype.vue').default);
+Vue.component('html-fieldtype', require('../components/fieldtypes/HtmlFieldtype.vue').default);
 Vue.component('integer-fieldtype', require('../components/fieldtypes/IntegerFieldtype.vue').default);
 Vue.component('link-fieldtype', require('../components/fieldtypes/LinkFieldtype.vue').default);
 Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.vue').default);
diff --git a/resources/js/components/fieldtypes/HtmlFieldtype.vue b/resources/js/components/fieldtypes/HtmlFieldtype.vue
new file mode 100644
index 00000000000..9dbeebc35d0
--- /dev/null
+++ b/resources/js/components/fieldtypes/HtmlFieldtype.vue
@@ -0,0 +1,9 @@
+<template>
+    <div v-html="config.html" />
+</template>
+
+<script>
+export default {
+    mixins: [Fieldtype]
+};
+</script>
diff --git a/src/Fieldtypes/Html.php b/src/Fieldtypes/Html.php
new file mode 100644
index 00000000000..7dc437b553a
--- /dev/null
+++ b/src/Fieldtypes/Html.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fieldtype;
+
+class Html extends Fieldtype
+{
+    //
+}
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 13fe2d0b55a..b0365ff2c55 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -54,7 +54,7 @@ public function edit($container)
 
         $values = $container->toArray();
 
-        $fields = ($blueprint = $this->formBlueprint())
+        $fields = ($blueprint = $this->formBlueprint($container))
             ->fields()
             ->addValues($values)
             ->preProcess();
@@ -158,9 +158,9 @@ private function disks()
         return collect(config('filesystems.disks'))->keys();
     }
 
-    protected function formBlueprint()
+    protected function formBlueprint($container = null)
     {
-        return Blueprint::makeFromSections([
+        $fields = [
             'name' => [
                 'display' => __('Name'),
                 'fields' => [
@@ -189,19 +189,27 @@ protected function formBlueprint()
                         'validate' => 'required',
                     ],
                 ],
-            ],
-            // 'fields' => [
-            //     'display' => __('Fields'),
-            //     'fields' => [
-            //         'blueprint' => [
-            //             'type' => 'blueprints',
-            //             'display' => __('Blueprint'),
-            //             'instructions' => __('statamic::messages.asset_container_blueprint_instructions'),
-            //             'mode' => 'select',
-            //             'max_items' => 1,
-            //         ],
-            //     ],
-            // ],
+            ]
+        ];
+
+        if ($container) {
+            $fields['fields'] = [
+                'display' => __('Fields'),
+                'fields' => [
+                    'blueprint' => [
+                        'type' => 'html',
+                        'display' => __('Blueprint'),
+                        'instructions' => __('statamic::messages.asset_container_blueprint_instructions'),
+                        'html' => $container ? ''.
+                            '<div class="text-xs">'.
+                            '   <a href="'.cp_route('asset-containers.blueprint.edit', $container->handle()).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>' : '<div class="text-xs text-grey">'.__('Editable once created').'</div>',
+                    ],
+                ],
+            ];
+        }
+
+        $fields = array_merge($fields, [
             'settings' => [
                 'display' => __('Settings'),
                 'fields' => [
@@ -238,5 +246,7 @@ protected function formBlueprint()
                 ],
             ],
         ]);
+
+        return Blueprint::makeFromSections($fields);
     }
 }
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 3b175fdfaad..74c02afa6c8 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -132,7 +132,7 @@ public function edit($collection)
             'mount' => optional($collection->mount())->id(),
         ];
 
-        $fields = ($blueprint = $this->editFormBlueprint())
+        $fields = ($blueprint = $this->editFormBlueprint($collection))
             ->fields()
             ->addValues($values)
             ->preProcess();
@@ -181,7 +181,7 @@ public function update(Request $request, $collection)
     {
         $this->authorize('update', $collection, __('You are not authorized to edit this collection.'));
 
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $fields = $this->editFormBlueprint($collection)->fields()->addValues($request->all());
 
         $fields->validate();
 
@@ -269,7 +269,7 @@ public function destroy($collection)
         $collection->delete();
     }
 
-    protected function editFormBlueprint()
+    protected function editFormBlueprint($collection)
     {
         $fields = [
             'name' => [
@@ -354,13 +354,16 @@ protected function editFormBlueprint()
             'content_model' => [
                 'display' => __('Content Model'),
                 'fields' => [
-                    // 'blueprints' => [
-                    //     'display' => __('Blueprints'),
-                    //     'instructions' => __('statamic::messages.collections_blueprint_instructions'),
-                    //     'type' => 'blueprints',
-                    //     'validate' => 'array',
-                    //     'mode' => 'select',
-                    // ],
+                    'blueprints' => [
+                        'display' => __('Blueprints'),
+                        'instructions' => __('statamic::messages.collections_blueprint_instructions'),
+                        'type' => 'html',
+                        'html' => ''.
+                            '<div class="text-xs">'.
+                            '   <span class="mr-2">'.$collection->entryBlueprints()->map->title()->join(', ').'</span>'.
+                            '   <a href="'.cp_route('collections.blueprints.index', $collection).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>',
+                    ],
                     'links' => [
                         'display' => __('Links'),
                         'instructions' => __('statamic::messages.collections_links_instructions'),
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index a85cae13c0f..edfb727cf6e 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -113,7 +113,7 @@ public function edit($form)
 
         $values = $form->toArray();
 
-        $fields = ($blueprint = $this->editFormBlueprint())
+        $fields = ($blueprint = $this->editFormBlueprint($form))
             ->fields()
             ->addValues($values)
             ->preProcess();
@@ -130,7 +130,7 @@ public function update($form, Request $request)
     {
         $this->authorize('edit', $form);
 
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $fields = $this->editFormBlueprint($form)->fields()->addValues($request->all());
 
         $fields->validate();
 
@@ -156,7 +156,7 @@ public function destroy($form)
         $form->delete();
     }
 
-    protected function editFormBlueprint()
+    protected function editFormBlueprint($form)
     {
         return Blueprint::makeFromSections([
             'name' => [
@@ -172,12 +172,14 @@ protected function editFormBlueprint()
             'fields' => [
                 'display' => __('Fields'),
                 'fields' => [
-                    // 'blueprint' => [
-                    //     'type' => 'blueprints',
-                    //     'instructions' => __('statamic::messages.form_configure_blueprint_instructions'),
-                    //     'max_items' => 1,
-                    //     'mode' => 'select',
-                    // ],
+                    'blueprint' => [
+                        'type' => 'html',
+                        'instructions' => __('statamic::messages.form_configure_blueprint_instructions'),
+                        'html' => ''.
+                            '<div class="text-xs">'.
+                            '   <a href="'.cp_route('forms.blueprint.edit', $form->handle()).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>',
+                    ],
                     'honeypot' => [
                         'type' => 'text',
                         'instructions' => __('statamic::messages.form_configure_honeypot_instructions'),
diff --git a/src/Http/Controllers/CP/Globals/GlobalsController.php b/src/Http/Controllers/CP/Globals/GlobalsController.php
index b799a0bc962..74f19a7083f 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsController.php
@@ -59,7 +59,7 @@ public function edit($set)
             })->values(),
         ];
 
-        $fields = ($blueprint = $this->editFormBlueprint())
+        $fields = ($blueprint = $this->editFormBlueprint($set))
             ->fields()
             ->addValues($values)
             ->preProcess();
@@ -80,7 +80,7 @@ public function update(Request $request, $set)
 
         $this->authorize('update', $set);
 
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $fields = $this->editFormBlueprint($set)->fields()->addValues($request->all());
 
         $fields->validate();
 
@@ -153,7 +153,7 @@ public function destroy($set)
         return response('', 204);
     }
 
-    protected function editFormBlueprint()
+    protected function editFormBlueprint($set)
     {
         $fields = [
             'name' => [
@@ -166,18 +166,19 @@ protected function editFormBlueprint()
                     ],
                 ],
             ],
-            // 'content_model' => [
-            //     'display' => __('Content Model'),
-            //     'fields' => [
-            //         'blueprint' => [
-            //             'type' => 'blueprints',
-            //             'instructions' => __('statamic::messages.globals_blueprint_instructions'),
-            //             'validate' => 'array',
-            //             'mode' => 'select',
-            //             'max_items' => 1,
-            //         ],
-            //     ],
-            // ],
+            'content_model' => [
+                'display' => __('Content Model'),
+                'fields' => [
+                    'blueprint' => [
+                        'type' => 'html',
+                        'instructions' => __('statamic::messages.globals_blueprint_instructions'),
+                        'html' => ''.
+                            '<div class="text-xs">'.
+                            '   <a href="'.cp_route('globals.blueprint.edit', $set->handle()).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>',
+                    ],
+                ],
+            ],
         ];
 
         if (Site::hasMultiple()) {
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
index 32a3c27f989..ad511641122 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -120,7 +120,7 @@ public function edit($taxonomy)
             'sites' => $taxonomy->sites()->all(),
         ];
 
-        $fields = ($blueprint = $this->editFormBlueprint())
+        $fields = ($blueprint = $this->editFormBlueprint($taxonomy))
             ->fields()
             ->addValues($values)
             ->preProcess();
@@ -137,7 +137,7 @@ public function update(Request $request, $taxonomy)
     {
         $this->authorize('update', $taxonomy, __('You are not authorized to edit this taxonomy.'));
 
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $fields = $this->editFormBlueprint($taxonomy)->fields()->addValues($request->all());
 
         $fields->validate();
 
@@ -189,7 +189,7 @@ public function destroy($taxonomy)
         $taxonomy->delete();
     }
 
-    protected function editFormBlueprint()
+    protected function editFormBlueprint($taxonomy)
     {
         $fields = [
             'name' => [
@@ -204,13 +204,16 @@ protected function editFormBlueprint()
             'content_model' => [
                 'display' => __('Content Model'),
                 'fields' => [
-                    // 'blueprints' => [
-                    //     'display' => __('Blueprints'),
-                    //     'instructions' => __('statamic::messages.taxonomies_blueprints_instructions'),
-                    //     'type' => 'blueprints',
-                    //     'validate' => 'array',
-                    //     'mode' => 'select',
-                    // ],
+                    'blueprints' => [
+                        'display' => __('Blueprints'),
+                        'instructions' => __('statamic::messages.taxonomies_blueprints_instructions'),
+                        'type' => 'html',
+                        'html' => ''.
+                            '<div class="text-xs">'.
+                            '   <span class="mr-2">'.$taxonomy->termBlueprints()->map->title()->join(', ').'</span>'.
+                            '   <a href="'.cp_route('taxonomies.blueprints.index', $taxonomy).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>',
+                    ],
                     'collections' => [
                         'display' => __('Collections'),
                         'instructions' => __('statamic::messages.taxonomies_collections_instructions'),
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index c2da388b109..6683d38e80e 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -47,6 +47,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\GlobalSetSites::class,
         Fieldtypes\Grid::class,
         Fieldtypes\Hidden::class,
+        Fieldtypes\Html::class,
         Fieldtypes\Integer::class,
         Fieldtypes\Link::class,
         Fieldtypes\Lists::class,

From ab850dacc68ab1cfa728658f367906ab91e033e2 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 23:38:58 -0400
Subject: [PATCH 38/39] Prevent error when scaffolding blueprint

---
 .../CP/Collections/ScaffoldCollectionController.php    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php b/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
index 6593de704a6..a47b3ab9614 100644
--- a/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
+++ b/src/Http/Controllers/CP/Collections/ScaffoldCollectionController.php
@@ -19,13 +19,13 @@ public function index($collection)
         return view('statamic::collections.scaffold', compact('collection'));
     }
 
-    public function create(Request $request)
+    public function create(Request $request, $collection)
     {
         $this->authorize('store', CollectionContract::class, __('You are not authorized to scaffold resources.'));
 
         // Make the blueprint
         if ($blueprint = $this->request->get('blueprint')) {
-            $this->makeBlueprint($blueprint);
+            $this->makeBlueprint($blueprint, $collection);
         }
 
         // Make the index template
@@ -45,13 +45,10 @@ public function create(Request $request)
         ];
     }
 
-    private function makeBlueprint($title)
+    private function makeBlueprint($title, $collection)
     {
         $handle = Str::snake($title);
 
-        // Set the blueprint
-        $this->request->collection->entryBlueprints($handle)->save();
-
         // Don't overwrite existing
         if (Facades\Blueprint::find($handle)) {
             return;
@@ -59,6 +56,7 @@ private function makeBlueprint($title)
 
         $blueprint = (new Blueprint)
             ->setHandle($handle)
+            ->setNamespace('collections.'.$collection->handle())
             ->setContents([
                 'title' => $title,
                 'sections' => [

From d22dedc549bca2300c62b8601145123a585fe806 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 20 Jul 2020 23:45:25 -0400
Subject: [PATCH 39/39] Apply fixes from StyleCI (#2108)

---
 src/Http/Controllers/CP/Assets/AssetContainersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index b0365ff2c55..7a2e87d5755 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -189,7 +189,7 @@ protected function formBlueprint($container = null)
                         'validate' => 'required',
                     ],
                 ],
-            ]
+            ],
         ];
 
         if ($container) {