Move additional libraries to Tabler core (#2385)

shared/data/libs.json

@@ -1,44 +0,0 @@
-{
-  "js": {
-    "imask": "imask/dist/imask.min.js",
-    "autosize": "autosize/dist/autosize.min.js",
-    "apexcharts": "apexcharts/dist/apexcharts.min.js",
-    "nouislider": "nouislider/dist/nouislider.min.js",
-    "countup": "countup.js/dist/countUp.umd.js",
-    "lists": "list.js/dist/list.min.js",
-    "masonry": "https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js",
-    "mapbox": "https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.js",
-    "google-maps": "https://maps.googleapis.com/maps/api/js?key=GOOGLE_MAPS_KEY",
-    "litepicker": "litepicker/dist/litepicker.js",
-    "tom-select": "tom-select/dist/js/tom-select.base.min.js",
-    "jsvectormap": "jsvectormap/dist/jsvectormap.min.js",
-    "jsvectormap-world": "jsvectormap/dist/maps/world.js",
-    "jsvectormap-world-merc": "jsvectormap/dist/maps/world-merc.js",
-    "fslightbox": "fslightbox/index.js",
-    "hugerte": "hugerte/hugerte.min.js",
-    "plyr": "plyr/dist/plyr.min.js",
-    "dropzone": "dropzone/dist/dropzone-min.js",
-    "star-rating.js": "star-rating.js/dist/star-rating.min.js",
-    "coloris.js": "@melloware/coloris/dist/umd/coloris.min.js",
-    "typed.js": "typed.js/dist/typed.umd.js",
-    "signature_pad": "signature_pad/dist/signature_pad.umd.min.js",
-    "clipboard": "clipboard/dist/clipboard.min.js",
-    "fullcalendar": "fullcalendar/index.global.min.js"
-  },
-  "js-head": {
-    "turbo": "@hotwired/turbo/dist/turbo.es2017-umd.js"
-  },
-  "css": {
-    "mapbox": "https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.css",
-    "jsvectormap": "jsvectormap/dist/jsvectormap.css",
-    "dropzone": "dropzone/dist/dropzone.css",
-    "plyr": "plyr/dist/plyr.css",
-    "star-rating.js": "star-rating.js/dist/star-rating.min.css",
-    "coloris.js": "@melloware/coloris/dist/coloris.min.css",
-    "tom-select": "tom-select/dist/css/tom-select.bootstrap5.min.css",
-    "nouislider": "nouislider/dist/nouislider.min.css"
-  },
-  "js-copy": {
-    "hugerte" :"hugerte/*"
-  }
-}

shared/data/menu.json

@@ -434,6 +434,10 @@
         "url": "maps-vector.html",
         "title": "Map vector"
       },
