Merge pull request #421 from iLib-js/development

Merge to master to publish v14.17.0

Author: ehoogerbeets

.circleci/config.yml

@@ -27,7 +27,15 @@ jobs:
           command: |
             #sudo apt-add-repository --yes ppa:beineri/opt-qt551-trusty
             #sudo apt update
-            sudo apt install -y build-essential libfontconfig1 mesa-common-dev qmlscene qt5-default qtdeclarative5-dev qtbase5-dev
+            sudo apt install -y build-essential libfontconfig1 mesa-common-dev qtbase5-dev qmlscene qtdeclarative5-dev 
+
+      - run:
+          name: Set up OpenJDK
+          command: |
+            sudo apt-get install openjdk-11-jdk
+            sudo update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
+            sudo update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
+            sudo update-alternatives --set javadoc /usr/lib/jvm/java-11-openjdk-amd64/bin/javadoc
 
       - run:
           name: Set up node packages
@@ -43,6 +51,8 @@ jobs:
             echo "node version: " $(node -v)
             echo "npm version: " $(npm -v)
             echo "java version: " $(java -version)
+            echo "javac version: " $(javac -version)
+            echo "javadoc version: " $(javadoc --version)
             echo "ant version: " $(ant -version)
             echo "qmake version: " $(qmake --version)
             echo "TZ is $TZ"
@@ -65,6 +75,10 @@ workflows:
       - test:
           docker_image: circleci/node:12-browsers
       - test:
-          docker_image: circleci/node:14-browsers
+          docker_image: cimg/node:14.21.2-browsers
       - test:
-          docker_image: circleci/node:16-browsers
+          docker_image: cimg/node:16.19.0-browsers
+      - test:
+          docker_image: cimg/node:18.14.0-browsers
+      - test
+

build.properties

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2022, JEDLSoft
+# Copyright (c) 2012-2023, JEDLSoft
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=14.16.0
+version=14.17.0

docs/ReleaseNotes.md

@@ -1,6 +1,16 @@
 Release Notes for Version 14
 ============================
 
+Build 026
+-------
+Published as version 14.17.0
+
+New Features:
+* Update to CLDR v42 data
+Bug Fixes:
+* Fixed to publish js apidoc with applying style properly.
+* Fixed the case of setting the root path incorrectly in `ilib-web.js`.
+
 Build 025
 -------
 Published as version 14.16.0

js/build.xml

@@ -120,8 +120,20 @@ limitations under the License.
         <mkdir dir="${build.output.js}"/>
         <mkdir dir="${build.output.dyncode}"/>
         <mkdir dir="${build.output.test}"/>
-        
+        <exec executable="node" outputproperty="node.version">
+            <arg value="--version"/>
+        </exec>
+        <condition property="node16orLower">
+            <matches string="${node.version}" pattern="^v([0-9]\.|1[0-6]\.)" />
+        </condition>
+        <condition property="node17orHigher">
+            <matches string="${node.version}" pattern="^v(1[7-9]\.|[2-9][0-9]\.)" />
+        </condition>
+        <condition property="node.options" value="--max-old-space-size=3300 --openssl-legacy-provider" else="--max-old-space-size=3300">
+            <isset property="node17orHigher"/>
+        </condition>
     </target>
+
     <!-- =================================================================== -->
     <!-- Create the core jar file                                            -->
     <!-- =================================================================== -->
@@ -135,7 +147,7 @@ limitations under the License.
         <sequential>
             <echo>executing webpack</echo>
             <exec osfamily="unix" executable="webpack-cli" dir="${build.base}" failifexecutionfails="@{failquit}" failonerror="@{failquit}">
-                <env key="NODE_OPTIONS" value="--max-old-space-size=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
                 <arg value="--env.assembly=@{assembly}"/>
                 <arg value="--env.size=@{size}"/>
                 <arg value="--env.compilation=@{compilation}"/>
@@ -146,7 +158,7 @@ limitations under the License.
                 <arg value="--mode=@{mode}"/>
             </exec>
             <exec osfamily="windows" executable="webpack-cli.bat" dir="${build.base}" failifexecutionfails="@{failquit}"  failonerror="@{failquit}">
-                <env key="NODE_OPTIONS" value="--max-old-space-size=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
                 <arg value="--env.assembly=@{assembly}"/>
                 <arg value="--env.size=@{size}"/>
                 <arg value="--env.compilation=@{compilation}"/>
