From 0e9d64edb76db4a6203ebd3a4989acccb1b0e1e6 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <31214002+jaxwilko@users.noreply.github.com>
Date: Fri, 8 Nov 2024 09:28:06 +0000
Subject: [PATCH 1/9] Remove redundent vite logic (#1249)

---
 modules/system/console/asset/vite/ViteWatch.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/modules/system/console/asset/vite/ViteWatch.php b/modules/system/console/asset/vite/ViteWatch.php
index aee89ac1db..b58e0d3e0f 100644
--- a/modules/system/console/asset/vite/ViteWatch.php
+++ b/modules/system/console/asset/vite/ViteWatch.php
@@ -57,17 +57,6 @@ protected function createCommand(string $configPath): array
         return array_values($command);
     }
 
-    /**
-     * Create the public dir if required
-     */
-    protected function beforeExecution(string $configPath): void
-    {
-        $publicDir = dirname($configPath) . '/public';
-        if (!File::exists($publicDir)) {
-            File::makeDirectory($publicDir);
-        }
-    }
-
     /**
      * Handle the cleanup of this command if a termination signal is received
      */

From 225457a468a901ba6304047a8a091ff93eb07eb4 Mon Sep 17 00:00:00 2001
From: AIC BV <89913092+AIC-BV@users.noreply.github.com>
Date: Sun, 10 Nov 2024 05:11:17 +0100
Subject: [PATCH 2/9] Fix deprecated meta tag (#1250)

---
 modules/backend/layouts/_head.php | 2 +-
 modules/backend/layouts/auth.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/backend/layouts/_head.php b/modules/backend/layouts/_head.php
index 0ff93ceb75..16c794cb2d 100644
--- a/modules/backend/layouts/_head.php
+++ b/modules/backend/layouts/_head.php
@@ -1,7 +1,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0, minimal-ui">
 <meta name="robots" content="noindex">
-<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
 <meta name="app-timezone" content="<?= e(Config::get('app.timezone')) ?>">
 <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
 <meta name="backend-timezone" content="<?= e(Backend\Models\Preference::get('timezone')) ?>">
diff --git a/modules/backend/layouts/auth.php b/modules/backend/layouts/auth.php
index ec65941199..a227a7a06f 100644
--- a/modules/backend/layouts/auth.php
+++ b/modules/backend/layouts/auth.php
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0">
         <meta name="robots" content="noindex">
-        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="mobile-web-app-capable" content="yes">
         <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
         <meta name="csrf-token" content="<?= csrf_token() ?>">
         <link rel="icon" type="image/png" href="<?= e(Backend\Models\BrandSetting::getFavicon()) ?>">

From a16458f48f66aacfb72b00d01cce686de6e53180 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 13 Nov 2024 16:23:07 -0500
Subject: [PATCH 3/9] Revert applyFiltersFromModel change (#1126)

Reverts changes to original behavior - too many problems.

Related: #1222

#927 was originally intended to solve the issue logged in #950 where if you hide a field by default, and then want to unhide it dynamically in filterFields() it does not get saved because disabled and hidden fields are skipped by default in Form->getSaveData(); so the proposed fix was to apply model filtering logic immediately before processing the save data; however that caused issues (#1036) because the model was no longer populated the same way when calling filterFields() at that point in the request and the filterFields() method could be called multiple times.

The solution to the original issue would have been to use the client side Trigger API instead; and potentially we could have solved the other issue by looking at how we're populating the model before calling filterFields() but as this functionality isn't well tested we'll just revert for now.

The second change being reverted is #1099 which was an attempt to solve an issue encountered by someone that was caused by the method being called multiple times.
---
 modules/backend/widgets/Form.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 59ec24e033..ecb078c4d6 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -354,7 +354,7 @@ public function setFormValues($data = null)
     public function onRefresh()
     {
         $result = [];
-        $saveData = $this->getSaveData(true);
+        $saveData = $this->getSaveData();
 
         /**
          * @event backend.form.beforeRefresh
@@ -1172,10 +1172,9 @@ protected function showFieldLabels($field)
     /**
      * Returns post data from a submitted form.
      */
-    public function getSaveData(bool $includeAllFields = false): array
+    public function getSaveData(): array
     {
         $this->defineFormFields();
-        $this->applyFiltersFromModel();
 
         $result = [];
 
@@ -1194,7 +1193,7 @@ public function getSaveData(bool $includeAllFields = false): array
             /*
              * Disabled and hidden should be omitted from data set
              */
-            if (!$includeAllFields && ($field->disabled || $field->hidden)) {
+            if ($field->disabled || $field->hidden) {
                 continue;
             }
 

From 64a268b58ec771aa6bfbd822d333a60eadd7b6fc Mon Sep 17 00:00:00 2001
From: Alex Orosciuc <oroshchuk@gmail.com>
Date: Wed, 13 Nov 2024 22:06:50 +0000
Subject: [PATCH 4/9] Support --isolatable flag on migration command (#1226)

See https://laravel.com/docs/11.x/artisan#isolatable-commands
---
 modules/system/console/WinterUp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/console/WinterUp.php b/modules/system/console/WinterUp.php
index c774b8e1fc..1b54d1d534 100644
--- a/modules/system/console/WinterUp.php
+++ b/modules/system/console/WinterUp.php
@@ -1,6 +1,7 @@
 <?php namespace System\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Isolatable;
 use System\Classes\UpdateManager;
 
 /**
@@ -11,7 +12,7 @@
  * @package winter\wn-system-module
  * @author Alexey Bobkov, Samuel Georges
  */
-class WinterUp extends Command
+class WinterUp extends Command implements Isolatable
 {
     /**
      * The name and signature of the console command.

From 65ab300fee331bbd42eb41177c1375775766685d Mon Sep 17 00:00:00 2001
From: AIC BV <89913092+AIC-BV@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:10:37 +0100
Subject: [PATCH 5/9] Fix displaying repeater item titles in preview contexts
 (#1191)

---
 modules/backend/formwidgets/repeater/assets/js/repeater.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/formwidgets/repeater/assets/js/repeater.js b/modules/backend/formwidgets/repeater/assets/js/repeater.js
index 6c80b47733..c72ef23063 100644
--- a/modules/backend/formwidgets/repeater/assets/js/repeater.js
+++ b/modules/backend/formwidgets/repeater/assets/js/repeater.js
@@ -269,7 +269,7 @@
                     return $textInput.val()
             }
         } else {
-            var $disabledTextInput = $('.text-field:first > .form-control', $target)
+            var $disabledTextInput = $('.form-control:first', $target)
             if ($disabledTextInput.length) {
                 return $disabledTextInput.text()
             }

From 6b4f6016e786d3bc3300c06e5bf4a5b468c2d15b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 22 Nov 2024 10:35:28 -0500
Subject: [PATCH 6/9] Improve RecordFinder FormWidget (#1254)

make whole field clickable to open the record finder form
add string translation for default prompt
Similar change that was done recently for the FileUpload formwidget (ref. #1229)
---
 modules/backend/formwidgets/RecordFinder.php              | 6 +++++-
 .../formwidgets/recordfinder/partials/_recordfinder.php   | 8 +++++++-
 modules/backend/lang/en/lang.php                          | 1 +
 modules/backend/lang/fr/lang.php                          | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index 982e12dc01..0e5799cf0d 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -60,7 +60,7 @@ class RecordFinder extends FormWidgetBase
     /**
      * @var string Prompt to display if no record is selected.
      */
-    public $prompt = 'Click the %s button to find a record';
+    public $prompt = null;
 
     /**
      * @var int Maximum rows to display for each page.
@@ -144,6 +144,10 @@ public function init()
             'modelClass',
         ]);
 
+        if (!isset($this->prompt)) {
+            $this->prompt = Lang::get('backend::lang.recordfinder.default_prompt');
+        }
+
         if (!$this->useRelation && !class_exists($this->modelClass)) {
             throw new ApplicationException(Lang::get('backend::lang.recordfinder.invalid_model_class', ['modelClass' => $this->modelClass]));
         }
diff --git a/modules/backend/formwidgets/recordfinder/partials/_recordfinder.php b/modules/backend/formwidgets/recordfinder/partials/_recordfinder.php
index 79ad7f4fe9..3ad24d971a 100644
--- a/modules/backend/formwidgets/recordfinder/partials/_recordfinder.php
+++ b/modules/backend/formwidgets/recordfinder/partials/_recordfinder.php
@@ -10,7 +10,13 @@ class="field-recordfinder loading-indicator-container size-input-text"
     data-control="recordfinder"
     data-refresh-handler="<?= $this->getEventHandler('onRefresh') ?>"
     data-data-locker="#<?= $field->getId() ?>">
-    <span class="form-control" <?= $previewMode ? 'disabled="disabled"' : '' ?>>
+    <span class="form-control" style="cursor:pointer"
+            <?= $previewMode ? 'disabled="disabled"' : '' ?>
+            data-control="popup"
+            data-size="huge"
+            data-handler="<?= $this->getEventHandler('onFindRecord') ?>"
+            data-request-data="recordfinder_flag: 1"
+    >
         <?php if ($value): ?>
             <span class="primary"><?= e($nameValue) ?: 'Undefined' ?></span>
             <?php if ($descriptionValue): ?>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 83fabed70e..5c1a96f55b 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -312,6 +312,7 @@
     ],
     'recordfinder' => [
         'find_record' => 'Find Record',
+        'default_prompt' => 'Click the %s button to find a record',
         'invalid_model_class' => 'The provided model class ":modelClass" for the recordfinder is invalid',
         'cancel' => 'Cancel',
     ],
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index b0250c4d30..251d800c18 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -310,6 +310,7 @@
         'return_to_list' => 'Retourner à la liste'
     ],
     'recordfinder' => [
+        'default_prompt' => 'Cliquer sur %s pour chercher un enregistrement',
         'find_record' => 'Trouver un enregistrement',
         'invalid_model_class' => "La classe du modèle \":modelClass\" fournie pour le recordfinder n'est pas valide.",
         'cancel' => 'Annuler',

From eabd18c68a60bdb08e2bee9059663180d06ac6c9 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <31214002+jaxwilko@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:53:27 +0000
Subject: [PATCH 7/9] Vite theme create (#1253)

Replaces #1244. Alters how create:theme [name] tailwind works to generate the default asset configs via the vite:* commands, it also runs an initial compile to ensure styles are generated before first load.
---
 modules/cms/console/CreateTheme.php           | 52 ++++++++++++++++---
 .../scaffold/theme/tailwind/package.stub      | 12 -----
 .../theme/tailwind/partials/meta/styles.stub  | 16 +-----
 .../theme/tailwind/partials/site/footer.stub  |  4 +-
 .../theme/tailwind/tailwind.config.stub       | 21 --------
 .../scaffold/theme/tailwind/winter.mix.stub   | 15 ------
 modules/system/console/asset/AssetCompile.php |  5 +-
 modules/system/console/asset/AssetCreate.php  | 27 ++++++++--
 modules/system/console/asset/AssetInstall.php |  4 +-
 .../config/tailwind/postcss.config.js.fixture |  1 -
 .../system/console/asset/mix/MixCompile.php   |  2 +-
 .../system/console/asset/mix/MixCreate.php    |  4 +-
 .../system/console/asset/mix/MixInstall.php   |  1 +
 modules/system/console/asset/mix/MixWatch.php |  2 +-
 .../system/console/asset/vite/ViteCompile.php |  2 +-
 .../system/console/asset/vite/ViteCreate.php  |  8 ++-
 .../system/console/asset/vite/ViteInstall.php |  1 +
 .../system/console/asset/vite/ViteWatch.php   |  2 +-
 18 files changed, 93 insertions(+), 86 deletions(-)
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/package.stub
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/tailwind.config.stub
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/winter.mix.stub

diff --git a/modules/cms/console/CreateTheme.php b/modules/cms/console/CreateTheme.php
index 29a5f91966..71a8036f66 100644
--- a/modules/cms/console/CreateTheme.php
+++ b/modules/cms/console/CreateTheme.php
@@ -35,6 +35,11 @@ class CreateTheme extends GeneratorCommand
      */
     protected $nameFrom = 'theme';
 
+    /**
+     * @var string The scaffold that we are building
+     */
+    protected string $scaffold;
+
     /**
      * @var array Available theme scaffolds and their types
      */
@@ -68,12 +73,9 @@ class CreateTheme extends GeneratorCommand
             'scaffold/theme/tailwind/partials/site/header.stub' => 'partials/site/header.htm',
             'scaffold/theme/tailwind/partials/site/footer.stub' => 'partials/site/footer.htm',
             'scaffold/theme/tailwind/.gitignore.stub' => '.gitignore',
-            'scaffold/theme/tailwind/package.stub' => 'package.json',
             'scaffold/theme/tailwind/README.stub' => 'README.md',
-            'scaffold/theme/tailwind/tailwind.config.stub' => 'tailwind.config.js',
             'scaffold/theme/tailwind/theme.stub' => 'theme.yaml',
             'scaffold/theme/tailwind/version.stub' => 'version.yaml',
-            'scaffold/theme/tailwind/winter.mix.stub' => 'winter.mix.js',
         ],
     ];
 
@@ -90,12 +92,13 @@ protected function getNameInput(): string
      */
     protected function prepareVars(): array
     {
-        $scaffold = $this->argument('scaffold') ?? 'tailwind';
+        $this->scaffold = $this->argument('scaffold') ?? 'tailwind';
+
         $validOptions = $this->suggestScaffoldValues();
-        if (!in_array($scaffold, $validOptions)) {
-            throw new InvalidArgumentException("$scaffold is not an available theme scaffold type (Available types: " . implode(', ', $validOptions) . ')');
+        if (!in_array($this->scaffold, $validOptions)) {
+            throw new InvalidArgumentException("$this->scaffold is not an available theme scaffold type (Available types: " . implode(', ', $validOptions) . ')');
         }
-        $this->stubs = $this->themeScaffolds[$scaffold];
+        $this->stubs = $this->themeScaffolds[$this->scaffold];
 
         return [
             'code' => $this->getNameInput(),
@@ -146,4 +149,39 @@ public function makeStub($stubName)
 
         $this->files->put($destinationFile, $destinationContent);
     }
+
+    public function makeStubs(): void
+    {
+        parent::makeStubs();
+
+        if ($this->scaffold === 'tailwind') {
+            // Set up the vite config files
+            $this->call('vite:create', [
+                'packageName' => 'theme-' . $this->getNameInput(),
+                '--no-interaction' => true,
+                '--force' => true,
+                '--silent' => true,
+                '--tailwind' => true
+            ]);
+
+            $this->info('Installing NPM dependencies...');
+
+            // Ensure all require packages are available for the new theme and add the new theme to our npm workspaces
+            $this->call('vite:install', [
+                'assetPackage' => ['theme-' . $this->getNameInput()],
+                '--no-interaction' => true,
+                '--silent' => true,
+                '--disable-tty' => true
+            ]);
+
+            $this->info('Compiling your theme...');
+
+            // Run an initial compile to ensure styles are available for first load
+            $this->call('vite:compile', [
+                '--package' => ['theme-' . $this->getNameInput()],
+                '--no-interaction' => true,
+                '--silent' => true,
+            ]);
+        }
+    }
 }
diff --git a/modules/cms/console/scaffold/theme/tailwind/package.stub b/modules/cms/console/scaffold/theme/tailwind/package.stub
deleted file mode 100644
index 51ba79a043..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/package.stub
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "name": "{{code}}",
-    "private": true,
-    "version": "1.0.0",
-    "devDependencies": {
-        "postcss": "~8.4.x",
-        "postcss-import": "~14.1.x",
-        "tailwindcss": "~3.0.x"
-    },
-    "dependencies": {
-    }
-}
diff --git a/modules/cms/console/scaffold/theme/tailwind/partials/meta/styles.stub b/modules/cms/console/scaffold/theme/tailwind/partials/meta/styles.stub
index fdcc745eab..154e01dcc7 100644
--- a/modules/cms/console/scaffold/theme/tailwind/partials/meta/styles.stub
+++ b/modules/cms/console/scaffold/theme/tailwind/partials/meta/styles.stub
@@ -1,19 +1,5 @@
 ==
-<?php
-use Cms\Classes\Asset;
-use Cms\Classes\Theme;
-function onStart() {
-    // Cache bust the main styles file
-    $styles = (new Asset(Theme::getActiveTheme()))->find('dist/css/theme.css');
-    if ($styles) {
-        $this['lastmodified'] = $styles->mtime;
-    } else {
-        throw new \Exception("Asset files were not detected, try running artisan mix:install && artisan mix:compile -p theme-{{code}}");
-    }
-}
-?>
-==
-<link rel="stylesheet" href="{{ 'assets/dist/css/theme.css' | theme }}?v={{ lastmodified }}">
+{{ vite(['assets/src/css/theme-{{code}}.css'], 'theme-{{code}}') }}
 
 <style>
     :root {
diff --git a/modules/cms/console/scaffold/theme/tailwind/partials/site/footer.stub b/modules/cms/console/scaffold/theme/tailwind/partials/site/footer.stub
index 4435b21666..38efe90212 100644
--- a/modules/cms/console/scaffold/theme/tailwind/partials/site/footer.stub
+++ b/modules/cms/console/scaffold/theme/tailwind/partials/site/footer.stub
@@ -7,8 +7,8 @@
             '@framework.extras',
         ] | theme }}"></script>
 
-        {# Mix extracted assets #}
-        <script src="{{ 'assets/dist/js/theme.js' | theme }}"></script>
+        {# Vite extracted assets #}
+        {{ vite(['assets/src/js/theme-{{code}}.js'], 'theme-{{code}}') }}
 
         {% scripts %}
 
diff --git a/modules/cms/console/scaffold/theme/tailwind/tailwind.config.stub b/modules/cms/console/scaffold/theme/tailwind/tailwind.config.stub
deleted file mode 100644
index dbea377e04..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/tailwind.config.stub
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-    content: [
-        '../../plugins/*/*/blocks/*.block',
-        './theme.yaml',
-        './assets/src/js/**/*.{js,vue}',
-        './blocks/**/*.block',
-        './layouts/**/*.htm',
-        './pages/**/*.htm',
-        './partials/**/*.htm',
-    ],
-    theme: {
-        extend: {
-            colors: {
-                primary: 'var(--primary)',
-                secondary: 'var(--secondary)',
-            },
-        },
-    },
-    plugins: [
-    ],
-}
diff --git a/modules/cms/console/scaffold/theme/tailwind/winter.mix.stub b/modules/cms/console/scaffold/theme/tailwind/winter.mix.stub
deleted file mode 100644
index dad297ba9a..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/winter.mix.stub
+++ /dev/null
@@ -1,15 +0,0 @@
-const mix = require('laravel-mix');
-
-mix
-    .setPublicPath(__dirname)
-
-    // Render Tailwind style
-    .postCss('assets/src/css/theme.css', 'assets/dist/css/theme.css', [
-        require('postcss-import'),
-        require('tailwindcss'),
-        require('tailwindcss/nesting'),
-        require('autoprefixer'),
-    ])
-
-    // Compile JS
-    .js('assets/src/js/theme.js', 'assets/dist/js/theme.js');
diff --git a/modules/system/console/asset/AssetCompile.php b/modules/system/console/asset/AssetCompile.php
index 3fca7f8e9c..be4a3726ea 100644
--- a/modules/system/console/asset/AssetCompile.php
+++ b/modules/system/console/asset/AssetCompile.php
@@ -147,7 +147,10 @@ public function watchHandle(string $type): int
             return 1;
         }
 
-        $this->info(sprintf('Watching package "%s" for changes', $name));
+        if (!$this->option('silent')) {
+            $this->info(sprintf('Watching package "%s" for changes', $name));
+        }
+
         $this->watchingFilePath = $relativeConfigPath;
 
         if ($this->executeProcess(base_path($relativeConfigPath)) !== 0) {
diff --git a/modules/system/console/asset/AssetCreate.php b/modules/system/console/asset/AssetCreate.php
index 7912a12789..ef702bfd27 100644
--- a/modules/system/console/asset/AssetCreate.php
+++ b/modules/system/console/asset/AssetCreate.php
@@ -64,8 +64,12 @@ public function handle(): int
         $packages = $compilableAssets->getPackages($this->assetType, true);
 
         if (
+            // We have the package already
             isset($packages[$package])
-            && !$this->confirm('Package `' . $package . '` has already been configured, are you sure you wish to continue?')
+            // If the user has requested `force` & `no-interaction` then we do not ask for confirmation and continue
+            && !($this->option('force') && $this->option('no-interaction'))
+            // If the user has forced but with interaction, then we do not ask for confirmation, else we do
+            && !($this->option('force') || $this->confirm('Package `' . $package . '` has already been configured, are you sure you wish to continue?'))
         ) {
             return 0;
         }
@@ -87,8 +91,10 @@ public function handle(): int
         $verb = File::exists($packageJson->getPath()) ? 'updated' : 'generated';
         $packageJson->save();
 
-        $this->warn("File $verb: " . str_after($packageJson->getPath(), base_path()));
-        $this->info(ucfirst($this->assetType) . ' configuration complete.');
+        if (!$this->option('silent')) {
+            $this->warn("File $verb: " . str_after($packageJson->getPath(), base_path()));
+            $this->info(ucfirst($this->assetType) . ' configuration complete.');
+        }
 
         $this->afterExecution();
 
@@ -196,13 +202,24 @@ protected function installConfigs(
      */
     protected function writeFile(string $path, string $content): int
     {
-        if (File::exists($path) && !$this->confirm(sprintf('%s already exists, overwrite?', basename($path)))) {
+        if (
+            // If forced, ignore file existing and overwrite
+            (!$this->option('force') && File::exists($path))
+            && (
+                // If no interaction requested, then skip the confirm check and return
+                $this->option('no-interaction')
+                // else ask the user if they want overwriting
+                || !$this->confirm(sprintf('%s already exists, overwrite?', basename($path)))
+            )
+        ) {
             return 0;
         }
 
         $result = File::put($path, $content);
 
-        $this->warn('File generated: ' . str_after($path, base_path()));
+        if (!$this->option('silent')) {
+            $this->warn('File generated: ' . str_after($path, base_path()));
+        }
 
         return $result;
     }
diff --git a/modules/system/console/asset/AssetInstall.php b/modules/system/console/asset/AssetInstall.php
index fcd9013c66..03cc469988 100644
--- a/modules/system/console/asset/AssetInstall.php
+++ b/modules/system/console/asset/AssetInstall.php
@@ -369,7 +369,9 @@ protected function runNpmInstall(): int
 
         try {
             return $process->run(function ($status, $stdout) {
-                $this->getOutput()->write($stdout);
+                if (!$this->option('silent')) {
+                    $this->getOutput()->write($stdout);
+                }
             });
         } catch (ProcessSignaledException $e) {
             if (extension_loaded('pcntl') && $e->getSignal() !== SIGINT) {
diff --git a/modules/system/console/asset/fixtures/config/tailwind/postcss.config.js.fixture b/modules/system/console/asset/fixtures/config/tailwind/postcss.config.js.fixture
index 49c0612d5c..616868cd6e 100644
--- a/modules/system/console/asset/fixtures/config/tailwind/postcss.config.js.fixture
+++ b/modules/system/console/asset/fixtures/config/tailwind/postcss.config.js.fixture
@@ -1,6 +1,5 @@
 export default {
     plugins: {
         tailwindcss: {},
-        autoprefixer: {},
     },
 };
diff --git a/modules/system/console/asset/mix/MixCompile.php b/modules/system/console/asset/mix/MixCompile.php
index ba6ece5442..14559cb39d 100644
--- a/modules/system/console/asset/mix/MixCompile.php
+++ b/modules/system/console/asset/mix/MixCompile.php
@@ -19,7 +19,7 @@ class MixCompile extends AssetCompile
     protected $signature = 'mix:compile
         {webpackArgs?* : Arguments to pass through to the Webpack CLI}
         {--f|production : Runs compilation in "production" mode}
-        {--s|silent : Silent mode}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--d|disable-tty : Disable tty mode}
         {--e|stop-on-error : Exit once an error is encountered}
         {--m|manifest= : Defines package.json to use for compile}
diff --git a/modules/system/console/asset/mix/MixCreate.php b/modules/system/console/asset/mix/MixCreate.php
index 101032ca1e..85e1259aee 100644
--- a/modules/system/console/asset/mix/MixCreate.php
+++ b/modules/system/console/asset/mix/MixCreate.php
@@ -14,7 +14,9 @@ class MixCreate extends AssetCreate
      */
     protected $signature = 'mix:create
         {packageName : The package name to add configuration for}
-        {--no-stubs : Disable stub file generation}';
+        {--no-stubs : Disable stub file generation}
+        {--s|silent : Enables silent mode, no output will be shown.}
+        {--f|force : Force file overwrites}';
 
     /**
      * @var array List of commands that this command replaces (aliases)
diff --git a/modules/system/console/asset/mix/MixInstall.php b/modules/system/console/asset/mix/MixInstall.php
index 272ad6852a..b08d8c4b96 100644
--- a/modules/system/console/asset/mix/MixInstall.php
+++ b/modules/system/console/asset/mix/MixInstall.php
@@ -17,6 +17,7 @@ class MixInstall extends AssetInstall
         {--no-install : Tells Winter not to run npm install after config update.}
         {--npm= : Defines a custom path to the "npm" binary.}
         {--d|disable-tty : Disable tty mode.}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--p|package-json= : Defines a custom path to "package.json" file. Must be above the workspace path.}';
 
     /**
diff --git a/modules/system/console/asset/mix/MixWatch.php b/modules/system/console/asset/mix/MixWatch.php
index 0bcd213899..53aee49133 100644
--- a/modules/system/console/asset/mix/MixWatch.php
+++ b/modules/system/console/asset/mix/MixWatch.php
@@ -17,7 +17,7 @@ class MixWatch extends MixCompile
         {webpackArgs?* : Arguments to pass through to the Webpack CLI}
         {--f|production : Runs compilation in "production" mode}
         {--m|manifest= : Defines package.json to use for compile}
-        {--s|silent : Silent mode}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--d|disable-tty : Disable tty mode}
         {--no-progress : Do not show mix progress}';
 
diff --git a/modules/system/console/asset/vite/ViteCompile.php b/modules/system/console/asset/vite/ViteCompile.php
index 6e10447844..828a3edd6f 100644
--- a/modules/system/console/asset/vite/ViteCompile.php
+++ b/modules/system/console/asset/vite/ViteCompile.php
@@ -18,7 +18,7 @@ class ViteCompile extends AssetCompile
     protected $signature = 'vite:compile
         {viteArgs?* : Arguments to pass through to the Vite CLI}
         {--f|production : Runs compilation in "production" mode}
-        {--s|silent : Silent mode}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--d|disable-tty : Disable tty mode}
         {--e|stop-on-error : Exit once an error is encountered}
         {--m|manifest= : Defines package.json to use for compile}
diff --git a/modules/system/console/asset/vite/ViteCreate.php b/modules/system/console/asset/vite/ViteCreate.php
index c9c2056388..7f30b51e0d 100644
--- a/modules/system/console/asset/vite/ViteCreate.php
+++ b/modules/system/console/asset/vite/ViteCreate.php
@@ -16,7 +16,9 @@ class ViteCreate extends AssetCreate
      */
     protected $signature = 'vite:create
         {packageName : The package name to add configuration for}
-        {--no-stubs : Disable stub file generation}';
+        {--no-stubs : Disable stub file generation}
+        {--s|silent : Enables silent mode, no output will be shown.}
+        {--f|force : Force file overwrites}';
 
     /**
      * @var array List of commands that this command replaces (aliases)
@@ -40,6 +42,10 @@ class ViteCreate extends AssetCreate
      */
     public function afterExecution(): void
     {
+        if ($this->option('silent')) {
+            return;
+        }
+
         $packageName = $this->makePackageName($this->argument('packageName'));
         $this->output->writeln('');
         $this->info('Add the following to your twig to enable asset loading:');
diff --git a/modules/system/console/asset/vite/ViteInstall.php b/modules/system/console/asset/vite/ViteInstall.php
index c7355a1096..c3da0483d9 100644
--- a/modules/system/console/asset/vite/ViteInstall.php
+++ b/modules/system/console/asset/vite/ViteInstall.php
@@ -19,6 +19,7 @@ class ViteInstall extends AssetInstall
         {--no-install : Tells Winter not to run npm install after config update.}
         {--npm= : Defines a custom path to the "npm" binary.}
         {--d|disable-tty : Disable tty mode.}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--p|package-json= : Defines a custom path to "package.json" file. Must be above the workspace path.}';
 
     /**
diff --git a/modules/system/console/asset/vite/ViteWatch.php b/modules/system/console/asset/vite/ViteWatch.php
index b58e0d3e0f..72aea49d4d 100644
--- a/modules/system/console/asset/vite/ViteWatch.php
+++ b/modules/system/console/asset/vite/ViteWatch.php
@@ -19,7 +19,7 @@ class ViteWatch extends ViteCompile
         {viteArgs?* : Arguments to pass through to the Webpack CLI}
         {--f|production : Runs compilation in "production" mode}
         {--m|manifest= : Defines package.json to use for compile}
-        {--s|silent : Silent mode}
+        {--s|silent : Enables silent mode, no output will be shown.}
         {--d|disable-tty : Disable tty mode}
         {--no-progress : Do not show mix progress}';
 

From 6df0e595d578945665d4731348ddd0597efb4169 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <31214002+jaxwilko@users.noreply.github.com>
Date: Mon, 25 Nov 2024 17:02:39 +0000
Subject: [PATCH 8/9] Tailwind theme create improvements (#1255)

---
 modules/cms/console/CreateTheme.php           | 82 +++++++++++++------
 .../theme/tailwind/assets/src/css/base.stub   |  3 -
 .../theme/tailwind/assets/src/css/custom.stub |  3 -
 .../theme/tailwind/assets/src/css/theme.stub  |  2 -
 .../theme/tailwind/assets/src/js/theme.stub   | 33 --------
 modules/system/ServiceProvider.php            |  1 +
 .../system/console/asset/npm/NpmVersion.php   | 74 +++++++++++++++++
 7 files changed, 131 insertions(+), 67 deletions(-)
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/assets/src/css/base.stub
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/assets/src/css/custom.stub
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/assets/src/css/theme.stub
 delete mode 100644 modules/cms/console/scaffold/theme/tailwind/assets/src/js/theme.stub
 create mode 100644 modules/system/console/asset/npm/NpmVersion.php

diff --git a/modules/cms/console/CreateTheme.php b/modules/cms/console/CreateTheme.php
index 71a8036f66..00b1196b6f 100644
--- a/modules/cms/console/CreateTheme.php
+++ b/modules/cms/console/CreateTheme.php
@@ -1,6 +1,8 @@
 <?php namespace Cms\Console;
 
 use InvalidArgumentException;
+use System\Classes\Asset\PackageManager;
+use Winter\Storm\Exception\SystemException;
 use Winter\Storm\Scaffold\GeneratorCommand;
 
 class CreateTheme extends GeneratorCommand
@@ -59,10 +61,6 @@ class CreateTheme extends GeneratorCommand
             'scaffold/theme/less/version.stub' => 'version.yaml',
         ],
         'tailwind' => [
-            'scaffold/theme/tailwind/assets/src/css/base.stub' => 'assets/src/css/base.css',
-            'scaffold/theme/tailwind/assets/src/css/custom.stub' => 'assets/src/css/custom.css',
-            'scaffold/theme/tailwind/assets/src/css/theme.stub' => 'assets/src/css/theme.css',
-            'scaffold/theme/tailwind/assets/src/js/theme.stub' => 'assets/src/js/theme.js',
             'scaffold/theme/tailwind/lang/en/lang.stub' => 'lang/en/lang.php',
             'scaffold/theme/tailwind/layouts/default.stub' => 'layouts/default.htm',
             'scaffold/theme/tailwind/pages/404.stub' => 'pages/404.htm',
@@ -155,33 +153,65 @@ public function makeStubs(): void
         parent::makeStubs();
 
         if ($this->scaffold === 'tailwind') {
-            // Set up the vite config files
-            $this->call('vite:create', [
-                'packageName' => 'theme-' . $this->getNameInput(),
-                '--no-interaction' => true,
-                '--force' => true,
-                '--silent' => true,
-                '--tailwind' => true
-            ]);
+            // @TODO: allow support for mix here
+            $this->tailwindPostCreate('vite');
+        }
+    }
 
-            $this->info('Installing NPM dependencies...');
+    protected function tailwindPostCreate(string $processor): void
+    {
+        if ($this->call('npm:version', ['--silent' => true, '--compatible' => true]) !== 0) {
+            throw new SystemException(sprintf(
+                'NPM is not installed or is outdated, please ensure NPM >= v7.0 is available and then manually set up %s.',
+                $processor
+            ));
+        }
 
+        $commands = [
+            // Set up the vite config files
+            $processor . ':create' => [
+                'message' => 'Generating ' . $processor . ' + tailwind config...',
+                'args' => [
+                    'packageName' => 'theme-' . $this->getNameInput(),
+                    '--no-interaction' => true,
+                    '--force' => true,
+                    '--silent' => true,
+                    '--tailwind' => true
+                ]
+            ],
             // Ensure all require packages are available for the new theme and add the new theme to our npm workspaces
-            $this->call('vite:install', [
-                'assetPackage' => ['theme-' . $this->getNameInput()],
-                '--no-interaction' => true,
-                '--silent' => true,
-                '--disable-tty' => true
-            ]);
+            $processor . ':install' => [
+                'message' => 'Installing NPM dependencies...',
+                'args' => [
+                    'assetPackage' => ['theme-' . $this->getNameInput()],
+                    '--no-interaction' => true,
+                    '--silent' => false,
+                    '--disable-tty' => true
+                ]
+            ],
+            // Run an initial compile to ensure styles are available for first load
+            $processor . ':compile' => [
+                'message' => 'Compiling your theme...',
+                'args' => [
+                    '--package' => ['theme-' . $this->getNameInput()],
+                    '--no-interaction' => true,
+                    '--silent' => true,
+                ]
+            ]
+        ];
 
-            $this->info('Compiling your theme...');
+        foreach ($commands as $command => $data) {
+            $this->info($data['message']);
 
-            // Run an initial compile to ensure styles are available for first load
-            $this->call('vite:compile', [
-                '--package' => ['theme-' . $this->getNameInput()],
-                '--no-interaction' => true,
-                '--silent' => true,
-            ]);
+            // Handle commands throwing errors
+            if ($this->call($command, $data['args']) !== 0) {
+                throw new SystemException(sprintf('Post create command `%s` failed, please review manually.', $command));
+            }
+
+            // Force PackageManger to reset available packages
+            if ($command === $processor . ':create') {
+                PackageManager::forgetInstance();
+            }
         }
     }
 }
diff --git a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/base.stub b/modules/cms/console/scaffold/theme/tailwind/assets/src/css/base.stub
deleted file mode 100644
index b5c61c9567..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/base.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
diff --git a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/custom.stub b/modules/cms/console/scaffold/theme/tailwind/assets/src/css/custom.stub
deleted file mode 100644
index 5fc1ea54e5..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/custom.stub
+++ /dev/null
@@ -1,3 +0,0 @@
-/**
- * Custom CSS for theme goes here
- */
diff --git a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/theme.stub b/modules/cms/console/scaffold/theme/tailwind/assets/src/css/theme.stub
deleted file mode 100644
index b020ae8833..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/assets/src/css/theme.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'base.css';
-@import 'custom.css';
diff --git a/modules/cms/console/scaffold/theme/tailwind/assets/src/js/theme.stub b/modules/cms/console/scaffold/theme/tailwind/assets/src/js/theme.stub
deleted file mode 100644
index 416aa12526..0000000000
--- a/modules/cms/console/scaffold/theme/tailwind/assets/src/js/theme.stub
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Application
- */
-(function($) {
-    "use strict";
-
-    jQuery(document).ready(function($) {
-        /*-------------------------------
-        WINTER CMS FLASH MESSAGE HANDLING
-        ---------------------------------*/
-        $(document).on('ajaxSetup', function(event, context) {
-            // Enable AJAX handling of Flash messages on all AJAX requests
-            context.options.flash = true;
-
-            // Enable the StripeLoadIndicator on all AJAX requests
-            context.options.loading = $.oc.stripeLoadIndicator;
-
-            // Handle Flash Messages
-            context.options.handleFlashMessage = function(message, type) {
-                $.oc.flashMsg({ text: message, class: type });
-            };
-
-            // Handle Error Messages
-            context.options.handleErrorMessage = function(message) {
-                $.oc.flashMsg({ text: message, class: 'error' });
-            };
-        });
-    });
-}(jQuery));
-
-if (typeof(gtag) !== 'undefined' && typeof(gtag) !== 'function') {
-    gtag = function() { console.log('GoogleAnalytics not present.'); }
-}
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 396f2e352e..3a8b58f301 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -336,6 +336,7 @@ protected function registerConsole()
         $this->registerConsoleCommand('npm.run', Console\Asset\Npm\NpmRun::class);
         $this->registerConsoleCommand('npm.install', Console\Asset\Npm\NpmInstall::class);
         $this->registerConsoleCommand('npm.update', Console\Asset\Npm\NpmUpdate::class);
+        $this->registerConsoleCommand('npm.version', Console\Asset\Npm\NpmVersion::class);
     }
 
     /*
diff --git a/modules/system/console/asset/npm/NpmVersion.php b/modules/system/console/asset/npm/NpmVersion.php
new file mode 100644
index 0000000000..78e4a4a0b7
--- /dev/null
+++ b/modules/system/console/asset/npm/NpmVersion.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace System\Console\Asset\Npm;
+
+use Symfony\Component\Process\Process;
+use System\Console\Asset\Npm\NpmCommand;
+
+class NpmVersion extends NpmCommand
+{
+    const NPM_MINIMUM_SUPPORTED_VERSION = '7.0';
+
+    /**
+     * @var string|null The default command name for lazy loading.
+     */
+    protected static $defaultName = 'npm:version';
+
+    /**
+     * @var string The name and signature of this command.
+     */
+    protected $signature = 'npm:version
+        {--c|compatible : Report compatible version via exit code.}
+        {--s|silent : Silent mode.}
+        {--disable-tty : Disable tty mode}';
+
+    /**
+     * @var string The console command description.
+     */
+    protected $description = 'Runs a script in a given package.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $process = new Process(
+            ['npm', '--version'],
+            base_path(),
+            ['NODE_ENV' => $this->getNodeEnv()],
+            null,
+            null
+        );
+
+        $output = '';
+
+        $exit = $process->run(function ($status, $stdout) use (&$output) {
+            $output .= $stdout;
+        });
+
+        $output = trim($output);
+
+        // Npm failed for some reason, report to user
+        if ($exit !== 0) {
+            $this->error('NPM exited with error: ' . $output);
+            return $exit;
+        }
+
+        // Report the version to user
+        if (!$this->option('silent')) {
+            $this->info($output);
+        }
+
+        // If the user has not requested a compatibility check, then return 0
+        if (!$this->option('compatible')) {
+            return 0;
+        }
+
+        // If the version of npm is less than the required minimum, then return fail
+        if (version_compare($output, static::NPM_MINIMUM_SUPPORTED_VERSION, '<')) {
+            return 1;
+        }
+
+        return 0;
+    }
+}

From ad02e34dff3ba2ca5a364fe731bcf9bf38a86014 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 27 Nov 2024 15:38:08 -0500
Subject: [PATCH 9/9] Move after login logic to event listener instead of
 controller (#1257)

Co-authored-by: Luke Towers <git@luketowers.ca>
---
 modules/backend/ServiceProvider.php  | 39 ++++++++++++++++++++++++----
 modules/backend/controllers/Auth.php | 16 ------------
 modules/backend/models/User.php      |  8 +++---
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index c81552de9d..8d352d294d 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,13 +1,19 @@
 <?php namespace Backend;
 
-use Backend;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserRole;
 use Backend\Classes\WidgetManager;
-use System\Classes\MailManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\AccessLog;
+use Backend\Models\UserRole;
+use Exception;
+use Illuminate\Support\Facades\Event;
 use System\Classes\CombineAssets;
+use System\Classes\MailManager;
 use System\Classes\SettingsManager;
+use System\Classes\UpdateManager;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -25,6 +31,7 @@ public function register()
         $this->registerMailer();
         $this->registerAssetBundles();
         $this->registerBackendPermissions();
+        $this->registerBackendUserEvents();
 
         /*
          * Backend specific
@@ -207,6 +214,28 @@ protected function registerBackendPermissions()
         });
     }
 
+    /**
+     * Register the backend user events
+     */
+    protected function registerBackendUserEvents()
+    {
+        Event::listen('backend.user.login', function (\Backend\Models\User $user) {
+            // @TODO: Deprecate this, and only run migrations when it makes sense
+            $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
+            if ($runMigrationsOnLogin) {
+                try {
+                    // Load version updates
+                    UpdateManager::instance()->update();
+                } catch (Exception $e) {
+                    Flash::error($e->getMessage());
+                }
+            }
+
+            // Log the sign in event
+            AccessLog::add($user);
+        });
+    }
+
     /*
      * Register widgets
      */
diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php
index 82a39dec65..8ed4ecef42 100644
--- a/modules/backend/controllers/Auth.php
+++ b/modules/backend/controllers/Auth.php
@@ -4,13 +4,11 @@
 use Backend;
 use BackendAuth;
 use Backend\Classes\Controller;
-use Backend\Models\AccessLog;
 use Config;
 use Exception;
 use Flash;
 use Mail;
 use Request;
-use System\Classes\UpdateManager;
 use ValidationException;
 use Validator;
 use Winter\Storm\Foundation\Http\Middleware\CheckForTrustedHost;
@@ -94,20 +92,6 @@ public function signin_onSubmit()
             'password' => post('password')
         ], $remember);
 
-        $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
-
-        if ($runMigrationsOnLogin) {
-            try {
-                // Load version updates
-                UpdateManager::instance()->update();
-            } catch (Exception $ex) {
-                Flash::error($ex->getMessage());
-            }
-        }
-
-        // Log the sign in event
-        AccessLog::add($user);
-
         // Redirect to the intended page after successful sign in
         return Backend::redirectIntended('backend');
     }
diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index 4063c716c2..37c8892a18 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -1,10 +1,10 @@
 <?php namespace Backend\Models;
 
-use Mail;
-use Event;
-use Backend;
-use BackendAuth;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Illuminate\Support\Facades\Event;
 use Winter\Storm\Auth\Models\User as UserBase;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Administrator user model