Skip to content

Commit

Permalink
laravel 11 upgrade, move to pinia
Browse files Browse the repository at this point in the history
  • Loading branch information
tobischulz committed May 31, 2024
1 parent 841013a commit b16766d
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 52 deletions.
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "laravel/laravel",
"type": "project",
"description": "The skeleton application for the Laravel framework.",
"keywords": ["laravel", "framework"],
"keywords": [
"laravel",
"framework"
],
"license": "MIT",
"require": {
"php": "^8.2",
Expand Down Expand Up @@ -65,4 +68,4 @@
},
"minimum-stability": "stable",
"prefer-stable": true
}
}
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["resources/js/*"]
"@/*": [
"resources/js/*"
]
}
},
"exclude": ["node_modules", "public"]
}
"exclude": [
"node_modules",
"public"
]
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import defaultTheme from 'tailwindcss/defaultTheme';

/** @type {import('tailwindcss').Config} */
export default {
content: [
"./resources/**/*.blade.php",
"./resources/**/*.js",
"./resources/**/*.vue",
],
content: [
"./resources/**/*.blade.php",
"./resources/**/*.js",
"./resources/**/*.vue",
],

theme: {
extend: {
fontFamily: {
sans: ['Figtree', ...defaultTheme.fontFamily.sans],
},
},
theme: {
extend: {
fontFamily: {
sans: ['Figtree', ...defaultTheme.fontFamily.sans],
},
},
},

plugins: [],
plugins: [],
};
66 changes: 33 additions & 33 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@ import laravel from 'laravel-vite-plugin';
import vue from '@vitejs/plugin-vue';

export default defineConfig({
resolve: {
alias: {
'@': '/resources/js',
},
},
build: {
sourcemap: true,
resolve: {
alias: {
'@': '/resources/js',
},
plugins: [
laravel({
input: [
'resources/js/app.js'
],
refresh: true,
// detectTls: 'vue-laravel-spa.test',
}),
vue({
template: {
transformAssetUrls: {
// The Vue plugin will re-write asset URLs, when referenced
// in Single File Components, to point to the Laravel web
// server. Setting this to `null` allows the Laravel plugin
// to instead re-write asset URLs to point to the Vite
// server instead.
base: null,
},
build: {
sourcemap: true,
},
plugins: [
laravel({
input: [
'resources/js/app.js'
],
refresh: true,
// detectTls: 'vue-laravel-spa.test',
}),
vue({
template: {
transformAssetUrls: {
// The Vue plugin will re-write asset URLs, when referenced
// in Single File Components, to point to the Laravel web
// server. Setting this to `null` allows the Laravel plugin
// to instead re-write asset URLs to point to the Vite
// server instead.
base: null,

// The Vue plugin will parse absolute URLs and treat them
// as absolute paths to files on disk. Setting this to
// `false` will leave absolute URLs un-touched so they can
// reference assets in the public directory as expected.
includeAbsolute: false,
},
},
}),
],
// The Vue plugin will parse absolute URLs and treat them
// as absolute paths to files on disk. Setting this to
// `false` will leave absolute URLs un-touched so they can
// reference assets in the public directory as expected.
includeAbsolute: false,
},
},
}),
],
});

0 comments on commit b16766d

Please sign in to comment.