Merge pull request #196 from iLib-js/development

Merge to master to release v14.3.0
iLib-js · Jul 10, 2019 · 4db7e6f · 4db7e6f
2 parents f3b86da + 1f6beb4
commit 4db7e6f
Show file tree

Hide file tree

Showing 139 changed files with 1,826 additions and 750 deletions.
diff --git a/build.properties b/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=14.2.0
+version=14.3.0
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,6 +1,22 @@
 Release Notes for Version 14
 ============================
 
+Build 006
+-------
+Published as version 14.3.0
+
+New Features:
+* Now uses webpack4 to package up all of the classes and data
+* Added style "disjunction" to the list formatter do you can now format lists with "or" as well:
+    * "One, Two, Three, or Four" vs. "One, Two, Three, and Four"
+
+Bug Fixes:
+* Updated to IANA time zone data version 2019b
+* Fixed a bug where the DateRngFmt was not heeding the specified
+  time zone when formatting the start and end dates
+* Fixed a bug which a default script for pa-IN should be Guru instead of Arabic
+
+
 Build 005
 -------
 Published as version 14.2.0

diff --git a/js/build.xml b/js/build.xml
@@ -104,7 +104,11 @@ limitations under the License.
 		<delete file="${build.locale.src}/localeinfo.stamp"/>
 		<delete file="${build.locale.src}/jsoncompress.stamp"/>
 		<delete file="${build.demo}/demo.tgz"/>
+		<delete dir="${build.demo}/scripts/assets"/>
 		<delete file="${build.demo}/scripts/ilib-demo.js"/>
+		<delete file="${build.demo}/scripts/ilib-include.js"/>
+		<delete file="${build.demo}/scripts/ilib.js"/>
+		<delete file="${build.demo}/scripts/webpack.config.js"/>
 		<delete file="${build.base}/package.json"/>
 		<delete file="${build.test}/nodeunit/nodeunit-qml.jsc"/>
 		<delete file="${build.lib}/ilib-qt.jsc"/>
@@ -125,10 +129,11 @@ limitations under the License.
         <attribute name="size"/>
         <attribute name="compilation" default="uncompiled"/>
         <attribute name="locales" default="${locales.default}"/>
-		<attribute name="target" default="web"/>
+        <attribute name="target" default="web"/>
+        <attribute name="mode" default="production"/>
 		<sequential>
 		    <echo>executing webpack</echo>
-			<exec osfamily="unix" executable="webpack" dir="${build.base}" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
+			<exec osfamily="unix" executable="webpack-cli" dir="${build.base}" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
 				<env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
 				<arg value="--env.assembly=@{assembly}"/>
 				<arg value="--env.size=@{size}"/>
@@ -137,8 +142,9 @@ limitations under the License.
 				<arg value="--env.target=@{target}"/>
 				<arg value="--env.ilibRoot=${build.base}"/>
 				<arg value="--env.tempDir=${build.output}"/>
+                <arg value="--mode=@{mode}"/>
 			</exec>
-			<exec osfamily="windows" executable="webpack.bat" dir="${build.base}" failifexecutionfails="@{failquit}"  failonerror="@{failquit}">
+			<exec osfamily="windows" executable="webpack-cli.bat" dir="${build.base}" failifexecutionfails="@{failquit}"  failonerror="@{failquit}">
 				<env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
 				<arg value="--env.assembly=@{assembly}"/>
 				<arg value="--env.size=@{size}"/>
@@ -147,6 +153,7 @@ limitations under the License.
                 <arg value="--env.target=@{target}"/>
                 <arg value="--env.ilibRoot=${build.base}"/>
                 <arg value="--env.tempDir=${build.output}"/>
+                <arg value="--mode=@{mode}"/>
 			</exec>
 		</sequential>
 	</macrodef>
@@ -225,8 +232,8 @@ limitations under the License.
 		</uptodate>
 	</target>
     <target name="assemble.unittest.assembled" depends="prepare,gen.manifest.locale,update.package.json,testilibut" unless="ilib-ut.not.needed" description="assembles only the locales needed for the unit tests">
-        <runassemble size="ut" locales="${locales.unittest}"/>
-        <runassemble size="ut" compilation="compiled" locales="${locales.unittest}"/>
+        <runassemble size="ut" locales="${locales.unittest}" mode="development"/>
+        <runassemble size="ut" compilation="compiled" locales="${locales.unittest}" mode="development"/>
     </target>
     <target name="testilibut.dyndata" description="test whether or not the ilib-ut single file needs to be rebuilt">
         <uptodate property="ilib-ut.dyndata.not.needed" targetfile="${build.output.js}/ut-dynamicdata-uncompiled-web/ilib-ut-dyn.js">
