Skip to content

Commit 0de9e7f

Browse files
committed
Re-organize: Move resources/js|scss to resources/app|styles
1 parent 6843a9e commit 0de9e7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+16
-14
lines changed

.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ root = true
33
[*]
44
charset = utf-8
55
end_of_line = lf
6-
insert_final_newline = true
7-
indent_style = space
86
indent_size = 4
7+
indent_style = space
8+
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

1111
[*.md]

.env.example

-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
6464
VITE_APP_NAME="${APP_NAME}"
6565

6666
# Customizations
67-
APP_LOGO=/assets/images/logo.png
6867
SANCTUM_STATEFUL_DOMAINS=yourdomain.test
6968
SESSION_DOMAIN=yourdomain.test

README.md

+1-1

jsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"baseUrl": ".",
44
"paths": {
5-
"@/*": ["./resources/js/*"]
5+
"@/*": ["./resources/app/*"]
66
}
77
}
88
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

resources/views/index.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<meta name="viewport" content="width=device-width,initial-scale=1.0">
77
<title>{{env('APP_NAME')}}</title>
88

9-
@vite(['resources/scss/main.scss', 'resources/js/main.js'])
9+
@vite(['resources/styles/main.scss', 'resources/app/main.js'])
1010

1111
<script>
1212
window.AppConfig = {
1313
name: '{{ env('APP_NAME') }}',
14-
logo: '{{ env('APP_LOGO') }}',
14+
logo: '{{ url('/assets/images/logo.png') }}',
1515
url: '{{ env('APP_URL') }}',
1616
csrf: '{{ csrf_token() }}',
1717
defaultLocale: '{{ env('APP_LOCALE', 'en') }}',

tailwind.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const colors = require('tailwindcss/colors');
22

33
module.exports = {
4-
content: ["./resources/js/**/*.html", "./resources/js/**/*.vue"],
4+
content: ["./resources/app/**/*.html", "./resources/app/**/*.vue"],
55
theme: {
66
extend: {
77
colors: {

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"baseUrl": ".",
55
"paths": {
6-
"@/*": ["./resources/js/*"]
6+
"@/*": ["./resources/app/*"]
77
},
88

99
"module": "ESNext",

vite.config.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ export default defineConfig({
1010
__INTLIFY_PROD_DEVTOOLS__: false,
1111
},
1212
plugins: [
13-
laravel([
14-
'resources/scss/main.scss',
15-
'resources/js/main.js',
16-
]),
13+
laravel({
14+
input: [
15+
'resources/styles/main.scss',
16+
'resources/app/main.js',
17+
],
18+
refresh: true,
19+
}),
1720
vue({
1821
template: {
1922
transformAssetUrls: {
@@ -35,7 +38,7 @@ export default defineConfig({
3538
],
3639
resolve: {
3740
alias: {
38-
'@': path.resolve(__dirname, './resources/js'),
41+
'@': path.resolve(__dirname, './resources/app'),
3942
},
4043
extensions: ['.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.mjs']
4144
}

0 commit comments

Comments
 (0)