Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.x] Readd vite support #1474

Draft
wants to merge 3 commits into
base: 5.x
Choose a base branch
from
Draft

[5.x] Readd vite support #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30285e0
Reapply "feature: move laravel mix setup to vite (#1460)" (#1465)
mmachatschek Apr 23, 2024
0542dae
Reapply "feature: add vite integrity plugin (#1461)" (#1464)
mmachatschek Apr 23, 2024
081a4d2
fix: vite dev mode when hotfile is detected
mmachatschek Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10,309 changes: 1,013 additions & 9,296 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 18 additions & 20 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,30 @@
"private": true,
"scripts": {
"dev": "npm run development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"development": "NODE_ENV=development vite build --mode=development",
"watch": "NODE_ENV=development vite build --mode=development --watch",
"prod": "npm run production",
"production": "mix --production"
"production": "NODE_ENV=production vite build"
},
"devDependencies": {
"axios": "^1.6",
"@vitejs/plugin-vue2": "^2.3.1",
"axios": "^1.6.8",
"bootstrap": "^4.5.0",
"highlight.js": "^11.3.1",
"highlight.js": "^11.9.0",
"jquery": "^3.5",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"moment": "^2.29.4",
"moment-timezone": "^0.5.40",
"popper.js": "^1.12",
"laravel-vite-plugin": "^1.0.2",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
"popper.js": "^1.16.1",
"resolve-url-loader": "^5.0.0",
"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",
"sass": "^1.74.1",
"sql-formatter": "^4.0.2",
"vite": "^5.2.8",
"vite-plugin-manifest-sri": "^0.2.0",
"vue": "^2.7.16",
"vue-json-pretty": "^1.9.5",
"vue-router": "^3.6.5",
"vue-copy-to-clipboard": "^1.0.3"
}
}
8 changes: 0 additions & 8 deletions public/app-dark.css
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions public/app.css
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions public/app.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions public/build/app.css
View file
Open in desktop

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

121 changes: 121 additions & 0 deletions public/build/app.js
View file
Open in desktop

Large diffs are not rendered by default.

0 public/favicon.ico → public/build/favicon.ico
100755 → 100644
View file
Open in desktop
File renamed without changes.
29 changes: 29 additions & 0 deletions public/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"resources/img/favicon.ico": {
"file": "favicon.ico",
"src": "resources/img/favicon.ico",
"integrity": "sha384-qq+rp+VctxiZdCG1H4EuMLbay0TmMKRw9/AMIToF+uoiexMCWbCmtPzrU6MeAHQz"
},
"resources/js/app.js": {
"file": "app.js",
"name": "app",
"src": "resources/js/app.js",
"isEntry": true,
"css": [
"app.css"
],
"integrity": "sha384-6AywQ89qF1DHGgFQTE+7C9EL1dDfpzF3OMrLl+DZaBlaag+1Siuwbq/DiwDmRO6r"
},
"resources/sass/styles-dark.scss": {
"file": "styles-dark.css",
"src": "resources/sass/styles-dark.scss",
"isEntry": true,
"integrity": "sha384-M9RRJ/l5Ei2BaDikjqqhjnhhKxFLMdJVXGtsI5xxBPcdVjF7jg9RLEO2W4F4YyuT"
},
"resources/sass/styles.scss": {
"file": "styles.css",
"src": "resources/sass/styles.scss",
"isEntry": true,
"integrity": "sha384-fArREpvoBcln8Ka3MTaQaj1IPYRqVVC/Q0+Bqq1I++o5+Ub5mnh+pAfiifFE5RCI"
}
}
6 changes: 6 additions & 0 deletions public/build/styles-dark.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions public/build/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions public/mix-manifest.json
View file
Open in desktop

This file was deleted.

Binary file added resources/img/favicon.ico
View file
Open in desktop
Binary file not shown.
22 changes: 15 additions & 7 deletions resources/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@ 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';

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

import 'bootstrap';

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

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

Vue.use(VueRouter);

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

moment.tz.setDefault(Telescope.timezone);

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

Vue.component('vue-json-pretty', VueJsonPretty);
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.component('related-entries', relatedEntries);
Vue.component('index-screen', indexScreen);
Vue.component('preview-screen', previewScreen);
Vue.component('alert', alert);
Vue.component('copy-clipboard', copyClipboard);

Vue.mixin(Base);

Expand Down
Loading