Merge branch 'refactor/export-map-internal-types' into feat/code-mod-export-paths

Author: Lukas742

.storybook/components/ProjectTemplate.tsx

@@ -12,7 +12,7 @@ import {
   Text,
   ThemeProvider,
 } from '@ui5/webcomponents-react';
-import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/dist/utils/addCustomCSSWithScoping.js';
+import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/dist/internal/utils/addCustomCSSWithScoping.js';
 import { clsx } from 'clsx';
 import type { ReactNode } from 'react';
 import { useRef, useState } from 'react';

REUSE.toml

@@ -16,19 +16,19 @@ SPDX-FileCopyrightText = "2016-2025 Recharts Group"
 SPDX-License-Identifier = "MIT"
 
 [[annotations]]
-path = "packages/base/src/hooks/useIsomorphicLayoutEffect.ts"
+path = "packages/base/src/internal/hooks/useIsomorphicLayoutEffect.ts"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2019 Tanner Linsley"
 SPDX-License-Identifier = "MIT"
 
 [[annotations]]
-path = "packages/base/src/utils/debounce.ts"
+path = "packages/base/src/internal/utils/debounce.ts"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2009-2021 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors"
 SPDX-License-Identifier = "MIT"
 
 [[annotations]]
-path = "packages/base/src/utils/throttle.ts"
+path = "packages/base/src/internal/utils/throttle.ts"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2009-2021 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors"
 SPDX-License-Identifier = "MIT"

package.json

@@ -23,7 +23,7 @@
     "lerna:version-dryrun": "lerna version --conventional-graduate --no-git-tag-version --no-push",
     "wrappers:main": "node packages/cli/dist/bin/index.js create-wrappers --packageName @ui5/webcomponents --out ./packages/main/src/webComponents --additionalComponentNote 'This is a UI5 Web Component! [Repository](https://github.com/UI5/webcomponents) | [Documentation](https://ui5.github.io/webcomponents/)'",
     "wrappers:fiori": "node packages/cli/dist/bin/index.js create-wrappers --packageName @ui5/webcomponents-fiori --out ./packages/main/src/webComponents --additionalComponentNote 'This is a UI5 Web Component! [Repository](https://github.com/UI5/webcomponents) | [Documentation](https://ui5.github.io/webcomponents/)'",
-    "wrappers:compat": "WITH_WEB_COMPONENT_IMPORT_PATH='@ui5/webcomponents-react-base/dist/wrapper/withWebComponent.js' node packages/cli/dist/bin/index.js create-wrappers --packageName @ui5/webcomponents-compat --out ./packages/compat/src/components --additionalComponentNote 'This is a UI5 Web Component! [Repository](https://github.com/UI5/webcomponents) | [Documentation](https://ui5.github.io/webcomponents/)' && prettier --log-level silent --write ./packages/compat/src/components",
+    "wrappers:compat": "WITH_WEB_COMPONENT_IMPORT_PATH='@ui5/webcomponents-react-base/internal/wrapper/withWebComponent.js' node packages/cli/dist/bin/index.js create-wrappers --packageName @ui5/webcomponents-compat --out ./packages/compat/src/components --additionalComponentNote 'This is a UI5 Web Component! [Repository](https://github.com/UI5/webcomponents) | [Documentation](https://ui5.github.io/webcomponents/)' && prettier --log-level silent --write ./packages/compat/src/components",
     "wrappers:ai": "node packages/cli/dist/bin/index.js create-wrappers --packageName @ui5/webcomponents-ai --out ./packages/ai/src/components --additionalComponentNote 'This is a UI5 Web Component! [Repository](https://github.com/UI5/webcomponents) | [Documentation](https://ui5.github.io/webcomponents/)' && prettier --log-level silent --write ./packages/ai/src/components",
     "create-webcomponents-wrapper": "(cd packages/cli && tsc) && yarn run wrappers:main && yarn run wrappers:fiori && prettier --log-level silent --write ./packages/main/src/webComponents && eslint --fix ./packages/main/src/webComponents/*/index.tsx && yarn run sb:prepare-cem",
     "create-webcomponents-wrapper-compat": "(cd packages/cli && tsc) && yarn run wrappers:compat && yarn run sb:prepare-cem && eslint --fix ./packages/compat/src/components/*/index.tsx",

packages/base/package.json

@@ -15,7 +15,6 @@
     "./dist": "./dist/index.js",
     "./dist/*": "./dist/*",
     "./dist/*.js": "./dist/*.js",
