Skip to content

Commit 92f0e68

Browse files
pskelinpskelin
authored
fix(framework): .d.ts errors that require skipLibCheck (#11189)
1 parent b1d9311 commit 92f0e68

File tree

7 files changed

+58
-59
lines changed

7 files changed

+58
-59
lines changed

‎packages/base/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "SAP SE (https://www.sap.com)",
66
"license": "Apache-2.0",
77
"type": "module",
8-
"module": "index.js",
8+
"module": "./dist/index.js",
99
"keywords": [
1010
"openui5",
1111
"sapui5",
@@ -25,8 +25,8 @@
2525
"default": "./dist/ssr-dom.js"
2626
},
2727
".": {
28-
"types": "./src/index.d.ts",
29-
"default": "./index.js"
28+
"types": "./dist/index.d.ts",
29+
"default": "./dist/index.js"
3030
},
3131
"./dist/*": {
3232
"production": "./dist/prod/*",

‎packages/base/src/index.d.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/base/index.js renamed to packages/base/src/index.ts

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
1+
import type { JSX } from "./jsx-runtime.d.ts";
2+
13
// animations/
2-
import scroll from "./dist/animations/scroll.js";
3-
import slideDown from "./dist/animations/slideDown.js";
4-
import slideUp from "./dist/animations/slideUp.js";
4+
import scroll from "./animations/scroll.js";
5+
import slideDown from "./animations/slideDown.js";
6+
import slideUp from "./animations/slideUp.js";
57

68
// config/
7-
import { getAnimationMode, setAnimationMode } from "./dist/config/AnimationMode.js";
8-
import { getCalendarType } from "./dist/config/CalendarType.js";
9-
import { getFirstDayOfWeek, getLegacyDateCalendarCustomizing } from "./dist/config/FormatSettings.js";
9+
import { getAnimationMode, setAnimationMode } from "./config/AnimationMode.js";
10+
import { getCalendarType } from "./config/CalendarType.js";
11+
import { getFirstDayOfWeek, getLegacyDateCalendarCustomizing } from "./config/FormatSettings.js";
1012
import {
1113
setDefaultIconCollection,
1214
getDefaultIconCollection,
13-
} from "./dist/config/Icons.js";
14-
import { RegisteredIconCollection } from "./dist/asset-registries/util/IconCollectionsByTheme.js";
15-
import getEffectiveIconCollection from "./dist/asset-registries/util/getIconCollectionByTheme.js";
15+
} from "./config/Icons.js";
16+
import { RegisteredIconCollection } from "./asset-registries/util/IconCollectionsByTheme.js";
17+
import getEffectiveIconCollection from "./asset-registries/util/getIconCollectionByTheme.js";
1618
import {
1719
getLanguage,
1820
setLanguage,
1921
getDefaultLanguage,
2022
setFetchDefaultLanguage,
2123
getFetchDefaultLanguage,
22-
} from "./dist/config/Language.js";
23-
import { getNoConflict, setNoConflict } from "./dist/config/NoConflict.js";
24+
} from "./config/Language.js";
25+
import { getNoConflict, setNoConflict } from "./config/NoConflict.js";
2426
import {
2527
getTheme,
2628
setTheme,
2729
getDefaultTheme,
28-
} from "./dist/config/Theme.js";
30+
} from "./config/Theme.js";
2931

3032
// decorators/
31-
import customElement from "./dist/decorators/customElement.js";
32-
import event from "./dist/decorators/event.js";
33-
import property from "./dist/decorators/property.js";
34-
import slot from "./dist/decorators/slot.js";
33+
import customElement from "./decorators/customElement.js";
34+
import event from "./decorators/event.js";
35+
import property from "./decorators/property.js";
36+
import slot from "./decorators/slot.js";
3537

3638
// delegate/
37-
import ItemNavigation from "./dist/delegate/ItemNavigation.js";
38-
import ResizeHandler from "./dist/delegate/ResizeHandler.js";
39-
import ScrollEnablement from "./dist/delegate/ScrollEnablement.js";
39+
import ItemNavigation from "./delegate/ItemNavigation.js";
40+
import ResizeHandler from "./delegate/ResizeHandler.js";
41+
import ScrollEnablement from "./delegate/ScrollEnablement.js";
4042

4143
// locale/
42-
import applyDirection from "./dist/locale/applyDirection.js";
43-
import { attachDirectionChange, detachDirectionChange } from "./dist/locale/directionChange.js";
44-
import getEffectiveDir from "./dist/locale/getEffectiveDir.js";
45-
import { attachLanguageChange, detachLanguageChange } from "./dist/locale/languageChange.js";
44+
import applyDirection from "./locale/applyDirection.js";
45+
import { attachDirectionChange, detachDirectionChange } from "./locale/directionChange.js";
46+
import getEffectiveDir from "./locale/getEffectiveDir.js";
47+
import { attachLanguageChange, detachLanguageChange } from "./locale/languageChange.js";
4648

4749
// util/
48-
import { URLListValidator, sanitizeHTML } from "./dist/util/HTMLSanitizer.js";
50+
import { URLListValidator, sanitizeHTML } from "./util/HTMLSanitizer.js";
4951

