Skip to content

Commit

Permalink
Revert "feature: move laravel mix setup to vite (#1460)" (#1465)
Browse files Browse the repository at this point in the history
This reverts commit 8281384.
  • Loading branch information
driesvints committed Apr 17, 2024
1 parent 0dd15e7 commit e45a4ce
Show file tree
Hide file tree
Showing 25 changed files with 9,435 additions and 1,319 deletions.
10,300 changes: 9,295 additions & 1,005 deletions package-lock.json

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions package.json
Expand Up @@ -2,29 +2,32 @@
"private": true,
"scripts": {
"dev": "npm run development",
"development": "NODE_ENV=development vite build --mode=development",
"watch": "NODE_ENV=development vite build --mode=development --watch",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "NODE_ENV=production vite build"
"production": "mix --production"
},
"devDependencies": {
"@vitejs/plugin-vue2": "^2.3.1",
"axios": "^1.6.8",
"axios": "^1.6",
"bootstrap": "^4.5.0",
"highlight.js": "^11.9.0",
"highlight.js": "^11.3.1",
"jquery": "^3.5",
"laravel-vite-plugin": "^1.0.2",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
"popper.js": "^1.16.1",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"moment": "^2.29.4",
"moment-timezone": "^0.5.40",
"popper.js": "^1.12",
"resolve-url-loader": "^5.0.0",
"sass": "^1.74.1",
"sql-formatter": "^4.0.2",
"vite": "^5.2.8",
"vue": "^2.7.16",
"vue-json-pretty": "^1.9.5",
"vue-router": "^3.6.5",
"sass": "^1.15.2",
"sass-loader": "^11.0.1",
"sql-formatter": "^3.1.0",
"vue": "^2.5.7",
"vue-json-pretty": "^1.6.2",
"vue-loader": "^15.9.6",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.21",
"vue-copy-to-clipboard": "^1.0.3"
}
}
8 changes: 8 additions & 0 deletions public/app-dark.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions public/app.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public/app.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/app.css

This file was deleted.

121 changes: 0 additions & 121 deletions public/build/app.js

This file was deleted.

25 changes: 0 additions & 25 deletions public/build/manifest.json

This file was deleted.

6 changes: 0 additions & 6 deletions public/build/styles-dark.css

This file was deleted.

6 changes: 0 additions & 6 deletions public/build/styles.css

This file was deleted.

File renamed without changes.
5 changes: 5 additions & 0 deletions public/mix-manifest.json
@@ -0,0 +1,5 @@
{
"/app.js": "/app.js?id=7049e92a398e816f8cd53a915eaea592",
"/app-dark.css": "/app-dark.css?id=1ea407db56c5163ae29311f1f38eb7b9",
"/app.css": "/app.css?id=de4c978567bfd90b38d186937dee5ccf"
}
Binary file removed resources/img/favicon.ico
Binary file not shown.
22 changes: 7 additions & 15 deletions resources/js/app.js
Expand Up @@ -6,16 +6,8 @@ import VueRouter from 'vue-router';
import VueJsonPretty from 'vue-json-pretty';
import 'vue-json-pretty/lib/styles.css';
import moment from 'moment-timezone';
import popper from 'popper.js';
import relatedEntries from './components/RelatedEntries.vue';
import indexScreen from './components/IndexScreen.vue';
import previewScreen from './components/PreviewScreen.vue';
import alert from './components/Alert.vue';
import copyClipboard from './components/CopyClipboard.vue';

import.meta.glob(['../img/**']);

import 'bootstrap';
require('bootstrap');

let token = document.head.querySelector('meta[name="csrf-token"]');

Expand All @@ -25,7 +17,7 @@ if (token) {

Vue.use(VueRouter);

window.Popper = popper;
window.Popper = require('popper.js').default;

moment.tz.setDefault(Telescope.timezone);

Expand All @@ -45,11 +37,11 @@ const router = new VueRouter({
});

Vue.component('vue-json-pretty', VueJsonPretty);
Vue.component('related-entries', relatedEntries);
Vue.component('index-screen', indexScreen);
Vue.component('preview-screen', previewScreen);
Vue.component('alert', alert);
Vue.component('copy-clipboard', copyClipboard);
Vue.component('related-entries', require('./components/RelatedEntries.vue').default);
Vue.component('index-screen', require('./components/IndexScreen.vue').default);
Vue.component('preview-screen', require('./components/PreviewScreen.vue').default);
Vue.component('alert', require('./components/Alert.vue').default);
Vue.component('copy-clipboard', require('./components/CopyClipboard.vue').default);

Vue.mixin(Base);

Expand Down

0 comments on commit e45a4ce

Please sign in to comment.