[TikiWiki-commits] [Git][tikiwiki/tiki][master] [REF] Move boomerangjs into new JS sytem build

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
17fe0613 by franck franck kalunga at 2025-08-20T21:14:01+00:00
[REF] Move boomerangjs into new JS sytem build
---
* [REF] Move boomerangjs into new JS sytem build

See merge request tikiwiki/tiki!8321

- - - - -


6 changed files:

- package-lock.json
- src/js/common-externals/package.json
- src/js/vite.config.mjs
- tiki-setup.php
- vendor_bundled/composer.json
- vendor_bundled/composer.lock


Changes:

=====================================
package-lock.json
=====================================
@@ -5184,6 +5184,19 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/boomerangjs": {
+      "version": "1.815.1",
+      "resolved": "https://registry.npmjs.org/boomerangjs/-/boomerangjs-1.815.1.tgz",
+      "integrity": "sha512-HHTbRtNMHA6NSk5dlTs5x3FZpGF8KJp1CVEJdwCuyIdUWyG0C+7saN/qWXwUr72GieBpzTAMuTWUq7ahh8t/sA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "credit-card-regex": "2.0.0",
+        "error-stack-parser": "1.3.3",
+        "jsurl": "0.1.3",
+        "usertiming-compression": "^0.1.9"
+      }
+    },
     "node_modules/boosted": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/boosted/-/boosted-5.2.3.tgz",
@@ -6444,6 +6457,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/credit-card-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/credit-card-regex/-/credit-card-regex-2.0.0.tgz",
+      "integrity": "sha512-x//8JqyNbqpqtU1iDxquYe0KhosNB91ggVtBx4M+EAyGysGqSZEliunNdiySquFxgaP9AQZLkhupegXflQ20VA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-font": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-font/-/css-font-1.2.0.tgz",
@@ -7626,6 +7649,16 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/error-stack-parser": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.3.tgz",
+      "integrity": "sha512-clK4YPJ6la0EOFrlup17G8CtzsUYa8jT3Dx2y3N/NdHaK00+8hZOg4G5uBtD+a47VnK82HM0UFpuuAuQIW93Ig==",
+      "dev": true,
+      "license": "Unlicense",
+      "dependencies": {
+        "stackframe": "^0.3.1"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -11028,6 +11061,13 @@
         "url": "https://opencollective.com/core-js"
       }
     },
+    "node_modules/jsurl": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/jsurl/-/jsurl-0.1.3.tgz",
+      "integrity": "sha512-XzJzySbFIXmObeP4wTWNooWchUTIEkMAzUnxXbjw5IVAze4iRow9cex/Hl8UmX3yxbNWqm8KbDZwobo91oxe2w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/kanban": {
       "resolved": "src/js/vue-mf/kanban",
       "link": true
@@ -14764,6 +14804,13 @@
         "node": ">=0.1.14"
       }
     },
+    "node_modules/stackframe": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+      "integrity": "sha512-XmoiF4T5nuWEp2x2w92WdGjdHGY/cZa6LIbRsDRQR/Xlk4uW0PAUlH1zJYVffocwKpCdwyuypIp25xsSXEtZHw==",
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE"
+    },
     "node_modules/static-eval": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.1.tgz",
@@ -16141,6 +16188,13 @@
       "integrity": "sha512-tXzkojrv2SujumYthZ/WjF7jaSfNhSXlYMpE5AYdL2I3D7DCeo+mch8KtW2rUuKjDg+3VXODXHVgipt8yGY/eQ==",
       "license": "MIT"
     },
+    "node_modules/usertiming-compression": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/usertiming-compression/-/usertiming-compression-0.1.9.tgz",
+      "integrity": "sha512-PZzhw9EpwaQInPH/9IZYXIrjqcwYma2RZi3QMpVY6Uwrl7wWgQsRKubwd/mNbvNIHnu1EsGAk+ByyftmpYhzgw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -17348,6 +17402,7 @@
         "@shoelace-style/shoelace": "^2.15.1",
         "@zxing/library": "^0.21.2",
         "animejs": "~3.2.2",
+        "boomerangjs": "^1.815.1",
         "bootstrap": "^5.3.6",
         "bootstrap-icons": "^1.11.3",
         "chart.js": "^4.4.2",


=====================================
src/js/common-externals/package.json
=====================================
@@ -13,6 +13,7 @@
     "@shoelace-style/shoelace": "^2.15.1",
     "@zxing/library": "^0.21.2",
     "animejs": "~3.2.2",
+    "boomerangjs": "^1.815.1",
     "bootstrap": "^5.3.6",
     "bootstrap-icons": "^1.11.3",
     "chart.js": "^4.4.2",


