From 3d263c3ffa7c6186f96464db900b23ddae6cac8e Mon Sep 17 00:00:00 2001 From: Keraito Date: Tue, 31 Aug 2021 09:43:21 +0200 Subject: [PATCH 1/7] feat(pluggable-widgets-tools): prepare 9.5.0 release --- packages/tools/pluggable-widgets-tools/CHANGELOG.md | 2 ++ packages/tools/pluggable-widgets-tools/package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tools/pluggable-widgets-tools/CHANGELOG.md b/packages/tools/pluggable-widgets-tools/CHANGELOG.md index b80ef59ad7..9ebf0e9280 100644 --- a/packages/tools/pluggable-widgets-tools/CHANGELOG.md +++ b/packages/tools/pluggable-widgets-tools/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [9.5.0] - 2021-08-31 + ### Added - We added support for icon and tile images. Now you can use an image file instead of `` in your `MyWidget.xml`. In order to use, please make sure you follow the pattern `src/MyWidget.icon.png` (24x24px) and `src/MyWidget.tile.png` (256x192px) diff --git a/packages/tools/pluggable-widgets-tools/package.json b/packages/tools/pluggable-widgets-tools/package.json index 915601c29c..ccb82a2156 100644 --- a/packages/tools/pluggable-widgets-tools/package.json +++ b/packages/tools/pluggable-widgets-tools/package.json @@ -1,6 +1,6 @@ { "name": "@mendix/pluggable-widgets-tools", - "version": "9.4.3", + "version": "9.5.0", "description": "Mendix Pluggable Widgets Tools", "license": "Apache-2.0", "copyright": "© Mendix Technology BV 2021. All rights reserved.", From a21bce953647429e941d24a573d7cb9741dad12f Mon Sep 17 00:00:00 2001 From: Keraito Date: Tue, 31 Aug 2021 09:50:12 +0200 Subject: [PATCH 2/7] feat(image-web): rename image-viewer to image --- .../image-viewer-web/README.md | 2 +- .../image-viewer-web/package.json | 6 +- ....editorConfig.ts => Image.editorConfig.ts} | 0 ...torPreview.tsx => Image.editorPreview.tsx} | 4 +- .../src/{ImageViewer.tsx => Image.tsx} | 2 +- .../src/{ImageViewer.xml => Image.xml} | 2 +- .../{ImageViewer => Image}/index.tsx | 2 +- .../components/{ImageViewer => Image}/ui.tsx | 2 +- .../{ImageViewer.spec.tsx => Image.spec.tsx} | 2 +- ...ewer.spec.tsx.snap => Image.spec.tsx.snap} | 0 .../image-viewer-web/src/package.xml | 6 +- .../src/ui/{ImageViewer.scss => Image.scss} | 0 .../image-viewer-web/typings/ImageProps.d.ts | 59 +++++++++++++++++++ 13 files changed, 73 insertions(+), 14 deletions(-) rename packages/pluggableWidgets/image-viewer-web/src/{ImageViewer.editorConfig.ts => Image.editorConfig.ts} (100%) rename packages/pluggableWidgets/image-viewer-web/src/{ImageViewer.editorPreview.tsx => Image.editorPreview.tsx} (97%) rename packages/pluggableWidgets/image-viewer-web/src/{ImageViewer.tsx => Image.tsx} (98%) rename packages/pluggableWidgets/image-viewer-web/src/{ImageViewer.xml => Image.xml} (95%) rename packages/pluggableWidgets/image-viewer-web/src/components/{ImageViewer => Image}/index.tsx (98%) rename packages/pluggableWidgets/image-viewer-web/src/components/{ImageViewer => Image}/ui.tsx (98%) rename packages/pluggableWidgets/image-viewer-web/src/components/__tests__/{ImageViewer.spec.tsx => Image.spec.tsx} (99%) rename packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/{ImageViewer.spec.tsx.snap => Image.spec.tsx.snap} (100%) rename packages/pluggableWidgets/image-viewer-web/src/ui/{ImageViewer.scss => Image.scss} (100%) create mode 100644 packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts diff --git a/packages/pluggableWidgets/image-viewer-web/README.md b/packages/pluggableWidgets/image-viewer-web/README.md index 57c4f9fc52..53dd82cbf9 100644 --- a/packages/pluggableWidgets/image-viewer-web/README.md +++ b/packages/pluggableWidgets/image-viewer-web/README.md @@ -1 +1 @@ -Please see [Image Viewer](https://docs.mendix.com/appstore/widgets/image-viewer) in the Mendix documentation for details. +Please see [Image](https://docs.mendix.com/appstore/widgets/image-viewer) in the Mendix documentation for details. diff --git a/packages/pluggableWidgets/image-viewer-web/package.json b/packages/pluggableWidgets/image-viewer-web/package.json index fb5ea6b364..e2c7f36d70 100644 --- a/packages/pluggableWidgets/image-viewer-web/package.json +++ b/packages/pluggableWidgets/image-viewer-web/package.json @@ -1,6 +1,6 @@ { - "name": "image-viewer-web", - "widgetName": "ImageViewer", + "name": "image-web", + "widgetName": "Image", "version": "1.0.0", "description": "Display an image and enlarge it on click", "copyright": "© Mendix Technology BV 2021. All rights reserved.", @@ -19,7 +19,7 @@ }, "testProject": { "githubUrl": "https://github.com/mendix/testProjects", - "branchName": "image-viewer-web" + "branchName": "image-web" }, "packagePath": "com.mendix.widget.web", "scripts": { diff --git a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.editorConfig.ts b/packages/pluggableWidgets/image-viewer-web/src/Image.editorConfig.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/ImageViewer.editorConfig.ts rename to packages/pluggableWidgets/image-viewer-web/src/Image.editorConfig.ts diff --git a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.editorPreview.tsx b/packages/pluggableWidgets/image-viewer-web/src/Image.editorPreview.tsx similarity index 97% rename from packages/pluggableWidgets/image-viewer-web/src/ImageViewer.editorPreview.tsx rename to packages/pluggableWidgets/image-viewer-web/src/Image.editorPreview.tsx index 196050b0dc..a7863813bb 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.editorPreview.tsx +++ b/packages/pluggableWidgets/image-viewer-web/src/Image.editorPreview.tsx @@ -2,7 +2,7 @@ import { parseStyle } from "@mendix/piw-utils-internal"; import { WebIcon } from "mendix"; import { createElement, ReactElement } from "react"; import { ImageViewerPreviewProps } from "../typings/ImageViewerProps"; -import { ImageViewer as ImageViewerComponent } from "./components/ImageViewer/index"; +import { ImageViewer as ImageViewerComponent } from "./components/Image/index"; import ImageViewerPlaceholder from "./assets/placeholder.svg"; @@ -58,5 +58,5 @@ export function preview(props: ImageViewerPreviewProps): ReactElement | null { } export function getPreviewCss(): string { - return require("./ui/ImageViewer.scss"); + return require("./ui/Image.scss"); } diff --git a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.tsx b/packages/pluggableWidgets/image-viewer-web/src/Image.tsx similarity index 98% rename from packages/pluggableWidgets/image-viewer-web/src/ImageViewer.tsx rename to packages/pluggableWidgets/image-viewer-web/src/Image.tsx index 92c048c616..50ba63abb9 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.tsx +++ b/packages/pluggableWidgets/image-viewer-web/src/Image.tsx @@ -1,7 +1,7 @@ import { ValueStatus } from "mendix"; import { createElement, FunctionComponent, useCallback } from "react"; import { ImageViewerContainerProps } from "../typings/ImageViewerProps"; -import { ImageViewer as ImageViewerComponent, ImageViewerImageProps } from "./components/ImageViewer/index"; +import { ImageViewer as ImageViewerComponent, ImageViewerImageProps } from "./components/Image/index"; function getImageProps({ datasource, diff --git a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.xml b/packages/pluggableWidgets/image-viewer-web/src/Image.xml similarity index 95% rename from packages/pluggableWidgets/image-viewer-web/src/ImageViewer.xml rename to packages/pluggableWidgets/image-viewer-web/src/Image.xml index 0540174472..5428d0bd87 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/ImageViewer.xml +++ b/packages/pluggableWidgets/image-viewer-web/src/Image.xml @@ -1,5 +1,5 @@ - + Image viewer Display an image and enlarge it on click. iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABnlBMVEUAAAD///+A//9V//+Av/9mzP9gv/9Vxv9Ns/9duf9Vv/9Osf9Jtv9Vu/9Qv/9LtP9RvP9Jtv9Osf9Ktf9Ms/9Puf9Ns/9Ktf9Ms/hKtfhOsfhNs/lLtPlLtPlKtflIsflMs/pJsfpNs/pIsvpKsPpLtPtKsftJsvtJsvdJs/hLtPhKsfhJsvhXV1dLsflKsvlKsvlKsvlKsvpKsvdKs/dJsfdIsvhKsPhJsfhKsPhJsvhKsfhIsPlKsflJsPlKsflIsflJsvdKsvdJsfhJsPhJsfhKsvhIsvhJsfhIsPhKsfhJsvlJsfdJsfdIsPdKsfdJsfdJsfdIsfdIsfhIsfhIsfhJsfhJsfhIsPhJsPhIsfhJsfdJsfdJsfdJsfdIsPdJsfdJsPhIsfhJsfhIsfhJsfhIsfhJsfhJsPhJsfhJsfhIsfhIsPhJsfdIsPdJsPdVVVVJsfdJsfdJsfdIsPdJsfdIsPdIsPdJsfhJsPhIsPhJsfhIsPhIsfhJsfhJsPhIsfhJsfhJsPhIsPhIsfhJsPhJsPhIsfhIsPdVVVU8lPiOAAAAiHRSTlMAAQIDBAUICQoLDA0ODxARExUXGBsdHh8lJicoKSwtLi8xMjU3PT4/QkZHSElJUlNWWV1gZGVqa2xucHV4eXt8f4SHiYuMjpGTm5yeoKGio6SnqaqtsbO2uLm+wMHEyMnLzM3O0NHU1dba3d7f4eLj4+Tn6Onr7O3u7/Dy8/T19vf4+fr7/P3+LOCsiQAAAeRJREFUeAHt1/lTEmEYwPHHhYyiLEjtPtLu0siOsLL7MLtNOjRLs8MyU7Q7K4hyv/7Xve/sLrAzArPvMFPT7Oen9wf4MsDz7OyKI9QxvWBgukM8Ru9XBfEsGKpvQAL6/wORY48+5ieu7zIN7HiG4+5yo0B7Hs/oMoNA4i0lN4IHkreA+Ssbmva/BOztAQP7nqL1iBJ7BfQGCxy30WYt0Q4C44ECbb9Qih+7BpgLFLgN2BOF0WbTQBboFEsUs6/wDXBnx+xHfAKcXuKcV5j8jZdwmQ7SqhlcpqO8e5Yi/zJt6ZvMTfXvrBWQRO+YOws/feucLqDZFwwvKJ02rrRRIPkBz/dmk8AAkDsU3/sJuGkQSKGcVIejgN1eM9DYfX/yx+uH3S3iSLwHHkfUyXoODNcKdGVx/L62VrR+IL9JtD0oqaoB6yIlubS7UpwSRwZ401gl0HAHn0xs9TtgJCKOdQWgp0rgPEr+3PrYxhMv0IYH9FBtFs9l4GuyYqALJeu83Dr8GdcZKWrSI9FXKdAyB0y1iqt1BI2xqJSkgfltFQL39Ki1SVF8CKWwVcpEx4HBxQMplCNSZukgcFZ8DqAsGojPAEMNUm5l5svVqPg9cAP/2D1SeJcWBsLA398F84euOj32hf4AR3v7uNFLZj0AAAAASUVORK5CYII= diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/index.tsx b/packages/pluggableWidgets/image-viewer-web/src/components/Image/index.tsx similarity index 98% rename from packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/index.tsx rename to packages/pluggableWidgets/image-viewer-web/src/components/Image/index.tsx index b84939957c..e09a18da48 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/index.tsx +++ b/packages/pluggableWidgets/image-viewer-web/src/components/Image/index.tsx @@ -4,7 +4,7 @@ import { useLightboxState } from "../../utils/lightboxState"; import { ImageViewerUi, ImageViewerContentProps } from "./ui"; import { Lightbox, LightboxProps } from "../Lightbox"; -import "../../ui/ImageViewer.scss"; +import "../../ui/Image.scss"; export type ImageViewerImageProps = { type: "image" | "icon"; diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/ui.tsx b/packages/pluggableWidgets/image-viewer-web/src/components/Image/ui.tsx similarity index 98% rename from packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/ui.tsx rename to packages/pluggableWidgets/image-viewer-web/src/components/Image/ui.tsx index 3fc023ac3f..764c308387 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/components/ImageViewer/ui.tsx +++ b/packages/pluggableWidgets/image-viewer-web/src/components/Image/ui.tsx @@ -3,7 +3,7 @@ import classNames from "classnames"; import { HeightUnitEnum, WidthUnitEnum } from "../../../typings/ImageViewerProps"; import { LightboxProps } from "../Lightbox"; -import "../../ui/ImageViewer.scss"; +import "../../ui/Image.scss"; function getStyle(value: string | number, type: WidthUnitEnum | HeightUnitEnum): number | string { // when type is auto default browser styles applies diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/ImageViewer.spec.tsx b/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/Image.spec.tsx similarity index 99% rename from packages/pluggableWidgets/image-viewer-web/src/components/__tests__/ImageViewer.spec.tsx rename to packages/pluggableWidgets/image-viewer-web/src/components/__tests__/Image.spec.tsx index 62aac39c3d..b443acebe2 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/ImageViewer.spec.tsx +++ b/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/Image.spec.tsx @@ -1,6 +1,6 @@ import { createElement } from "react"; import { mount, render } from "enzyme"; -import { ImageViewer, ImageViewerProps } from "../ImageViewer/index"; +import { ImageViewer, ImageViewerProps } from "../Image/index"; import { Lightbox } from "../Lightbox"; import { ModalProps } from "react-overlays/esm/Modal"; diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/ImageViewer.spec.tsx.snap b/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/ImageViewer.spec.tsx.snap rename to packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap diff --git a/packages/pluggableWidgets/image-viewer-web/src/package.xml b/packages/pluggableWidgets/image-viewer-web/src/package.xml index c79b4f2ff8..1ea150663d 100644 --- a/packages/pluggableWidgets/image-viewer-web/src/package.xml +++ b/packages/pluggableWidgets/image-viewer-web/src/package.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/packages/pluggableWidgets/image-viewer-web/src/ui/ImageViewer.scss b/packages/pluggableWidgets/image-viewer-web/src/ui/Image.scss similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/ui/ImageViewer.scss rename to packages/pluggableWidgets/image-viewer-web/src/ui/Image.scss diff --git a/packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts b/packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts new file mode 100644 index 0000000000..d60803302e --- /dev/null +++ b/packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts @@ -0,0 +1,59 @@ +/** + * This file was generated from Image.xml + * WARNING: All changes made to this file will be overwritten + * @author Mendix UI Content Team + */ +import { CSSProperties } from "react"; +import { ActionValue, DynamicValue, WebIcon, WebImage } from "mendix"; + +export type DatasourceEnum = "image" | "imageUrl" | "icon"; + +export type OnClickTypeEnum = "action" | "enlarge"; + +export type WidthUnitEnum = "auto" | "pixels" | "percentage"; + +export type HeightUnitEnum = "auto" | "pixels"; + +export type DisplayAsEnum = "fullImage" | "thumbnail"; + +export interface ImageContainerProps { + name: string; + class: string; + style?: CSSProperties; + tabIndex?: number; + datasource: DatasourceEnum; + imageObject?: DynamicValue; + defaultImageDynamic?: DynamicValue; + imageUrl?: DynamicValue; + imageIcon?: DynamicValue; + onClickType: OnClickTypeEnum; + onClick?: ActionValue; + alternativeText?: DynamicValue; + widthUnit: WidthUnitEnum; + width: number; + heightUnit: HeightUnitEnum; + height: number; + iconSize: number; + displayAs: DisplayAsEnum; + responsive: boolean; +} + +export interface ImagePreviewProps { + class: string; + style: string; + datasource: DatasourceEnum; + imageObject: string; + defaultImageDynamic: string; + imageUrl: string; + imageIcon: { type: "glyph"; iconClass: string; } | { type: "image"; imageUrl: string; } | null; + onClickType: OnClickTypeEnum; + onClick: {} | null; + alternativeText: string; + widthUnit: WidthUnitEnum; + width: number | null; + heightUnit: HeightUnitEnum; + height: number | null; + iconSize: number | null; + displayAs: DisplayAsEnum; + responsive: boolean; +} From 954ac0c839b59320ce8cd46b43489b19b094bfcd Mon Sep 17 00:00:00 2001 From: Keraito Date: Tue, 31 Aug 2021 09:54:13 +0200 Subject: [PATCH 3/7] feat(image-web): rename image-viewer-web folder to image-web --- .../pluggableWidgets/{image-viewer-web => image-web}/CHANGELOG.md | 0 .../pluggableWidgets/{image-viewer-web => image-web}/README.md | 0 .../pluggableWidgets/{image-viewer-web => image-web}/package.json | 0 .../{image-viewer-web => image-web}/src/Image.editorConfig.ts | 0 .../{image-viewer-web => image-web}/src/Image.editorPreview.tsx | 0 .../{image-viewer-web => image-web}/src/Image.tsx | 0 .../{image-viewer-web => image-web}/src/Image.xml | 0 .../{image-viewer-web => image-web}/src/assets/ic24-close.svg | 0 .../{image-viewer-web => image-web}/src/assets/placeholder.svg | 0 .../src/components/Image/index.tsx | 0 .../{image-viewer-web => image-web}/src/components/Image/ui.tsx | 0 .../{image-viewer-web => image-web}/src/components/Lightbox.tsx | 0 .../src/components/__tests__/Image.spec.tsx | 0 .../src/components/__tests__/__snapshots__/Image.spec.tsx.snap | 0 .../{image-viewer-web => image-web}/src/package.xml | 0 .../{image-viewer-web => image-web}/src/ui/Image.scss | 0 .../{image-viewer-web => image-web}/src/utils/lightboxState.tsx | 0 .../tests/e2e/objects/constants.ts | 0 .../tests/e2e/objects/imageViewer.widget.ts | 0 .../tests/e2e/specs/dataTypes.spec.ts | 0 .../tests/e2e/specs/differentViews.spec.ts | 0 .../tests/e2e/specs/onClick.spec.ts | 0 .../{image-viewer-web => image-web}/tests/e2e/tsconfig.json | 0 .../{image-viewer-web => image-web}/tsconfig.json | 0 .../{image-viewer-web => image-web}/typings/ImageProps.d.ts | 0 .../{image-viewer-web => image-web}/typings/ImageViewerProps.d.ts | 0 .../typings/react-images-lightbox.d.ts | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename packages/pluggableWidgets/{image-viewer-web => image-web}/CHANGELOG.md (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/README.md (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/package.json (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/Image.editorConfig.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/Image.editorPreview.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/Image.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/Image.xml (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/assets/ic24-close.svg (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/assets/placeholder.svg (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/components/Image/index.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/components/Image/ui.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/components/Lightbox.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/components/__tests__/Image.spec.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/components/__tests__/__snapshots__/Image.spec.tsx.snap (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/package.xml (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/ui/Image.scss (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/src/utils/lightboxState.tsx (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/objects/constants.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/objects/imageViewer.widget.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/specs/dataTypes.spec.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/specs/differentViews.spec.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/specs/onClick.spec.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tests/e2e/tsconfig.json (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/tsconfig.json (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/typings/ImageProps.d.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/typings/ImageViewerProps.d.ts (100%) rename packages/pluggableWidgets/{image-viewer-web => image-web}/typings/react-images-lightbox.d.ts (100%) diff --git a/packages/pluggableWidgets/image-viewer-web/CHANGELOG.md b/packages/pluggableWidgets/image-web/CHANGELOG.md similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/CHANGELOG.md rename to packages/pluggableWidgets/image-web/CHANGELOG.md diff --git a/packages/pluggableWidgets/image-viewer-web/README.md b/packages/pluggableWidgets/image-web/README.md similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/README.md rename to packages/pluggableWidgets/image-web/README.md diff --git a/packages/pluggableWidgets/image-viewer-web/package.json b/packages/pluggableWidgets/image-web/package.json similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/package.json rename to packages/pluggableWidgets/image-web/package.json diff --git a/packages/pluggableWidgets/image-viewer-web/src/Image.editorConfig.ts b/packages/pluggableWidgets/image-web/src/Image.editorConfig.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/Image.editorConfig.ts rename to packages/pluggableWidgets/image-web/src/Image.editorConfig.ts diff --git a/packages/pluggableWidgets/image-viewer-web/src/Image.editorPreview.tsx b/packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/Image.editorPreview.tsx rename to packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/Image.tsx b/packages/pluggableWidgets/image-web/src/Image.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/Image.tsx rename to packages/pluggableWidgets/image-web/src/Image.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/Image.xml b/packages/pluggableWidgets/image-web/src/Image.xml similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/Image.xml rename to packages/pluggableWidgets/image-web/src/Image.xml diff --git a/packages/pluggableWidgets/image-viewer-web/src/assets/ic24-close.svg b/packages/pluggableWidgets/image-web/src/assets/ic24-close.svg similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/assets/ic24-close.svg rename to packages/pluggableWidgets/image-web/src/assets/ic24-close.svg diff --git a/packages/pluggableWidgets/image-viewer-web/src/assets/placeholder.svg b/packages/pluggableWidgets/image-web/src/assets/placeholder.svg similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/assets/placeholder.svg rename to packages/pluggableWidgets/image-web/src/assets/placeholder.svg diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/Image/index.tsx b/packages/pluggableWidgets/image-web/src/components/Image/index.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/Image/index.tsx rename to packages/pluggableWidgets/image-web/src/components/Image/index.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/Image/ui.tsx b/packages/pluggableWidgets/image-web/src/components/Image/ui.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/Image/ui.tsx rename to packages/pluggableWidgets/image-web/src/components/Image/ui.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/Lightbox.tsx b/packages/pluggableWidgets/image-web/src/components/Lightbox.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/Lightbox.tsx rename to packages/pluggableWidgets/image-web/src/components/Lightbox.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/Image.spec.tsx b/packages/pluggableWidgets/image-web/src/components/__tests__/Image.spec.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/__tests__/Image.spec.tsx rename to packages/pluggableWidgets/image-web/src/components/__tests__/Image.spec.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap b/packages/pluggableWidgets/image-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap rename to packages/pluggableWidgets/image-web/src/components/__tests__/__snapshots__/Image.spec.tsx.snap diff --git a/packages/pluggableWidgets/image-viewer-web/src/package.xml b/packages/pluggableWidgets/image-web/src/package.xml similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/package.xml rename to packages/pluggableWidgets/image-web/src/package.xml diff --git a/packages/pluggableWidgets/image-viewer-web/src/ui/Image.scss b/packages/pluggableWidgets/image-web/src/ui/Image.scss similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/ui/Image.scss rename to packages/pluggableWidgets/image-web/src/ui/Image.scss diff --git a/packages/pluggableWidgets/image-viewer-web/src/utils/lightboxState.tsx b/packages/pluggableWidgets/image-web/src/utils/lightboxState.tsx similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/src/utils/lightboxState.tsx rename to packages/pluggableWidgets/image-web/src/utils/lightboxState.tsx diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/objects/constants.ts b/packages/pluggableWidgets/image-web/tests/e2e/objects/constants.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/objects/constants.ts rename to packages/pluggableWidgets/image-web/tests/e2e/objects/constants.ts diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/objects/imageViewer.widget.ts b/packages/pluggableWidgets/image-web/tests/e2e/objects/imageViewer.widget.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/objects/imageViewer.widget.ts rename to packages/pluggableWidgets/image-web/tests/e2e/objects/imageViewer.widget.ts diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/dataTypes.spec.ts b/packages/pluggableWidgets/image-web/tests/e2e/specs/dataTypes.spec.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/dataTypes.spec.ts rename to packages/pluggableWidgets/image-web/tests/e2e/specs/dataTypes.spec.ts diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/differentViews.spec.ts b/packages/pluggableWidgets/image-web/tests/e2e/specs/differentViews.spec.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/differentViews.spec.ts rename to packages/pluggableWidgets/image-web/tests/e2e/specs/differentViews.spec.ts diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/onClick.spec.ts b/packages/pluggableWidgets/image-web/tests/e2e/specs/onClick.spec.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/specs/onClick.spec.ts rename to packages/pluggableWidgets/image-web/tests/e2e/specs/onClick.spec.ts diff --git a/packages/pluggableWidgets/image-viewer-web/tests/e2e/tsconfig.json b/packages/pluggableWidgets/image-web/tests/e2e/tsconfig.json similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tests/e2e/tsconfig.json rename to packages/pluggableWidgets/image-web/tests/e2e/tsconfig.json diff --git a/packages/pluggableWidgets/image-viewer-web/tsconfig.json b/packages/pluggableWidgets/image-web/tsconfig.json similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/tsconfig.json rename to packages/pluggableWidgets/image-web/tsconfig.json diff --git a/packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts b/packages/pluggableWidgets/image-web/typings/ImageProps.d.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/typings/ImageProps.d.ts rename to packages/pluggableWidgets/image-web/typings/ImageProps.d.ts diff --git a/packages/pluggableWidgets/image-viewer-web/typings/ImageViewerProps.d.ts b/packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/typings/ImageViewerProps.d.ts rename to packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts diff --git a/packages/pluggableWidgets/image-viewer-web/typings/react-images-lightbox.d.ts b/packages/pluggableWidgets/image-web/typings/react-images-lightbox.d.ts similarity index 100% rename from packages/pluggableWidgets/image-viewer-web/typings/react-images-lightbox.d.ts rename to packages/pluggableWidgets/image-web/typings/react-images-lightbox.d.ts From f9034d091efbc37dc0e99ed38c60fb68e1a7977b Mon Sep 17 00:00:00 2001 From: Keraito Date: Tue, 31 Aug 2021 10:03:12 +0200 Subject: [PATCH 4/7] feat(image-web): keep old testproject branch name and update readme --- packages/pluggableWidgets/image-web/README.md | 2 +- packages/pluggableWidgets/image-web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pluggableWidgets/image-web/README.md b/packages/pluggableWidgets/image-web/README.md index 53dd82cbf9..7460354550 100644 --- a/packages/pluggableWidgets/image-web/README.md +++ b/packages/pluggableWidgets/image-web/README.md @@ -1 +1 @@ -Please see [Image](https://docs.mendix.com/appstore/widgets/image-viewer) in the Mendix documentation for details. +Please see [Image](https://docs.mendix.com/appstore/widgets/image) in the Mendix documentation for details. diff --git a/packages/pluggableWidgets/image-web/package.json b/packages/pluggableWidgets/image-web/package.json index e2c7f36d70..ce3d45a4b8 100644 --- a/packages/pluggableWidgets/image-web/package.json +++ b/packages/pluggableWidgets/image-web/package.json @@ -19,7 +19,7 @@ }, "testProject": { "githubUrl": "https://github.com/mendix/testProjects", - "branchName": "image-web" + "branchName": "image-viewer-web" }, "packagePath": "com.mendix.widget.web", "scripts": { From 4fded291326e1ff264d720621e01c766dd1fcecb Mon Sep 17 00:00:00 2001 From: Keraito Date: Tue, 31 Aug 2021 16:54:40 +0200 Subject: [PATCH 5/7] feat(image-web): remove old typings --- .../image-web/src/Image.editorConfig.ts | 8 +-- .../image-web/src/Image.editorPreview.tsx | 4 +- .../pluggableWidgets/image-web/src/Image.tsx | 6 +- .../image-web/src/components/Image/index.tsx | 2 +- .../image-web/src/components/Image/ui.tsx | 2 +- .../image-web/typings/ImageProps.d.ts | 4 +- .../image-web/typings/ImageViewerProps.d.ts | 59 ------------------- 7 files changed, 13 insertions(+), 72 deletions(-) delete mode 100644 packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts diff --git a/packages/pluggableWidgets/image-web/src/Image.editorConfig.ts b/packages/pluggableWidgets/image-web/src/Image.editorConfig.ts index 4f2b23e8e1..b51493a013 100644 --- a/packages/pluggableWidgets/image-web/src/Image.editorConfig.ts +++ b/packages/pluggableWidgets/image-web/src/Image.editorConfig.ts @@ -7,10 +7,10 @@ import { StructurePreviewProps, transformGroupsIntoTabs } from "@mendix/piw-utils-internal"; -import { DatasourceEnum, ImageViewerPreviewProps } from "../typings/ImageViewerProps"; +import { DatasourceEnum, ImagePreviewProps } from "../typings/ImageProps"; import StructurePreviewImageViewerSvg from "./assets/placeholder.svg"; -type ImageViewPreviewPropsKey = keyof ImageViewerPreviewProps; +type ImageViewPreviewPropsKey = keyof ImagePreviewProps; const dataSourceProperties: ImageViewPreviewPropsKey[] = ["imageObject", "imageUrl", "imageIcon"]; @@ -40,7 +40,7 @@ function reorderTabsForStudio(tabs: Properties): void { } export function getProperties( - values: ImageViewerPreviewProps, + values: ImagePreviewProps, defaultProperties: Properties, platform: "web" | "desktop" ): Properties { @@ -88,7 +88,7 @@ export function getPreview(): StructurePreviewProps | null { }; } -export function check(values: ImageViewerPreviewProps): Problem[] { +export function check(values: ImagePreviewProps): Problem[] { const errors: Problem[] = []; if (values.datasource === "imageUrl" && !values.imageUrl) { diff --git a/packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx b/packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx index a7863813bb..056c8d912e 100644 --- a/packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx +++ b/packages/pluggableWidgets/image-web/src/Image.editorPreview.tsx @@ -1,14 +1,14 @@ import { parseStyle } from "@mendix/piw-utils-internal"; import { WebIcon } from "mendix"; import { createElement, ReactElement } from "react"; -import { ImageViewerPreviewProps } from "../typings/ImageViewerProps"; +import { ImagePreviewProps } from "../typings/ImageProps"; import { ImageViewer as ImageViewerComponent } from "./components/Image/index"; import ImageViewerPlaceholder from "./assets/placeholder.svg"; declare function require(name: string): string; -export function preview(props: ImageViewerPreviewProps): ReactElement | null { +export function preview(props: ImagePreviewProps): ReactElement | null { let image = ImageViewerPlaceholder; switch (props.datasource) { case "image": diff --git a/packages/pluggableWidgets/image-web/src/Image.tsx b/packages/pluggableWidgets/image-web/src/Image.tsx index 50ba63abb9..39dd0ba45b 100644 --- a/packages/pluggableWidgets/image-web/src/Image.tsx +++ b/packages/pluggableWidgets/image-web/src/Image.tsx @@ -1,6 +1,6 @@ import { ValueStatus } from "mendix"; import { createElement, FunctionComponent, useCallback } from "react"; -import { ImageViewerContainerProps } from "../typings/ImageViewerProps"; +import { ImageContainerProps } from "../typings/ImageProps"; import { ImageViewer as ImageViewerComponent, ImageViewerImageProps } from "./components/Image/index"; function getImageProps({ @@ -9,7 +9,7 @@ function getImageProps({ imageObject, imageUrl, defaultImageDynamic -}: ImageViewerContainerProps): ImageViewerImageProps { +}: ImageContainerProps): ImageViewerImageProps { const fallback: ImageViewerImageProps = { type: "image", image: undefined @@ -62,7 +62,7 @@ function getImageProps({ } } -export const ImageViewer: FunctionComponent = props => { +export const ImageViewer: FunctionComponent = props => { const onClick = useCallback(() => props.onClick?.execute(), [props.onClick]); const { type, image } = getImageProps(props); diff --git a/packages/pluggableWidgets/image-web/src/components/Image/index.tsx b/packages/pluggableWidgets/image-web/src/components/Image/index.tsx index e09a18da48..a204aa8c2e 100644 --- a/packages/pluggableWidgets/image-web/src/components/Image/index.tsx +++ b/packages/pluggableWidgets/image-web/src/components/Image/index.tsx @@ -1,5 +1,5 @@ import { cloneElement, createElement, CSSProperties, FunctionComponent, useCallback } from "react"; -import { HeightUnitEnum, WidthUnitEnum, OnClickTypeEnum, DisplayAsEnum } from "../../../typings/ImageViewerProps"; +import { HeightUnitEnum, WidthUnitEnum, OnClickTypeEnum, DisplayAsEnum } from "../../../typings/ImageProps"; import { useLightboxState } from "../../utils/lightboxState"; import { ImageViewerUi, ImageViewerContentProps } from "./ui"; import { Lightbox, LightboxProps } from "../Lightbox"; diff --git a/packages/pluggableWidgets/image-web/src/components/Image/ui.tsx b/packages/pluggableWidgets/image-web/src/components/Image/ui.tsx index 764c308387..8e7e788283 100644 --- a/packages/pluggableWidgets/image-web/src/components/Image/ui.tsx +++ b/packages/pluggableWidgets/image-web/src/components/Image/ui.tsx @@ -1,6 +1,6 @@ import { createElement, CSSProperties, HTMLAttributes, ReactElement, ReactEventHandler } from "react"; import classNames from "classnames"; -import { HeightUnitEnum, WidthUnitEnum } from "../../../typings/ImageViewerProps"; +import { HeightUnitEnum, WidthUnitEnum } from "../../../typings/ImageProps"; import { LightboxProps } from "../Lightbox"; import "../../ui/Image.scss"; diff --git a/packages/pluggableWidgets/image-web/typings/ImageProps.d.ts b/packages/pluggableWidgets/image-web/typings/ImageProps.d.ts index d60803302e..c1b2ce6bdc 100644 --- a/packages/pluggableWidgets/image-web/typings/ImageProps.d.ts +++ b/packages/pluggableWidgets/image-web/typings/ImageProps.d.ts @@ -42,8 +42,8 @@ export interface ImagePreviewProps { class: string; style: string; datasource: DatasourceEnum; - imageObject: string; - defaultImageDynamic: string; + imageObject: { type: "static"; imageUrl: string; } | { type: "dynamic"; entity: string; } | null; + defaultImageDynamic: { type: "static"; imageUrl: string; } | { type: "dynamic"; entity: string; } | null; imageUrl: string; imageIcon: { type: "glyph"; iconClass: string; } | { type: "image"; imageUrl: string; } | null; onClickType: OnClickTypeEnum; diff --git a/packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts b/packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts deleted file mode 100644 index b20424cb3c..0000000000 --- a/packages/pluggableWidgets/image-web/typings/ImageViewerProps.d.ts +++ /dev/null @@ -1,59 +0,0 @@ -/** - * This file was generated from ImageViewer.xml - * WARNING: All changes made to this file will be overwritten - * @author Mendix UI Content Team - */ -import { CSSProperties } from "react"; -import { ActionValue, DynamicValue, WebIcon, WebImage } from "mendix"; - -export type DatasourceEnum = "image" | "imageUrl" | "icon"; - -export type OnClickTypeEnum = "action" | "enlarge"; - -export type WidthUnitEnum = "auto" | "pixels" | "percentage"; - -export type HeightUnitEnum = "auto" | "pixels"; - -export type DisplayAsEnum = "fullImage" | "thumbnail"; - -export interface ImageViewerContainerProps { - name: string; - class: string; - style?: CSSProperties; - tabIndex?: number; - datasource: DatasourceEnum; - imageObject?: DynamicValue; - defaultImageDynamic?: DynamicValue; - imageUrl?: DynamicValue; - imageIcon?: DynamicValue; - onClickType: OnClickTypeEnum; - onClick?: ActionValue; - alternativeText?: DynamicValue; - widthUnit: WidthUnitEnum; - width: number; - heightUnit: HeightUnitEnum; - height: number; - iconSize: number; - displayAs: DisplayAsEnum; - responsive: boolean; -} - -export interface ImageViewerPreviewProps { - class: string; - style: string; - datasource: DatasourceEnum; - imageObject: { type: "static"; imageUrl: string; } | { type: "dynamic"; entity: string; } | null; - defaultImageDynamic: { type: "static"; imageUrl: string; } | { type: "dynamic"; entity: string; } | null; - imageUrl: string; - imageIcon: { type: "glyph"; iconClass: string; } | { type: "image"; imageUrl: string; } | null; - onClickType: OnClickTypeEnum; - onClick: {} | null; - alternativeText: string; - widthUnit: WidthUnitEnum; - width: number | null; - heightUnit: HeightUnitEnum; - height: number | null; - iconSize: number | null; - displayAs: DisplayAsEnum; - responsive: boolean; -} From 4e85ed99dddf392c176e22ae8d510a0657ba5abf Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Tue, 31 Aug 2021 19:48:37 +0200 Subject: [PATCH 6/7] feat(pluggable-widgets-tools): fixing typescript version & update libs --- package-lock.json | 90 +++++-------------- .../nanoflow-actions-hybrid/package.json | 2 +- packages/theming/atlas/package.json | 2 +- .../package.json | 2 +- .../piw-native-utils-internal/package.json | 2 +- .../tools/piw-utils-internal/package.json | 2 +- .../pluggable-widgets-tools/CHANGELOG.md | 5 +- .../pluggable-widgets-tools/package.json | 6 +- 8 files changed, 32 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbb8fe9915..1149180749 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21941,13 +21941,23 @@ } }, "mendix": { - "version": "9.4.24572", - "resolved": "https://registry.npmjs.org/mendix/-/mendix-9.4.24572.tgz", - "integrity": "sha512-1+rkdRhDDl9nR9BZKFSdIMHO+kTtMTgvQYqLHlrI2ogHw/y5UJOqoMC+vgEzp9F7FHf7E/uxphicBJX3frp9OA==", + "version": "9.5.25874", + "resolved": "https://registry.npmjs.org/mendix/-/mendix-9.5.25874.tgz", + "integrity": "sha512-s692VMX8qpFGlRi9x7fPE5cIHI1wC0uqUJoNozqajDQNMfctGmXGnvq4rUnAgg1g1VSX568tWsCaRqPUd93Hwg==", "requires": { "@types/big.js": "^6.0.0", "@types/react": "~17.0.0", - "@types/react-native": "~0.63.23" + "@types/react-native": "~0.64.10" + }, + "dependencies": { + "@types/react-native": { + "version": "0.64.13", + "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.64.13.tgz", + "integrity": "sha512-QSOBN6m3TKBPFAcDhuFItDQtw1Fo1/FKDTHGeyeTwBXd3bu0V9s+oHEhntHN7PUK5dAOYFWsnO0wynWwS/KRxQ==", + "requires": { + "@types/react": "*" + } + } } }, "mendix-client": { @@ -28652,71 +28662,13 @@ } }, "rollup-plugin-sass": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/rollup-plugin-sass/-/rollup-plugin-sass-1.2.4.tgz", - "integrity": "sha512-MnX0JAjL/Uz8Wmz8vdHe0cEHfHBTDyaa6QRZV0nWTmoDWf53fa3QSyLY9kSuVB+lbheBbhx7qM8EjTAlbzk9Ww==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/rollup-plugin-sass/-/rollup-plugin-sass-1.2.6.tgz", + "integrity": "sha512-tT1psOwPhoCRfwQqcDdtWaT9Gt0+G6UcxCqk6Ar3ewffSgrC2svI2mUxBbZNdFBKRcizhFQX2OxFStxlQaoXkQ==", "requires": { - "@babel/runtime-corejs3": "^7.14.8", - "@rollup/pluginutils": "^4.1.1", - "fs-extra": "^0.30.0", - "pify": "^3.0.0", + "@rollup/pluginutils": "^3.1.0", "resolve": "^1.5.0", "sass": "^1.7.2" - }, - "dependencies": { - "@babel/runtime-corejs3": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz", - "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==", - "requires": { - "core-js-pure": "^3.16.0", - "regenerator-runtime": "^0.13.4" - } - }, - "@rollup/pluginutils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.1.tgz", - "integrity": "sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==", - "requires": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" - } - }, - "core-js-pure": { - "version": "3.16.2", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.2.tgz", - "integrity": "sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw==" - }, - "estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" - }, - "fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } } }, "rollup-plugin-terser": { @@ -31724,9 +31676,9 @@ } }, "typescript": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", - "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==" + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", + "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==" }, "typical": { "version": "5.2.0", diff --git a/packages/jsActions/nanoflow-actions-hybrid/package.json b/packages/jsActions/nanoflow-actions-hybrid/package.json index 709ad64878..b9de5d8382 100644 --- a/packages/jsActions/nanoflow-actions-hybrid/package.json +++ b/packages/jsActions/nanoflow-actions-hybrid/package.json @@ -54,7 +54,7 @@ "concurrently": "^5.3.0", "eslint": "^7.20.0", "npm-watch": "^0.6.0", - "typescript": "^4.0.5", + "typescript": "~4.3.5", "rimraf": "^2.7.1" } } diff --git a/packages/theming/atlas/package.json b/packages/theming/atlas/package.json index 5c748b1527..4c9e163030 100644 --- a/packages/theming/atlas/package.json +++ b/packages/theming/atlas/package.json @@ -33,7 +33,7 @@ "cross-env": "^7.0.2", "concurrently": "^5.3.0", "fast-xml-parser": "^3.17.5", - "typescript": "^4.0.5" + "typescript": "~4.3.5" }, "dependencies": {} } diff --git a/packages/tools/custom-widgets-utils-internal/package.json b/packages/tools/custom-widgets-utils-internal/package.json index 231597a85d..9a7da638cb 100644 --- a/packages/tools/custom-widgets-utils-internal/package.json +++ b/packages/tools/custom-widgets-utils-internal/package.json @@ -57,7 +57,7 @@ "tsconfig-paths": "^3.9.0", "tslint": "^6.1.3", "tslint-eslint-rules": "^5.4.0", - "typescript": "^4.0.5", + "typescript": "~4.3.5", "webpack": "^5.3.2", "webpack-cli": "^4.1.0", "webpack-dev-server": "^3.11.0", diff --git a/packages/tools/piw-native-utils-internal/package.json b/packages/tools/piw-native-utils-internal/package.json index d7d2a9f931..b28306f1ef 100644 --- a/packages/tools/piw-native-utils-internal/package.json +++ b/packages/tools/piw-native-utils-internal/package.json @@ -14,7 +14,7 @@ "devDependencies": { "@mendix/pluggable-widgets-tools": ">=8.9.2", "eslint": "^7.20.0", - "typescript": "^4.0.5", + "typescript": "~4.3.5", "rimraf": "^2.7.1" } } diff --git a/packages/tools/piw-utils-internal/package.json b/packages/tools/piw-utils-internal/package.json index 1e74c56999..c6a7c09751 100644 --- a/packages/tools/piw-utils-internal/package.json +++ b/packages/tools/piw-utils-internal/package.json @@ -16,7 +16,7 @@ "devDependencies": { "@mendix/pluggable-widgets-tools": ">=8.9.2", "eslint": "^7.20.0", - "typescript": "^4.0.5", + "typescript": "~4.3.5", "rimraf": "^2.7.1" } } diff --git a/packages/tools/pluggable-widgets-tools/CHANGELOG.md b/packages/tools/pluggable-widgets-tools/CHANGELOG.md index 9ebf0e9280..bcdd409e78 100644 --- a/packages/tools/pluggable-widgets-tools/CHANGELOG.md +++ b/packages/tools/pluggable-widgets-tools/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] -## [9.5.0] - 2021-08-31 +## [9.5.0] - 2021-09-01 ### Added - We added support for icon and tile images. Now you can use an image file instead of `` in your `MyWidget.xml`. In order to use, please make sure you follow the pattern `src/MyWidget.icon.png` (24x24px) and `src/MyWidget.tile.png` (256x192px) @@ -13,7 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed - We fixed the formatting of Preview typings - We fixed the Preview typings for Icon property. -- We downgraded the version of `rollup-plugin-sass` to 1.2.4 in order to prevent a library version issue throwing `The "path" argument must be of type string. Received an instance of RegExp`. +- We defined a fixed version of `typescript` to 4.3.5 in order to prevent processes to be hanging after creates the widget mpk. See issue [here](https://github.com/rollup/rollup/issues/4213) +- We updated Mendix library to 9.5.0 ## [9.4.3] - 2021-08-12 diff --git a/packages/tools/pluggable-widgets-tools/package.json b/packages/tools/pluggable-widgets-tools/package.json index ccb82a2156..a84664e8ed 100644 --- a/packages/tools/pluggable-widgets-tools/package.json +++ b/packages/tools/pluggable-widgets-tools/package.json @@ -87,7 +87,7 @@ "jest-junit": "^12.0.0", "jest-react-hooks-shallow": "^1.4.1", "jest-svg-transformer": "^1.0.0", - "mendix": "^9.4.24572", + "mendix": "^9.5.25874", "metro-react-native-babel-preset": "~0.63.0", "node-fetch": "^2.6.1", "postcss": "^8.1.10", @@ -105,13 +105,13 @@ "rollup-plugin-command": "^1.1.3", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-re": "^1.0.7", - "rollup-plugin-sass": "1.2.4", + "rollup-plugin-sass": "^1.2.6", "rollup-plugin-terser": "^7.0.2", "semver": "^7.3.2", "shelljs": "^0.8.4", "ts-jest": "^26.4.3", "ts-node": "^9.0.0", - "typescript": "^4.0.5", + "typescript": "~4.3.5", "webdriverio": "^7.5.3", "xml2js": "^0.4.23", "zip-a-folder": "^0.0.12" From 367923340c6f59be38311f2681075915fe6b6a5c Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Tue, 31 Aug 2021 21:52:36 +0200 Subject: [PATCH 7/7] fix: fix typings for hybrid actions --- .../jsActions/nanoflow-actions-hybrid/src/camera/ScanBarcode.ts | 2 +- .../nanoflow-actions-hybrid/src/contacts/SelectContact.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jsActions/nanoflow-actions-hybrid/src/camera/ScanBarcode.ts b/packages/jsActions/nanoflow-actions-hybrid/src/camera/ScanBarcode.ts index 961abe9280..c189933d60 100644 --- a/packages/jsActions/nanoflow-actions-hybrid/src/camera/ScanBarcode.ts +++ b/packages/jsActions/nanoflow-actions-hybrid/src/camera/ScanBarcode.ts @@ -12,7 +12,7 @@ /** * @returns {Promise.} */ -export async function ScanBarcode(): Promise { +export async function ScanBarcode(): Promise { // BEGIN USER CODE // Documentation https://github.com/phonegap/phonegap-plugin-barcodescanner return new Promise((resolve, reject) => { diff --git a/packages/jsActions/nanoflow-actions-hybrid/src/contacts/SelectContact.ts b/packages/jsActions/nanoflow-actions-hybrid/src/contacts/SelectContact.ts index e77c42be98..d4ff74602a 100644 --- a/packages/jsActions/nanoflow-actions-hybrid/src/contacts/SelectContact.ts +++ b/packages/jsActions/nanoflow-actions-hybrid/src/contacts/SelectContact.ts @@ -12,7 +12,7 @@ /** * @returns {Promise.} */ -export async function SelectContact(): Promise { +export async function SelectContact(): Promise { // BEGIN USER CODE // Documentation: https://github.com/apache/cordova-plugin-contacts return new Promise((resolve, reject) => {