Skip to content

Commit 8abc357

Browse files
mattfletchermattfletcher
authoredAug 6, 2023
Merge pull request #8 from torrix/laravel-10
Update for Laravel 10
·
v3.16.24
2 parents bf6f402 + f0a6600 commit 8abc357

11 files changed

+49
-27
lines changed
 

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ composer.lock
55
.DS_Store
66
Thumbs.db
77
.phpunit.result.cache
8+
/package-lock.json
9+
/node_modules

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# UIkit starter template for Laravel 9
1+
# UIkit starter template for Laravel
22
## Including authentication scaffolding for Laravel Fortify
33

44
![](https://torrix.uk/laravel-uikit.jpg)
55

6-
Out of the box, Laravel 9 ships with a default welcome template built with
6+
Out of the box, Laravel ships with a default welcome template built with
77
[Tailwind CSS](https://tailwindcss.com). On top of the base framework,
88
[Laravel JetStream](https://jetstream.laravel.com/) provides two user
99
interfaces (your choice of Laravel Livewire or InertiaJS) for login and
@@ -52,7 +52,7 @@ on how to deploy the project on a live system.
5252

5353
### Prerequisites
5454

55-
To begin, you'll need a **fresh** install of Laravel 9. **Adding this to an
55+
To begin, you'll need a **fresh** install of Laravel 10+. **Adding this to an
5656
existing project is not recommended and may cause issues**. For full
5757
instructions on installing Laravel, refer to the
5858
[Laravel installation docs](https://laravel.com/docs/9.x/installation), but

‎app/LaravelUikitServiceProvider.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public function boot(): void
2323

2424
$this->publishes(
2525
[
26-
__DIR__ . '/../webpack.mix.js' => 'webpack.mix.js',
26+
__DIR__ . '/../package.json' => 'package.json',
27+
__DIR__ . '/../vite.config.js' => 'vite.config.js',
2728
__DIR__ . '/../resources/js' => resource_path('js'),
2829
__DIR__ . '/../resources/sass' => resource_path('sass'),
2930
__DIR__ . '/../resources/views/welcome.blade.php' => resource_path('views/welcome.blade.php'),

‎composer.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "torrix/laravel-uikit",
3-
"description": "UIkit starter template for Laravel 9",
3+
"description": "UIkit starter template for Laravel",
44
"minimum-stability": "stable",
55
"keywords": [
66
"laravel",
@@ -16,9 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.0.2",
20-
"illuminate/support": "^9.0",
21-
"uikit/uikit": "^v3.11.1"
19+
"php": "^8.2",
20+
"illuminate/support": "^10.0"
2221
},
2322
"extra": {
2423
"laravel": {

‎package.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"private": true,
3+
"type": "module",
4+
"scripts": {
5+
"dev": "vite",
6+
"build": "vite build"
7+
},
8+
"devDependencies": {
9+
"axios": "^1.1.2",
10+
"laravel-vite-plugin": "^0.7.5",
11+
"sass": "^1.64.2",
12+
"uikit": "^3.16.24",
13+
"vite": "^4.0.0"
14+
}
15+
}

‎resources/js/bootstrap.js

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
window._ = require('lodash');
1+
import UIkit from 'uikit';
2+
import Icons from 'uikit/dist/js/uikit-icons';
23

3-
window.UIkit = require("../../vendor/uikit/uikit");
4-
window.Icons = require("../../vendor/uikit/uikit/dist/js/uikit-icons");
5-
6-
UIkit.use(window.Icons);
7-
8-
window.axios = require('axios');
9-
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
4+
UIkit.use(Icons)

‎resources/sass/app.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This is how you might override UIkit default variables
22
$global-primary-background: #491165;
33

4-
@import "../../vendor/uikit/uikit/src/scss/variables-theme.scss";
5-
@import "../../vendor/uikit/uikit/src/scss/mixins-theme.scss";
6-
@import "../../vendor/uikit/uikit/src/scss/uikit-theme.scss";
4+
@import "uikit/src/scss/variables-theme.scss";
5+
@import "uikit/src/scss/mixins-theme.scss";
6+
@import "uikit/src/scss/uikit-theme.scss";

‎resources/views/layouts/app.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>{{ config('app.name', 'Laravel') }}</title>
1111

1212
<!-- Styles -->
13-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
13+
@vite(['resources/sass/app.scss'])
1414
</head>
1515
<body>
1616
<div id="app">
@@ -119,6 +119,6 @@ class="uk-icon-button" data-uk-icon="github"></a>
119119
</div>
120120
</footer>
121121
</div>
122-
<script src="{{ asset('js/app.js') }}" defer></script>
122+
@vite(['resources/js/app.js'])
123123
</body>
124124
</html>

‎resources/views/welcome.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
@section('content')
44
<div class="uk-section uk-section-small uk-section-muted">
55
<div class="uk-container">
6-
<h1 class="uk-heading-divider">UIkit starter template for Laravel 9</h1>
6+
<h1 class="uk-heading-divider">UIkit starter template for Laravel</h1>
77
<p>
8-
Congratulations, you've successfully installed the UIkit starter template for Laravel 9. Have a browse
8+
Congratulations, you've successfully installed the UIkit starter template for Laravel. Have a browse
99
through the links below for inspiration on how to work with Laravel, UIkit, and Vue.js. Happy coding!
1010
</p>
1111
<div class="uk-grid" data-uk-grid data-uk-height-match="target:.uk-card">

‎vite.config.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { defineConfig } from 'vite';
2+
import laravel from 'laravel-vite-plugin';
3+
4+
export default defineConfig({
5+
plugins: [
6+
laravel({
7+
input: [
8+
'resources/sass/app.scss',
9+
'resources/js/app.js',
10+
],
11+
refresh: true,
12+
}),
13+
],
14+
});

‎webpack.mix.js

-4
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.