diff --git a/resources/assets/v2/package.json b/resources/assets/v2/package.json
index a896aaff4b..42e5caf7d7 100644
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -4,7 +4,7 @@
"scripts": {
"dev": "vite",
"build": "vite build",
- "postinstall": "patch-package"
+ "postinstall": "patch-package --error-on-fail"
},
"devDependencies": {
"axios": "^1.6.8",
diff --git a/resources/assets/v2/vite.config.js b/resources/assets/v2/vite.config.js
index ae7f81f502..31b22409e3 100644
--- a/resources/assets/v2/vite.config.js
+++ b/resources/assets/v2/vite.config.js
@@ -1,6 +1,6 @@
/*
* vite.config.js
- * Copyright (c) 2023 james@firefly-iii.org
+ * Copyright (c) 2024 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -15,7 +15,7 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
+ * along with this program. If not, see https://www.gnu.org/licenses/.
*/
import {defineConfig} from 'vite';
@@ -43,26 +43,26 @@ export default defineConfig({
laravel({
input: [
// css
- 'resources/assets/v2/sass/app.scss',
+ 'src/sass/app.scss',
// dashboard
- 'resources/assets/v2/pages/dashboard/dashboard.js',
+ 'src/pages/dashboard/dashboard.js',
// accounts
- 'resources/assets/v2/pages/accounts/index.js',
+ 'src/pages/accounts/index.js',
// administrations
- 'resources/assets/v2/pages/administrations/index.js',
- 'resources/assets/v2/pages/administrations/create.js',
- 'resources/assets/v2/pages/administrations/edit.js',
+ 'src/pages/administrations/index.js',
+ 'src/pages/administrations/create.js',
+ 'src/pages/administrations/edit.js',
// transactions
- 'resources/assets/v2/pages/transactions/create.js',
- 'resources/assets/v2/pages/transactions/edit.js',
- 'resources/assets/v2/pages/transactions/show.js',
- 'resources/assets/v2/pages/transactions/index.js',
-
+ 'src/pages/transactions/create.js',
+ 'src/pages/transactions/edit.js',
+ 'src/pages/transactions/show.js',
+ 'src/pages/transactions/index.js',
],
+ publicDirectory: '../../../public',
refresh: true,
}),
//manifestSRI(),
diff --git a/resources/assets/v2/webpack.mix.js b/resources/assets/v2/webpack.mix.js
deleted file mode 100644
index e8bfe3eb0f..0000000000
--- a/resources/assets/v2/webpack.mix.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * webpack.mix.js
- * Copyright (c) 2020 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-let mix = require('laravel-mix');
-
-mix.webpackConfig({
- resolve: {
- alias: {
- 'vue$': 'vue/dist/vue.runtime.common.js'
- },
- fallback: {
- "stream": require.resolve("stream-browserify"),
- "zlib": false,
- "https": false,
- "http": false
- }
- }
-});
-
-mix.js('resources/assets/js/app.js', 'public/v1/js');
-mix.js('resources/assets/js/app_vue.js', 'public/v1/js').vue({version: 2});
-mix.js('resources/assets/js/create_transaction.js', 'public/v1/js').vue({version: 2});
-mix.js('resources/assets/js/edit_transaction.js', 'public/v1/js').vue({version: 2});
-mix.js('resources/assets/js/profile.js', 'public/v1/js').vue({version: 2});
-
-// webhooks
-mix.js('resources/assets/js/webhooks/index.js', 'public/v1/js/webhooks').vue({version: 2});
-mix.js('resources/assets/js/webhooks/create.js', 'public/v1/js/webhooks').vue({version: 2});
-mix.js('resources/assets/js/webhooks/edit.js', 'public/v1/js/webhooks').vue({version: 2});
-mix.js('resources/assets/js/webhooks/show.js', 'public/v1/js/webhooks').vue({version: 2});
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index e6b6765b0d..b370dfc0bc 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -76,5 +76,5 @@
@endsection
@section('scripts')
- @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
+ @vite(['src/pages/dashboard/dashboard.js'])
@endsection
diff --git a/resources/views/install/index.blade.php b/resources/views/install/index.blade.php
index 1ad8bb5049..f443fba30d 100644
--- a/resources/views/install/index.blade.php
+++ b/resources/views/install/index.blade.php
@@ -62,7 +62,7 @@
})()
- @vite(['resources/assets/v2/sass/app.scss'])
+ @vite(['sass/app.scss'])
diff --git a/resources/views/layout/v2/error.blade.php b/resources/views/layout/v2/error.blade.php
index baec40ef7e..ae87eeb982 100644
--- a/resources/views/layout/v2/error.blade.php
+++ b/resources/views/layout/v2/error.blade.php
@@ -62,7 +62,7 @@
})()
- @vite(['resources/assets/v2/sass/app.scss'])
+ @vite(['sass/app.scss'])
diff --git a/resources/views/layout/v2/session.blade.php b/resources/views/layout/v2/session.blade.php
index b9147e675c..51723b92de 100644
--- a/resources/views/layout/v2/session.blade.php
+++ b/resources/views/layout/v2/session.blade.php
@@ -62,7 +62,7 @@
})()
- @vite(['resources/assets/v2/sass/app.scss'])
+ @vite(['sass/app.scss'])
diff --git a/resources/views/v2/accounts/index.blade.php b/resources/views/v2/accounts/index.blade.php
index 402dd3a190..d2721fa7e7 100644
--- a/resources/views/v2/accounts/index.blade.php
+++ b/resources/views/v2/accounts/index.blade.php
@@ -174,5 +174,5 @@
@endsection
@section('scripts')
- @vite(['resources/assets/v2/pages/accounts/index.js'])
+ @vite(['src/pages/accounts/index.js'])
@endsection
diff --git a/resources/views/v2/administrations/create.blade.php b/resources/views/v2/administrations/create.blade.php
index 9c2096f067..d1c9597f6b 100644
--- a/resources/views/v2/administrations/create.blade.php
+++ b/resources/views/v2/administrations/create.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/administrations/create.js'])
+ @vite(['src/pages/administrations/create.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/administrations/edit.blade.php b/resources/views/v2/administrations/edit.blade.php
index 4826f1dc31..cf0201eb3b 100644
--- a/resources/views/v2/administrations/edit.blade.php
+++ b/resources/views/v2/administrations/edit.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/administrations/edit.js'])
+ @vite(['src/pages/administrations/edit.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/administrations/index.blade.php b/resources/views/v2/administrations/index.blade.php
index eb09e95ac3..0afc3eb2cb 100644
--- a/resources/views/v2/administrations/index.blade.php
+++ b/resources/views/v2/administrations/index.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/administrations/index.js'])
+ @vite(['src/pages/administrations/index.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/index.blade.php b/resources/views/v2/index.blade.php
index 7306b8f8f5..84b5ac5ef0 100644
--- a/resources/views/v2/index.blade.php
+++ b/resources/views/v2/index.blade.php
@@ -54,5 +54,5 @@
@endsection
@section('scripts')
- @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
+ @vite(['src/pages/dashboard/dashboard.js'])
@endsection
diff --git a/resources/views/v2/partials/layout/head.blade.php b/resources/views/v2/partials/layout/head.blade.php
index 2820a1124c..8708996e6c 100644
--- a/resources/views/v2/partials/layout/head.blade.php
+++ b/resources/views/v2/partials/layout/head.blade.php
@@ -68,7 +68,7 @@
@yield('styles')
- @vite(['resources/assets/v2/sass/app.scss'])
+ @vite(['src/sass/app.scss'])
diff --git a/resources/views/v2/transactions/create.blade.php b/resources/views/v2/transactions/create.blade.php
index e66ba532db..5ad6f22e1f 100644
--- a/resources/views/v2/transactions/create.blade.php
+++ b/resources/views/v2/transactions/create.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/transactions/create.js'])
+ @vite(['src/pages/transactions/create.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/transactions/edit.blade.php b/resources/views/v2/transactions/edit.blade.php
index 4c6ac25c6b..248a4ad610 100644
--- a/resources/views/v2/transactions/edit.blade.php
+++ b/resources/views/v2/transactions/edit.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/transactions/edit.js'])
+ @vite(['src/pages/transactions/edit.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/transactions/index.blade.php b/resources/views/v2/transactions/index.blade.php
index df5c107d6c..3c707226e1 100644
--- a/resources/views/v2/transactions/index.blade.php
+++ b/resources/views/v2/transactions/index.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/transactions/index.js'])
+ @vite(['src/pages/transactions/index.js'])
@endsection
@section('content')
diff --git a/resources/views/v2/transactions/show.blade.php b/resources/views/v2/transactions/show.blade.php
index d6f4a006d0..80f948b353 100644
--- a/resources/views/v2/transactions/show.blade.php
+++ b/resources/views/v2/transactions/show.blade.php
@@ -1,6 +1,6 @@
@extends('layout.v2')
@section('scripts')
- @vite(['resources/assets/v2/pages/transactions/show.js'])
+ @vite(['src/pages/transactions/show.js'])
@endsection
@section('content')