=====================================
src/js/vite.config.mjs
=====================================
@@ -286,6 +286,10 @@ export default defineConfig(({ command, mode }) => {
                         src: "node_modules/@event-calendar/core/dist/index.css",
                         dest: "vendor_dist/@event-calendar/core/dist",
                     },
+                    {
+                        src: ["node_modules/boomerangjs/boomerangjs.js", "node_modules/boomerangjs/plugins/rt.js"],
+                        dest: "vendor_dist/boomerangjs/",
+                    },
                     {
                         src: "node_modules/bootstrap/dist/css/bootstrap.min.*",
                         dest: "vendor_dist/bootstrap/dist/css",


=====================================
tiki-setup.php
=====================================
@@ -1027,8 +1027,8 @@ if ($prefs['feature_calendar'] === 'y') {
 
 // Using boomerang for performance monitoring
 if ($prefs['tiki_monitor_performance'] == 'y') {
-    $headerlib->add_jsfile_dependency('vendor_bundled/vendor/npm-asset/boomerangjs/boomerang.js');
-    $headerlib->add_jsfile_dependency('vendor_bundled/vendor/npm-asset/boomerangjs/plugins/rt.js');
+    $headerlib->add_jsfile_dependency(NODE_PUBLIC_DIST_PATH . "/boomerangjs/boomerangjs.js");
+    $headerlib->add_jsfile_dependency(NODE_PUBLIC_DIST_PATH . "/boomerangjs/plugins/rt.js");
 }
 
 if ($prefs['error_tracking_enabled_js'] == 'y' &&  ! empty($prefs['error_tracking_dsn'])) {


=====================================
vendor_bundled/composer.json
=====================================
@@ -178,9 +178,6 @@
         "     - 'philippemarcmeyer/fieldslinker': '^1.0.3'",
         "        - Reasons: Not available on NPM: https://github.com/PhilippeMarcMeyer/FieldsLinker/issues/34",
         "",
-        "     - 'npm-asset/boomerangjs': '^1.687'",
-        "        - Reasons: Waiting on upstream: https://gitlab.com/tikiwiki/tiki/-/merge_requests/5566",
-        "",
         "DEV DEPENDENCIES NOTES:",
         "",
         "  sebastian/diff: ",
@@ -252,7 +249,6 @@
         "monolog/monolog": "~2.0",
         "montefuscolo/xmpp": "dev-php8.1",
         "nlgen/nlgen": "~0.18",
-        "npm-asset/boomerangjs": "~1.687",
         "onelogin/php-saml": "~4.2",
         "paragonie/sodium_compat": "~2.1",
         "pclzip/pclzip": "~2.8",


=====================================
vendor_bundled/composer.lock
=====================================
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "089b1ad4e23acfec4b381f9bc70bedbf",
+    "content-hash": "f0d21512a3e2b8dc1d29c225bee54d44",
     "packages": [
         {
             "name": "amphp/amp",
@@ -6595,87 +6595,6 @@
             ],
             "time": "2022-10-11T13:10:14+00:00"
         },
-        {
-            "name": "npm-asset/boomerangjs",
-            "version": "1.815.0",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/boomerangjs/-/boomerangjs-1.815.0.tgz"
-            },
-            "require": {
-                "npm-asset/credit-card-regex": "2.0.0",
-                "npm-asset/error-stack-parser": "1.3.3",
-                "npm-asset/jsurl": "0.1.3",
-                "npm-asset/usertiming-compression": ">=0.1.9,<0.2.0"
-            },
-            "type": "npm-asset",
-            "license": [
-                "BSD-3-Clause"
-            ]
-        },
-        {
-            "name": "npm-asset/credit-card-regex",
-            "version": "2.0.0",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/credit-card-regex/-/credit-card-regex-2.0.0.tgz"
-            },
-            "type": "npm-asset",
-            "license": [
-                "MIT"
-            ]
-        },
-        {
-            "name": "npm-asset/error-stack-parser",
-            "version": "1.3.3",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.3.tgz"
-            },
-            "require": {
-                "npm-asset/stackframe": ">=0.3.1,<0.4.0"
-            },
-            "type": "npm-asset",
-            "license": [
-                "Unlicense"
-            ]
-        },
-        {
-            "name": "npm-asset/jsurl",
-            "version": "0.1.3",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/jsurl/-/jsurl-0.1.3.tgz"
-            },
-            "type": "npm-asset",
-            "license": [
-                "MIT"
-            ]
-        },
-        {
-            "name": "npm-asset/stackframe",
-            "version": "0.3.1",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz"
-            },
-            "type": "npm-asset",
-            "license": [
-                "SEE LICENSE IN LICENSE"
-            ]
-        },
-        {
-            "name": "npm-asset/usertiming-compression",
-            "version": "0.1.9",
-            "dist": {
-                "type": "tar",
-                "url": "https://registry.npmjs.org/usertiming-compression/-/usertiming-compression-0.1.9.tgz"
-            },
-            "type": "npm-asset",
-            "license": [
-                "MIT"
-            ]
-        },
         {
             "name": "onelogin/php-saml",
             "version": "4.3.0",



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/17fe061394941eba98ffc88f22dc56eacb7c61b1

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/17fe061394941eba98ffc88f22dc56eacb7c61b1
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs