danny007in · dependabot · May 31, 2021 · May 31, 2021 · May 31, 2021 · May 31, 2021
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
@@ -2,27 +2,27 @@
   "files": [
     {
       "path": "./dist/css/adminlte.css",
-      "maxSize": "122.3 kB"
+      "maxSize": "128.3 kB"
     },
     {
       "path": "./dist/css/adminlte.min.css",
-      "maxSize": "116.5 kB"
+      "maxSize": "121.5 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.components.css",
-      "maxSize": "27.2 kB"
+      "maxSize": "27.6 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.components.min.css",
-      "maxSize": "26.5 kB"
+      "maxSize": "26.8 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.core.css",
-      "maxSize": "69.2 kB"
+      "maxSize": "72.2 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.core.min.css",
-      "maxSize": "65.4 kB"
+      "maxSize": "69.4 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.extra-components.css",
@@ -32,6 +32,14 @@
       "path": "./dist/css/alt/adminlte.extra-components.min.css",
       "maxSize": "4.5 kB"
     },
+    {
+      "path": "./dist/css/alt/adminlte.light.css",
+      "maxSize": "94 kB"
+    },
+    {
+      "path": "./dist/css/alt/adminlte.light.min.css",
+      "maxSize": "89 kB"
+    },
     {
       "path": "./dist/css/alt/adminlte.pages.css",
       "maxSize": "3.5 kB"
@@ -42,19 +50,19 @@
     },
     {
       "path": "./dist/css/alt/adminlte.plugins.css",
-      "maxSize": "21.8 kB"
+      "maxSize": "22.2 kB"
     },
     {
       "path": "./dist/css/alt/adminlte.plugins.min.css",
-      "maxSize": "21.2 kB"
+      "maxSize": "21.5 kB"
     },
     {
       "path": "./dist/js/adminlte.js",
-      "maxSize": "15.7 kB"
+      "maxSize": "16.4 kB"
     },
     {
       "path": "./dist/js/adminlte.min.js",
-      "maxSize": "10.5 kB"
+      "maxSize": "10.9 kB"
     }
   ]
 }
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+.git
+*Dockerfile*
+*docker-compose*
+node_modules
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,14 +5,19 @@
     "plugin:import/errors",
     "plugin:import/warnings",
     "plugin:unicorn/recommended",
-    "xo/esnext",
+    "xo",
     "xo/browser"
   ],
   "env": {
     "jquery": true
   },
   "rules": {
+    "arrow-body-style": "off",
     "capitalized-comments": "off",
+    "comma-dangle": [
+      "error",
+      "never"
+    ],
     "eqeqeq": "off",
     "indent": [
       "error",
@@ -39,8 +44,13 @@
       "error",
       "always"
     ],
+    "operator-linebreak": [
+      "error",
+      "after"
+    ],
     "prefer-template": "error",
     "prefer-named-capture-group": "off",
+
     "semi": [
       "error",
       "never"
@@ -55,6 +65,7 @@
     "unicorn/prefer-dom-node-append": "off",
     "unicorn/prefer-dom-node-dataset": "off",
     "unicorn/prefer-dom-node-remove": "off",
+    "unicorn/prefer-export-from": "off",
     "unicorn/prefer-includes": "off",
     "unicorn/prefer-number-properties": "off",
     "unicorn/prefer-optional-catch-binding": "off",

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -21,14 +21,14 @@ Contributions are always **welcome and recommended**! Here is how for beginner's
     * Delete ./package-lock.json file
     * `npm install` (install npm deps)
     * `npm run dev` (developer mode, autocompile with browsersync support for live demo)
-    * Make your changes only in ./buid Folder OR package.json OR ./dist/js/demo.js OR in any html files which nessary to contribute
-    * Do not changes in ./dist/css/ AND ./dist/js/ Because its compiled files
-    * `npm run production` (compile css/js files and test every pages are perfectly working fine, before creating pull request)
+    * Make your changes only in ./build Folder OR package.json OR ./dist/js/demo.js OR package-lock.json OR ./dist/js/pages/ OR ./docs OR in any html files which are necessary for contribution
+    * Do not make changes in ./dist/css/ AND ./dist/js/ AND ./plugins Because it contains compiled files and do not include in PR (Pull Request)
+    * `npm run production` (compile css/js files and test all pages are perfectly working fine, before creating a pull request)
 4. Create a pull request
 
 ## Online one-click setup for contributing
 
-You can use Gitpod(an online IDE which is free for Open Source) for working on issues or making Prs. With a single click it will launch a workspace and automatically:
+You can use Gitpod(an online IDE which is free for Open Source) for working on issues or making PRs (Pull Requests). With a single click it will launch a workspace and automatically:
 
 - clone the `AdminLTE` repo.
 - install the dependencies.

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,13 +1,19 @@
 version: 2
 updates:
+  # for master branch
   - package-ecosystem: npm
     directory: "/"
     schedule:
       interval: weekly
       day: monday
       time: "03:00"
     open-pull-requests-limit: 10
+    target-branch: "master"
+    labels:
+      - dependencies
+      - version:3.1.x
     versioning-strategy: increase
+    rebase-strategy: disabled
   - package-ecosystem: bundler
     directory: "/docs/"
     schedule:
@@ -16,3 +22,19 @@ updates:
       time: "03:00"
     open-pull-requests-limit: 10
     versioning-strategy: increase
+    rebase-strategy: disabled
+
+  # for v4-dev branch
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: tuesday
+      time: "03:00"
+    open-pull-requests-limit: 10
+    target-branch: "v4-dev"
+    labels:
+      - dependencies
+      - version:4.x
+    versioning-strategy: increase
+    rebase-strategy: disabled
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - v4-dev
   pull_request:
     branches:
       - "**"
@@ -19,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - "10.x"
           - "12.x"
           - "14.x"
+          - "16.x"
         os:
           - "ubuntu-latest"
           - "macos-latest"
@@ -58,6 +59,6 @@ jobs:
 
       - name: Run bundlewatch
         run: npm run bundlewatch
-        if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.node, '14')
+        if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.node, '16')
         env:
           BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - v4-dev
       - "!dependabot/**"
   pull_request:
     # The branches below must be a subset of the branches above

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -4,13 +4,14 @@ on:
   push:
     branches:
       - master
