From e5c6098e36abc19b98bc09320d311aab6238e1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gautier=20Ben=20A=C3=AFm?= <benaim.gautier@gmail.com>
Date: Thu, 6 Feb 2025 09:54:48 +0100
Subject: [PATCH 1/2] style: removed barrel files

---
 javascript-modules-library/src/core/index.js  |  1 -
 .../core/server/components/AddResources.jsx   |  2 +-
 .../src/core/server/components/index.js       |  5 ---
 .../core/server/components/render/index.js    |  3 --
 .../components/render/internal/InBrowser.jsx  |  2 +-
 .../src/core/server/framework/index.js        |  2 -
 .../src/core/server/hooks/index.js            |  4 --
 .../src/core/server/hooks/useJCRQuery.js      |  2 +-
 .../src/core/server/hooks/useUrlBuilder.jsx   |  2 +-
 .../src/core/server/index.js                  |  4 --
 .../src/core/server/utils/index.js            |  2 -
 .../src/core/server/utils/jcr/index.js        |  4 --
 .../src/core/server/utils/urlBuilder/index.js |  1 -
 javascript-modules-library/src/index.js       | 40 ++++++++++++++++++-
 javascript-modules-library/src/nav/index.js   |  1 -
 .../src/nav/server/index.js                   |  1 -
 .../src/nav/server/navBuilder/index.js        |  1 -
 17 files changed, 42 insertions(+), 35 deletions(-)
 delete mode 100644 javascript-modules-library/src/core/index.js
 delete mode 100644 javascript-modules-library/src/core/server/components/index.js
 delete mode 100644 javascript-modules-library/src/core/server/components/render/index.js
 delete mode 100644 javascript-modules-library/src/core/server/framework/index.js
 delete mode 100644 javascript-modules-library/src/core/server/hooks/index.js
 delete mode 100644 javascript-modules-library/src/core/server/index.js
 delete mode 100644 javascript-modules-library/src/core/server/utils/index.js
 delete mode 100644 javascript-modules-library/src/core/server/utils/jcr/index.js
 delete mode 100644 javascript-modules-library/src/core/server/utils/urlBuilder/index.js
 delete mode 100644 javascript-modules-library/src/nav/index.js
 delete mode 100644 javascript-modules-library/src/nav/server/index.js
 delete mode 100644 javascript-modules-library/src/nav/server/navBuilder/index.js

diff --git a/javascript-modules-library/src/core/index.js b/javascript-modules-library/src/core/index.js
deleted file mode 100644
index 0ce5251a..00000000
--- a/javascript-modules-library/src/core/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './server';
diff --git a/javascript-modules-library/src/core/server/components/AddResources.jsx b/javascript-modules-library/src/core/server/components/AddResources.jsx
index e0c5e532..728c8ea9 100644
--- a/javascript-modules-library/src/core/server/components/AddResources.jsx
+++ b/javascript-modules-library/src/core/server/components/AddResources.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import {useServerContext} from '../hooks';
 import {server} from '@jahia/javascript-modules-library-private';