@@ -527,11 +539,11 @@ limitations under the License.
             <echo>Executing webpack</echo>
             <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=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
             </exec>
             <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=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
             </exec>
         </sequential>
     </target>
@@ -540,11 +552,11 @@ limitations under the License.
             <echo>Executing webpack</echo>
             <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=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
             </exec>
             <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=3300"/>
+                <env key="NODE_OPTIONS" value="${node.options}"/>
             </exec>
         </sequential>
     </target>
@@ -860,7 +872,7 @@ limitations under the License.
         <mkdir dir="${build.apidocs}"/>
         <copy todir="${build.apidocs}">
             <fileset dir="${build.jsdoc}">
-                <include name="**/*.html"/>
+                <include name="**/*.*"/>
             </fileset>
         </copy>
     </target>
@@ -1000,7 +1012,7 @@ limitations under the License.
         <attribute name="suite"/>
         <attribute name="failquit"/>
         <sequential>
-            <java	dir="${build.test}"
+            <java    dir="${build.test}"
                     classname="io.apigee.trireme.shell.Main"
                     fork="true"
                     maxmemory="4096m"

js/data/locale/af/NA/dateformats.json

@@ -0,0 +1,12 @@
+{
+    "gregorian": {
+        "time": {
+            "12": {
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
+            }
+        }
+    }
+}

js/data/locale/af/NA/unitfmt.json

@@ -123,7 +123,6 @@
             "meter": "#{n} meter",
             "meter-per-second": "#{n} meter per sekonde",
             "meter-per-square-second": "#{n} meter per vierkante sekonde",
-            "metric-ton": "#{n} metrieke ton",
             "microgram": "#{n} mikrogram",
             "micrometer": "#{n} mikrometer",
             "microsecond": "one#{n} mikrosekonde|#{n} mikrosekondes",
@@ -175,6 +174,7 @@
             "pound-force-per-square-inch": "#{n} pond per vierkante duim",
             "quart": "one#{n} kwartgelling|#{n} kwartgellings",
             "quart-imperial": "#{n} Engelse kwartgelling",
+            "quarter": "one#{n} kwartaal|#{n} kwartale",
             "radian": "one#{n} radiaal|#{n} radiale",
             "revolution": "one#{n} omwenteling|#{n} omwentelings",
             "second": "one#{n} sekonde|#{n} sekondes",
@@ -199,6 +199,7 @@
             "terabyte-per-second": "#{n} teragreep per sekonde",
             "therm-us": "one#{n} VSA- termiese eenheid|#{n} VSA- termiese eenhede",
             "ton": "#{n} VSA-ton",
+            "tonne": "#{n} metrieke ton",
             "volt": "#{n} volt",
             "watt": "#{n} watt",
             "week": "one#{n} week|#{n} weke",
@@ -328,7 +329,6 @@
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s.",
             "meter-per-square-second": "#{n} m/s²",
-            "metric-ton": "#{n} t",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
             "microsecond": "#{n} μs.",
@@ -380,6 +380,7 @@
             "pound-force-per-square-inch": "#{n} lb./vk.dm",
             "quart": "#{n} kw.gell.",
             "quart-imperial": "#{n} kwart Eng.",
+            "quarter": "one#{n} kw.|#{n} kwe.",
             "radian": "#{n} rad.",
             "revolution": "#{n} omw.",
             "second": "#{n} s.",
@@ -404,6 +405,7 @@
             "terabyte-per-second": "#{n} TB/s.",
             "therm-us": "#{n} VSA-term.",
             "ton": "#{n} VSA-t.",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} w.",

js/data/locale/af/dateformats.json

@@ -80,24 +80,34 @@
                 "s": "yyyy"
             }
         },
