Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add suport to Vite #1308

Merged
merged 13 commits into from
Oct 5, 2024
Merged

Add suport to Vite #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3ec49a2
Add suport to Vite
ruanpepe Sep 20, 2024
9d0da38
Reidenting master.blade.php
ruanpepe Sep 22, 2024
2dd0244
Update master.blade.php
ruanpepe Sep 22, 2024
c488195
Update master.blade.php
ruanpepe Sep 22, 2024
8b66814
Update master.blade.php
ruanpepe Sep 22, 2024
caaccc6
Merge branch 'jeroennoten:master' into vite_suport
ruanpepe Sep 23, 2024
dffae5d
Insert 'type="module"' in script tags that uses $
ruanpepe Sep 23, 2024
5d13923
Remove 'vite_spa' option
ruanpepe Sep 23, 2024
75567d6
Reident master.blade.php
ruanpepe Sep 24, 2024
e3deba8
Add vite_js_only option
ruanpepe Sep 24, 2024
2a2c24e
[resources/views]: Highlight script section of components with blank …
dfsmania Sep 24, 2024
542be45
[config]: Update docs for asset bundling section
dfsmania Sep 24, 2024
bf7a640
[resources/views]: Revert some style changes on master and improve vi…
dfsmania Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions config/adminlte.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,19 +267,23 @@

/*
|--------------------------------------------------------------------------
| Laravel Mix
| Laravel Asset Bundling
|--------------------------------------------------------------------------
|
| Here we can enable the Laravel Mix option for the admin panel.
| Here we can enable the Laravel Asset Bundling option for the admin panel.
| Currently, the next modes are supported: 'mix', 'vite' and 'vite_js_only'.
| When using 'vite_js_only', it's expected that your CSS is imported using
| JavaScript. Typically, in your application's 'resources/js/app.js' file.
| If you are not using any of these, leave it as 'false'.
|
| For detailed instructions you can look the laravel mix section here:
| For detailed instructions you can look the asset bundling section here:
| https://github.com/jeroennoten/Laravel-AdminLTE/wiki/Other-Configuration
|
*/

'enabled_laravel_mix' => false,
'laravel_mix_css_path' => 'css/app.css',
'laravel_mix_js_path' => 'js/app.js',
'laravel_asset_bundling' => false,
'laravel_css_path' => 'css/app.css',
'laravel_js_path' => 'js/app.js',

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/date-range.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
let usrCfg = _AdminLTE_DateRange.parseCfg( @json($config) );
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/input-color.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {

Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/input-date.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
let usrCfg = _AdminLTE_InputDate.parseCfg( @json($config) );
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/form/input-file-krajee.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{{-- Add the plugin initialization code --}}

@push('js')
<script>
<script type="module">

$(() => {

Expand Down Expand Up @@ -67,4 +67,4 @@
})

</script>
@endpush
@endpush
2 changes: 1 addition & 1 deletion resources/views/components/form/input-file.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

@once
@push('js')
<script>
<script type="module">

$(() => {
bsCustomFileInput.init();
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/input-slider.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
let usrCfg = @json($config);
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/input-switch.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
$('#{{ $id }}').bootstrapSwitch( @json($config) );
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/select-bs.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
$('#{{ $id }}').selectpicker( @json($config) );
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/select.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

@if($errors->any() && $enableOldSupport)
@push('js')
<script>
<script type="module">

$(() => {

Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/select2.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
$('#{{ $id }}').select2( @json($config) );
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/form/text-editor.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
let usrCfg = @json($config);
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/layout/navbar-darkmode-widget.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@once
@push('js')
<script>
<script type="module">

$(() => {

Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/layout/navbar-notification.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

@if (! is_null($makeUpdateUrl()) && $makeUpdatePeriod() > 0)
@push('js')
<script>
<script type="module">

$(() => {

Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/tool/datatable.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{{-- Add plugin initialization and configuration code --}}

@push('js')
<script>
<script type="module">

$(() => {
$('#{{ $id }}').DataTable( @json($config) );
Expand Down
62 changes: 44 additions & 18 deletions resources/views/master.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,32 @@
{{-- Custom stylesheets (pre AdminLTE) --}}
@yield('adminlte_css_pre')

{{-- Base Stylesheets --}}
@if(!config('adminlte.enabled_laravel_mix'))
<link rel="stylesheet" href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/overlayScrollbars/css/OverlayScrollbars.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/adminlte/dist/css/adminlte.min.css') }}">

@if(config('adminlte.google_fonts.allowed', true))
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@endif
@else
{{-- Base Stylesheets (depends on Laravel asset bundling tool) --}}
@if(config('adminlte.enabled_laravel_mix', false))
<link rel="stylesheet" href="{{ mix(config('adminlte.laravel_mix_css_path', 'css/app.css')) }}">
@else
@switch(config('adminlte.laravel_asset_bundling', false))
@case('mix')
<link rel="stylesheet" href="{{ mix(config('adminlte.laravel_css_path', 'css/app.css')) }}">
@break

@case('vite')
@vite([config('adminlte.laravel_css_path', 'resources/css/app.css'), config('adminlte.laravel_js_path', 'resources/js/app.js')])
@break

@case('vite_js_only')
@vite(config('adminlte.laravel_js_path', 'resources/js/app.js'))
@break

@default
<link rel="stylesheet" href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/overlayScrollbars/css/OverlayScrollbars.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/adminlte/dist/css/adminlte.min.css') }}">

@if(config('adminlte.google_fonts.allowed', true))
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@endif
@endswitch
@endif

{{-- Extra Configured Plugins Stylesheets --}}
Expand Down Expand Up @@ -67,7 +82,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="{{ asset('favicons/favicon-16x16.png') }}">
<link rel="icon" type="image/png" sizes="32x32" href="{{ asset('favicons/favicon-32x32.png') }}">
<link rel="icon" type="image/png" sizes="96x96" href="{{ asset('favicons/favicon-96x96.png') }}">
<link rel="icon" type="image/png" sizes="192x192" href="{{ asset('favicons/android-icon-192x192.png') }}">
<link rel="icon" type="image/png" sizes="192x192" href="{{ asset('favicons/android-icon-192x192.png') }}">
<link rel="manifest" crossorigin="use-credentials" href="{{ asset('favicons/manifest.json') }}">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="{{ asset('favicon/ms-icon-144x144.png') }}">
Expand All @@ -80,14 +95,25 @@
{{-- Body Content --}}
@yield('body')

{{-- Base Scripts --}}
@if(!config('adminlte.enabled_laravel_mix'))
<script src="{{ asset('vendor/jquery/jquery.min.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('vendor/overlayScrollbars/js/jquery.overlayScrollbars.min.js') }}"></script>
<script src="{{ asset('vendor/adminlte/dist/js/adminlte.min.js') }}"></script>
@else
{{-- Base Scripts (depends on Laravel asset bundling tool) --}}
@if(config('adminlte.enabled_laravel_mix', false))
<script src="{{ mix(config('adminlte.laravel_mix_js_path', 'js/app.js')) }}"></script>
@else
@switch(config('adminlte.laravel_asset_bundling', false))
@case('mix')
<script src="{{ mix(config('adminlte.laravel_js_path', 'js/app.js')) }}"></script>
@break

@case('vite')
@case('vite_js_only')
@break

@default
<script src="{{ asset('vendor/jquery/jquery.min.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('vendor/overlayScrollbars/js/jquery.overlayScrollbars.min.js') }}"></script>
<script src="{{ asset('vendor/adminlte/dist/js/adminlte.min.js') }}"></script>
@endswitch
@endif

{{-- Extra Configured Plugins Scripts --}}
Expand Down