+import {useServerContext} from '../hooks/useServerContext';
 
 /**
  * Adds a resources to the head tag of the HTML page.
diff --git a/javascript-modules-library/src/core/server/components/index.js b/javascript-modules-library/src/core/server/components/index.js
deleted file mode 100644
index 09f5b2f6..00000000
--- a/javascript-modules-library/src/core/server/components/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './AddContentButtons';
-export * from './AddResources';
-export * from './Area';
-export * from './AbsoluteArea';
-export * from './render';
diff --git a/javascript-modules-library/src/core/server/components/render/index.js b/javascript-modules-library/src/core/server/components/render/index.js
deleted file mode 100644
index 4a38d577..00000000
--- a/javascript-modules-library/src/core/server/components/render/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './Render';
-export * from './HydrateInBrowser';
-export * from './RenderInBrowser';
diff --git a/javascript-modules-library/src/core/server/components/render/internal/InBrowser.jsx b/javascript-modules-library/src/core/server/components/render/internal/InBrowser.jsx
index a02e86fe..2d1eb3ef 100644
--- a/javascript-modules-library/src/core/server/components/render/internal/InBrowser.jsx
+++ b/javascript-modules-library/src/core/server/components/render/internal/InBrowser.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {useServerContext} from '../../../hooks/useServerContext';
 import {AddResources} from '../../AddResources';
-import {buildUrl} from '../../../utils/urlBuilder';
 import {I18nextProvider} from 'react-i18next';
 import i18n from 'i18next';
+import {buildUrl} from '../../../utils/urlBuilder/urlBuilder';
 
 const getClientI18nStoreScript = (lang, namespace) => {
     const i18nResourceBundle = i18n.getResourceBundle(lang, namespace);
diff --git a/javascript-modules-library/src/core/server/framework/index.js b/javascript-modules-library/src/core/server/framework/index.js
deleted file mode 100644
index 9a5f8055..00000000
--- a/javascript-modules-library/src/core/server/framework/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './register';
-export * from './defineJahiaComponent';
diff --git a/javascript-modules-library/src/core/server/hooks/index.js b/javascript-modules-library/src/core/server/hooks/index.js
deleted file mode 100644
index ff0b387c..00000000
--- a/javascript-modules-library/src/core/server/hooks/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './useGQLQuery';
-export * from './useJCRQuery';
-export * from './useServerContext';
-export * from './useUrlBuilder';
diff --git a/javascript-modules-library/src/core/server/hooks/useJCRQuery.js b/javascript-modules-library/src/core/server/hooks/useJCRQuery.js
index c30eb499..996da210 100644
--- a/javascript-modules-library/src/core/server/hooks/useJCRQuery.js
+++ b/javascript-modules-library/src/core/server/hooks/useJCRQuery.js
@@ -1,5 +1,5 @@
 import {useServerContext} from './useServerContext';
-import {getNodesByJCRQuery} from '../utils/jcr';
+import {getNodesByJCRQuery} from '../utils/jcr/getNodesByJCRQuery';
 
 /**
  * Execute a JCR query
diff --git a/javascript-modules-library/src/core/server/hooks/useUrlBuilder.jsx b/javascript-modules-library/src/core/server/hooks/useUrlBuilder.jsx
index 4e330046..c10a0c23 100644
--- a/javascript-modules-library/src/core/server/hooks/useUrlBuilder.jsx
+++ b/javascript-modules-library/src/core/server/hooks/useUrlBuilder.jsx
@@ -1,5 +1,5 @@
 import {useServerContext} from './useServerContext';
-import {buildUrl as originalBuildUrl} from '../utils/urlBuilder';
+import {buildUrl as originalBuildUrl} from '../utils/urlBuilder/urlBuilder';
 
 /**
  * @typedef {Object} UrlBuilderType
diff --git a/javascript-modules-library/src/core/server/index.js b/javascript-modules-library/src/core/server/index.js
deleted file mode 100644
index 2ce978b1..00000000
--- a/javascript-modules-library/src/core/server/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './components';
-export * from './framework';
-export * from './hooks';
-export * from './utils';
diff --git a/javascript-modules-library/src/core/server/utils/index.js b/javascript-modules-library/src/core/server/utils/index.js
deleted file mode 100644
index 06cb797a..00000000
--- a/javascript-modules-library/src/core/server/utils/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './jcr';
-export * from './urlBuilder';
diff --git a/javascript-modules-library/src/core/server/utils/jcr/index.js b/javascript-modules-library/src/core/server/utils/jcr/index.js
deleted file mode 100644
index 8558510a..00000000
--- a/javascript-modules-library/src/core/server/utils/jcr/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './getChildNodes';
-export * from './getNodeFromPathOrId';
-export * from './getNodeProps';
-export * from './getNodesByJCRQuery';
diff --git a/javascript-modules-library/src/core/server/utils/urlBuilder/index.js b/javascript-modules-library/src/core/server/utils/urlBuilder/index.js
deleted file mode 100644
index 522d382f..00000000
--- a/javascript-modules-library/src/core/server/utils/urlBuilder/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './urlBuilder';
diff --git a/javascript-modules-library/src/index.js b/javascript-modules-library/src/index.js
index d84e985a..aa84e439 100644
--- a/javascript-modules-library/src/index.js
+++ b/javascript-modules-library/src/index.js
@@ -1,2 +1,38 @@
-export * from './core';
-export * from './nav';
+// Rendering components
+export {RenderInBrowser} from './core/server/components/render/RenderInBrowser';
+export {HydrateInBrowser} from './core/server/components/render/HydrateInBrowser';
+export {Render} from './core/server/components/render/Render';
+
+// Components
+export {AbsoluteArea} from './core/server/components/AbsoluteArea';
+export {AddContentButtons} from './core/server/components/AddContentButtons';
+export {AddResources} from './core/server/components/AddResources';
+export {Area} from './core/server/components/Area';
+
+// Declaration and registration
+export {defineJahiaComponent} from './core/server/framework/defineJahiaComponent';
+export {registerJahiaComponents} from './core/server/framework/register';
+
+// Hooks
+export {useGQLQuery} from './core/server/hooks/useGQLQuery';
+export {useJCRQuery} from './core/server/hooks/useJCRQuery';
+export {
+    useServerContext,
+    ServerContextProvider
+} from './core/server/hooks/useServerContext';
+export {useUrlBuilder} from './core/server/hooks/useUrlBuilder';
+
+// JCR utils
+export {getChildNodes} from './core/server/utils/jcr/getChildNodes';
+export {getNodeFromPathOrId} from './core/server/utils/jcr/getNodeFromPathOrId';
+export {getNodeProps} from './core/server/utils/jcr/getNodeProps';
+export {getNodesByJCRQuery} from './core/server/utils/jcr/getNodesByJCRQuery';
+
+// URL builder
+export {
+    buildUrl,
+    initUrlBuilder
+} from './core/server/utils/urlBuilder/urlBuilder';
+
+// Navigation
+export {buildNavMenu} from './nav/server/navBuilder/navBuilder';
diff --git a/javascript-modules-library/src/nav/index.js b/javascript-modules-library/src/nav/index.js
deleted file mode 100644
index 0ce5251a..00000000
--- a/javascript-modules-library/src/nav/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './server';
diff --git a/javascript-modules-library/src/nav/server/index.js b/javascript-modules-library/src/nav/server/index.js
deleted file mode 100644
index 04a4b4c8..00000000
--- a/javascript-modules-library/src/nav/server/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './navBuilder';
diff --git a/javascript-modules-library/src/nav/server/navBuilder/index.js b/javascript-modules-library/src/nav/server/navBuilder/index.js
deleted file mode 100644
index 04a4b4c8..00000000
--- a/javascript-modules-library/src/nav/server/navBuilder/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './navBuilder';

From 459a0b4a3264aaf1451ce7e4b9a1060c1a3e5f5b Mon Sep 17 00:00:00 2001
From: Baptiste Grimaud <bgrimaud@jahia.com>
Date: Thu, 6 Feb 2025 11:28:42 +0100
Subject: [PATCH 2/2] update yarn.lock checksums

---
 javascript-modules-engine/tests/jahia-module/yarn.lock | 4 ++--
 javascript-modules-engine/yarn.lock                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/javascript-modules-engine/tests/jahia-module/yarn.lock b/javascript-modules-engine/tests/jahia-module/yarn.lock
index ccf70864..e51cdb0e 100644
--- a/javascript-modules-engine/tests/jahia-module/yarn.lock
+++ b/javascript-modules-engine/tests/jahia-module/yarn.lock
@@ -1703,7 +1703,7 @@ __metadata:
 
 "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist::locator=%40jahia%2Fnpm-module-example%40workspace%3A.":
   version: 0.4.0-SNAPSHOT
-  resolution: "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist#../../../javascript-modules-library/dist::hash=cd3405&locator=%40jahia%2Fnpm-module-example%40workspace%3A."
+  resolution: "@jahia/javascript-modules-library@file:../../../javascript-modules-library/dist#../../../javascript-modules-library/dist::hash=6b9ce5&locator=%40jahia%2Fnpm-module-example%40workspace%3A."
   dependencies:
     graphql: "npm:^16.0.1"
     graphql-tag: "npm:^2.12.6"
@@ -1725,7 +1725,7 @@ __metadata:
       optional: true
     styled-jsx:
       optional: true
-  checksum: 10/1559e3d2dbd8ffa113c2ceb65fb4c24cff752c6a8e35251af5928c433e67c7577c3da89df59610ff6b4df57de7aae2cd554136057a12ec5d109118ef30019971
+  checksum: 10/cafb04abfb128a244fbc167331cdb32405a1dd94c517309356199b8a2419d06433f21573e5be65f7ddd60eb3e0d53e4a33b161e682d0dcd2194b186f14b20896
   languageName: node
   linkType: hard
 
diff --git a/javascript-modules-engine/yarn.lock b/javascript-modules-engine/yarn.lock
index 6f96f6ba..6234b029 100644
--- a/javascript-modules-engine/yarn.lock
+++ b/javascript-modules-engine/yarn.lock
@@ -1277,7 +1277,7 @@ __metadata:
 
 "@jahia/javascript-modules-library@file:../javascript-modules-library/dist::locator=javascript-modules-engine%40workspace%3A.":
   version: 0.4.0-SNAPSHOT
-  resolution: "@jahia/javascript-modules-library@file:../javascript-modules-library/dist#../javascript-modules-library/dist::hash=216b87&locator=javascript-modules-engine%40workspace%3A."
+  resolution: "@jahia/javascript-modules-library@file:../javascript-modules-library/dist#../javascript-modules-library/dist::hash=1aef80&locator=javascript-modules-engine%40workspace%3A."
   dependencies:
     graphql: "npm:^16.0.1"
     graphql-tag: "npm:^2.12.6"
@@ -1299,7 +1299,7 @@ __metadata:
       optional: true
     styled-jsx:
       optional: true
-  checksum: 10c0/5e2c8ac67266b896883e337fc2de0aed4271d2862b17a6b9412b7722b87a8de3506a8b64f9c20c71b683a187e9298896edd9486746bf65e0093c412469c04e97
+  checksum: 10c0/715ce10015e887886c93521f3c17eeeb6e19d90ba2b1f3eb7e9a5e1a1724bb7f426459c421b6fd510ac34c06fe96426bfcd68d64719324cdd89106b7809c80a2
   languageName: node
   linkType: hard