Browse Source

dependencies/devDependencies updates
- updated dependencies
- `@fortawesome/fontawesome-free` to 5.10.2
- `@fullcalendar/bootstrap` to 4.3.0
- `@fullcalendar/core` to 4.3.1
- `@fullcalendar/daygrid` to 4.3.0
- `@fullcalendar/interaction` to 4.3.0
- `@fullcalendar/timegrid` to 4.3.0
- `bootstrap-slider` to 10.6.2
- `flot` to 3.2.9
- `overlayscrollbars` to 1.9.1
- `raphael` to 2.3.0
- `select2` to 4.0.10
- `sweetalert2` to 8.16.3
- replaced dependencies
- `jqvmap` with `jqvmap-novulnerability` (removes git requirement on `npm i`)
- added new dependencies
- `datatables.net-autofill-bs4` to 2.3.3
- `datatables.net-bs4` to 1.10.19
- `datatables.net-buttons-bs4` to 1.5.6
- `datatables.net-colreorder-bs4` to 1.5.1
- `datatables.net-fixedcolumns-bs4` to 3.2.6
- `datatables.net-fixedheader-bs4` to 3.1.5
- `datatables.net-keytable-bs4` to 2.5.0
- `datatables.net-responsive-bs4` to 2.2.3
- `datatables.net-rowgroup-bs4` to 1.1.0
- `datatables.net-rowreorder-bs4` to 1.2.5
- `datatables.net-scroller-bs4` to 2.0.0
- `datatables.net-select-bs4` to 1.3.0
- `jszip` to 3.2.2
- `pdfmake` to 0.1.58
- updated devDependencies
- `@babel/cli` to 7.5.5
- `@babel/core` to 7.5.5
- `@babel/preset-env` to 7.5.5
- `css-loader` to 3.2.0
- `rollup"` to .20.2
- `terser` to 4.2.1
- removed old plugins
- `morris`

REJack 5 years ago
parent
commit
2865815c47

+ 145 - 4
build/npm/Plugins.js

@@ -99,18 +99,159 @@ const Plugins = [
     to  : 'plugins/daterangepicker'
   },
   // DataTables
+  {
+    from: 'node_modules/pdfmake/build',
+    to: 'plugins/pdfmake'
+  },
+  {
+    from: 'node_modules/jszip/dist',
+    to: 'plugins/jszip'
+  },
   {
     from: 'node_modules/datatables.net/js',
     to: 'plugins/datatables'
   },
   {
     from: 'node_modules/datatables.net-bs4/js',
-    to: 'plugins/datatables'
+    to: 'plugins/datatables-bs4/js'
   },
   {
     from: 'node_modules/datatables.net-bs4/css',
-    to: 'plugins/datatables'
+    to: 'plugins/datatables-bs4/css'
+  },
+  {
+    from: 'node_modules/datatables.net-autofill/js',
+    to: 'plugins/datatables-autofill/js'
+  },
+  {
+    from: 'node_modules/datatables.net-autofill-bs4/js',
+    to: 'plugins/datatables-autofill/js'
   },
