summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUdo Walter2019-02-25 17:00:13 +0100
committerUdo Walter2019-02-25 17:00:13 +0100
commitc3f76eea57ed48596fa14d8b29a2e2791fff7693 (patch)
treea6b76909097e74b2d4eebe816c10849788225f52
parent[webapp/selectbox] new selectbox component (diff)
downloadbas-c3f76eea57ed48596fa14d8b29a2e2791fff7693.tar.gz
bas-c3f76eea57ed48596fa14d8b29a2e2791fff7693.tar.xz
bas-c3f76eea57ed48596fa14d8b29a2e2791fff7693.zip
[webapp] npm update
-rw-r--r--webapp/package-lock.json140
-rw-r--r--webapp/package.json16
-rw-r--r--webapp/src/components/DataTable.vue6
-rw-r--r--webapp/src/components/IpxeBuilderModuleConfig.vue2
-rw-r--r--webapp/src/components/PermissionModuleEdit.vue6
5 files changed, 86 insertions, 84 deletions
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index fe6ce80..b03144b 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -3462,61 +3462,31 @@
}
},
"eslint-module-utils": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
- "integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz",
+ "integrity": "sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==",
"dev": true,
"requires": {
"debug": "^2.6.8",
- "pkg-dir": "^1.0.0"
- },
- "dependencies": {
- "find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
- "requires": {
- "path-exists": "^2.0.0",
- "pinkie-promise": "^2.0.0"
- }
- },
- "path-exists": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
- "dev": true,
- "requires": {
- "pinkie-promise": "^2.0.0"
- }
- },
- "pkg-dir": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
- "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
- "dev": true,
- "requires": {
- "find-up": "^1.0.0"
- }
- }
+ "pkg-dir": "^2.0.0"
}
},
"eslint-plugin-import": {
- "version": "2.14.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
- "integrity": "sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==",
+ "version": "2.16.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz",
+ "integrity": "sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==",
"dev": true,
"requires": {
"contains-path": "^0.1.0",
- "debug": "^2.6.8",
+ "debug": "^2.6.9",
"doctrine": "1.5.0",
- "eslint-import-resolver-node": "^0.3.1",
- "eslint-module-utils": "^2.2.0",
- "has": "^1.0.1",
- "lodash": "^4.17.4",
- "minimatch": "^3.0.3",
+ "eslint-import-resolver-node": "^0.3.2",
+ "eslint-module-utils": "^2.3.0",
+ "has": "^1.0.3",
+ "lodash": "^4.17.11",
+ "minimatch": "^3.0.4",
"read-pkg-up": "^2.0.0",
- "resolve": "^1.6.0"
+ "resolve": "^1.9.0"
},
"dependencies": {
"doctrine": {
@@ -3528,6 +3498,36 @@
"esutils": "^2.0.2",
"isarray": "^1.0.0"
}
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+ "dev": true
+ },
+ "path-parse": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+ "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+ "dev": true,
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
}
}
},
@@ -6626,12 +6626,13 @@
}
},
"node-notifier": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz",
- "integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==",
+ "version": "5.4.0",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
+ "integrity": "sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==",
"dev": true,
"requires": {
"growly": "^1.3.0",
+ "is-wsl": "^1.1.0",
"semver": "^5.5.0",
"shellwords": "^0.1.1",
"which": "^1.3.0"
@@ -10520,9 +10521,9 @@
}
},
"sortablejs": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.7.0.tgz",
- "integrity": "sha1-gKKyNwq9Vo4c7IwnETHvMKkE+ig="
+ "version": "1.8.3",
+ "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.8.3.tgz",
+ "integrity": "sha512-AftvD4hdKcR5QlGi7L/JST506zGNGrysE8/QohDpwKXJarHWqCt+TUlrtoMk/wkECB607Q019/OZlJViyWiD6A=="
},
"source-list-map": {
"version": "2.0.0",
@@ -11445,9 +11446,9 @@
}
},
"vue": {
- "version": "2.5.22",
- "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.22.tgz",
- "integrity": "sha512-pxY3ZHlXNJMFQbkjEgGVMaMMkSV1ONpz+4qB55kZuJzyJOhn6MSy/YZdzhdnumegNzVTL/Dn3Pp4UrVBYt1j/g=="
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.7.tgz",
+ "integrity": "sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg=="
},
"vue-codemirror": {
"version": "4.0.6",
@@ -11541,9 +11542,9 @@
}
},
"vue-template-compiler": {
- "version": "2.5.22",
- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.22.tgz",
- "integrity": "sha512-1VTw/NPTUeHNiwhkq6NkFzO7gYLjFCueBN0FX8NEiQIemd5EUMQ5hxrF7O0zCPo5tae+U9S/scETPea+hIz8Eg==",
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.7.tgz",
+ "integrity": "sha512-ZjxJLr6Lw2gj6aQGKwBWTxVNNd28/qggIdwvr5ushrUHUvqgbHD0xusOVP2yRxT4pX3wRIJ2LfxjgFT41dEtoQ==",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
@@ -11568,9 +11569,9 @@
}
},
"vue-virtual-scroller": {
- "version": "1.0.0-beta.4",
- "resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.0-beta.4.tgz",
- "integrity": "sha512-ZS4iKucfYb5JSH/Zr1LzQv8X+EEHY6eqJuWr7x7P8itKTqVAdNQk9YL/I5IBn1Xw3k2g9z1Sqc3di2O9YpWd2Q==",
+ "version": "1.0.0-rc.2",
+ "resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.0-rc.2.tgz",
+ "integrity": "sha512-4YFx1a+QDP4f6HW/HBI/qHcmSTlh7BMH6IjEH8WC3ylt499cErl0LpvLLAx9yo3c6NtuK/XvjYXi0vvdxFB5dw==",
"requires": {
"scrollparent": "^2.0.1",
"vue-observe-visibility": "^0.4.3",
@@ -11586,22 +11587,23 @@
}
},
"vuedraggable": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.17.0.tgz",
- "integrity": "sha512-TAC5tJTSbHSINQCSB59qHnuzT0Ad+E3IgvSWuA1e9UaebD8DxKaY1tCdvL3XvuLoaM3wc1dhpP/NbjpdxYsrng==",
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.18.0.tgz",
+ "integrity": "sha512-RBFiqlXy1XWtHhCYqb+PEGv7cfY27ae3SlGM/t20xWjH8Hy0lHUWAeq6/6wK8d4Igb7WPLy+qPNAe1RMR5jTYw==",
"requires": {
- "sortablejs": "^1.7.0"
+ "sortablejs": "^1.8.3",
+ "vue": "^2.5.22"
}
},
"vuetify": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.4.1.tgz",
- "integrity": "sha512-rf86frKvK3c6fdzXkbLdChamifnyhLRwLEVvXKua8zfVSrFZ4HXFK4T8zN68Pg/4vxlp+5DFxF1IQ4rq4tJ03A=="
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.2.tgz",
+ "integrity": "sha512-OzXHXklOpfYufV1l8v/av99gty6osJ/acTKqd/4CsRPOW+eyJA4nABXWk+4Qm9eAF/Uuf/fSHOprv4donvTeLw=="
},
"vuex": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
- "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.0.tgz",
+ "integrity": "sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg=="
},
"watchpack": {
"version": "1.6.0",
diff --git a/webapp/package.json b/webapp/package.json
index 82df089..ce4055b 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -13,16 +13,16 @@
"dependencies": {
"axios": "^0.18.0",
"socket.io-client": "^2.2.0",
- "vue": "^2.5.22",
+ "vue": "^2.6.7",
"vue-codemirror": "^4.0.6",
"vue-i18n": "^7.8.1",
"vue-router": "^3.0.2",
"vue-touch": "^2.0.0-beta.4",
- "vue-virtual-scroller": "^1.0.0-beta.4",
+ "vue-virtual-scroller": "^1.0.0-rc.2",
"vue2-hammer": "^1.0.7",
- "vuedraggable": "^2.17.0",
- "vuetify": "^1.4.1",
- "vuex": "^3.0.1"
+ "vuedraggable": "^2.18.0",
+ "vuetify": "^1.5.2",
+ "vuex": "^3.1.0"
},
"devDependencies": {
"@kazupon/vue-i18n-loader": "^0.3.0",
@@ -43,7 +43,7 @@
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.7.1",
- "eslint-plugin-import": "^2.14.0",
+ "eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.0.1",
@@ -52,7 +52,7 @@
"file-loader": "^1.1.4",
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1",
- "node-notifier": "^5.3.0",
+ "node-notifier": "^5.4.0",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
"portfinder": "^1.0.20",
@@ -66,7 +66,7 @@
"url-loader": "^1.1.2",
"vue-loader": "^13.7.3",
"vue-style-loader": "^3.0.1",
- "vue-template-compiler": "^2.5.22",
+ "vue-template-compiler": "^2.6.7",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.13.1",
"webpack-dev-server": "^2.11.3",
diff --git a/webapp/src/components/DataTable.vue b/webapp/src/components/DataTable.vue
index d87cbc7..1f6514a 100644
--- a/webapp/src/components/DataTable.vue
+++ b/webapp/src/components/DataTable.vue
@@ -123,11 +123,11 @@
class="scroller non-selectable"
:style="scrollerStyle"
:items="filteredRows"
- :item-height="48"
+ :item-size="48"
:page-mode="computedRowCount <= 0"
@click.native.capture.passive="setShiftState"
>
- <template slot="before-container">
+ <template slot="before">
<div class="table-head-wrapper non-selectable" :style="{ 'min-width': computedMinWidth }">
<div class="table-head">
<div class="non-selectable header-cell">
@@ -167,7 +167,7 @@
<slot v-else :name="header.key" :item="item.data" />
</div>
</div>
- <div v-if="filteredRows.length === 0" slot="after-container" class="no-result">{{ $t('noResult') }}</div>
+ <div v-if="filteredRows.length === 0" slot="after" class="no-result">{{ $t('noResult') }}</div>
</RecycleScroller>
</div>
</template>
diff --git a/webapp/src/components/IpxeBuilderModuleConfig.vue b/webapp/src/components/IpxeBuilderModuleConfig.vue
index 284a6cf..e9cd504 100644
--- a/webapp/src/components/IpxeBuilderModuleConfig.vue
+++ b/webapp/src/components/IpxeBuilderModuleConfig.vue
@@ -46,7 +46,7 @@
<v-subheader>{{ $t('ipxe') }}</v-subheader>
<v-card style="height: 588px;" ref="log">
- <RecycleScroller :items="log" :item-height="21" style="height: 100%;">
+ <RecycleScroller :items="log" :item-size="21" style="height: 100%;">
<div slot-scope="{ item }" style="height: 21px;">
<pre :class="item.status + '--text'" style="margin-bottom: 0px"><span>{{ item.date }} {{ item.msg }}</span></pre>
</div>
diff --git a/webapp/src/components/PermissionModuleEdit.vue b/webapp/src/components/PermissionModuleEdit.vue
index 4f78c14..70c61f4 100644
--- a/webapp/src/components/PermissionModuleEdit.vue
+++ b/webapp/src/components/PermissionModuleEdit.vue
@@ -162,7 +162,7 @@
<v-divider class="list-header-margin"></v-divider>
<RecycleScroller
:items="permissionsSelected"
- :item-height="48"
+ :item-size="48"
page-mode
>
<div slot-scope="{ item }" class="list-item">
@@ -178,7 +178,7 @@
<v-divider class="list-header-margin"></v-divider>
<RecycleScroller
:items="whitelist"
- :item-height="48"
+ :item-size="48"
page-mode
>
<div slot-scope="{ item }" class="list-item">
@@ -194,7 +194,7 @@
<v-divider class="list-header-margin"></v-divider>
<RecycleScroller
:items="blacklist"
- :item-height="48"
+ :item-size="48"
page-mode
>
<div slot-scope="{ item }" class="list-item">