Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
738 changes: 536 additions & 202 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build"
},
"dependencies": {
"alpinejs": "^3.13.3",
"filepond": "^4.30.6",
"filepond-plugin-file-validate-size": "^2.2.8",
"filepond-plugin-file-validate-type": "^1.2.9",
Expand All @@ -16,7 +16,6 @@
"uniqid": "^5.2.0"
},
"devDependencies": {
"laravel-vite-plugin": "^0.7.8",
"vite": "^4.5.5"
"vite": "^6.2.0"
}
}
9 changes: 9 additions & 0 deletions resources/dist/css/livewire-forms.css

Large diffs are not rendered by default.

9,148 changes: 9,098 additions & 50 deletions resources/dist/js/livewire-forms.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions resources/js/alpine/filepond.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ import uk_UA from 'filepond/locale/uk-ua';
import vi_VI from 'filepond/locale/vi-vi';
import zh_CN from 'filepond/locale/zh-cn';
import zh_TW from 'filepond/locale/zh-tw';
import 'filepond/dist/filepond.min.css';
import 'filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css';

const locales = {
'ar-ar': ar_AR,
Expand Down
4 changes: 1 addition & 3 deletions resources/views/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@
@formView("forms.{$this->type}")
</form>

@assets
<script type="module" src="/vendor/livewire-forms/js/livewire-forms.js"></script>
@endassets
@formAssets
5 changes: 0 additions & 5 deletions resources/views/default/fields/assets.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,3 @@
@elseif($field->instructions && $field->instructions_position === 'below')
@formView('messages.instructions')
@endif

@assets
<link href="https://unpkg.com/filepond@^4/dist/filepond.css" rel="stylesheet" />
<link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet" />
@endassets
13 changes: 13 additions & 0 deletions src/BladeDirectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,17 @@ public static function formField(string $expression): string
echo view(\Aerni\LivewireForms\Facades\ViewManager::themeViewPath(\$this->theme, 'layouts.field'), ['field' => \$field]);
?>";
}

/**
* Push the Livewire Form assets into the head.
*/
public static function formAssets(): string
{
return Blade::compileString("
@assets
<link href='/vendor/livewire-forms/css/livewire-forms.css' rel='stylesheet' />
<script src='/vendor/livewire-forms/js/livewire-forms.js' type='module'></script>
@endassets
");
}
}
4 changes: 4 additions & 0 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ class ServiceProvider extends AddonServiceProvider
__DIR__.'/../resources/dist/js/livewire-forms.js',
];

protected $stylesheets = [
__DIR__.'/../resources/dist/css/livewire-forms.css',
];

public function bootAddon()
{
$this
Expand Down
6 changes: 4 additions & 2 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import { defineConfig } from 'vite';

export default defineConfig({
build: {
outDir: 'resources/dist/js',
outDir: 'resources/dist',
lib: {
entry: 'resources/js/livewire-forms.js',
name: 'livewire-forms',
fileName: () => 'livewire-forms.js',
fileName: 'js/livewire-forms',
cssFileName: 'css/livewire-forms',
formats: ['es'],
}
}
});