build dist

matfish2 · Apr 15, 2020 · 3a88261 · 3a88261
1 parent c70e403
commit 3a88261
Show file tree

Hide file tree

Showing 10 changed files with 773 additions and 324 deletions.
diff --git a/compiled/components/renderless/RLPagination.js b/compiled/components/renderless/RLPagination.js
@@ -16,6 +16,7 @@ var _default = {
     return this.$scopedSlots["default"]({
       setPage: this.setPage,
       options: this.opts().pagination,
+      infiniteScroll: this.opts().infiniteScroll,
       page: this.page(),
       records: this.count(),
       perPage: parseInt(this.limit()),

diff --git a/compiled/config/defaults.js b/compiled/config/defaults.js
@@ -112,6 +112,7 @@ module.exports = function () {
     resizableColumns: true,
     editableColumns: [],
     tabbable: true,
+    infiniteScroll: false,
     componentsOverride: {}
   };
 };
diff --git a/dist/vue-tables-2.min.js b/dist/vue-tables-2.min.js
diff --git a/dist/vue-tables.js b/dist/vue-tables.js
diff --git a/lib/components/renderless/RLPagination.js b/lib/components/renderless/RLPagination.js
@@ -7,6 +7,7 @@ export default {
         return this.$scopedSlots.default({
             setPage: this.setPage,
             options: this.opts().pagination,
+            infiniteScroll: this.opts().infiniteScroll,
             page: this.page(),
             records: this.count(),
             perPage: parseInt(this.limit()),

diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -112,6 +112,7 @@ module.exports = function() {
     resizableColumns: true,
     editableColumns:[],
     tabbable: true,
+    infiniteScroll: false,
     componentsOverride:{
 
     }

diff --git a/lib/v-client-table.js b/lib/v-client-table.js
@@ -4,7 +4,7 @@ import merge from "merge";
 import Table from "./table";
 import stateData from "./state/data";
 import resizableColumns from "./helpers/resizeable-columns";
-import VtClientTable from "./components/VtClientTable";
+import VtClientTable from "./components/VtClientTable.jsx";
 
 var data = require("./mixins/data");
 var created = require("./mixins/created");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
   ],
   "dependencies": {
     "array-intersect": "^0.0.1",
-    "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "clone": "^2.1.1",
     "debounce": "^1.1",
     "merge": "^1.2.0",
@@ -48,6 +47,7 @@
     "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.6.2",
     "@babel/preset-env": "^7.6.3",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "axios": "^0.19.0",
     "babel-jest": "^23.0.1",
     "babel-loader": "^8.0.6",

diff --git a/webpack.config.dist.js b/webpack.config.dist.js
@@ -12,6 +12,9 @@ module.exports = {
     libraryTarget:'var',
     library:'VueTables'
   },
+  resolve:{
+    extensions: [".js",".jsx"]
+  },
   optimization: {
     minimize: env==='production'
   },
@@ -21,8 +24,9 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /\.js$/,
+        test: /\.jsx?$/,
         loader: 'babel-loader',
+        options: { plugins: ['transform-vue-jsx'] },
         exclude: /node_modules/
       }
     ]