[6.x] Separate globals config and content

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];

resources/js/components/globals/Sites.vue

@@ -22,7 +22,7 @@
  <td class="text-sm">
  <v-select
  :options="siteOriginOptions(site)"
- :value="site.origin"
+ :model-value="site.origin"
  :searchable="false"
  :reduce="(opt) => opt.value"
  @update:model-value="site.origin = $event"

src/Console/Commands/Multisite.php

@@ -11,12 +11,10 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Config;
 use Statamic\Facades\File;
-use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
-use Statamic\Facades\YAML;
 use Statamic\Rules\Handle;
 use Statamic\Statamic;
 use Statamic\Support\Traits\Hookable;
@@ -103,9 +101,9 @@ private function collectionsHaveBeenMoved(string $siteHandle): bool
 
  private function globalsHaveBeenMoved(string $siteHandle): bool
  {
-$directory = Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle;
-
-return File::isDirectory($directory);
+return File::exists(
+ Stache::store('globals')->directory().DIRECTORY_SEPARATOR.$siteHandle
+ );
  }
 
  private function navsHaveBeenMoved(string $siteHandle): bool
@@ -264,29 +262,30 @@ private function moveCollectionTrees($collection): void
 
  private function convertGlobalSets(): self
  {
- Config::set('statamic.system.multisite', true);
+ if ($this->siteHandle === 'default') {
+ // If it's default, the variables are already in the right spot.
+ return $this;
+ }
 
- GlobalSet::all()->each(function ($set) {
- $this->components->task(
- description: "Updating global [{$set->handle()}]...",
- task: function () use ($set) {
- $this->moveGlobalSet($set);
- }
- );
- });
+ $directory = Stache::store('globals')->directory();
+ $originalDirectory = $directory.DIRECTORY_SEPARATOR.'default';
+ $newDirectory = $directory.DIRECTORY_SEPARATOR.$this->siteHandle;
 
- return $this;
- }
+ File::makeDirectory($newDirectory);
 
-private function moveGlobalSet($set): void
- {
-$yaml = YAML::file($set->path())->parse();
+ collect(File::getFiles($originalDirectory))
+ ->each(function ($path) use ($originalDirectory, $newDirectory) {
+ $basename = pathinfo($path, PATHINFO_BASENAME);
 
- $data = $yaml['data'] ?? [];
+ File::move(
+ $originalDirectory.DIRECTORY_SEPARATOR.$basename,
+ $newDirectory.DIRECTORY_SEPARATOR.$basename
+ );
+ });
 
-$set->addLocalization($set->makeLocalization($this->siteHandle)->data($data));
+File::delete($originalDirectory);
 
-$set->save();
+return $this;
  }
 
  private function convertNavs(): self

src/Events/Concerns/ListensForContentEvents.php

@@ -35,6 +35,8 @@ trait ListensForContentEvents
  \Statamic\Events\FormSaved::class,
  \Statamic\Events\GlobalSetDeleted::class,
  \Statamic\Events\GlobalSetSaved::class,
+ \Statamic\Events\GlobalVariablesDeleted::class,
+ \Statamic\Events\GlobalVariablesSaved::class,
  \Statamic\Events\NavDeleted::class,
  \Statamic\Events\NavSaved::class,
  \Statamic\Events\NavTreeSaved::class,

src/Events/GlobalVariablesDeleted.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesDeleted extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesDeleted extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables deleted', [], config('statamic.git.locale'));
+ }
 }

src/Events/GlobalVariablesSaved.php

@@ -2,9 +2,16 @@
 
 namespace Statamic\Events;
 
-class GlobalVariablesSaved extends Event
+use Statamic\Contracts\Git\ProvidesCommitMessage;
+
+class GlobalVariablesSaved extends Event implements ProvidesCommitMessage
 {
  public function __construct(public $variables)
  {
  }
+
+ public function commitMessage()
+ {
+ return __('Global variables saved', [], config('statamic.git.locale'));
+ }
 }

src/Globals/GlobalSet.php

@@ -28,6 +28,7 @@ class GlobalSet implements Contract
  protected $handle;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
+ private $sites = [];
 
  public function id()
  {
@@ -118,12 +119,14 @@ public function save()
 
  protected function saveOrDeleteLocalizations()
  {
- $localizations = $this->localizations();
+ $localizations = $this->freshLocalizations();
 
- $localizations->each->save();
+ $this->sites()
+ ->reject(fn ($site) => $localizations->has($site))
+ ->each(fn ($site) => $this->makeLocalization($site)->save());
 
- $this->freshLocalizations()
- ->diffKeys($localizations)
+ $localizations
+ ->filter(fn ($localization) => ! $this->sites()->contains($localization->locale()))
  ->each->delete();
  }
 
@@ -156,17 +159,10 @@ public function delete()
 
  public function fileData()
  {
-$data = [
+return Arr::removeNullValues([
  'title' => $this->title(),
- ];
-
- if (! Site::multiEnabled() && ($variables = $this->in(Site::default()->handle()))) {
- $data['data'] = Arr::removeNullValues(
- $variables->data()->all()
- );
- }
-
- return $data;
+ 'sites' => Site::multiEnabled() ? $this->origins()->all() : null,
+ ]);
  }
 
  public function makeLocalization($site)
@@ -176,30 +172,53 @@ public function makeLocalization($site)
  ->locale($site);
  }
 
- public function addLocalization($localization)
+ public function sites($sites = null)
  {
- $localization->globalSet($this);
+ if (func_num_args() === 0) {
+ $sites = collect($this->sites);
 
- $this->localizations()[$localization->locale()] = $localization;
+ if ($sites->isEmpty()) {
+ return collect([Site::default()->handle()]);
+ }
 
- return $this;
- }
+return collect($this->sites)->keys();
+}
 