@@ -236,8 +243,8 @@ limitations under the License.
         </uptodate>
     </target>
     <target name="assemble.unittest.dyndata" depends="prepare,gen.manifest.locale,update.package.json,testilibut.dyndata" unless="ilib-ut.dyndata.not.needed" description="assembles only the locales needed for the unit tests">
-        <runassemble assembly="dynamicdata" size="ut" locales="${locales.unittest}"/>
-        <runassemble assembly="dynamicdata" size="ut" compilation="compiled" locales="${locales.unittest}"/>
+        <runassemble assembly="dynamicdata" size="ut" locales="${locales.unittest}" mode="development"/>
+        <runassemble assembly="dynamicdata" size="ut" compilation="compiled" locales="${locales.unittest}" mode="development"/>
     </target>
 
    <target name="testilibut.node" description="test whether or not the ilib-ut single file needs to be rebuilt">
@@ -248,8 +255,8 @@ limitations under the License.
         </uptodate>
     </target>
 	<target name="assemble.unittest.assembled.node" depends="prepare,gen.manifest.locale,update.package.json,testilibut.node" unless="ilib-ut.node.not.needed" description="assembles only the locales needed for the unit tests">
-        <runassemble size="ut" locales="${locales.unittest}" target="node"/>
-        <runassemble size="ut" locales="${locales.unittest}" compilation="compiled" target="node"/>
+        <runassemble size="ut" locales="${locales.unittest}" target="node" mode="development"/>
+        <runassemble size="ut" locales="${locales.unittest}" compilation="compiled" target="node" mode="development"/>
     </target>
    <target name="testilibut.dyndata.node" description="test whether or not the ilib-ut single file needs to be rebuilt">
         <uptodate property="ilib-ut.dyndata.node.not.needed" targetfile="${build.output.js}/ut-dynamicdata-uncompiled-node/ilib-ut-dyn.js">
@@ -259,8 +266,8 @@ limitations under the License.
         </uptodate>
     </target>
     <target name="assemble.unittest.dyndata.node" depends="prepare,gen.manifest.locale,update.package.json,testilibut.dyndata.node" unless="ilib-ut.dyndata.node.not.needed" description="assembles only the locales needed for the unit tests">
-        <runassemble assembly="dynamicdata" size="ut" locales="${locales.unittest}" target="node"/>
-        <runassemble assembly="dynamicdata" size="ut" compilation="compiled" locales="${locales.unittest}" target="node"/>
+        <runassemble assembly="dynamicdata" size="ut" locales="${locales.unittest}" target="node" mode="development"/>
+        <runassemble assembly="dynamicdata" size="ut" compilation="compiled" locales="${locales.unittest}" target="node" mode="development"/>
     </target>
     <target name="assemble.unittest" depends="assemble.unittest.assembled,assemble.unittest.dyndata,assemble.unittest.assembled.node,assemble.unittest.dyndata.node"/>
 
@@ -536,38 +543,38 @@ limitations under the License.
             <exec osfamily="unix" executable="bash" dir="${build.demo}" failifexecutionfails="@{failquit}" failonerror="@{failquit}" searchpath="true">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <arg value="-c"/>
-                <arg value="ilib-scanner scripts/ilib-include.js --assembly=assembled --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base}"/>
+                <arg value="ilib-scanner scripts/ilib-include.js --assembly=assembled --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base} --mode=production"/>
             </exec>
             <exec osfamily="windows" executable="cmd.exe" dir="${build.demo}" failifexecutionfails="@{failquit}"  failonerror="@{failquit}" searchpath="true">
                 <env key="Path" path="${env.PATH}:${nm.bin}"/>
                 <arg value="/c"/>
-                <arg value="ilib-scanner.bat scripts/ilib-include.js --assembly=assembled --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base}"/>
+                <arg value="ilib-scanner.bat scripts/ilib-include.js --assembly=assembled --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base} --mode=production"/>
             </exec>
         </sequential>
     </target>
     <target name="scan.demo.dynamic">
         <sequential>
             <echo>Scanning demo dir for ilib classes</echo>