+  {
+    from: 'node_modules/datatables.net-autofill-bs4/css',
+    to: 'plugins/datatables-autofill/css'
+  },
+  {
+    from: 'node_modules/datatables.net-buttons/js',
+    to: 'plugins/datatables-buttons/js'
+  },
+  {
+    from: 'node_modules/datatables.net-buttons-bs4/js',
+    to: 'plugins/datatables-buttons/js'
+  },
+  {
+    from: 'node_modules/datatables.net-buttons-bs4/css',
+    to: 'plugins/datatables-buttons/css'
+  },
+  {
+    from: 'node_modules/datatables.net-colreorder/js',
+    to: 'plugins/datatables-colreorder/js'
+  },
+  {
+    from: 'node_modules/datatables.net-colreorder-bs4/js',
+    to: 'plugins/datatables-colreorder/js'
+  },
+  {
+    from: 'node_modules/datatables.net-colreorder-bs4/css',
+    to: 'plugins/datatables-colreorder/css'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedcolumns/js',
+    to: 'plugins/datatables-fixedcolumns/js'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedcolumns-bs4/js',
+    to: 'plugins/datatables-fixedcolumns/js'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedcolumns-bs4/css',
+    to: 'plugins/datatables-fixedcolumns/css'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedheader/js',
+    to: 'plugins/datatables-fixedheader/js'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedheader-bs4/js',
+    to: 'plugins/datatables-fixedheader/js'
+  },
+  {
+    from: 'node_modules/datatables.net-fixedheader-bs4/css',
+    to: 'plugins/datatables-fixedheader/css'
+  },
+  {
+    from: 'node_modules/datatables.net-keytable/js',
+    to: 'plugins/datatables-keytable/js'
+  },
+  {
+    from: 'node_modules/datatables.net-keytable-bs4/js',
+    to: 'plugins/datatables-keytable/js'
+  },
+  {
+    from: 'node_modules/datatables.net-keytable-bs4/css',
+    to: 'plugins/datatables-keytable/css'
+  },
+  {
+    from: 'node_modules/datatables.net-responsive/js',
+    to: 'plugins/datatables-responsive/js'
+  },
+  {
+    from: 'node_modules/datatables.net-responsive-bs4/js',
+    to: 'plugins/datatables-responsive/js'
+  },
+  {
+    from: 'node_modules/datatables.net-responsive-bs4/css',
+    to: 'plugins/datatables-responsive/css'
+  },
+  {
+    from: 'node_modules/datatables.net-rowgroup/js',
+    to: 'plugins/datatables-rowgroup/js'
+  },
+  {
+    from: 'node_modules/datatables.net-rowgroup-bs4/js',
+    to: 'plugins/datatables-rowgroup/js'
+  },
+  {
+    from: 'node_modules/datatables.net-rowgroup-bs4/css',
+    to: 'plugins/datatables-rowgroup/css'
+  },
+  {
+    from: 'node_modules/datatables.net-rowreorder/js',
+    to: 'plugins/datatables-rowreorder/js'
+  },
+  {
+    from: 'node_modules/datatables.net-rowreorder-bs4/js',
+    to: 'plugins/datatables-rowreorder/js'
+  },
+  {
+    from: 'node_modules/datatables.net-rowreorder-bs4/css',
+    to: 'plugins/datatables-rowreorder/css'
+  },
+  {
+    from: 'node_modules/datatables.net-scroller/js',
+    to: 'plugins/datatables-scroller/js'
+  },
+  {
+    from: 'node_modules/datatables.net-scroller-bs4/js',
+    to: 'plugins/datatables-scroller/js'
+  },
+  {
+    from: 'node_modules/datatables.net-scroller-bs4/css',
+    to: 'plugins/datatables-scroller/css'
+  },
+  {
+    from: 'node_modules/datatables.net-select/js',
+    to: 'plugins/datatables-select/js'
+  },
+  {
+    from: 'node_modules/datatables.net-select-bs4/js',
+    to: 'plugins/datatables-select/js'
+  },
+  {
+    from: 'node_modules/datatables.net-select-bs4/css',
+    to: 'plugins/datatables-select/css'
+  },
+
   // Fullcalendar
   {
     from: 'node_modules/@fullcalendar/core/',
@@ -147,9 +288,9 @@ const Plugins = [
     from: 'node_modules/ion-rangeslider/',
     to  : 'plugins/ion-rangeslider'
   },
-  // JQVMap
+  // JQVMap (jqvmap-novulnerability)
   {
-    from: 'node_modules/jqvmap/dist/',
+    from: 'node_modules/jqvmap-novulnerability/dist/',
     to  : 'plugins/jqvmap'
   },
   // jQuery Mapael

File diff suppressed because it is too large
+ 257 - 257
package-lock.json


+ 32 - 19
package.json

@@ -44,27 +44,38 @@
     "url": "https://github.com/ColorlibHQ/AdminLTE/issues"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.9.0",
-    "@fullcalendar/bootstrap": "^4.2.0",
-    "@fullcalendar/core": "^4.2.0",
-    "@fullcalendar/daygrid": "^4.2.0",
-    "@fullcalendar/interaction": "^4.2.0",
-    "@fullcalendar/timegrid": "^4.2.0",
+    "@fortawesome/fontawesome-free": "^5.10.2",
+    "@fullcalendar/bootstrap": "^4.3.0",
+    "@fullcalendar/core": "^4.3.1",
+    "@fullcalendar/daygrid": "^4.3.0",
+    "@fullcalendar/interaction": "^4.3.0",
+    "@fullcalendar/timegrid": "^4.3.0",
     "@lgaitan/pace-progress": "^1.0.7",
     "@sweetalert2/theme-bootstrap-4": "^2.1.0",
     "@ttskch/select2-bootstrap4-theme": "^1.2.3",
     "bootstrap": "^4.3.1",
     "bootstrap-colorpicker": "^3.1.2",
-    "bootstrap-slider": "^10.6.1",
+    "bootstrap-slider": "^10.6.2",
     "bootstrap4-duallistbox": "^4.0.1",
     "chart.js": "^2.8.0",
     "datatables.net": "^1.10.19",
+    "datatables.net-autofill-bs4": "^2.3.3",
     "datatables.net-bs4": "^1.10.19",
+    "datatables.net-buttons-bs4": "^1.5.6",
+    "datatables.net-colreorder-bs4": "^1.5.1",
+    "datatables.net-fixedcolumns-bs4": "^3.2.6",
+    "datatables.net-fixedheader-bs4": "^3.1.5",
+    "datatables.net-keytable-bs4": "^2.5.0",
+    "datatables.net-responsive-bs4": "^2.2.3",
+    "datatables.net-rowgroup-bs4": "^1.1.0",
+    "datatables.net-rowreorder-bs4": "^1.2.5",
+    "datatables.net-scroller-bs4": "^2.0.0",
+    "datatables.net-select-bs4": "^1.3.0",
     "daterangepicker": "^3.0.5",
     "fastclick": "^1.0.6",
     "filterizr": "^2.2.3",
     "flag-icon-css": "^3.3.0",
-    "flot": "^3.1.1",
+    "flot": "^3.2.9",
     "icheck-bootstrap": "^3.0.1",
     "inputmask": "^4.0.8",
     "ion-rangeslider": "^2.3.0",
@@ -73,29 +84,31 @@
     "jquery-mapael": "^2.2.0",
     "jquery-mousewheel": "^3.1.13",
     "jquery-ui-dist": "^1.12.1",
-    "jqvmap": "github:bbmumford/jqvmap",
+    "jqvmap-novulnerability": "^1.5.1",
     "jsgrid": "^1.5.3",
+    "jszip": "^3.2.2",
     "moment": "^2.24.0",
-    "overlayscrollbars": "^1.7.2",
+    "overlayscrollbars": "^1.9.1",
+    "pdfmake": "^0.1.58",
     "popper.js": "^1.15.0",
-    "raphael": "^2.2.8",
-    "select2": "^4.0.7",
+    "raphael": "^2.3.0",
+    "select2": "^4.0.10",
     "sparklines": "^1.2.0",
     "summernote": "^0.8.12",
-    "sweetalert2": "^8.16.2",
+    "sweetalert2": "^8.16.3",
     "tempusdominus-bootstrap-4": "^5.1.2",
     "toastr": "^2.1.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.0",
-    "@babel/core": "^7.5.4",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
     "@babel/plugin-external-helpers": "^7.2.0",
-    "@babel/preset-env": "^7.5.4",
+    "@babel/preset-env": "^7.5.5",
     "autoprefixer": "^9.6.0",
     "babel-eslint": "^8.2.6",
     "browser-sync": "^2.26.7",
     "clean-css-cli": "^4.3.0",
-    "css-loader": "^3.0.0",
+    "css-loader": "^3.2.0",
     "eslint": "^4.19.1",
     "eslint-plugin-compat": "^2.7.0",
     "extract-text-webpack-plugin": "^3.0.2",
@@ -106,10 +119,10 @@
     "npm-run-all": "^4.1.5",
     "path": "^0.12.7",
     "postcss-cli": "^5.0.1",
-    "rollup": "^1.16.7",
+    "rollup": "^1.20.2",
     "rollup-plugin-babel": "^4.3.3",
     "set-value": "^3.0.1",
     "style-loader": "^0.19.1",
-    "terser": "^4.0.0"
+    "terser": "^4.2.1"
   }
 }

