Skip to content

Commit

Permalink
Revert "[4.x] Mix to Vite migration (#1391)" (#1403)
Browse files Browse the repository at this point in the history
This reverts commit 46b85cd.
  • Loading branch information
taylorotwell authored Nov 1, 2023
1 parent 1be4ec1 commit 64da53e
Show file tree
Hide file tree
Showing 21 changed files with 8,805 additions and 1,786 deletions.
10,176 changes: 8,676 additions & 1,500 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
{
"private": true,
"scripts": {
"dev": "vite",
"build": "vite build"
"dev": "npm run development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "mix --production"
},
"devDependencies": {
"@vitejs/plugin-vue2": "^2.2.0",
"axios": "^0.21",
"bootstrap": "^4.5.0",
"highlight.js": "^11.3.1",
"jquery": "^3.5",
"laravel-vite-plugin": "^0.8.1",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"moment": "^2.29.4",
"moment-timezone": "^0.5.40",
Expand All @@ -19,12 +23,11 @@
"sass": "^1.15.2",
"sass-loader": "^11.0.1",
"sql-formatter": "^3.1.0",
"vite": "^4.4.11",
"vue": "^2.5.7",
"vue-copy-to-clipboard": "^1.0.3",
"vue-json-pretty": "^1.6.2",
"vue-loader": "^15.9.6",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.21"
"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/assets/app-078b96bc.css

This file was deleted.

6 changes: 0 additions & 6 deletions public/build/assets/app-7fe7ae9e.css

This file was deleted.

6 changes: 0 additions & 6 deletions public/build/assets/app-dark-54427812.css

This file was deleted.

116 changes: 0 additions & 116 deletions public/build/assets/app-f966f027.js

This file was deleted.

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

This file was deleted.

5 changes: 5 additions & 0 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"/app.js": "/app.js?id=140ed4bc5b10bc99492b97668c59272d",
"/app-dark.css": "/app-dark.css?id=b11fa9a28e9d3aeb8c92986f319b3c44",
"/app.css": "/app.css?id=b3ccfbe68f24cff776f83faa8dead721"
}
20 changes: 7 additions & 13 deletions resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +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 RelatedEntries from './components/RelatedEntries.vue';
import IndexScreen from './components/IndexScreen.vue';
import PreviewScreen from './components/PreviewScreen.vue';
import AlertComponent from './components/Alert.vue';
import CopyClipboard from './components/CopyClipboard.vue';

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

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

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

Vue.use(VueRouter);

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

moment.tz.setDefault(Telescope.timezone);

Expand All @@ -43,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', AlertComponent);
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
Loading

0 comments on commit 64da53e

Please sign in to comment.