@brightspace-ui/intl 3.13.0 → 3.13.2

package/README.md

@@ -276,7 +276,7 @@ Contributions are welcome, please submit a pull request!
 
 > TL;DR: Commits prefixed with `fix:` and `feat:` will trigger patch and minor releases when merged to `main`. Read on for more details...
 
-The [sematic-release GitHub Action](https://github.com/BrightspaceUI/actions/tree/master/semantic-release) is called from the `release.yml` GitHub Action workflow to handle version changes and releasing.
+The [semantic-release GitHub Action](https://github.com/BrightspaceUI/actions/tree/main/semantic-release) is called from the `release.yml` GitHub Action workflow to handle version changes and releasing.
 
 ### Version Changes
 

package/lib/dateTime.js

@@ -1198,21 +1198,6 @@ export function formatRelativeDateTime(then) {
 	let numeric = 'always';
 	const thenTS = then.getTime();
 
-	if (unit === 'day' || unit === 'hour' && Math.round(Math.abs(value)) >= 6) {
-
-		const fullDay = 24 * 60 * 60 * 1000;
-		const today = new Date(now.toDateString()).getTime();
-
-		const yesterday = thenTS < today && thenTS > (today - fullDay);
-		const tomorrow = thenTS >= today + fullDay && thenTS < (today + fullDay * 2);
-
-		if (yesterday || tomorrow) {
-			numeric = 'auto';
-			unit = 'day';
-			value = Math.sign(value);
-		}
-	}
-
 	if (unit === 'week' || unit === 'day' && Math.round(Math.abs(value)) >= 4) {
 
 		const fullWeek = 7 * 24 * 60 * 60 * 1000;
@@ -1222,7 +1207,7 @@ export function formatRelativeDateTime(then) {
 			return d.getTime();
 		})(new Date(now));
 
-		const lastWeek = thenTS < thisWeek && thenTS > (thisWeek - fullWeek);
+		const lastWeek = thenTS < thisWeek && thenTS >= (thisWeek - fullWeek);
 		const nextWeek = thenTS >= thisWeek + fullWeek && thenTS < (thisWeek + fullWeek * 2);
 
 		if (lastWeek || nextWeek) {
@@ -1231,6 +1216,20 @@ export function formatRelativeDateTime(then) {
 			value = Math.sign(value);
 		}
 	}
+	else if (unit === 'day' || unit === 'hour' && Math.round(Math.abs(value)) >= 6) {
+
+		const fullDay = 24 * 60 * 60 * 1000;
+		const today = new Date(now.toDateString()).getTime();
+
+		const yesterday = thenTS < today && thenTS >= (today - fullDay);
+		const tomorrow = thenTS >= today + fullDay && thenTS < (today + fullDay * 2);
+
+		if (yesterday || tomorrow) {
+			numeric = 'auto';
+			unit = 'day';
+			value = Math.sign(value);
+		}
+	}
 
 	const rtf = new Intl.RelativeTimeFormat(getLanguage(), {
 		localeMatcher: 'best fit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/intl",
-  "version": "3.13.0",
+  "version": "3.13.2",
   "description": "Internationalization APIs for number, date, time and file size formatting and parsing in D2L Brightspace.",
   "main": "lib/number.js",
   "scripts": {
@@ -38,11 +38,11 @@
   "devDependencies": {
     "@babel/core": "^7",
     "@babel/eslint-parser": "^7",
-    "@web/dev-server": "^0.1.33",
+    "@web/dev-server": "^0.2",
     "chai": "^4",
-    "concurrently": "^7",
+    "concurrently": "^8",
     "eslint": "^8",
-    "eslint-config-brightspace": "^0.20",
+    "eslint-config-brightspace": "^0.21",
     "http-server": "^14.0",
     "mocha": "^10",
     "mocha-headless-chrome": "^4"