+ 2 - 2
pages/tables/data.html

@@ -12,7 +12,7 @@
   <!-- Ionicons -->
   <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
   <!-- DataTables -->
-  <link rel="stylesheet" href="../../plugins/datatables/dataTables.bootstrap4.css">
+  <link rel="stylesheet" href="../../plugins/datatables-bs4/css/dataTables.bootstrap4.css">
   <!-- Theme style -->
   <link rel="stylesheet" href="../../dist/css/adminlte.min.css">
   <!-- Google Font: Source Sans Pro -->
@@ -1539,7 +1539,7 @@
 <script src="../../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 <!-- DataTables -->
 <script src="../../plugins/datatables/jquery.dataTables.js"></script>
-<script src="../../plugins/datatables/dataTables.bootstrap4.js"></script>
+<script src="../../plugins/datatables-bs4/js/dataTables.bootstrap4.js"></script>
 <!-- AdminLTE App -->
 <script src="../../dist/js/adminlte.min.js"></script>
 <!-- AdminLTE for demo purposes -->

+ 3 - 4
plugins/bootstrap-slider/bootstrap-slider.js

@@ -1,5 +1,5 @@
 /*! =======================================================
-                      VERSION  10.6.1              
+                      VERSION  10.6.2              
 ========================================================= */
 "use strict";
 