+      "turbo": {
+        "url": "turbo-loader.html",
+        "title": "Turbo loader"
+      },
       "wysiwyg": {
         "url": "wysiwyg.html",
         "title": "WYSIWYG editor"

shared/data/sri.json

@@ -1,6 +1,6 @@
 {
-  "css": "sha384-n8Eaco6KCZ5R99jiJnSTWVUOh41zdxwpENxWBHB9xlBwbIsFL5G419uHHwsKUD4W",
-  "css-rtl": "sha384-0IlPjO9Km+IBC2msQbdJOsf9C8RlaoBVjhb0Znk+OpFw7G9Q2PcyaksnJxy9oqa5",
+  "css": "sha384-p5xrK2AiivdjrNPtu162Vv179cyFHJY2I4Mb0NZVR8Wn2aqSGUm7zlFFjM8jAzeD",
+  "css-rtl": "sha384-22IGd0xp1gk5BQwuhYqr8qUmsv65cwTzenvc19bvq5PYduXkWE8gUUruxIr/ZPsn",
   "css-flags": "sha384-fStl5MKxnUStSlpPiHGSFmUTTzr2KEY7jtgmvTswVDaQJ+sLbmEF+26m57M2sbCm",
   "css-flags-rtl": "sha384-i8KVpZYtpnZDkTYzaYlaeiF91VNnmyORipMLZh6hKGh5Jj80QN6962xlHQPkx/xr",
   "css-marketing": "sha384-IILX0Nea/+/hbVhEsrQ/djsqtSJmb4CM9hPzWd7Yh8hzbyYp4N/4hWMQL5kIPEuZ",
@@ -13,8 +13,8 @@
   "css-props-rtl": "sha384-Voq7oikM1MGBKKotIvWP3THYoINUMEQurBmKseurzXaiMzL3KPlbQXhbI4tHPKHU",
   "css-themes": "sha384-o3qxqNUMd6NW7wethAfo4ur0TF8cgmbdTRrUHwryoxEpy3DNmt5MWoCHRlJlX/zD",
   "css-themes-rtl": "sha384-er5SohDm2dJxg5UhUf1RI96jOlVA7RwgVm5++ribGoWmjds4MntkV6Mxg66xCQQg",
-  "css-vendors-rtl": "sha384-pmqjDmyHCjDzKM/ggLDh4+XLOp41n8d7z1/QxB3TEnz/yg7B0nV3yBKqx/O+buIU",
-  "css-vendors": "sha384-IHXMAokwkmX7RM5ureM6x8sBDwkSgYw3OWYboGb+CQZH7xzu7nYjodKx5WFatxIf",
+  "css-vendors-rtl": "sha384-tHbMgNpCKXcS6jHEZNTL3D8vphnCwUbnP37Mu3sihnvXRk47xUWU6VYDIO8kMyr3",
+  "css-vendors": "sha384-Fo//Kmhz1EIFHbqRN5ZnLePKoXW3c4MjGg1DVOrvwTlQNfC2rKRflTBS1degq6n6",
   "js": "sha384-PHMhDo1ZcalIgfBhQzaXnIBa6xdPJ8iQTzHd+WVAeoI/O2Xq3OuElAo7PyEYTqMg",
   "js-theme": "sha384-3Z3TIkq5YSKOncCfiURX/S03AUHfI0nVzd39uRc9KLhtLi7M228qgWBjnRXwt2j0",
   "demo-css": "sha384-BUDq2P684xwRBf0GDlySvob+KJg4ko8y2K7njgvYBscmEuqoVVqJ75zcTDozwkFA",

shared/e11ty/data.mjs

@@ -1,41 +1,8 @@
 import { readFileSync } from "fs";
-import { dirname } from "path";
-import { fileURLToPath } from "url";
 import { join } from "path";
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
-export function getCopyList () {
-	let copy = {
-		"node_modules/@tabler/core/dist": "dist",
-	}
-
-	const libs = JSON.parse(readFileSync(join(__dirname, '../data/libs.json')));
-
-	let files = []
-
-	Object.keys(libs.js).forEach((lib) => {
-		files.push(Array.isArray(libs.js[lib]) ? libs.js[lib] : [libs.js[lib]])
-	})
-
-	Object.keys(libs.css).forEach((lib) => {
-		files.push(Array.isArray(libs.css[lib]) ? libs.css[lib] : [libs.css[lib]])
-	})
-
-	Object.keys(libs['js-copy']).forEach((lib) => {
-		files.push(libs['js-copy'][lib])
-	})
-
-	files = files.flat()
-
-	files.forEach((file) => {
-		if (!file.match(/^https?/)) {
-			copy[`node_modules/${dirname(file)}`] = `libs/${dirname(file)}`;
-		}
-	})
-
-	return copy;
-}
-
 export function appData(eleventyConfig) {
+	eleventyConfig.addGlobalData("package", JSON.parse(readFileSync(join("..", "core", "package.json"), "utf-8")));
+	eleventyConfig.addGlobalData("changelog", readFileSync(join("..", "core", "CHANGELOG.md"), "utf-8"));
+	eleventyConfig.addGlobalData("libs", JSON.parse(readFileSync(join("..", "core", "libs.json"), "utf-8")));
 }

shared/includes/layout/css.html

@@ -6,13 +6,13 @@
 
 {% if page-libs -%}
 <!-- BEGIN PAGE LEVEL STYLES -->
-	{% for lib in libs.css -%}
-		{% if page-libs contains lib[0] -%}
-			{% for file in lib[1] -%}
-				<link href="{% if file contains 'http://' or file contains 'https://' %}{{ file }}{% else %}{{ page | relative }}/libs/{% if environment == 'preview' %}{{ file | replace: '@', '' }}{% else %}{{ file }}{% endif %}{% if environment != 'development %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}" rel="stylesheet"/>
-			{% endfor -%}
-		{% endif -%}
-	{% endfor -%}
+{% for lib in libs -%}
+{% if page-libs contains lib[0] -%}
+{% for file in lib[1].css -%}
+<link href="{% if file contains 'http://' or file contains 'https://' %}{{ file }}{% else %}{{ page | relative }}/dist/libs/{{ lib[1].npm }}/{{ file }}{% if environment != 'development %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}" rel="stylesheet"/>
+{% endfor -%}
+{% endif -%}
+{% endfor -%}
 <!-- END PAGE LEVEL STYLES -->
 {% endif %}
 

shared/includes/layout/js-libs.html

@@ -1,14 +1,15 @@
 {% if page-libs -%}
 {% capture libs-code -%}
-{% for lib in include.libs -%}
-{% if page-libs contains lib[0] -%}
-{% for file in lib[1] -%}
-<script src="{% if file contains 'http://' or file contains 'https://' %}{{ file | replace: 'GOOGLE_MAPS_KEY', google-maps-key }}{% else %}{{ page | relative }}/libs/{{ file }}{% if environment != 'development' %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}" defer></script>
+{% for lib in libs -%}
+{% if page-libs contains lib[0] and lib[1].head == include.head -%}
+{% for file in lib[1].js -%}
+<script src="{% if file contains 'http://' or file contains 'https://' %}{{ file | replace: 'GOOGLE_MAPS_KEY', google-maps-key }}{% else %}{{ page | relative }}/dist/libs/{{ lib[1].npm }}/{{ file }}{% if environment != 'development' %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}" defer></script>
 {% endfor -%}
 {% endif -%}
 {% endfor -%}
 {% endcapture -%}
 
+
 {% assign libs-code = libs-code | strip -%}
 {% if libs-code != "" -%}
 <!-- BEGIN PAGE LIBRARIES -->

shared/includes/layout/js.html

@@ -3,7 +3,7 @@
 {% assign google-maps-key = site.googleMapsKey -%}
 {% endif -%}
 
-{% include "layout/js-libs.html" libs=libs.js %}
+{% include "layout/js-libs.html" %}
 
 <!-- BEGIN GLOBAL MANDATORY SCRIPTS -->
 <script src="{{ page | relative }}/dist/js/tabler{% if environment != 'development' %}.min{% endif %}.js{% if environment != 'development' %}?{{ 'now' | date: '%s' }}{% endif %}" defer{% if environment == 'preview' %} integrity="{{ sri.js }}"{% endif %}></script>

shared/layouts/base.html

@@ -31,7 +31,7 @@
 	{% endif %}
 
 	{% include "layout/css.html" %}
-	{% include "layout/js-libs.html" libs=libs.js-head %}
+	{% include "layout/js-libs.html" head %}
 
 	<!-- BEGIN CUSTOM FONT -->
 	<style>

shared/layouts/docs/default.html

@@ -149,11 +149,11 @@
 		</div>
 	</div>
 
-	{% for lib in libs.js -%}
+	{% for lib in libs -%}
 	{% if docs-libs contains lib[0] or libs.global-libs contains lib[0] or lib[0] == "clipboard" -%}
-	{% for file in lib[1] -%}
+	{% for file in lib[1].js -%}
 	<script
-		src="{% if file contains 'http://' or file contains 'https://' %}{{ file | replace: 'GOOGLE_MAPS_KEY', google-maps-key }}{% else %}/libs/{% if environment != 'development' %}{{ file | replace: '@', '' }}{% else %}{{ file }}{% endif %}{% if environment != 'development' %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}"
+		src="{% if file contains 'http://' or file contains 'https://' %}{{ file | replace: 'GOOGLE_MAPS_KEY', google-maps-key }}{% else %}/dist/libs/{{ lib[1].npm }}/{% if environment != 'development' %}{{ file | replace: '@', '' }}{% else %}{{ file }}{% endif %}{% if environment != 'development' %}?{{ 'now' | date: '%s' }}{% endif %}{% endif %}"
 	></script>
 	{% endfor -%}
 	{% endif -%}

shared/layouts/homepage.html

@@ -4,7 +4,7 @@ layout: default
 page-header: Dashboard
 page-header-pretitle: Overview
 page-header-actions: buttons
-page-libs: [apexcharts, jsvectormap, jsvectormap-world, jsvectormap-world-merc]
+page-libs: [apexcharts, jsvectormap]
 ---
 
 {% unless site.layoutOnly %}