+        "order": {
+            "f": "{date} 'om' {time}",
+            "l": "{date} 'om' {time}",
+            "m": "{date} {time}",
+            "s": "{date} {time}"
+        },
         "range": {
             "c00": {
+                "f": "{sd} {sm} {sy} om {st} – {et}",
+                "l": "{sd} {sm} {sy} om {st} – {et}",
                 "m": "{sd} {sm} {sy} {st} – {et}",
                 "s": "{sy}-{sm}-{sd} {st} – {et}"
             },
             "c01": {
-                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
+                "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
             "c02": {
-                "f": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
-                "l": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
+                "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
+                "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
             "c03": {
+                "f": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
+                "l": "{sd} {sm} {sy} om {st} – {ed} {em} {ey} om {et}",
                 "m": "{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}",
                 "s": "{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}"
             },
@@ -130,11 +140,7 @@
         },
         "time": {
             "12": {
-                "ah": "h a",
-                "ahm": "h:mm a",
-                "ahms": "h:mm:ss a",
-                "ahmsz": "h:mm:ss a z",
-                "ahmz": "h:mm a z"
+                "ah": "h a"
             },
             "24": {
                 "ah": "HH",

js/data/locale/af/unitfmt.json

@@ -123,7 +123,6 @@
             "meter": "#{n} meter",
             "meter-per-second": "#{n} meter per sekonde",
             "meter-per-square-second": "#{n} meter per vierkante sekonde",
-            "metric-ton": "#{n} metrieke ton",
             "microgram": "#{n} mikrogram",
             "micrometer": "#{n} mikrometer",
             "microsecond": "one#{n} mikrosekonde|#{n} mikrosekondes",
@@ -175,6 +174,7 @@
             "pound-force-per-square-inch": "#{n} pond per vierkante duim",
             "quart": "one#{n} kwartgelling|#{n} kwartgellings",
             "quart-imperial": "#{n} Engelse kwartgelling",
+            "quarter": "one#{n} kwartaal|#{n} kwartale",
             "radian": "one#{n} radiaal|#{n} radiale",
             "revolution": "one#{n} omwenteling|#{n} omwentelings",
             "second": "one#{n} sekonde|#{n} sekondes",
@@ -199,6 +199,7 @@
             "terabyte-per-second": "#{n} teragreep per sekonde",
             "therm-us": "one#{n} VSA- termiese eenheid|#{n} VSA- termiese eenhede",
             "ton": "#{n} VSA-ton",
+            "tonne": "#{n} metrieke ton",
             "volt": "#{n} volt",
             "watt": "#{n} watt",
             "week": "one#{n} week|#{n} weke",
@@ -328,7 +329,6 @@
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s.",
             "meter-per-square-second": "#{n} m/s²",
-            "metric-ton": "#{n} t",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
             "microsecond": "#{n} μs.",
@@ -380,6 +380,7 @@
             "pound-force-per-square-inch": "#{n} lb./vk.dm",
             "quart": "#{n} kw.gell.",
             "quart-imperial": "#{n} kwart Eng.",
+            "quarter": "one#{n} kw.|#{n} kwe.",
             "radian": "#{n} rad.",
             "revolution": "#{n} omw.",
             "second": "#{n} s.",
@@ -404,6 +405,7 @@
             "terabyte-per-second": "#{n} TB/s.",
             "therm-us": "#{n} VSA-term.",
             "ton": "#{n} VSA-t.",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} w.",

js/data/locale/agq/unitfmt.json

@@ -119,7 +119,6 @@
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s",
             "meter-per-square-second": "#{n} m/s²",
-            "metric-ton": "#{n} t",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
             "microsecond": "#{n} μs",
@@ -171,6 +170,7 @@
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
             "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
             "second": "#{n} s",
@@ -195,6 +195,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} w",
@@ -320,7 +321,6 @@
             "meter": "#{n} m",
             "meter-per-second": "#{n} m/s",
             "meter-per-square-second": "#{n} m/s²",
-            "metric-ton": "#{n} t",
             "microgram": "#{n} μg",
             "micrometer": "#{n} μm",
             "microsecond": "#{n} μs",
@@ -372,6 +372,7 @@
             "pound-force-per-square-inch": "#{n} psi",
             "quart": "#{n} qt",
             "quart-imperial": "#{n} qt Imp.",
+            "quarter": "#{n} q",
             "radian": "#{n} rad",
             "revolution": "#{n} rev",
             "second": "#{n} s",
@@ -396,6 +397,7 @@
             "terabyte-per-second": "#{n} TB/s",
             "therm-us": "#{n} US therm",
             "ton": "#{n} tn",
+            "tonne": "#{n} t",
             "volt": "#{n} V",
             "watt": "#{n} W",
             "week": "#{n} w",

js/data/locale/ak/dateformats.json

@@ -108,10 +108,10 @@
         "time": {
             "12": {
                 "ah": "h a",
-                "ahm": "h:mm a",
-                "ahms": "h:mm:ss a",
-                "ahmsz": "h:mm:ss a z",
-                "ahmz": "h:mm a z"
+                "ahm": "h:mm a",
+                "ahms": "h:mm:ss a",
+                "ahmsz": "h:mm:ss a z",
+                "ahmz": "h:mm a z"
             },
             "24": {
                 "ah": "HH",