5052
// Assets.ts
51-
import { registerI18nLoader } from "./dist/asset-registries/i18n.js";
52-
import { registerLocaleDataLoader } from "./dist/asset-registries/LocaleData.js";
53-
import { registerThemePropertiesLoader } from "./dist/asset-registries/Themes.js";
54-
import { registerIconLoader } from "./dist/asset-registries/Icons.js";
53+
import { registerI18nLoader } from "./asset-registries/i18n.js";
54+
import { registerLocaleDataLoader } from "./asset-registries/LocaleData.js";
55+
import { registerThemePropertiesLoader } from "./asset-registries/Themes.js";
56+
import { registerIconLoader } from "./asset-registries/Icons.js";
5557

5658
// Boot.ts
57-
import { attachBoot } from "./dist/Boot.js";
59+
import { attachBoot } from "./Boot.js";
5860

5961
// CustomElementsScope.ts
6062
import {
@@ -63,7 +65,7 @@ import {
6365
setCustomElementsScopingRules,
6466
getCustomElementsScopingRules,
6567
getEffectiveScopingSuffixForTag,
66-
} from "./dist/CustomElementsScope.js";
68+
} from "./CustomElementsScope.js";
6769

6870
// Device.ts
6971
import {
@@ -77,30 +79,30 @@ import {
7779
isCombi,
7880
isIOS,
7981
isAndroid,
80-
} from "./dist/Device.js";
82+
} from "./Device.js";
8183

8284
// EventProvider.ts
83-
import EventProvider from "./dist/EventProvider.js";
85+
import EventProvider from "./EventProvider.js";
8486

8587
// i18nBundle.ts
86-
import I18nBundle, { getI18nBundle, registerCustomI18nBundleGetter } from "./dist/i18nBundle.js";
88+
import I18nBundle, { getI18nBundle, registerCustomI18nBundleGetter } from "./i18nBundle.js";
8789

8890
// MediaRange.ts
89-
import MediaRange from "./dist/MediaRange.js";
91+
import MediaRange from "./MediaRange.js";
9092

9193
// Render.ts
9294
import {
9395
renderDeferred,
9496
renderImmediately,
9597
cancelRender,
9698
renderFinished,
97-
} from "./dist/Render.js";
99+
} from "./Render.js";
98100

99101
// Theming.ts
100-
import { addCustomCSS, attachThemeLoaded, detachThemeLoaded } from "./dist/Theming.js";
102+
import { addCustomCSS, attachThemeLoaded, detachThemeLoaded } from "./Theming.js";
101103

102104
// UI5Element.ts
103-
import UI5Element from "./dist/UI5Element.js";
105+
import UI5Element from "./UI5Element.js";
104106

105107
export default UI5Element;
106108
export {
@@ -206,3 +208,12 @@ export {
206208
// UI5Element.ts
207209
UI5Element,
208210
};
211+
212+
type TargetedCustomEvent<D, T> = Omit<CustomEvent<D>, "currentTarget"> & { currentTarget: T };
213+
// export type UI5NativeEvent<T extends keyof HTMLElementTagNameMap, N> = Parameters<JSX.IntrinsicElements[T][N]>[0];
214+
export type UI5CustomEvent<T extends UI5Element, N extends keyof T["eventDetails"]> = TargetedCustomEvent<T["eventDetails"][N], T>;
215+
export type JsxTemplateResult = JSX.Element | void;
216+
export type JsxTemplate = () => JsxTemplateResult;
217+
218+
export type * from "./types.d.ts";
219+
export type * from "./jsx-runtime.d.ts";

‎packages/base/src/thirdparty/preact/jsx.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
FunctionComponent,
1010
PreactDOMAttributes,
1111
VNode
12-
} from './preact.module.d.ts';
12+
} from './preact.module.js';
1313

1414
type Defaultize<Props, Defaults> =
1515
// Distribute over unions

‎packages/base/src/thirdparty/preact/jsxRuntime.module.d.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Intentionally not using a relative path to take advantage of
22
// the TS version resolution mechanism
3-
export { Fragment } from './preact.module.d.ts';
3+
export { Fragment } from './preact.module.js';
44
import {
55
ComponentType,
66
ComponentChild,
77
ComponentChildren,
88
VNode,
99
Attributes
10-
} from './preact.module.d.ts';
11-
import { JSXInternal } from './jsx.d.ts';
10+
} from './preact.module.js';
11+
import { JSXInternal } from './jsx.js';
1212

1313
export function jsx(
1414
type: string,

‎packages/base/src/util/HTMLSanitizer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// @ts-ignore
1+
/** @ts-expect-error */
22
import sanitizeHTML from "../sap/base/security/sanitizeHTML.js";
3-
// @ts-ignore
3+
/** @ts-expect-error */
44
import URLListValidator from "../sap/base/security/URLListValidator.js";
55

66
export {

‎packages/main/src/Table.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class Table extends UI5Element {
410410
_onResizeBound: ResizeObserverCallback;
411411
_tableNavigation?: TableNavigation;
412412
_tableDragAndDrop?: TableDragAndDrop;
413-
_poppedIn: Array<{col: TableHeaderCell, width: float}> = [];
413+
_poppedIn: Array<{col: TableHeaderCell, width: number}> = [];
414414
_containerWidth = 0;
415415

416416
constructor() {

0 commit comments

Comments
 (0)