@@ -183,11 +183,10 @@ var windowIsDefined = (typeof window === "undefined" ? "undefined" : _typeof(win
 							return $(this);
 						});
 
-						if (!objects || objects.length > 1) {
-							return objects;
-						} else {
+						if (objects.length === 1) {
 							return objects[0];
 						}
+						return objects;
 					}
 				};
 			}

File diff suppressed because it is too large
+ 1 - 1
plugins/bootstrap-slider/bootstrap-slider.min.js


+ 9 - 9
plugins/bootstrap-slider/css/bootstrap-slider.css

@@ -1,5 +1,5 @@
 /*! =======================================================
-                      VERSION  10.6.1              
+                      VERSION  10.6.2              
 ========================================================= */
 /*! =========================================================
  * bootstrap-slider.js
@@ -181,15 +181,15 @@
   background-image: -webkit-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
   background-image: -o-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
   background-image: linear-gradient(to bottom, #dfdfdf 0%, #bebebe 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdfdfdf', endColorstr='#ffbebebe', GradientType=0);
+  background-repeat: repeat-x;
 }
 .slider.slider-disabled .slider-track {
   background-image: -webkit-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
   background-image: -o-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
   background-image: linear-gradient(to bottom, #e5e5e5 0%, #e9e9e9 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe5e5e5', endColorstr='#ffe9e9e9', GradientType=0);
+  background-repeat: repeat-x;
   cursor: not-allowed;
 }
 .slider input {
@@ -214,8 +214,8 @@
   background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
   background-image: -o-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
   background-image: linear-gradient(to bottom, #f5f5f5 0%, #f9f9f9 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  background-repeat: repeat-x;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
@@ -225,8 +225,8 @@
   background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
   background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
   background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
+  background-repeat: repeat-x;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-box-sizing: border-box;
@@ -238,8 +238,8 @@
   background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
   background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
   background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
+  background-repeat: repeat-x;
 }
 .slider-track-low,
 .slider-track-high {
@@ -259,8 +259,8 @@
   background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
   background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
   background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+  background-repeat: repeat-x;
   filter: none;
   -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
@@ -292,8 +292,8 @@
   background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
   background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
   background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
+  background-repeat: repeat-x;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -webkit-box-sizing: border-box;
@@ -322,7 +322,7 @@
   background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
   background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
   background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
+  background-repeat: repeat-x;
   opacity: 1;
 }

File diff suppressed because it is too large
+ 1 - 1
plugins/bootstrap-slider/css/bootstrap-slider.min.css


File diff suppressed because it is too large
+ 0 - 1003
plugins/chart.js/docs/axes/cartesian/category.html


File diff suppressed because it is too large
+ 0 - 1105
plugins/chart.js/docs/axes/cartesian/index.html


Some files were not shown because too many files changed in this diff