Skip to content
This repository was archived by the owner on Jun 27, 2024. It is now read-only.

Commit 3a78740

Browse files
authored
Migrate demo app to Vite (#70)
1 parent 29c6b94 commit 3a78740

29 files changed

+3693
-17065
lines changed

.eslintrc.js renamed to .eslintrc.cjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ module.exports = {
1313
"vue/require-default-prop": 0,
1414
"indent": ["error", 4],
1515
"quotes": ["error", "double"],
16+
"object-curly-spacing": ["error", "always"],
17+
"semi": ["error", "always"],
18+
"comma-spacing": ["error", { "before": false, "after": true }]
1619
}
17-
}
20+
};

.github/workflows/php.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
- name: "Install locked dependencies with npm"
4141
run: |
4242
npm ci --ignore-scripts
43-
cd app
44-
npm ci --ignore-scripts
4543
4644
- name: Build package
47-
run: npm run build
45+
run: |
46+
npm run build
47+
npm pack
4848
4949
- name: Setup PHP
5050
uses: shivammathur/setup-php@v2
@@ -58,7 +58,8 @@ jobs:
5858
cd app
5959
cp .env.example .env
6060
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
61-
npm run production
61+
npm ci --ignore-scripts
62+
npm run build
6263
touch database/database.sqlite
6364
php artisan migrate:fresh --seed
6465
php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ coverage
3131
app/public/css/app.css
3232
app/public/js/app.js
3333
app/public/mix-manifest.json
34+
35+
protonemedia-inertiajs-tables-laravel-query-builder-*.tgz

app/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"require": {
1111
"php": "^8.0.2",
1212
"guzzlehttp/guzzle": "^7.2",
13-
"inertiajs/inertia-laravel": "^0.5.4",
13+
"inertiajs/inertia-laravel": "^0.6.3",
1414
"laravel/breeze": "^1.9",
1515
"laravel/dusk": "^6.24",
16-
"laravel/framework": "^9.11",
16+
"laravel/framework": "^9.19.0",
1717
"laravel/sanctum": "^2.8",
1818
"laravel/tinker": "^2.7",
19+
"protonemedia/inertiajs-tables-laravel-query-builder": "@dev",
1920
"spatie/laravel-query-builder": "^5.0",
20-
"tightenco/ziggy": "^1.0",
21-
"protonemedia/inertiajs-tables-laravel-query-builder": "@dev"
21+
"tightenco/ziggy": "^1.0"
2222
},
2323
"require-dev": {
2424
"fakerphp/faker": "^1.9.1",

app/package-lock.json

Lines changed: 2731 additions & 15427 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
11
{
22
"private": true,
33
"scripts": {
4-
"dev": "npm run development",
5-
"development": "mix",
6-
"watch": "mix watch",
7-
"watch-poll": "mix watch -- --watch-options-poll=1000",
8-
"hot": "mix watch --hot",
9-
"prod": "npm run production",
10-
"production": "mix --production --mix-config=webpack.ssr.mix.js && mix --production"
11-
},
12-
"dependencies": {
13-
"@protonemedia/inertiajs-tables-laravel-query-builder": "file:.."
4+
"dev": "vite",
5+
"build": "vite build"
146
},
157
"devDependencies": {
8+
"@protonemedia/inertiajs-tables-laravel-query-builder": "file:../protonemedia-inertiajs-tables-laravel-query-builder-2.1.0.tgz",
169
"@inertiajs/inertia": "^0.11.0",
1710
"@inertiajs/inertia-vue3": "^0.6.0",
1811
"@inertiajs/progress": "^0.2.7",
1912
"@inertiajs/server": "^0.1.0",
2013
"@tailwindcss/forms": "^0.5.0",
21-
"@vue/compiler-sfc": "^3.2.31",
22-
"@vue/server-renderer": "^3.2.31",
14+
"@vitejs/plugin-vue": "^3.0",
2315
"autoprefixer": "^10.4.2",
2416
"axios": "^0.25",
2517
"eslint": "^8.18.0",
2618
"eslint-plugin-vue": "^9.1.1",
27-
"laravel-mix": "^6.0.6",
19+
"laravel-vite-plugin": "^0.5.0",
2820
"lodash": "^4.17.19",
2921
"postcss": "^8.4.6",
3022
"tailwindcss": "^3.1.0",
31-
"vue": "^3.2.31",
32-
"vue-loader": "^17.0.0",
33-
"webpack-node-externals": "^3.0.0"
23+
"vite": "^3.0",
24+
"vue": "^3.2.31"
3425
}
3526
}

app/postcss.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
plugins: {
3+
tailwindcss: {},
4+
autoprefixer: {},
5+
},
6+
}

app/resources/js/Pages/CustomTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Table } from "@protonemedia/inertiajs-tables-laravel-query-builder";
55
// use this one for development:
66
// import Table from "../../../../js/Components/Table.vue"
77
8-
defineProps(["users"])
8+
defineProps(["users"]);
99
</script>
1010

1111
<template>

app/resources/js/Pages/TwoTables.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Table } from "@protonemedia/inertiajs-tables-laravel-query-builder";
55
// use this one for development:
66
// import Table from "../../../../js/Components/Table.vue"
77
8-
defineProps(["companies", "users"])
8+
defineProps(["companies", "users"]);
99
</script>
1010

1111
<template>

app/resources/js/Pages/Users.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Table } from "@protonemedia/inertiajs-tables-laravel-query-builder";
55
// use this one for development:
66
// import Table from "../../../../js/Components/Table.vue"
77
8-
defineProps(["users"])
8+
defineProps(["users"]);
99
</script>
1010

1111
<template>

0 commit comments

Comments
 (0)