mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-11 13:57:41 -08:00
Back out Laravel Vite stuff - we're so far away from that right now
This commit is contained in:
parent
645bba96cd
commit
aadfa9aa9c
28364
package-lock.json
generated
28364
package-lock.json
generated
File diff suppressed because it is too large
Load diff
16
package.json
16
package.json
|
@ -1,23 +1,25 @@
|
||||||
{
|
{
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "npm run development",
|
||||||
"build": "vite build"
|
"development": "mix",
|
||||||
|
"watch": "mix watch",
|
||||||
|
"watch-poll": "mix watch -- --watch-options-poll=1000",
|
||||||
|
"hot": "mix watch --hot",
|
||||||
|
"prod": "npm run production",
|
||||||
|
"production": "mix --production"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.12"
|
"node": ">=0.12"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vitejs/plugin-vue": "^4.0.0",
|
|
||||||
"axios": "^0.27.2",
|
"axios": "^0.27.2",
|
||||||
"babel-preset-latest": "^6.24.1",
|
"babel-preset-latest": "^6.24.1",
|
||||||
"jquery": "<3.6.0",
|
"jquery": "<3.6.0",
|
||||||
"laravel-mix": "^6.0.49",
|
"laravel-mix": "^6.0.49",
|
||||||
"laravel-vite-plugin": "^0.7.3",
|
|
||||||
"lodash": "^4.17.20",
|
"lodash": "^4.17.20",
|
||||||
"postcss": "^8.4.5",
|
"postcss": "^8.4.5",
|
||||||
"vite": "^4.0.4",
|
"vue": "2.4.4",
|
||||||
"vue": "^3.0",
|
|
||||||
"vue-loader": "^15.9.7",
|
"vue-loader": "^15.9.7",
|
||||||
"vue-template-compiler": "2.4.4"
|
"vue-template-compiler": "2.4.4"
|
||||||
},
|
},
|
||||||
|
@ -45,7 +47,7 @@
|
||||||
"jquery.iframe-transport": "^1.0.0",
|
"jquery.iframe-transport": "^1.0.0",
|
||||||
"jspdf-autotable": "^3.5.24",
|
"jspdf-autotable": "^3.5.24",
|
||||||
"less": "^4.1.2",
|
"less": "^4.1.2",
|
||||||
"less-loader": "^6.0",
|
"less-loader": "^5.0",
|
||||||
"list.js": "^1.5.0",
|
"list.js": "^1.5.0",
|
||||||
"papaparse": "^4.3.3",
|
"papaparse": "^4.3.3",
|
||||||
"select2": "4.0.13",
|
"select2": "4.0.13",
|
||||||
|
|
4
public/vendor/livewire/livewire.js
vendored
4
public/vendor/livewire/livewire.js
vendored
File diff suppressed because one or more lines are too long
2
public/vendor/livewire/livewire.js.map
vendored
2
public/vendor/livewire/livewire.js.map
vendored
File diff suppressed because one or more lines are too long
2
public/vendor/livewire/manifest.json
vendored
2
public/vendor/livewire/manifest.json
vendored
|
@ -1 +1 @@
|
||||||
{"/livewire.js":"/livewire.js?id=fe747446aa84856d8b66"}
|
{"/livewire.js":"/livewire.js?id=c69d0f2801c01fcf8166"}
|
14
resources/assets/js/bootstrap.js
vendored
14
resources/assets/js/bootstrap.js
vendored
|
@ -1,5 +1,4 @@
|
||||||
import lodash from 'lodash';
|
window._ = require('lodash');
|
||||||
window._ = lodash;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
|
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
|
||||||
|
@ -7,20 +6,18 @@ window._ = lodash;
|
||||||
* code may be modified to fit the specific needs of your application.
|
* code may be modified to fit the specific needs of your application.
|
||||||
*/
|
*/
|
||||||
//window.$ = window.jQuery = require('jquery');
|
//window.$ = window.jQuery = require('jquery');
|
||||||
import jQuery from 'jquery';
|
|
||||||
window.$ = jQuery;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* jQuery UI is loaded here and then the tooltip is assigned another funtion name
|
* jQuery UI is loaded here and then the tooltip is assigned another funtion name
|
||||||
* This resolves the issue of jquery-ui & bootstrap tooltip conflict
|
* This resolves the issue of jquery-ui & bootstrap tooltip conflict
|
||||||
*/
|
*/
|
||||||
import jquery_ui from 'jquery-ui';
|
require('jquery-ui');
|
||||||
jQuery.fn.uitooltip = jQuery.fn.tooltip;
|
jQuery.fn.uitooltip = jQuery.fn.tooltip;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load boostrap
|
* Load boostrap
|
||||||
*/
|
*/
|
||||||
import 'bootstrap-less';
|
require('bootstrap-less');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Vue is a modern JavaScript library for building interactive web interfaces
|
* Vue is a modern JavaScript library for building interactive web interfaces
|
||||||
|
@ -28,10 +25,9 @@ import 'bootstrap-less';
|
||||||
* and simple, leaving you to focus on building your next great project.
|
* and simple, leaving you to focus on building your next great project.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import Vue from 'vue';
|
window.Vue = require('vue').default;
|
||||||
window.Vue = Vue.default;
|
|
||||||
window.eventHub = new Vue();
|
window.eventHub = new Vue();
|
||||||
import vue_resource from 'vue-resource';
|
require('vue-resource');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We'll register a HTTP interceptor to attach the "CSRF" header to each of
|
* We'll register a HTTP interceptor to attach the "CSRF" header to each of
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* include Vue and Vue Resource. This gives a great starting point for
|
* include Vue and Vue Resource. This gives a great starting point for
|
||||||
* building robust, powerful web applications using Vue and Laravel.
|
* building robust, powerful web applications using Vue and Laravel.
|
||||||
*/
|
*/
|
||||||
import './bootstrap';
|
require('./bootstrap');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Next, we will create a fresh Vue application instance and attach it to
|
* Next, we will create a fresh Vue application instance and attach it to
|
||||||
|
@ -13,22 +13,22 @@ import './bootstrap';
|
||||||
*/
|
*/
|
||||||
Vue.component(
|
Vue.component(
|
||||||
'passport-clients',
|
'passport-clients',
|
||||||
import './components/passport/Clients.vue' // ? .default
|
require('./components/passport/Clients.vue').default
|
||||||
);
|
);
|
||||||
|
|
||||||
Vue.component(
|
Vue.component(
|
||||||
'passport-authorized-clients',
|
'passport-authorized-clients',
|
||||||
import './components/passport/AuthorizedClients.vue' // ?).default
|
require('./components/passport/AuthorizedClients.vue').default
|
||||||
);
|
);
|
||||||
|
|
||||||
Vue.component(
|
Vue.component(
|
||||||
'passport-personal-access-tokens',
|
'passport-personal-access-tokens',
|
||||||
import './components/passport/PersonalAccessTokens.vue' // ).default
|
require('./components/passport/PersonalAccessTokens.vue').default
|
||||||
);
|
);
|
||||||
|
|
||||||
Vue.component(
|
Vue.component(
|
||||||
'importer',
|
'importer',
|
||||||
import './components/importer/importer.vue' //).default
|
require('./components/importer/importer.vue').default
|
||||||
);
|
);
|
||||||
|
|
||||||
// This component has been removed and replaced with a Livewire implementation
|
// This component has been removed and replaced with a Livewire implementation
|
||||||
|
|
|
@ -10,8 +10,7 @@
|
||||||
|
|
||||||
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">
|
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">
|
||||||
{{-- stylesheets --}}
|
{{-- stylesheets --}}
|
||||||
@vite(['css/dist/all.css','js/dist/all.js'])
|
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
|
||||||
{{-- <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">--}}
|
|
||||||
<link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
|
<link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
|
||||||
|
|
||||||
<script nonce="{{ csrf_token() }}">
|
<script nonce="{{ csrf_token() }}">
|
||||||
|
@ -72,7 +71,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{-- Javascript files --}}
|
{{-- Javascript files --}}
|
||||||
{{-- <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>--}}
|
<script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
|
||||||
|
|
||||||
|
|
||||||
@stack('js')
|
@stack('js')
|
||||||
|
|
Loading…
Reference in a new issue