refactor: update laravel-mix and peer dependencies (#5094)

This commit is contained in:
Alexis Saettler
2021-04-24 11:11:19 +02:00
committed by GitHub
parent e012125ede
commit f808704032
51 changed files with 2300 additions and 19035 deletions
+60 -60
View File
@@ -1,94 +1,94 @@
module.exports = {
"env": {
"browser": true,
"es6": true,
"cypress/globals": true
'env': {
'browser': true,
'es6': true,
'cypress/globals': true
},
"extends": [
"plugin:vue/recommended"
'extends': [
'plugin:vue/recommended'
],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
'parserOptions': {
'ecmaVersion': 12,
'sourceType': 'module'
},
"plugins": [
"vue",
"cypress"
'plugins': [
'vue',
'cypress'
],
"rules": {
"array-bracket-spacing": [
"error",
"never"
'rules': {
'array-bracket-spacing': [
'error',
'never'
],
"indent": [
"error",
'indent': [
'error',
2
],
"linebreak-style": [
"error",
"unix"
'linebreak-style': [
'error',
'unix'
],
"no-trailing-spaces": [
"error",
'no-trailing-spaces': [
'error',
{
"ignoreComments": true,
"skipBlankLines": true
'ignoreComments': true,
'skipBlankLines': true
}
],
"quotes": [
"error",
"single"
'quotes': [
'error',
'single'
],
"semi": [
"error",
"always"
'semi': [
'error',
'always'
],
"semi-spacing": [
"error",
'semi-spacing': [
'error',
{
"after": true,
"before": false
'after': true,
'before': false
}
],
"semi-style": [
"error",
"last"
'semi-style': [
'error',
'last'
],
// strongly recommended
"vue/component-name-in-template-casing": [
"error",
"kebab-case"
'vue/component-name-in-template-casing': [
'error',
'kebab-case'
],
"vue/component-tags-order": [
"error", {
"order": [
"style",
'vue/component-tags-order': [
'error', {
'order': [
'style',
[
"template",
"script"
'template',
'script'
]
]
}],
"vue/html-end-tags" : "error",
"vue/html-self-closing": [
"error",
'vue/html-end-tags' : 'error',
'vue/html-self-closing': [
'error',
{
"html": {
"normal": "never",
"void": "always"
'html': {
'normal': 'never',
'void': 'always'
}
}
],
"vue/no-v-html" : 0,
"vue/max-attributes-per-line": [
'vue/no-v-html' : 0,
'vue/max-attributes-per-line': [
// https://vuejs.org/v2/style-guide/#Multi-attribute-elements-strongly-recommended
"error",
'error',
{
"singleline": 5,
"multiline": {
"max": 5,
"allowFirstLine": true
'singleline': 5,
'multiline': {
'max': 5,
'allowFirstLine': true
}
}
],
+1 -1
View File
@@ -590,7 +590,7 @@ class ContactsController extends Controller
*/
public function vCard(Contact $contact)
{
if (config('app.debug')) {
if (config('app.debug') && class_exists('\Barryvdh\Debugbar\Facade')) {
Debugbar::disable();
}
-16425
View File
File diff suppressed because it is too large Load Diff
+57 -55
View File
@@ -1,13 +1,13 @@
{
"private": true,
"scripts": {
"dev": "yarn run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "yarn run development --watch",
"watch-poll": "yarn run watch --watch-poll",
"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",
"prod": "yarn run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"dev": "yarn development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "yarn production",
"production": "mix --production",
"preproduction": "php artisan lang:generate -vvv",
"e2e": "cypress run",
"e2e:chrome": "cypress run --browser chrome",
@@ -17,7 +17,7 @@
"cy:verify": "cypress verify",
"cy:version": "cypress version",
"inst": "yarn install --ignore-engines --frozen-lockfile",
"lint": "eslint --ext .js,.vue resources/js/",
"lint": "eslint --ext .js,.vue *.js .*.js resources/js/",
"lint:cypress": "eslint --ext .js tests/cypress/",
"lint:all": "yarn lint & yarn lint:cypress",
"lint:fix": "yarn lint --fix & yarn lint:cypress --fix",
@@ -32,60 +32,62 @@
"composer update": "COMPOSER_MEMORY_LIMIT=-1 composer update"
},
"devDependencies": {
"cross-env": "^7.0.2",
"cypress": "^5.3.0",
"eslint": "^7.10.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-cypress": "^2.11.2",
"cross-env": "^7.0",
"cypress": "^6.1",
"eslint": "^7.10",
"eslint-config-standard": "^16.0",
"eslint-plugin-cypress": ">=2.11.2",
"eslint-plugin-import": ">=2.22.1",
"eslint-plugin-node": ">=11.1.0",
"eslint-plugin-promise": ">=4.0.0",
"eslint-plugin-standard": ">=4.0.0",
"eslint-plugin-vue": "^7.0.1",
"faker": "^5.1.0",
"mocha": "^8.1.3",
"mocha-junit-reporter": "^2.0.0",
"mocha-multi-reporters": "^1.1.7",
"moment-locales-webpack-plugin": "^1.2.0",
"resolve-url-loader": "^3.1.1",
"sass-loader": "^10.0.2",
"vue-template-compiler": "^2.5.21"
"eslint-plugin-vue": "^7.0",
"faker": "^5.1",
"mocha": "^8.1",
"mocha-junit-reporter": "^2.0",
"mocha-multi-reporters": "^1.1",
"moment-locales-webpack-plugin": "^1.2",
"postcss": "^8.1",
"resolve-url-loader": "^3.1",
"sass-loader": "^11.0",
"vue-template-compiler": "^2.6"
},
"dependencies": {
"@hokify/vuejs-datepicker": "^2.0.2",
"animate.css": "^4.1.1",
"axios": "^0.21.1",
"bootstrap": "^4.5.2",
"font-awesome": "^4.7.0",
"hint.css": "^2.3.2",
"jquery": "^3.5.1",
"laravel-mix": "^5.0.6",
"laravel-mix-purgecss": "^5.0.0",
"list.js": "^1.5.0",
"lodash": "^4.17.14",
"marked": "^2.0.0",
"moment": "^2.26.0",
"moment-timezone": "^0.5.31",
"popper.js": "^1.16.1",
"pretty-checkbox-vue": "^1.1.8",
"@hokify/vuejs-datepicker": "^2.0",
"animate.css": "^4.1",
"axios": "^0.21",
"bootstrap": "^4.6",
"font-awesome": "^4.7",
"hint.css": "^2.3",
"jquery": "^3.6",
"laravel-mix": "^6.0",
"laravel-mix-purgecss": "^6.0",
"list.js": "^2.3",
"lodash": "^4.17",
"marked": "^2.0",
"moment": "^2.26",
"moment-timezone": "^0.5",
"popper.js": "^1.16",
"pretty-checkbox-vue": "^1.1",
"rx-js": "^0.0.0",
"sass": "^1.27.0",
"snyk": "^1.410.3",
"sweet-modal-vue": "^2.0.0",
"tachyons": "^4.12.0",
"vue": "^2.5.21",
"vue-autosuggest": "^2.1.1",
"vue-checkbox-radio": "^0.6.0",
"vue-clipboard2": "^0.3.0",
"vue-directive-tooltip": "^1.4.2",
"vue-good-table": "^2.21.0",
"vue-i18n": "^8.17",
"vue-js-toggle-button": "^1.2.2",
"vue-notification": "^1.3.6",
"vue-rx": "^6.2.0",
"vue-select": "^3.10.3",
"vuejs-clipper": "^2.0.0",
"vuelidate": "^0.7.5"
"sass": "^1.32",
"snyk": "^1.410",
"sweet-modal-vue": "^2.0",
"tachyons": "^4.12",
"vue": "^2.6",
"vue-autosuggest": "^2.2",
"vue-checkbox-radio": "^0.6",
"vue-clipboard2": "^0.3",
"vue-directive-tooltip": "^1.6",
"vue-good-table": "^2.21",
"vue-i18n": "^8.24",
"vue-js-toggle-button": "^1.3",
"vue-loader": "^15.9",
"vue-notification": "^1.3",
"vue-rx": "^6.2",
"vue-select": "^3.11",
"vuejs-clipper": "^3.1",
"vuelidate": "^0.7"
},
"snyk": true
}
+4 -4
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
!function(e){function r(r){for(var n,l,f=r[0],i=r[1],a=r[2],c=0,s=[];c<f.length;c++)l=f[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,f=1;f<t.length;f++){var i=t[f];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={0:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var f=window.webpackJsonp=window.webpackJsonp||[],i=f.push.bind(f);f.push=r,f=f.slice();for(var a=0;a<f.length;a++)r(f[a]);var p=i;t()}([]);
(()=>{"use strict";var e,r={},t={};function o(e){var n=t[e];if(void 0!==n)return n.exports;var l=t[e]={id:e,loaded:!1,exports:{}};return r[e].call(l.exports,l,l.exports,o),l.loaded=!0,l.exports}o.m=r,e=[],o.O=(r,t,n,l)=>{if(!t){var i=1/0;for(d=0;d<e.length;d++){for(var[t,n,l]=e[d],a=!0,u=0;u<t.length;u++)(!1&l||i>=l)&&Object.keys(o.O).every((e=>o.O[e](t[u])))?t.splice(u--,1):(a=!1,l<i&&(i=l));a&&(e.splice(d--,1),r=n())}return r}l=l||0;for(var d=e.length;d>0&&e[d-1][2]>l;d--)e[d]=e[d-1];e[d]=[t,n,l]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var t in r)o.o(r,t)&&!o.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),(()=>{var e={929:0,829:0,893:0,475:0};o.O.j=r=>0===e[r];var r=(r,t)=>{var n,l,[i,a,u]=t,d=0;for(n in a)o.o(a,n)&&(o.m[n]=a[n]);if(u)var f=u(o);for(r&&r(t);d<i.length;d++)l=i[d],o.o(e,l)&&e[l]&&e[l][0](),e[i[d]]=0;return o.O(f)},t=self.webpackChunk=self.webpackChunk||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+6
View File
@@ -78,6 +78,12 @@
* Released under the MIT License.
*/
/*!
* vue-i18n v8.24.3
* (c) 2021 kazuya kawaguchi
* Released under the MIT License.
*/
/*!
* vuejs-datepicker v2.0.2
* (c) 2016-2019 Charlie Kassel
+7 -7
View File
@@ -1,9 +1,9 @@
{
"/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
"/js/vendor.js": "/js/vendor.js?id=e5787b0380465869eedc",
"/js/app.js": "/js/app.js?id=1713cb83bf4ebdae1960",
"/css/app-ltr.css": "/css/app-ltr.css?id=bd68c4928a0d06cc4918",
"/css/app-rtl.css": "/css/app-rtl.css?id=5f132f181e8d4c476a3e",
"/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",
"/js/stripe.js": "/js/stripe.js?id=8ef2e658e80670420943"
"/js/app.js": "/js/app.js?id=2b185e105d345fa43e18",
"/js/stripe.js": "/js/stripe.js?id=0dd321b9d898bafa99db",
"/js/manifest.js": "/js/manifest.js?id=895f51a7a2cbcfaf0d03",
"/css/app-rtl.css": "/css/app-rtl.css?id=ec5e8c23bb6d87f0c69f",
"/css/app-ltr.css": "/css/app-ltr.css?id=73ac5493133cc33e1a26",
"/css/stripe.css": "/css/stripe.css?id=0308292ca58c025301a2",
"/js/vendor.js": "/js/vendor.js?id=f26be9624b93c49b29c1"
}
+2 -1
View File
@@ -13,7 +13,8 @@ require('./bootstrap');
* or customize the JavaScript scaffolding to fit your unique needs.
*/
window.Vue = require('vue');
import Vue from 'vue';
window.Vue = Vue;
// Notifications
import Notifications from 'vue-notification';
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="br3 ba b--gray-monica bg-white mb3">
<notifications group="main" position="bottom right" width="400" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div :class="[ dirltr ? 'fl' : 'fr' ]" class="journal-calendar-box relative">
<template v-if="journalEntry.show_calendar">
@@ -143,7 +143,7 @@ export default {
},
compiledMarkdown (text) {
return marked(text, { sanitize: true });
return text !== undefined && text !== null ? marked(text, { sanitize: true }) : '';
}
}
};
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<!-- Left columns: showing calendar -->
@@ -100,7 +97,7 @@ export default {
},
compiledMarkdown (text) {
return marked(text, { sanitize: true });
return text !== undefined && text !== null ? marked(text, { sanitize: true }) : '';
}
}
};
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<!-- Left columns: showing calendar -->
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="avatars">
<a v-if="clickable == true" :href="'people/' + id">
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div :class="{ 'form-group-error': validator && validator.$error }">
<datepicker
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div :class="dclass">
<div>
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<label
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<h3 class="mb3">
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="passport-clients" position="top middle" :duration="5000" width="400" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="sidebar-box" :class="[ editMode ? 'edit' : '' ]">
<div class="w-100 dt">
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="sidebar-box" :class="[ editMode ? 'edit' : '' ]">
<div class="w-100 dt">
+1 -1
View File
@@ -222,7 +222,7 @@ export default {
},
compiledMarkdown (text) {
return marked(text, { sanitize: true });
return text !== undefined && text !== null ? marked(text, { sanitize: true }) : '';
},
}
};
-3
View File
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="sidebar-box" :class="[ editMode ? 'edit' : '' ]">
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="pa4-ns ph3 pv2 bb b--gray-monica">
<p>{{ $t('people.avatar_question') }}</p>
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="di f5 normal">
<notifications group="favorite" position="top middle" width="400" />
-3
View File
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<div>
@@ -195,7 +195,7 @@ export default {
},
compiledMarkdown (text) {
return marked(text, { sanitize: true });
return text !== undefined && text !== null ? marked(text, { sanitize: true }) : '';
},
getActivities() {
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<form-select
:id="'activity-type-list'"
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<!-- LOG AN ACTIVITY -->
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<div class="">
@@ -326,7 +323,7 @@ export default {
},
compiledMarkdown (text) {
return marked(text, { sanitize: true });
return text !== undefined && text !== null ? marked(text, { sanitize: true }) : '';
},
resetFields() {
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<vue-good-table
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<section class="ph3 ph0-ns life-event">
<notifications group="main" position="top middle" width="400" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<div class="ph4 pv3 mb3 mb0-ns bb b--gray-monica">
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="activityTypes" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="lifeEventTypes" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<notifications group="mfa" position="bottom right" :duration="5000" width="400" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="reminder-rules">
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div class="reminder-rules">
<notifications group="main" position="bottom right" />
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<div>
<!-- Timezone -->
@@ -1,6 +1,3 @@
<style scoped>
</style>
<template>
<form ref="form" class="mb4" :action="callback" method="post" @submit.prevent="subscribe()">
<notifications group="subscription" position="top middle" :duration="5000" width="400" />
@@ -85,7 +82,6 @@
</template>
<script>
import { setTimeout } from 'timers';
export default {
props: {
+21 -9
View File
@@ -1,4 +1,5 @@
let mix = require('laravel-mix');
const mix = require('laravel-mix');
const path = require('path');
require('laravel-mix-purgecss');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
@@ -24,13 +25,17 @@ mix.webpackConfig({
],
});
let purgeCssOptions = {
enabled: true,
whitelistPatterns: [/^autosuggest/, /^fa-/, /^vdp-datepicker/, /^StripeElement/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vuejs-clipper-basic/, /^vs__/, /^sr-only/],
whitelistPatternsChildren: [/^vdp-datepicker/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vs-/]
const purgeCssOptions = {
safelist: {
// List of regex of CSS class to not remove
standard: [/^autosuggest/, /^fa-/, /^vdp-datepicker/, /^StripeElement/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vuejs-clipper-basic/, /^vs__/, /^sr-only/],
// List of regex of CSS class name whose child path CSS class will not be removed
// ex: to exclude "jane" in "mary jane": add "mary")
deep: [/^vdp-datepicker/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vs-/]
}
};
mix.js('resources/js/app.js', 'public/js')
mix.js('resources/js/app.js', 'public/js').vue()
.sass('resources/sass/app-ltr.scss', 'public/css')
.sass('resources/sass/app-rtl.scss', 'public/css')
@@ -38,9 +43,16 @@ mix.js('resources/js/app.js', 'public/js')
.js('resources/js/stripe.js', 'public/js')
.sass('resources/sass/stripe.scss', 'public/css')
.alias({
vue$: path.join(__dirname, 'node_modules/vue/dist/vue.esm.js'),
})
// global commands
.purgeCss(purgeCssOptions)
.extract()
.setResourceRoot('../')
.sourceMaps(false)
.version();
.sourceMaps(false, 'eval-cheap-module-source-map', 'source-map')
.setResourceRoot('../');
if (mix.inProduction()) {
mix.version();
}
+2123 -2357
View File
File diff suppressed because it is too large Load Diff