upgrade tailwind version and laravel-mix

This commit is contained in:
Mohit Panjwani
2021-01-06 14:18:41 +05:30
parent 607b1795bb
commit ed978d0174
10 changed files with 5880 additions and 5216 deletions

7781
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,49 +1,50 @@
{ {
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "dev": "mix",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "mix watch",
"watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "hot": "mix watch --hot",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "mix --production"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^8.2.6", "babel-eslint": "^8.2.6",
"cross-env": "^5.1", "cross-env": "^5.1",
"eslint": "^4.19.1", "eslint": "^4.19.1",
"eslint-config-prettier": "^6.15.0", "eslint-config-prettier": "^6.15.0",
"eslint-loader": "^3.0.4", "eslint-loader": "^3.0.4",
"eslint-plugin-prettier": "^3.3.0", "eslint-plugin-prettier": "^3.3.0",
"eslint-plugin-vue": "^4.7.1", "eslint-plugin-vue": "^4.7.1",
"laravel-mix": "^5.0.7", "laravel-mix": "^6.0.6",
"prettier": "^2.2.1", "postcss": "^8.1",
"resolve-url-loader": "3.1.0", "prettier": "^2.2.1",
"sass": "^1.29.0", "resolve-url-loader": "3.1.0",
"sass-loader": "^8.0.2", "sass": "^1.29.0",
"tailwindcss-plugins": "^0.3.0", "sass-loader": "^8.0.2",
"vue-template-compiler": "^2.6.10" "tailwindcss-plugins": "^0.3.0",
}, "vue-template-compiler": "^2.6.10"
"dependencies": { },
"@bytefury/spacewind": "^0.3.3", "dependencies": {
"@vue-hero-icons/outline": "^1.6.3", "@bytefury/spacewind": "^0.4.0",
"@vue-hero-icons/solid": "^1.6.3", "@vue-hero-icons/outline": "^1.6.3",
"axios": "^0.19", "@vue-hero-icons/solid": "^1.6.3",
"chart.js": "^2.7.3", "axios": "^0.19",
"guid": "0.0.12", "chart.js": "^2.7.3",
"lodash": "^4.17.13", "guid": "0.0.12",
"moment": "^2.29.1", "lodash": "^4.17.13",
"sweet-modal-vue": "^2.0.0", "moment": "^2.29.1",
"sweetalert": "^2.1.2", "sweet-modal-vue": "^2.0.0",
"tailwindcss": "^1.9.1", "sweetalert": "^2.1.2",
"toastr": "^2.1.4", "tailwindcss": "^2.0.1",
"v-tooltip": "^2.0.2", "toastr": "^2.1.4",
"vue": "^2.6.10", "v-tooltip": "^2.0.2",
"vue-i18n": "^8.22.0", "vue": "^2.6.10",
"vue-loader": "^15.9.3", "vue-i18n": "^8.22.0",
"vue-router": "2.7.0", "vue-loader": "^15.9.3",
"vue2-transitions": "^0.3.0", "vue-router": "2.7.0",
"vuedraggable": "^2.24.2", "vue2-transitions": "^0.3.0",
"vuelidate": "^0.6.2", "vuedraggable": "^2.24.2",
"vuex": "^3.0.1" "vuelidate": "^0.6.2",
} "vuex": "^3.0.1"
}
} }

View File

