fix(date-picker-web): build

mendixCN · Nov 28, 2021 · c8f4d9b · c8f4d9b
1 parent 81fefa7
commit c8f4d9b
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/packages/pluggableWidgets/ant-select-web/package.json b/packages/pluggableWidgets/ant-select-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ant-select-web",
   "widgetName": "Select",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "My widget description",
   "copyright": "2020 Mendix Technology BV",
   "author": "John",

diff --git a/packages/pluggableWidgets/ant-select-web/rollup.config.js b/packages/pluggableWidgets/ant-select-web/rollup.config.js
@@ -11,7 +11,8 @@ export default args => {
         return;
       }
       if (warning.code === 'NAMESPACE_CONFLICT') return;
-      //TODO Error: Circular dependency
+
+      if (warning.code === 'CIRCULAR_DEPENDENCY') return;
 
       // console.log(warning);
       onwarn(warning);

diff --git a/packages/pluggableWidgets/ant-select-web/src/Select.tsx b/packages/pluggableWidgets/ant-select-web/src/Select.tsx
@@ -95,7 +95,7 @@ export default function SelectMX(props: SelectContainerProps) {
 
     useEffect(() => {
         if (
-            !searchValue /*搜索中不应该变更值，以免失去输入焦点*/ &&
+            !searchValue /* 搜索中不应该变更值，以免失去输入焦点*/ &&
             props.isMultiConst &&
             props.selectList &&
             props.optionValueM

diff --git a/packages/pluggableWidgets/ant-select-web/src/package.xml b/packages/pluggableWidgets/ant-select-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Select" version="1.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Select" version="1.1.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Select.xml"/>
         </widgetFiles>

diff --git a/packages/pluggableWidgets/date-picker-web/package.json b/packages/pluggableWidgets/date-picker-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "date-picker-web",
   "widgetName": "DatePicker",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "My widget description",
   "copyright": "2020 Mendix Technology BV",
   "author": "Jason",

diff --git a/packages/pluggableWidgets/date-picker-web/rollup.config.js b/packages/pluggableWidgets/date-picker-web/rollup.config.js
@@ -0,0 +1,21 @@
+export default args => {
+  const result = args.configDefaultConfig;
+  result.forEach(config => {
+    const onwarn = config.onwarn;
+    config.onwarn = warning => {
+      if (
+        warning.loc &&
+        warning.loc.file &&
+        warning.loc.file.includes("node_modules")
+      ) {
+        return;
+      }
+      if (warning.code === 'NAMESPACE_CONFLICT') return;
+
+      if (warning.code === 'CIRCULAR_DEPENDENCY') return;
+
+      onwarn(warning);
+    };
+  });
+  return result;
+};
diff --git a/packages/pluggableWidgets/date-picker-web/src/DatePicker.tsx b/packages/pluggableWidgets/date-picker-web/src/DatePicker.tsx
@@ -9,7 +9,7 @@ import "./ui/index.scss";
 import { DatePickerContainerProps } from "../typings/DatePickerProps";
 import { useWhyDidYouUpdate } from "ahooks";
 
-export function getDefaultFormat(format: string, picker: string, showTime: boolean, use12Hours: boolean) {
+function getDefaultFormat(format: string, picker: string, showTime: boolean, use12Hours: boolean) {
     let mergedFormat = format;
 
     if (!mergedFormat) {

diff --git a/packages/pluggableWidgets/date-picker-web/src/package.xml b/packages/pluggableWidgets/date-picker-web/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="DatePicker" version="1.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="DatePicker" version="1.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="DatePicker.xml"/>
         </widgetFiles>