From c9eb4d5890c2733b47a4589888954e8ea0b34de3 Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Tue, 23 Feb 2016 12:35:42 +0200 Subject: [PATCH] Delete ui.ts and ui.d.ts The simplest way to resolve reexport conflicts. We have multiple modules exporting symbols with the same name e.g. Options, which clash at reexport time. TypeScript 1.7.x did not detect that error, but TypeScript 1.8 catches it. Since TypeScript doesn't allow hiding or renaming a single member when reexporting and exporting the rest, the alternative solution would be to explicitly list all module members in ui.ts/ui.d.ts *and* keep them in sync with every new release. --- tsconfig.json | 4 +--- ui/ui.d.ts | 56 --------------------------------------------------- ui/ui.ts | 49 -------------------------------------------- 3 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 ui/ui.d.ts delete mode 100644 ui/ui.ts diff --git a/tsconfig.json b/tsconfig.json index 6affc246c..33f8b8534 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -339,12 +339,12 @@ "apps/transforms/app.ts", "apps/transforms/main-page.ts", "apps/transforms/model.ts", + "apps/ui-tests-app/action-bar/action-view.ts", "apps/ui-tests-app/action-bar/all.ts", "apps/ui-tests-app/action-bar/background.ts", "apps/ui-tests-app/action-bar/clean.ts", "apps/ui-tests-app/action-bar/color.ts", "apps/ui-tests-app/action-bar/system-icons.ts", - "apps/ui-tests-app/action-bar/action-view.ts", "apps/ui-tests-app/animations/background.ts", "apps/ui-tests-app/app.ts", "apps/ui-tests-app/bindings/basics.ts", @@ -683,8 +683,6 @@ "ui/transition/transition.android.ts", "ui/transition/transition.d.ts", "ui/transition/transition.ios.ts", - "ui/ui.d.ts", - "ui/ui.ts", "ui/utils.d.ts", "ui/utils.ios.ts", "ui/web-view/web-view-common.ts", diff --git a/ui/ui.d.ts b/ui/ui.d.ts deleted file mode 100644 index 76730f68c..000000000 --- a/ui/ui.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Contains the all UI classes. - */ -declare module "ui" { - export * from "ui/action-bar"; - export * from "ui/activity-indicator"; - export * from "ui/animation"; - export * from "ui/builder"; - export * from "ui/button"; - export * from "ui/content-view"; - export * from "ui/core/bindable"; - export * from "ui/core/dependency-observable"; - export * from "ui/core/proxy"; - export * from "ui/core/view"; - export * from "ui/core/weak-event-listener"; - export * from "ui/dialogs"; - export * from "ui/date-picker"; - export * from "ui/editable-text-base"; - export * from "ui/enums"; - export * from "ui/frame"; - export * from "ui/gestures"; - export * from "ui/html-view"; - export * from "ui/image"; - export * from "ui/image-cache"; - export * from "ui/label"; - export * from "ui/layouts/layout-base"; - export * from "ui/layouts/layout"; - export * from "ui/layouts/absolute-layout"; - export * from "ui/layouts/dock-layout"; - export * from "ui/layouts/grid-layout"; - export * from "ui/layouts/stack-layout"; - export * from "ui/layouts/wrap-layout"; - export * from "ui/list-picker"; - export * from "ui/list-view"; - export * from "ui/page"; - export * from "ui/placeholder"; - export * from "ui/progress"; - export * from "ui/repeater"; - export * from "ui/scroll-view"; - export * from "ui/search-bar"; - export * from "ui/segmented-bar"; - export * from "ui/slider"; - export * from "ui/styling"; - export * from "ui/styling/background"; - export * from "ui/styling/css-selector"; - export * from "ui/styling/font"; - export * from "ui/styling/style-property"; - export * from "ui/styling/visual-state-constants"; - export * from "ui/switch"; - export * from "ui/tab-view"; - export * from "ui/text-base"; - export * from "ui/text-field"; - export * from "ui/text-view"; - export * from "ui/time-picker"; - export * from "ui/web-view"; -} \ No newline at end of file diff --git a/ui/ui.ts b/ui/ui.ts deleted file mode 100644 index eafb00057..000000000 --- a/ui/ui.ts +++ /dev/null @@ -1,49 +0,0 @@ -export * from "ui/action-bar"; -export * from "ui/activity-indicator"; -export * from "ui/builder"; -export * from "ui/button"; -export * from "ui/content-view"; -export * from "ui/core/bindable"; -export * from "ui/core/dependency-observable"; -export * from "ui/core/proxy"; -export * from "ui/core/view"; -export * from "ui/core/weak-event-listener"; -export * from "ui/dialogs"; -export * from "ui/date-picker"; -export * from "ui/editable-text-base"; -export * from "ui/enums"; -export * from "ui/frame"; -export * from "ui/gestures"; -export * from "ui/html-view"; -export * from "ui/image"; -export * from "ui/image-cache"; -export * from "ui/label"; -export * from "ui/layouts/layout"; -export * from "ui/layouts/absolute-layout"; -export * from "ui/layouts/dock-layout"; -export * from "ui/layouts/grid-layout"; -export * from "ui/layouts/stack-layout"; -export * from "ui/layouts/wrap-layout"; -export * from "ui/list-picker"; -export * from "ui/list-view"; -export * from "ui/page"; -export * from "ui/placeholder"; -export * from "ui/progress"; -export * from "ui/repeater"; -export * from "ui/scroll-view"; -export * from "ui/search-bar"; -export * from "ui/segmented-bar"; -export * from "ui/slider"; -export * from "ui/styling"; -export * from "ui/styling/background"; -export * from "ui/styling/css-selector"; -export * from "ui/styling/font"; -export * from "ui/styling/style-property"; -export * from "ui/styling/visual-state-constants"; -export * from "ui/switch"; -export * from "ui/tab-view"; -export * from "ui/text-base"; -export * from "ui/text-field"; -export * from "ui/text-view"; -export * from "ui/time-picker"; -export * from "ui/web-view";