From fcbcda9ec6d94116854a790cbe9719fbf64aa2f7 Mon Sep 17 00:00:00 2001 From: Daniel <50356015+danny007in@users.noreply.github.com> Date: Mon, 10 May 2021 00:59:06 +0530 Subject: [PATCH] rtlcss implemented --- build/config/esbuild.config-min.js | 12 --- build/config/esbuild.config.js | 14 ++- build/config/postcss.config.js | 25 +++-- build/scss/_variables-alt.scss | 6 +- build/scss/_variables.scss | 40 +++---- build/scss/parts/adminlte.pcs.rtl.scss | 8 ++ build/scss/parts/adminlte.pcs.scss | 8 ++ build/scss/parts/adminlte.rtl.scss | 5 + package-lock.json | 143 +++++++++++++------------ package.json | 25 +++-- 10 files changed, 156 insertions(+), 130 deletions(-) delete mode 100644 build/config/esbuild.config-min.js create mode 100644 build/scss/parts/adminlte.pcs.rtl.scss create mode 100644 build/scss/parts/adminlte.pcs.scss create mode 100644 build/scss/parts/adminlte.rtl.scss diff --git a/build/config/esbuild.config-min.js b/build/config/esbuild.config-min.js deleted file mode 100644 index 133654a8d..000000000 --- a/build/config/esbuild.config-min.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict' - -const esbuild = require('esbuild') - -esbuild.build({ - entryPoints: ['dist/js/adminlte.js'], - bundle: false, - minify: true, - sourcemap: true, - outfile: 'dist/js/adminlte.min.js' -}).catch(error => console.error(error)) - diff --git a/build/config/esbuild.config.js b/build/config/esbuild.config.js index 11ce232b7..e285509e0 100644 --- a/build/config/esbuild.config.js +++ b/build/config/esbuild.config.js @@ -13,13 +13,17 @@ const banner = `/*! esbuild.build({ entryPoints: ['build/ts/adminlte.ts'], - bundle: true, - format: 'iife', - minify: false, - sourcemap: true, banner: { js: banner }, + bundle: true, + color: true, + format: 'iife', + sourcemap: true, target: getTarget(['es', 'chrome', 'edge', 'firefox', 'ios', 'safari']), outfile: 'dist/js/adminlte.js' -}).catch(error => console.error(error)) +}).then( + console.log('build/ts/adminlte.ts is BUILD') +).catch( + error => console.error(error) +) diff --git a/build/config/postcss.config.js b/build/config/postcss.config.js index a325f3d31..c55226bd6 100644 --- a/build/config/postcss.config.js +++ b/build/config/postcss.config.js @@ -1,14 +1,17 @@ 'use strict' -module.exports = { - map: { - inline: false, - annotation: true, - sourcesContent: true - }, - plugins: [ - require('autoprefixer')({ - cascade: false - }) - ] +module.exports = ctx => { + return { + map: { + inline: false, + annotation: true, + sourcesContent: true + }, + plugins: { + autoprefixer: { + cascade: false + }, + rtlcss: ctx.env === 'RTL' ? {} : false + } + } } diff --git a/build/scss/_variables-alt.scss b/build/scss/_variables-alt.scss index 5c95fe5bd..2a40e2641 100644 --- a/build/scss/_variables-alt.scss +++ b/build/scss/_variables-alt.scss @@ -1,9 +1,9 @@ // MAIN FOOTER // -------------------------------------------------------- -$main-footer-bg-alt: $dark !default; +$main-footer-bg-alt: $dark !default; // Body background (Affects main content background only) -$main-bg-alt: tint-color($dark-alt, 7.5%) !default; -$main-color-alt: $white !default; +$main-bg-alt: tint-color($dark-alt, 7.5%) !default; +$main-color-alt: $white !default; // diff --git a/build/scss/_variables.scss b/build/scss/_variables.scss index abaa4c37f..2e3f2e517 100644 --- a/build/scss/_variables.scss +++ b/build/scss/_variables.scss @@ -9,8 +9,8 @@ $font-size-root: 1rem !default; // -------------------------------------------------------- // Transition global options -$transition-speed: .3s !default; -$transition-fn: ease-in-out !default; +$transition-speed: .3s !default; +$transition-fn: ease-in-out !default; // Sidebar // -------------------------------------------------------- @@ -45,12 +45,12 @@ $sidebar-dark-submenu-active-color: $sidebar-dark-bg !default; $sidebar-dark-submenu-active-bg: rgba(255, 255, 255, .9) !default; // Light sidebar -$sidebar-light-bg: $white !default; -$sidebar-light-hover-bg: rgba($black, .1) !default; -$sidebar-light-color: $gray-800 !default; -$sidebar-light-hover-color: $gray-900 !default; -$sidebar-light-active-color: $black !default; -$sidebar-light-submenu-bg: transparent !default; +$sidebar-light-bg: $white !default; +$sidebar-light-hover-bg: rgba($black, .1) !default; +$sidebar-light-color: $gray-800 !default; +$sidebar-light-hover-color: $gray-900 !default; +$sidebar-light-active-color: $black !default; +$sidebar-light-submenu-bg: transparent !default; $sidebar-light-submenu-color: #777 !default; $sidebar-light-submenu-hover-color: $black !default; $sidebar-light-submenu-hover-bg: $sidebar-light-hover-bg !default; @@ -96,24 +96,24 @@ $main-footer-color: tint-color($gray-700, 25%) !default; // BRAND LINK // -------------------------------------------------------- -$brand-link-padding-y: $navbar-brand-padding-y + $navbar-padding-y; -$brand-link-border-buttom: 1px; +$brand-link-padding-y: $navbar-brand-padding-y + $navbar-padding-y; +$brand-link-border-buttom: 1px; // Z-INDEX // -------------------------------------------------------- -$zindex-main-header: $zindex-fixed + 4 !default; -$zindex-sidebar: $zindex-fixed + 8 !default; -$zindex-main-footer: $zindex-fixed + 2 !default; -$zindex-control-sidebar: $zindex-fixed + 1 !default; -$zindex-toasts: $zindex-sidebar + 2 !default; -$zindex-content-wrapper: $zindex-sidebar - 2 !default; -$zindex-preloader: $zindex-toasts + 2 !default; +$zindex-main-header: $zindex-fixed + 4 !default; +$zindex-sidebar: $zindex-fixed + 8 !default; +$zindex-main-footer: $zindex-fixed + 2 !default; +$zindex-control-sidebar: $zindex-fixed + 1 !default; +$zindex-toasts: $zindex-sidebar + 2 !default; +$zindex-content-wrapper: $zindex-sidebar - 2 !default; +$zindex-preloader: $zindex-toasts + 2 !default; // Body background (Affects main content background only) -$main-bg: #f4f6f9 !default; -$main-color: $black !default; +$main-bg: #f4f6f9 !default; +$main-color: $black !default; // Dark mode -$enable-dark-mode: true !default; +$enable-dark-mode: false !default; // diff --git a/build/scss/parts/adminlte.pcs.rtl.scss b/build/scss/parts/adminlte.pcs.rtl.scss new file mode 100644 index 000000000..27396e1c5 --- /dev/null +++ b/build/scss/parts/adminlte.pcs.rtl.scss @@ -0,0 +1,8 @@ +// Dark mode Enable using prefers-color-scheme +$enable-dark-mode: true; + +// AdminLTE +// --------------------------------------------------- +@import "../adminlte"; + +// diff --git a/build/scss/parts/adminlte.pcs.scss b/build/scss/parts/adminlte.pcs.scss new file mode 100644 index 000000000..27396e1c5 --- /dev/null +++ b/build/scss/parts/adminlte.pcs.scss @@ -0,0 +1,8 @@ +// Dark mode Enable using prefers-color-scheme +$enable-dark-mode: true; + +// AdminLTE +// --------------------------------------------------- +@import "../adminlte"; + +// diff --git a/build/scss/parts/adminlte.rtl.scss b/build/scss/parts/adminlte.rtl.scss new file mode 100644 index 000000000..96d7eed11 --- /dev/null +++ b/build/scss/parts/adminlte.rtl.scss @@ -0,0 +1,5 @@ +// AdminLTE +// --------------------------------------------------- +@import "../adminlte"; + +// diff --git a/package-lock.json b/package-lock.json index d24e484f7..15e45b390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1001,14 +1001,14 @@ } }, "browserslist": { - "version": "4.16.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz", - "integrity": "sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001214", + "caniuse-lite": "^1.0.30001219", "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.719", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", "node-releases": "^1.1.71" } @@ -1157,9 +1157,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001219", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz", - "integrity": "sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==", + "version": "1.0.30001223", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz", + "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==", "dev": true }, "chalk": { @@ -1532,6 +1532,15 @@ "yaml": "^1.7.2" } }, + "cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1773,9 +1782,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.726", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.726.tgz", - "integrity": "sha512-dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w==", + "version": "1.3.727", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz", + "integrity": "sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==", "dev": true }, "emoji-regex": { @@ -1825,9 +1834,9 @@ } }, "engine.io-client": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz", - "integrity": "sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", + "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", "dev": true, "requires": { "component-emitter": "~1.3.0", @@ -1839,7 +1848,7 @@ "parseqs": "0.0.6", "parseuri": "0.0.6", "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.5.4", + "xmlhttprequest-ssl": "~1.6.2", "yeast": "0.1.2" }, "dependencies": { @@ -2077,9 +2086,9 @@ } }, "eslint-config-xo-typescript": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.40.0.tgz", - "integrity": "sha512-xo4GaWHWgxkzGTfN+KsW8ptzMq0iYV+pr4LbRUQKcSPwvAbzHmW4/RimX2x3eOoNitMJCbpzO02M8SBWQ8C35w==", + "version": "0.41.1", + "resolved": "https://registry.npmjs.org/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.41.1.tgz", + "integrity": "sha512-MiO3vyF5CRhGwEwNmwq+7PPgc1kYsDCQyt010vXOQJTXbJctjRytzvE8fFgs4X7MCjgtkj1sgrhDyZPVICjAAA==", "dev": true }, "eslint-import-resolver-node": { @@ -2276,16 +2285,15 @@ } }, "eslint-plugin-unicorn": { - "version": "31.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-31.0.0.tgz", - "integrity": "sha512-HR3gI4ANtV8A+0FLAaxjBD/G5J3PWBo+7OswyGeK5nylGqtKLJVbnPksIkBgmVg+SFpxu5MnjaxQQI+9KjyVAg==", + "version": "32.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-32.0.0.tgz", + "integrity": "sha512-VYE/XvZvdcY0RvOKGxsrVVWo8DaI/tGVYuhKzSd6Uuy69Ydc8zX+roZ/H9PgyykM4nuj8JDoOHSwVk9a4OYbCQ==", "dev": true, "requires": { "ci-info": "^3.1.1", "clean-regexp": "^1.0.0", "eslint-template-visitor": "^2.3.2", "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", "import-modules": "^2.1.0", "is-builtin-module": "^3.1.0", "lodash": "^4.17.21", @@ -2565,9 +2573,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.0.tgz", - "integrity": "sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", "dev": true }, "fraction.js": { @@ -2657,9 +2665,9 @@ } }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -3065,9 +3073,9 @@ "dev": true }, "is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", + "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", "dev": true }, "is-binary-path": { @@ -3080,12 +3088,12 @@ } }, "is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", + "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", "dev": true, "requires": { - "call-bind": "^1.0.0" + "call-bind": "^1.0.2" } }, "is-buffer": { @@ -3136,9 +3144,9 @@ } }, "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz", + "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==", "dev": true }, "is-decimal": { @@ -3212,9 +3220,9 @@ } }, "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", + "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", "dev": true }, "is-obj": { @@ -3236,13 +3244,13 @@ "dev": true }, "is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", + "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-regexp": { @@ -3252,18 +3260,18 @@ "dev": true }, "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", + "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", "dev": true }, "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-typedarray": { @@ -3555,12 +3563,6 @@ "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", "dev": true }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, "lodash.forown": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz", @@ -4210,9 +4212,9 @@ "dev": true }, "object-inspect": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz", - "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", + "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", "dev": true }, "object-keys": { @@ -6632,14 +6634,13 @@ "dev": true }, "table": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz", - "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.0.tgz", + "integrity": "sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==", "dev": true, "requires": { "ajv": "^8.0.1", "lodash.clonedeep": "^4.5.0", - "lodash.flatten": "^4.4.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", "string-width": "^4.2.0", @@ -6647,9 +6648,9 @@ }, "dependencies": { "ajv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz", - "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.3.0.tgz", + "integrity": "sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -7153,9 +7154,9 @@ "dev": true }, "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz", + "integrity": "sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg==", "dev": true }, "y18n": { diff --git a/package.json b/package.json index 03540eb99..4bf23e652 100644 --- a/package.json +++ b/package.json @@ -7,19 +7,27 @@ "main": "dist/js/adminlte.min.js", "scripts": { "bundlewatch": "bundlewatch --config .bundlewatch.config.json", + "css-all": "npm-run-all --parallel css css-splits", + "css-splits": "npm-run-all css-compile-splits css-prefix-splits css-rtl-splits css-minify-splits", "css": "npm-run-all css-compile css-prefix css-minify", - "css-compile": "sass --load-path=node_modules build/scss:dist/css", - "css-prefix": "postcss --config build/config/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"", + "css-compile-bash": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css", + "css-compile": "npm run css-compile-bash -- build/scss/adminlte.scss:dist/css/adminlte.css", + "css-compile-splits": "npm run css-compile-bash -- build/scss/parts/:dist/css/alt/", + "css-prefix-bash": "postcss --config build/config/postcss.config.js --replace", + "css-prefix": "npm run css-prefix-bash -- \"dist/css/*.css\" \"!dist/css/*.min.css\" \"!dist/css/alt/*.css\"", + "css-prefix-splits": "npm run css-prefix-bash -- \"dist/css/alt/*.css\" \"!dist/css/alt/*.min.css\" \"!dist/css/alt/*.rtl.css\"", + "css-rtl-splits": "cross-env NODE_ENV=RTL postcss --config build/config/postcss.config.js --replace \"dist/css/alt/*.rtl.css\" \"!dist/css/alt/*.min.css\"", "css-minify-bash": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output ", "css-minify": "npm run css-minify-bash -- dist/css/ --batch --batch-suffix \".min\" \"dist/css/*.css\" \"!dist/css/*.min.css\"", + "css-minify-splits": "npm run css-minify-bash -- dist/css/alt/ --batch --batch-suffix \".min\" \"dist/css/alt/*.css\" \"!dist/css/alt/*.min.css\"", "css-lint": "stylelint \"build/scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache", "dev": "npm-run-all --parallel watch sync", "lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json", "js": "npm-run-all js-compile js-minify", - "js-compile": "npm-run-all --parallel js-compile-esbuild js-type-check", - "js-compile-esbuild": "node build/config/esbuild.config.js", - "js-type-check": "tsc --noEmit", - "js-minify": "node build/config/esbuild.config-min.js", + "js-compile": "npm-run-all --parallel ts:build ts:type-check", + "ts:build": "node build/config/esbuild.config.js", + "ts:type-check": "tsc --noEmit", + "js-minify": "esbuild dist/js/adminlte.js --minify --sourcemap --outfile=dist/js/adminlte.min.js", "js-lint": "eslint --ext=js,ts --cache --cache-location .cache/.eslintcache --report-unused-disable-directives .", "lint": "npm-run-all --continue-on-error --parallel css-lint js-lint lockfile-lint", "compile": "npm-run-all --parallel css js", @@ -62,12 +70,13 @@ "bundlewatch": "^0.3.2", "clean-css-cli": "^5.3.0", "concurrently": "^6.1.0", + "cross-env": "^7.0.3", "esbuild": "^0.11.20", "eslint": "^7.26.0", "eslint-config-xo": "^0.36.0", - "eslint-config-xo-typescript": "^0.40.0", + "eslint-config-xo-typescript": "^0.41.1", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-unicorn": "^31.0.0", + "eslint-plugin-unicorn": "^32.0.0", "lockfile-lint": "^4.6.2", "nodemon": "^2.0.7", "npm-run-all": "^4.1.5",