@ui5/webcomponents-localization 0.32.0 → 1.0.0-rc.16

package/dist/sap/ui/core/date/UniversalDate.js

@@ -162,8 +162,8 @@ UniversalDate.prototype.getTimezoneLong = function () {
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
 UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
-    if (oLocale.getRegion() === 'US') {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+    if (oLocaleData.firstDayStartsFirstWeek()) {
         iWeek = calculateWeeks(oFirstDay, oDate);
     } else {
         iLastYear = iYear - 1;
@@ -186,8 +186,8 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
     };
 };
 UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
-    if (oLocale.getRegion() === 'US' && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek), bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
+    if (bIsRegionUS && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
         return {
             year: iYear,
             month: 0,

package/dist/sap/ui/core/format/DateFormat.js

@@ -940,13 +940,17 @@ DateFormat.prototype.oSymbols = {
             var bPM;
             var iLength;
             var sAM = oFormat.aDayPeriods[0], sPM = oFormat.aDayPeriods[1];
-            var rAMPM = /[aApP](?:\.)?[mM](?:\.)?/;
+            var rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
             var aMatch = sValue.match(rAMPM);
             var bVariant = aMatch && aMatch.index === 0;
             if (bVariant) {
-                sValue = aMatch[0].replace(/\./g, '').toLowerCase() + sValue.substring(aMatch[0].length);
+                sValue = aMatch[0];
+                sAM = sAM.replace(/[\x20\xA0]/g, '');
+                sPM = sPM.replace(/[\x20\xA0]/g, '');
+                sValue = sValue.replace(/[\x20\xA0]/g, '');
                 sAM = sAM.replace(/\./g, '').toLowerCase();
                 sPM = sPM.replace(/\./g, '').toLowerCase();
+                sValue = sValue.replace(/\./g, '').toLowerCase();
             }
             if (sValue.indexOf(sAM) === 0) {
                 bPM = false;
@@ -1162,7 +1166,7 @@ DateFormat.prototype.oSymbols = {
                 iLength = 1;
                 iTZDiff = 0;
             } else {
-                return { error: 'cannot be parsed correcly by sap.ui.core.format.DateFormat: The given timezone is not supported!' };
+                return { error: 'cannot be parsed correctly by sap.ui.core.format.DateFormat: The given timezone is not supported!' };
             }
             if (sValue.charAt(0) !== 'Z') {
                 var oParsedTZ = oParseHelper.parseTZ(sValue.substr(iLength), true);

package/hash.txt

@@ -1 +1 @@
-YT/JhzRK7/FBrFhEvetUM2/eCpI=
+65ggwN6ZkFOPO38ZE2UOXXibHi8=

package/package-scripts.js

@@ -1,7 +1,10 @@
 const resolve = require("resolve");
 const generateHash = resolve.sync("@ui5/webcomponents-tools/lib/hash/generate.js");
 const hashIsUpToDate = resolve.sync("@ui5/webcomponents-tools/lib/hash/upToDate.js");
-const UP_TO_DATE = `node ${hashIsUpToDate} dist/ hash.txt && echo "Up to date."`;
+const copyUsedModules = resolve.sync("@ui5/webcomponents-tools/lib/copy-list/index.js");
+const replaceGlobalCore = resolve.sync("@ui5/webcomponents-tools/lib/replace-global-core/index.js");
+const esmAbsToRel = resolve.sync("@ui5/webcomponents-tools/lib/esm-abs-to-rel/index.js");
+const UP_TO_DATE = `node "${hashIsUpToDate}" dist/ hash.txt && echo "Up to date."`;
 
 const scripts = {
 	clean: "rimraf dist",
@@ -13,12 +16,12 @@ const scripts = {
 		"replace-export-true": `replace-in-file ", /* bExport= */ true" "" dist/**/*.js`,
 		"replace-export-false": `replace-in-file ", /* bExport= */ false" "" dist/**/*.js`,
 		"amd-to-es6": "amdtoes6 --src=dist --replace --glob=**/*.js",
-		"replace-global-core-usage": "node ./lib/replace-global-core/index.js dist/",
-		"esm-abs-to-rel": "node ./lib/esm-abs-to-rel/index.js dist/",
+		"replace-global-core-usage": `node "${replaceGlobalCore}" dist/`,
+		"esm-abs-to-rel": `node "${esmAbsToRel}" dist/`,
 		jsonImports: "node ./lib/generate-json-imports/cldr.js"
 	},
 	copy: {
-		"used-modules": "node ./lib/copy-list/index.js ./used-modules.txt dist/",
+		"used-modules": `node "${copyUsedModules}" ./used-modules.txt dist/`,
 		cldr: `copy-and-watch "../../node_modules/@openui5/sap.ui.core/src/sap/ui/core/cldr/*.json" dist/generated/assets/cldr/`,
 		overlay: `copy-and-watch "overlay/**/*.js" dist/`,
 		src: `copy-and-watch "src/**/*.js" dist/`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "0.32.0",
+  "version": "1.0.0-rc.16",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,11 @@
     "url": "https://github.com/SAP/ui5-webcomponents.git",
     "directory": "packages/localization"
   },
+  "exports": {
+    "./dist/*": "./dist/*",
+    "./package.json": "./package.json",
+    "./*": "./dist/*"
+  },
   "scripts": {
     "clean": "nps clean",
     "lint": "nps lint",
@@ -23,20 +28,12 @@
     "prepublishOnly": "npm run clean && npm run build"
   },
   "devDependencies": {
-    "@buxlabs/amd-to-es6": "^0.16.0",
-    "@openui5/sap.ui.core": "1.87.3",
-    "@ui5/webcomponents-tools": "1.0.0-rc.13",
-    "chromedriver": "89.0.0",
-    "copy-and-watch": "^0.1.5",
-    "escodegen": "^2.0.0",
-    "esprima": "^4.0.1",
-    "glob": "^7.1.6",
+    "@ui5/webcomponents-tools": "1.0.0-rc.16",
+    "chromedriver": "95.0.0",
     "mkdirp": "^1.0.4",
-    "path-exists-cli": "^1.0.0",
-    "replace-in-file": "^6.2.0",
-    "rimraf": "^3.0.2"
+    "resolve": "^1.20.0"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.32.0"
+    "@ui5/webcomponents-base": "1.0.0-rc.16"
   }
 }