+      - v4-dev
   pull_request:
     branches:
       - "**"
 
 env:
   FORCE_COLOR: 2
-  NODE: 14.x
+  NODE: 16.x
   RUBY: 2.7
 
 jobs:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,13 +4,14 @@ on:
   push:
     branches:
       - master
+      - v4-dev
   pull_request:
     branches:
       - "**"
 
 env:
   FORCE_COLOR: 2
-  NODE: 14.x
+  NODE: 16.x
 
 jobs:
   run:

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,12 @@
+FROM node:14
+
+WORKDIR /code
+
+COPY package.json /code/package.json
+COPY package-lock.json /code/package-lock.json
+
+RUN npm install
+
+COPY . /code
+
+CMD ["npm", "run", "dev"]
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 [![Packagist](https://img.shields.io/packagist/v/almasaeed2010/adminlte.svg)](https://packagist.org/packages/almasaeed2010/adminlte)
 [![cdn version](https://data.jsdelivr.com/v1/package/npm/admin-lte/badge)](https://www.jsdelivr.com/package/npm/admin-lte)
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/from-referrer/)
+[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/ColorlibHQ/AdminLTE)
+[![Discord Invite](https://img.shields.io/badge/discord-join%20now-green)](https://discord.gg/jfdvjwFqfz)
 
 **AdminLTE** is a fully responsive administration template. Based on **[Bootstrap 4.6](https://getbootstrap.com/)** framework and also the JS/jQuery plugin.
 Highly customizable and easy to use. Fits many screen resolutions from small mobile devices to large desktops.

diff --git a/build/config/.eslintrc.json b/build/config/.eslintrc.json
@@ -9,6 +9,7 @@
   "extends": "../../.eslintrc.json",
   "rules": {
     "no-console": "off",
-    "strict": "error"
+    "strict": "error",
+    "unicorn/prefer-module": "off"
   }
 }
diff --git a/build/config/postcss.config.js b/build/config/postcss.config.js
@@ -7,9 +7,6 @@ module.exports = {
     sourcesContent: true
   },
   plugins: [
-    require('postcss-scrollbar')({
-      edgeAutohide: true
-    }),
     require('autoprefixer')({
       cascade: false
     })

diff --git a/build/js/CardRefresh.js b/build/js/CardRefresh.js
@@ -34,12 +34,15 @@ const Default = {
   content: '.card-body',
   loadInContent: true,
   loadOnInit: true,
+  loadErrorTemplate: true,
   responseType: '',
   overlayTemplate: '<div class="overlay"><i class="fas fa-2x fa-sync-alt fa-spin"></i></div>',
+  errorTemplate: '<span class="text-danger"></span>',
   onLoadStart() {},
   onLoadDone(response) {
     return response
-  }
+  },
+  onLoadFail(_jqXHR, _textStatus, _errorThrown) {}
 }
 
 class CardRefresh {
@@ -74,6 +77,16 @@ class CardRefresh {
       this._settings.onLoadDone.call($(this), response)
       this._removeOverlay()
     }, this._settings.responseType !== '' && this._settings.responseType)
+    .fail((jqXHR, textStatus, errorThrown) => {
+      this._removeOverlay()
+
+      if (this._settings.loadErrorTemplate) {
+        const msg = $(this._settings.errorTemplate).text(errorThrown)
+        this._parent.find(this._settings.content).empty().append(msg)
+      }
+
+      this._settings.onLoadFail.call($(this), jqXHR, textStatus, errorThrown)
+    })
 
     $(this._element).trigger($.Event(EVENT_LOADED))
   }