Skip to content

Commit

Permalink
Migrate from Laravel Mix to Vite (#67)
Browse files Browse the repository at this point in the history
  • Loading branch information
aerni authored May 12, 2023
1 parent e8be872 commit a8451b0
Show file tree
Hide file tree
Showing 13 changed files with 1,253 additions and 8,910 deletions.
10,027 changes: 1,153 additions & 8,874 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"private": true,
"scripts": {
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"production": "mix --production"
"dev": "vite",
"build": "vite build"
},
"dependencies": {
"marked": "^4.0.10",
Expand All @@ -15,11 +12,11 @@
"devDependencies": {
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/typography": "^0.5.9",
"@vitejs/plugin-vue2": "^2.2.0",
"autoprefixer": "^10.4.5",
"laravel-mix": "^6.0.43",
"laravel-vite-plugin": "^0.7.6",
"postcss": "^8.4.12",
"tailwindcss": "^3.0.24",
"vue-loader": "^15.9.8",
"vue-template-compiler": "^2.6.14"
"vite": "^4.3.5"
}
}
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};
48 changes: 48 additions & 0 deletions resources/dist/build/assets/cp-195abd8e.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions resources/dist/build/assets/cp-a354d7e4.css

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

12 changes: 12 additions & 0 deletions resources/dist/build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"resources/css/cp.css": {
"file": "assets/cp-a354d7e4.css",
"isEntry": true,
"src": "resources/css/cp.css"
},
"resources/js/cp.js": {
"file": "assets/cp-195abd8e.js",
"isEntry": true,
"src": "resources/js/cp.js"
}
}
1 change: 0 additions & 1 deletion resources/dist/css/cp.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/dist/js/cp.js

This file was deleted.

4 changes: 0 additions & 4 deletions resources/dist/mix-manifest.json

This file was deleted.

6 changes: 3 additions & 3 deletions resources/js/components.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DefaultsPublishForm from './components/DefaultsPublishForm'
import SocialImageFieldtype from './components/SocialImageFieldtype'
import SourceFieldtype from './components/SourceFieldtype'
import DefaultsPublishForm from './components/DefaultsPublishForm.vue'
import SocialImageFieldtype from './components/SocialImageFieldtype.vue'
import SourceFieldtype from './components/SourceFieldtype.vue'

Statamic.booting(() => {
Statamic.component('defaults-publish-form', DefaultsPublishForm)
Expand Down
13 changes: 7 additions & 6 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ class ServiceProvider extends AddonServiceProvider
'web' => __DIR__.'/../routes/web.php',
];

protected $scripts = [
__DIR__.'/../resources/dist/js/cp.js',
];

protected $stylesheets = [
__DIR__.'/../resources/dist/css/cp.css',
protected $vite = [
'input' => [
'resources/js/cp.js',
'resources/css/cp.css',
],
'publicDirectory' => 'resources/dist',
'hotFile' => __DIR__.'/../resources/dist/hot',
];

protected $policies = [
Expand Down
18 changes: 18 additions & 0 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineConfig } from 'vite';
import laravel from 'laravel-vite-plugin';
import vue from '@vitejs/plugin-vue2';

export default defineConfig({
plugins: [
laravel({
input: [
'resources/js/cp.js',
'resources/css/cp.css'
],
refresh: true,
publicDirectory: 'resources/dist',
hotFile: 'resources/dist/hot',
}),
vue(),
],
});
13 changes: 0 additions & 13 deletions webpack.mix.js

This file was deleted.

0 comments on commit a8451b0

Please sign in to comment.