Skip to content

Commit 6fab9c7

Browse files
committed
update laravel-mix to v4
1 parent 70ca7fa commit 6fab9c7

11 files changed

+20523
-23251
lines changed

.babelrc

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
{
2-
"presets": [
3-
["env", { "modules": false }],
4-
"stage-3"
5-
]
6-
}
1+
{}

.eslintrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ module.exports = {
2828
"quotes": [2, "single"],
2929
"vue/require-default-prop": 0,
3030
"vue/require-prop-types": 0,
31-
"vue/no-v-html": 0
31+
"vue/no-v-html": 0,
32+
"vue/html-indent": 0,
33+
"vue/component-name-in-template-casing": ['error', 'kebab-case']
3234
}
3335
};

dist/index.js

+16,374-19,820
Large diffs are not rendered by default.

dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/App.vue

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
<template>
22
<div
33
id="app"
4-
class="col-12">
4+
class="col-12"
5+
>
56
<div class="row">
67
<div class="col-12 col-md-9">
78
<div class="dt-buttons btn-group">
89
<button
910
class="btn btn-secondary buttons-copy buttons-html5"
10-
@click.stop.prevent="doExport('csv')">Csv</button>
11+
@click.stop.prevent="doExport('csv')"
12+
>
13+
Csv
14+
</button>
1115
<button
1216
class="btn btn-secondary buttons-copy buttons-html5"
13-
@click.stop.prevent="doExport('excel')">Excel</button>
17+
@click.stop.prevent="doExport('excel')"
18+
>
19+
Excel
20+
</button>
1421
<button
1522
class="btn btn-secondary buttons-copy buttons-html5"
16-
@click.stop.prevent="doExport('pdf')">Pdf</button>
23+
@click.stop.prevent="doExport('pdf')"
24+
>
25+
Pdf
26+
</button>
1727
</div>
1828
</div>
1929
<div class="col-12 col-md-3">
@@ -33,7 +43,7 @@
3343
type="submit"
3444
class="btn btn-outline-secondary"
3545
>
36-
<i class="mdi mdi-magnify"/> Go
46+
<i class="mdi mdi-magnify" /> Go
3747
</button>
3848
</div>
3949
</div>
@@ -66,14 +76,10 @@ import VdtnetTable from '../src'
6676
import 'datatables.net-bs4/js/dataTables.bootstrap4.js'
6777
6878
// import the rest
69-
import 'datatables.net-buttons-bs4'
70-
import 'datatables.net-responsive-bs4'
7179
import 'datatables.net-select-bs4'
7280
7381
import 'datatables.net-bs4/css/dataTables.bootstrap4.min.css'
7482
import 'datatables.net-select-bs4/css/select.bootstrap4.min.css'
75-
import 'datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css'
76-
import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css'
7783
7884
export default {
7985
name: 'App',
@@ -91,7 +97,6 @@ export default {
9197
},
9298
responsive: false,
9399
processing: true,
94-
pageLength: 10,
95100
searching: true,
96101
searchDelay: 1500,
97102
destroy: true,

lib/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/mix-manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"/index.js": "/index.js?id=7ee15f6b617974705b45",
3-
"/index.js.map": "/index.js.map?id=226097290267f14622d6"
2+
"/index.js": "/index.js?id=7d78e1d531f475e0ec43",
3+
"/index.js.map": "/index.js.map?id=0674e31b844d15842eac"
44
}

0 commit comments

Comments
 (0)