@ -3,6 +3,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 Vue from 'vue'
import router from './router.js' import router from './router.js'
import store from './store/index' import store from './store/index'
import utils from './helpers/utilities' import utils from './helpers/utilities'
@ -11,7 +12,7 @@ import swal from 'sweetalert'
require('./bootstrap') require('./bootstrap')
window.Vue.prototype.$utils = utils Vue.prototype.$utils = utils
/** /**
* 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

View File

@ -25,13 +25,6 @@ Vue.use(Vuelidate)
Vue.use(Transitions) Vue.use(Transitions)
window._ = require('lodash') window._ = require('lodash')
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue')
/** /**
* Custom Directives * Custom Directives
@ -97,7 +90,8 @@ global.axios.interceptors.response.use(undefined, function (err) {
} }
if (!err.response) { if (!err.response) {
window.toastr['error']( window.toastr['error'](
'Please check your internet connection or wait until servers are back online', 'Network Error' 'Please check your internet connection or wait until servers are back online',
'Network Error'
) )
} else { } else {
if ( if (
@ -121,7 +115,8 @@ global.axios.interceptors.response.use(undefined, function (err) {
window.toastr['error']( window.toastr['error'](
err.response.data.message err.response.data.message
? err.response.data.message ? err.response.data.message
: err.response.data || 'Unknown error occurred', 'Error' : err.response.data || 'Unknown error occurred',
'Error'
) )
} }
} }

View File

@ -1,3 +1,5 @@
import Vue from 'vue'
import BaseModal from './modal/BaseModal.vue' import BaseModal from './modal/BaseModal.vue'
import BaseLoader from './BaseLoader.vue' import BaseLoader from './BaseLoader.vue'
import BaseCustomerSelect from './BaseCustomerSelect.vue' import BaseCustomerSelect from './BaseCustomerSelect.vue'

View File

@ -1,3 +1,5 @@
import Vue from 'vue'
Vue.directive('click-outside', { Vue.directive('click-outside', {
bind: function (el, binding, vnode) { bind: function (el, binding, vnode) {
el.event = function (event) { el.event = function (event) {

View File

@ -2,10 +2,10 @@
<base-page class="customer-create"> <base-page class="customer-create">
<sw-page-header :title="$t('customers.title')"> <sw-page-header :title="$t('customers.title')">
<sw-breadcrumb slot="breadcrumbs"> <sw-breadcrumb slot="breadcrumbs">
<sw-breadcrumb-item to="dashboard" :title="$t('general.home')" /> <sw-breadcrumb-item :title="$t('general.home')" to="dashboard" />
<sw-breadcrumb-item <sw-breadcrumb-item
to="#"
:title="$tc('customers.customer', 2)" :title="$tc('customers.customer', 2)"
to="#"
active active
/> />
</sw-breadcrumb> </sw-breadcrumb>
@ -159,7 +159,7 @@
:filterable="false" :filterable="false"
cell-class="no-click" cell-class="no-click"
> >
<div class="relative block" slot-scope="row"> <div slot-scope="row" class="relative block">
<sw-checkbox <sw-checkbox
:id="row.id" :id="row.id"
v-model="selectField" v-model="selectField"
@ -243,16 +243,16 @@
<dot-icon slot="activator" /> <dot-icon slot="activator" />
<sw-dropdown-item <sw-dropdown-item
tag-name="router-link"
:to="`customers/${row.id}/edit`" :to="`customers/${row.id}/edit`"
tag-name="router-link"
> >
<pencil-icon class="h-5 mr-3 text-gray-600" /> <pencil-icon class="h-5 mr-3 text-gray-600" />
{{ $t('general.edit') }} {{ $t('general.edit') }}
</sw-dropdown-item> </sw-dropdown-item>
<sw-dropdown-item <sw-dropdown-item
tag-name="router-link"
:to="`customers/${row.id}/view`" :to="`customers/${row.id}/view`"
tag-name="router-link"
> >
<eye-icon class="h-5 mr-3 text-gray-600" /> <eye-icon class="h-5 mr-3 text-gray-600" />
{{ $t('general.view') }} {{ $t('general.view') }}
@ -281,7 +281,6 @@ import {
EyeIcon, EyeIcon,
} from '@vue-hero-icons/solid' } from '@vue-hero-icons/solid'
import AstronautIcon from '../../components/icon/AstronautIcon' import AstronautIcon from '../../components/icon/AstronautIcon'
import { request } from 'http'
export default { export default {
components: { components: {

View File

@ -1,11 +1,9 @@
// Tailwind @tailwind base;
//----------------------------------
@import 'tailwindcss/base'; @tailwind components;
@import 'tailwindcss/components'; @tailwind utilities;
@import 'tailwindcss/utilities';
// Plugins // Plugins
//---------------------------------- //----------------------------------

View File

@ -1,5 +1,6 @@
const mix = require('laravel-mix') const mix = require('laravel-mix')
const tailwindcss = require('tailwindcss') const tailwindcss = require('tailwindcss')
const path = require('path')
mix.webpackConfig({ mix.webpackConfig({
resolve: { resolve: {
@ -9,17 +10,14 @@ mix.webpackConfig({
}, },
}) })
/*
|--------------------------------------------------------------------------
| Admin
|--------------------------------------------------------------------------
*/
mix mix
.js('resources/assets/js/app.js', 'public/assets/js/') .js('resources/assets/js/app.js', 'public/assets/js/')
.vue({
version: 2,
extractVueStyles: true,
})
.sass('resources/assets/sass/crater.scss', 'public/assets/css/') .sass('resources/assets/sass/crater.scss', 'public/assets/css/')
.options({ .options({
processCssUrls: false,
postCss: [tailwindcss('./tailwind.config.js')], postCss: [tailwindcss('./tailwind.config.js')],
}) })

3169
yarn.lock

File diff suppressed because it is too large Load Diff