Skip to content

Commit ba27963

Browse files
Lukas742Lukas742
committed
Merge branch 'main' into feat/code-mod-export-paths
2 parents e9b28a4 + b3a0ce3 commit ba27963

File tree

17 files changed

+57
-28
lines changed

17 files changed

+57
-28
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: yarn install --immutable
5151

5252
test:
53-
needs: ['install']
53+
needs: ['build']
5454
uses: './.github/workflows/test.yml'
5555

5656
build:
@@ -83,6 +83,11 @@ jobs:
8383
- name: Build
8484
run: yarn build
8585

86+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
87+
with:
88+
name: build-${{ matrix.react }}
89+
path: packages/*/dist
90+
8691
lint:
8792
needs: ['install']
8893
runs-on: ubuntu-latest

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,13 @@ jobs:
4141
yarn add "@types/react@18" "@types/react-dom@18" --dev
4242
yarn add react@18 react-dom@18
4343
44+
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
45+
with:
46+
name: build-${{ matrix.react }}
47+
path: packages
48+
4449
- name: Cypress run
45-
uses: cypress-io/github-action@v6
50+
uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
4651
with:
4752
browser: chrome
4853
component: true

‎.storybook/components/ProjectTemplate.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {
1212
Text,
1313
ThemeProvider,
1414
} from '@ui5/webcomponents-react';
15-
import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/dist/internal/utils/addCustomCSSWithScoping.js';
1615
import { clsx } from 'clsx';
1716
import type { ReactNode } from 'react';
1817
import { useRef, useState } from 'react';
1918
import classes from './ProjectTemplate.module.css';
19+
import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/internal/utils';
2020

2121
interface ProjectTemplatePropTypes {
2222
title: string;

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"build:storybook-sitemap": "node ./scripts/create-storybook-sitemap.js --directory .out",
1616
"test:prepare": "rimraf temp && lerna run build",
1717
"test:open": "CYPRESS_COVERAGE=false cypress open --component --browser chrome",
18-
"test": "yarn test:prepare && cypress run --component --browser chrome",
18+
"test": "yarn test:prepare && cypress run --component --browser chrome --spec packages",
1919
"clean": "tsc --build --clean && tsc --build tsconfig.build.json --clean && rimraf temp .out && lerna run clean",
2020
"clean:remove-modules": "yarn clean && rimraf node_modules",
2121
"prettier:all": "prettier --write --config ./prettier.config.js \"**/*\"",
2222
"lint": "eslint .",
2323
"lerna:version-dryrun": "lerna version --conventional-graduate --no-git-tag-version --no-push",
2424
"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/)'",
2525
"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/)'",
26-
"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",
26+
"wrappers:compat": "WITH_WEB_COMPONENT_IMPORT_PATH='@ui5/webcomponents-react-base/withWebComponent' 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",
2727
"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",
2828
"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",
2929
"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‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,50 @@
2828
"default": "./dist/generated/VersionInfo.js"
2929
},
3030
"./I18nStore": {
31-
"types": "./dist/stores/I18nStore.d.ts",
32-
"default": "./dist/stores/I18nStore.js"
31+
"types": "./dist/internal/stores/I18nStore.d.ts",
32+
"default": "./dist/internal/stores/I18nStore.js"
3333
},
3434
"./StyleStore": {
35-
"types": "./dist/stores/StyleStore.d.ts",
36-
"default": "./dist/stores/StyleStore.js"
35+
"types": "./dist/internal/stores/StyleStore.d.ts",
36+
"default": "./dist/internal/stores/StyleStore.js"
3737
},
3838
"./CssSizeVariables": {
39-
"types": "./dist/styling/CssSizeVariables.d.ts",
40-
"default": "./dist/styling/CssSizeVariables.js"
39+
"types": "./dist/internal/styling/CssSizeVariables.d.ts",
40+
"default": "./dist/internal/styling/CssSizeVariables.js"
4141
},
4242
"./ThemingParameters": {
4343
"types": "./dist/styling/ThemingParameters.d.ts",
4444
"default": "./dist/styling/ThemingParameters.js"
4545
},
4646
"./withWebComponent": {
47-
"types": "./dist/wrapper/withWebComponent.d.ts",
48-
"default": "./dist/wrapper/withWebComponent.js"
47+
"types": "./dist/internal/wrapper/withWebComponent.d.ts",
48+
"default": "./dist/internal/wrapper/withWebComponent.js"
49+
},
50+
"./utils": {
51+
"types": "./dist/internal/utils/index.d.ts",
52+
"default": "./dist/internal/utils/index.js"
4953
},
5054
"./types": {
51-
"types": "./dist/types/index.d.ts"
55+
"types": "./dist/types/index.d.ts",
56+
"default": "./dist/types/index.js"
57+
},
58+
"./internal/addCustomCSSWithScoping.js": "./dist/internal/utils/addCustomCSSWithScoping.js",
59+
"./internal/hooks": {
60+
"types": "./dist/internal/hooks/index.d.ts",
61+
"default": "./dist/internal/hooks/index.js"
62+
},
63+
"./internal/types": {
64+
"types": "./dist/internal/types/index.d.ts",
65+
"default": "./dist/internal/types/index.js"
5266
},
53-
"./internal/*": "./dist/internal/*",
54-
"./internal/addCustomCSSWithScoping.js": "./dist/utils/addCustomCSSWithScoping.js"
67+
"./internal/utils": {
68+
"types": "./dist/internal/utils/index.d.ts",
69+
"default": "./dist/internal/utils/index.js"
70+
},
71+
"./internal/*": {
72+
"types": "./dist/internal/*.d.ts",
73+
"default": "./dist/internal/*.js"
74+
}
5575
},
5676
"homepage": "https://ui5.github.io/webcomponents-react",
5777
"repository": {

‎packages/base/src/internal/utils/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export function getUi5TagWithSuffix(baseTagName: string) {
6666

6767
export { debounce } from './debounce.js';
6868
export { throttle } from './throttle.js';
69+
export { addCustomCSSWithScoping } from './addCustomCSSWithScoping.js';
6970
/**
7071
* ⚠️ __INTERNAL__ use only! This function is not part of the public API.
7172
*/

‎packages/charts/src/internal/ChartContainer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { BusyIndicator, Label } from '@ui5/webcomponents-react';
22
import type { CommonProps } from '@ui5/webcomponents-react';
33
import { useStylesheet } from '@ui5/webcomponents-react-base';
4-
import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/dist/internal/utils/addCustomCSSWithScoping.js';
4+
import { addCustomCSSWithScoping } from '@ui5/webcomponents-react-base/internal/utils';
55
import { clsx } from 'clsx';
66
import type { ComponentType, ReactElement, ReactNode } from 'react';
77
import { Component, forwardRef } from 'react';

‎packages/compat/src/components/Table/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type TableGrowingMode from '@ui5/webcomponents-compat/dist/types/TableGro
1010
import type TableMode from '@ui5/webcomponents-compat/dist/types/TableMode.js';
1111
import { getCompatCustomElementsScopingSuffix } from '@ui5/webcomponents-compat/dist/utils/CompatCustomElementsScope.js';
1212
import type { CommonProps, Ui5CustomEvent, Ui5DomRef, UI5WCSlotsNode } from '@ui5/webcomponents-react-base';
13-
import { withWebComponent } from '@ui5/webcomponents-react-base/dist/internal/wrapper/withWebComponent.js';
13+
import { withWebComponent } from '@ui5/webcomponents-react-base/withWebComponent';
1414
import type { ReactNode } from 'react';
1515

1616
const compatScopingSuffix = getCompatCustomElementsScopingSuffix();

‎packages/compat/src/components/TableCell/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import '@ui5/webcomponents-compat/dist/TableCell.js';
44
import { getCompatCustomElementsScopingSuffix } from '@ui5/webcomponents-compat/dist/utils/CompatCustomElementsScope.js';
55
import type { CommonProps, Ui5DomRef } from '@ui5/webcomponents-react-base';
6-
import { withWebComponent } from '@ui5/webcomponents-react-base/dist/internal/wrapper/withWebComponent.js';
6+
import { withWebComponent } from '@ui5/webcomponents-react-base/withWebComponent';
77
import type { ReactNode } from 'react';
88

99
const compatScopingSuffix = getCompatCustomElementsScopingSuffix();

‎packages/compat/src/components/TableColumn/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import '@ui5/webcomponents-compat/dist/TableColumn.js';
44
import type TableColumnPopinDisplay from '@ui5/webcomponents-compat/dist/types/TableColumnPopinDisplay.js';
55
import { getCompatCustomElementsScopingSuffix } from '@ui5/webcomponents-compat/dist/utils/CompatCustomElementsScope.js';
66
import type { CommonProps, Ui5DomRef } from '@ui5/webcomponents-react-base';
7-
import { withWebComponent } from '@ui5/webcomponents-react-base/dist/internal/wrapper/withWebComponent.js';
7+
import { withWebComponent } from '@ui5/webcomponents-react-base/withWebComponent';
88
import type { ReactNode } from 'react';
99

1010
const compatScopingSuffix = getCompatCustomElementsScopingSuffix();

0 commit comments

Comments
 (0)