-    "./internal/addCustomCSSWithScoping.js": "./dist/utils/addCustomCSSWithScoping.js",
     "./Device": {
       "types": "./dist/Device/index.d.ts",
       "default": "./dist/Device/index.js"
@@ -51,7 +50,13 @@
     "./utils": {
       "types": "./dist/utils/index.d.ts",
       "default": "./dist/utils/index.js"
-    }
+    },
+    "./types": {
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/types/index.js"
+    },
+    "./internal": "./dist/internal",
+    "./internal/addCustomCSSWithScoping.js": "./dist/utils/addCustomCSSWithScoping.js"
   },
   "homepage": "https://ui5.github.io/webcomponents-react",
   "repository": {

packages/base/src/hooks/index.ts

@@ -1,17 +1,4 @@
-import { useCurrentTheme } from './useCurrentTheme.js';
 import { useI18nBundle } from './useI18nBundle.js';
-import { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect.js';
-import { useIsRTL } from './useIsRTL.js';
-import { useStylesheet } from './useStylesheet.js';
-import { useSyncRef } from './useSyncRef.js';
 import { useViewportRange } from './useViewportRange.js';
 
-export {
-  useI18nBundle,
-  useIsomorphicLayoutEffect,
-  useIsRTL,
-  useSyncRef,
-  useViewportRange,
-  useStylesheet,
-  useCurrentTheme,
-};
+export { useI18nBundle, useViewportRange };

packages/base/src/hooks/useI18nBundle.ts

@@ -2,7 +2,7 @@
 
 import I18nBundle from '@ui5/webcomponents-base/dist/i18nBundle.js';
 import { useEffect, useSyncExternalStore } from 'react';
-import { I18nStore } from '../stores/I18nStore.js';
+import { I18nStore } from '../internal/stores/I18nStore.js';
 
 const defaultBundle = new I18nBundle('defaultBundle');
 

packages/base/src/index.ts

@@ -1,15 +1,17 @@
 import * as Device from './Device/index.js';
 import VersionInfo from './generated/VersionInfo.js';
 import * as hooks from './hooks/index.js';
-import { I18nStore } from './stores/I18nStore.js';
-import { StyleStore } from './stores/StyleStore.js';
+import { I18nStore } from './internal/stores/I18nStore.js';
+import { StyleStore } from './internal/stores/StyleStore.js';
+import { withWebComponent } from './internal/wrapper/withWebComponent.js';
+import type { WithWebComponentPropTypes } from './internal/wrapper/withWebComponent.js';
 import { ThemingParameters } from './styling/ThemingParameters.js';
-import { withWebComponent } from './wrapper/withWebComponent.js';
-import type { WithWebComponentPropTypes } from './wrapper/withWebComponent.js';
 
-export * from './styling/CssSizeVariables.js';
-export * from './utils/index.js';
+export * from './internal/styling/CssSizeVariables.js';
+export * from './internal/utils/index.js';
 export * from './hooks/index.js';
+export * from './internal/hooks/index.js';
+export type * from './internal/types/index.js';
 export type * from './types/index.js';
 
 export { I18nStore, StyleStore, ThemingParameters, Device, hooks, withWebComponent };

packages/base/src/internal/hooks/index.ts

@@ -0,0 +1,7 @@
+import { useCurrentTheme } from './useCurrentTheme.js';
+import { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect.js';
+import { useIsRTL } from './useIsRTL.js';
+import { useStylesheet } from './useStylesheet.js';
+import { useSyncRef } from './useSyncRef.js';
+
+export { useIsomorphicLayoutEffect, useIsRTL, useSyncRef, useStylesheet, useCurrentTheme };

…ckages/base/src/hooks/useCurrentTheme.ts …se/src/internal/hooks/useCurrentTheme.tspackages/base/src/hooks/useCurrentTheme.ts renamed to packages/base/src/internal/hooks/useCurrentTheme.ts packages/base/src/hooks/useCurrentTheme.ts renamed to packages/base/src/internal/hooks/useCurrentTheme.ts

@@ -3,7 +3,7 @@
 import { attachDirectionChange, detachDirectionChange } from '@ui5/webcomponents-base/dist/locale/directionChange.js';
 import type { RefObject } from 'react';
 import { useRef, useState } from 'react';
-import { useIsomorphicLayoutEffect } from '../hooks/index.js';
+import { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect.js';
 
 const useIsRTL = <RefType extends HTMLElement>(elementRef: RefObject<RefType>): boolean => {
   const [isRTL, setRTL] = useState(false); // initial value is always LTR (also for SSR)