-            <exec osfamily="unix" executable="ilib-scanner" dir="${build.demo}" failifexecutionfails="@{failquit}" failonerror="@{failquit}" searchpath="true">
+            <exec osfamily="unix" executable="bash" dir="${build.demo}" failifexecutionfails="@{failquit}" failonerror="@{failquit}" searchpath="true">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <arg value="-c"/>
-                <arg value="ilib-scanner scripts/ilib-include.js --assembly=dynamicdata --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base}"/>
+                <arg value="ilib-scanner scripts/ilib-include.js --assembly=dynamicdata --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base} --mode=production"/>
             </exec>
             <exec osfamily="windows" executable="cmd.exe" dir="${build.demo}" failifexecutionfails="@{failquit}"  failonerror="@{failquit}" searchpath="true">
                 <env key="Path" path="${env.PATH}:${nm.bin}"/>
                 <arg value="/c"/>
-                <arg value="ilib-scanner.bat scripts/ilib-include.js --assembly=dynamicdata --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base}"/>
+                <arg value="ilib-scanner.bat scripts/ilib-include.js --assembly=dynamicdata --compilation=compiled --locales=${locales.demo} --ilibRoot=${build.base} --mode=production"/>
             </exec>
         </sequential>
     </target>
     <target name="build.demo" depends="scan.demo">
        <sequential>
             <echo>Executing webpack</echo>
-            <exec osfamily="unix" executable="webpack" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
+            <exec osfamily="unix" executable="webpack-cli" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
             </exec>
-            <exec osfamily="windows" executable="webpack.bat" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
+            <exec osfamily="windows" executable="webpack-cli.bat" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
             </exec>
@@ -576,11 +583,11 @@ limitations under the License.
     <target name="build.demo.dynamic" depends="scan.demo.dynamic">
        <sequential>
             <echo>Executing webpack</echo>
-            <exec osfamily="unix" executable="webpack" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
+            <exec osfamily="unix" executable="webpack-cli" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
             </exec>
-            <exec osfamily="windows" executable="webpack.bat" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
+            <exec osfamily="windows" executable="webpack-cli.bat" dir="${build.demo}/scripts" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
                 <env key="PATH" path="${env.PATH}:${nm.bin}"/>
                 <env key="NODE_OPTIONS" value="--max-old-space-size=3072"/>
             </exec>

diff --git a/js/data/locale/af/list.json b/js/data/locale/af/list.json
@@ -3,6 +3,10 @@
         "2": "{0} en {1}",
         "end": "{0} en {1}"
     },
+    "or": {
+        "2": "{0} of {1}",
+        "end": "{0} of {1}"
+    },
     "unit": {
         "2": "{0} en {1}",
         "end": "{0} en {1}"

diff --git a/js/data/locale/am/list.json b/js/data/locale/am/list.json
@@ -5,6 +5,12 @@
         "middle": "{0}፣ {1}",
         "end": "{0}, እና {1}"
     },
+    "or": {
+        "2": "{0} ወይም {1}",
+        "start": "{0}፣ {1}",
+        "middle": "{0}፣ {1}",
+        "end": "{0} ወይም {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",

diff --git a/js/data/locale/ar/list.json b/js/data/locale/ar/list.json
@@ -25,6 +25,12 @@
             "end": "{0}، و{1}"
         }
     },
+    "or": {
+        "2": "{0} أو {1}",
+        "start": "{0} و{1}",
+        "middle": "{0} و{1}",
+        "end": "{0} أو {1}"
+    },
     "unit": {
         "short": {
             "2": "{0}، {1}",

diff --git a/js/data/locale/as/list.json b/js/data/locale/as/list.json
@@ -0,0 +1,36 @@
+{
+    "standard": {
+        "2": "{0} আৰু {1}",
+        "end": "{0} আৰু {1}"
+    },
+    "or": {
+        "2": "{0} বা {1}",
+        "end": "{0} বা {1}"
+    },
+    "unit": {
+        "short": {
+            "2": "{0} {1}",
+            "start": "{0} {1}",
+            "middle": "{0} {1}",
+            "end": "{0} {1}"
+        },
+        "medium": {
+            "2": "{0}, {1}",
+            "start": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "long": {
+            "2": "{0}, {1}",
+            "start": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "end": "{0}, {1}"
+        },
+        "full": {
+            "2": "{0}, {1}",
+            "start": "{0}, {1}",
+            "middle": "{0}, {1}",
+            "end": "{0}, {1}"
+        }
+    }
+}
diff --git a/js/data/locale/ast/list.json b/js/data/locale/ast/list.json
@@ -3,6 +3,10 @@
         "2": "{0} y {1}",
         "end": "{0} y {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0} o {1}"
+    },
     "unit": {
         "2": "{0} y {1}",
         "end": "{0} y {1}"

diff --git a/js/data/locale/az/Cyrl/list.json b/js/data/locale/az/Cyrl/list.json
@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0}, {1}",
         "end": "{0}, {1}"
+    },
+    "or": {
+        "2": "{0} or {1}",
+        "end": "{0}, or {1}"
     }
 }