- public function removeLocalization($localization)
- {
- $this->localizations()->forget($localization->locale());
+ $this->sites = collect($sites)->mapWithKeys(function ($value, $key) {
+ if (is_int($key)) {
+ return [$value => ['origin' => null]];
+ }
+
+ if (is_string($value) || is_null($value)) {
+ return [$key => ['origin' => $value]];
+ }
+
+ return [$key => $value];
+ })->all();
 
  return $this;
  }
 
- public function sites()
+ public function origins()
  {
- return $this->localizations()->map->locale()->values()->toBase();
+ $sites = empty($this->sites)
+ ? [Site::default()->handle() => ['origin' => null]]
+ : $this->sites;
+
+ return collect($sites)->map(fn ($value, $key) => $value['origin'] ?? null);
  }
 
  public function in($locale)
  {
- return $this->localizations()->get($locale);
+ if (! $this->sites()->contains($locale)) {
+ return null;
+ }
+
+ if (! $variables = $this->localizations()->get($locale)) {
+ $variables = $this->makeLocalization($locale);
+ }
+
+ return $variables;
  }
 
  public function inSelectedSite()
@@ -239,6 +258,11 @@ public function editUrl()
  return cp_route('globals.edit', $this->handle());
  }
 
+ public function updateUrl()
+ {
+ return cp_route('globals.update', $this->handle());
+ }
+
  public function deleteUrl()
  {
  return cp_route('globals.destroy', $this->handle());

src/Globals/Variables.php

@@ -77,7 +77,7 @@ public function path()
  {
  return vsprintf('%s/%s%s.%s', [
  rtrim(Stache::store('global-variables')->directory(), '/'),
-Site::multiEnabled() ? $this->locale().'/' : '',
+ $this->locale().'/',
  $this->handle(),
  'yaml',
  ]);
@@ -152,6 +152,8 @@ public function save()
  GlobalVariablesSaved::dispatch($this);
  }
 
+ Blink::forget('global-set-localizations-'.$this->globalSet()->id());
+
  return $this;
  }
 
@@ -227,13 +229,18 @@ protected function fallbackBlueprint()
 
  public function fileData()
  {
- $data = $this->data()->all();
+ return $this->data()->all();
+ }
 
- if ($this->hasOrigin()) {
- $data['origin'] = $this->origin()->locale();
+ public function origin($origin = null)
+ {
+ if (func_num_args() === 0) {
+ return $this->getOriginByString(
+ $this->globalSet()->origins()->get($this->locale())
+ );
  }
 
-return $data;
+throw new \Exception('The origin cannot be set directly. It must be defined on the global set.');
  }
 
  protected function shouldRemoveNullsFromFileData()

src/Http/Controllers/CP/Globals/GlobalVariablesController.php

@@ -19,7 +19,7 @@ public function edit(Request $request, $id)
  }
 
  if (! $variables = $set->in($site)) {
- return abort(404);
+ return $this->pageNotFound();
  }
 
  $this->authorize('edit', $variables);
@@ -87,7 +87,7 @@ public function update(Request $request, $handle)
  }
 
  if (! $set = $set->in($site)) {
-abort(404);
+return $this->pageNotFound();
  }
 
  $this->authorize('edit', $set);
@@ -104,7 +104,7 @@ public function update(Request $request, $handle)
 
  $set->data($values);
 
- $save = $set->globalSet()->addLocalization($set)->save();
+ $save = $set->save();
 
  return response()->json([
  'saved' => is_bool($save) ? $save : true,

src/Http/Controllers/CP/Globals/GlobalsController.php

@@ -10,7 +10,6 @@
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Rules\Handle;
-use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
 class GlobalsController extends CpController
@@ -58,8 +57,8 @@ public function edit($set)
  return [
  'name' => $site->name(),
  'handle' => $site->handle(),
- 'enabled' => $enabled = $set->existsIn($site->handle()),
- 'origin' => $enabled ? optional($set->in($site->handle())->origin())->locale() : null,
+ 'enabled' => $set->sites()->contains($site->handle()),
+ 'origin' => $set->origins()->get($site->handle()),
  ];
  })->values(),
  ];
@@ -112,19 +111,11 @@ public function update(Request $request, $set)
  ->blueprint($values['blueprint']);
 
  if (Site::multiEnabled()) {
- $sites = collect(Arr::get($values, 'sites'));
+ $sites = collect($values['sites'])
+ ->filter(fn ($site) => $site['enabled'])
+ ->mapWithKeys(fn ($site) => [$site['handle'] => $site['origin']]);
 
- foreach ($sites->filter->enabled as $site) {
- $vars = $set->in($site['handle']) ?? $set->makeLocalization($site['handle']);
- $vars->origin($site['origin']);
- $set->addLocalization($vars);
- }
-
- foreach ($sites->reject->enabled as $site) {
- if ($set->existsIn($site['handle'])) {
- $set->removeLocalization($set->in($site['handle']));
- }
- }
+ $set->sites($sites);
  }
 
  $set->save();
@@ -161,11 +152,10 @@ public function store(Request $request)
  }
 
  $global = GlobalSet::make($handle)->title($data['title']);
-
- $global->addLocalization($global->makeLocalization(Site::default()->handle()));
-
  $global->save();
 
+ $global->in(Site::default()->handle())->save();
+
  session()->flash('message', __('Global Set created'));
 
  return ['redirect' => $global->editUrl()];