diff --git a/js/data/locale/az/list.json b/js/data/locale/az/list.json
@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0} və {1}",
         "end": "{0} və {1}"
+    },
+    "or": {
+        "2": "{0} yaxud {1}",
+        "end": "{0}, yaxud {1}"
     }
 }
diff --git a/js/data/locale/be/list.json b/js/data/locale/be/list.json
@@ -3,6 +3,10 @@
         "2": "{0} і {1}",
         "end": "{0} і {1}"
     },
+    "or": {
+        "2": "{0} ці {1}",
+        "end": "{0} ці {1}"
+    },
     "unit": {
         "2": "{0} {1}",
         "start": "{0} {1}",

diff --git a/js/data/locale/bg/list.json b/js/data/locale/bg/list.json
@@ -25,6 +25,10 @@
             "end": "{0} и {1}"
         }
     },
+    "or": {
+        "2": "{0} или {1}",
+        "end": "{0} или {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} и {1}",

diff --git a/js/data/locale/bn/list.json b/js/data/locale/bn/list.json
@@ -2,5 +2,9 @@
     "standard": {
         "2": "{0} এবং {1}",
         "end": "{0} এবং {1}"
+    },
+    "or": {
+        "2": "{0} বা {1}",
+        "end": "{0}, বা {1}"
     }
 }
diff --git a/js/data/locale/br/list.json b/js/data/locale/br/list.json
@@ -0,0 +1,6 @@
+{
+    "or": {
+        "2": "{0} pe {1}",
+        "end": "{0}, pe {1}"
+    }
+}
diff --git a/js/data/locale/bs/Cyrl/list.json b/js/data/locale/bs/Cyrl/list.json
@@ -3,6 +3,10 @@
         "2": "{0} и {1}",
         "end": "{0} и {1}"
     },
+    "or": {
+        "2": "{0} or {1}",
+        "end": "{0}, or {1}"
+    },
     "unit": {
         "2": "{0} и {1}",
         "end": "{0} и {1}"

diff --git a/js/data/locale/bs/list.json b/js/data/locale/bs/list.json
@@ -3,6 +3,10 @@
         "2": "{0} i {1}",
         "end": "{0} i {1}"
     },
+    "or": {
+        "2": "{0} ili {1}",
+        "end": "{0} ili {1}"
+    },
     "unit": {
         "2": "{0} i {1}",
         "end": "{0} i {1}"

diff --git a/js/data/locale/ca/list.json b/js/data/locale/ca/list.json
@@ -3,6 +3,10 @@
         "2": "{0} i {1}",
         "end": "{0} i {1}"
     },
+    "or": {
+        "2": "{0} o {1}",
+        "end": "{0} o {1}"
+    },
     "unit": {
         "2": "{0} i {1}",
         "end": "{0} i {1}"

diff --git a/js/data/locale/ccp/list.json b/js/data/locale/ccp/list.json
@@ -0,0 +1,6 @@
+{
+    "standard": {
+        "2": "{0} 𑄃𑄳𑄃 {1}",
+        "end": "{0} 𑄃𑄳𑄃 {1}"
+    }
+}
diff --git a/js/data/locale/chr/list.json b/js/data/locale/chr/list.json
@@ -1,7 +1,11 @@
 {
     "standard": {
         "2": "{0} ᎠᎴ {1}",
-        "end": "{0} ᎠᎴ {1}"
+        "end": "{0}, ᎠᎴ {1}"
+    },
+    "or": {
+        "2": "{0} ᎠᎴᏱᎩ {1}",
+        "end": "{0}, ᎠᎴᏱᎩ {1}"
     },
     "unit": {
         "short": {

diff --git a/js/data/locale/cs/list.json b/js/data/locale/cs/list.json
@@ -3,6 +3,10 @@
         "2": "{0} a {1}",
         "end": "{0} a {1}"
     },
+    "or": {
+        "2": "{0} nebo {1}",
+        "end": "{0} nebo {1}"
+    },
     "unit": {
         "short": {
             "2": "{0} {1}",