4.0.14 release

enactjs · May 14, 2024 · 122b2fa · 122b2fa
2 parents af24809 + 1de2ad8
commit 122b2fa
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The following is a curated list of changes in the Enact project, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+### Fixed
+
+- `i18n` resource loader to prioritize strings from additional resources files
+
 ## [4.0.13] - 2022-11-29
 
 ### Fixed

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "4.0.0",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "command": {
     "bootstrap": {
       "ci": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enact",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "Monorepo for all Enact front end libraries.",
   "private": true,
   "scripts": {

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The following is a curated list of changes in the Enact core module, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
 ## [4.0.13] - 2022-11-29
 
 No significant changes.

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enact/core",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "Enact is an open source JavaScript framework containing everything you need to create a fast, scalable mobile or web application.",
   "main": "index.js",
   "scripts": {

diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The following is a curated list of changes in the Enact i18n module, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+### Fixed
+
+- `i18n` resource loader to prioritize strings from additional resources files
+
 ## [4.0.13] - 2022-11-29
 
 No significant changes.

diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@enact/i18n",
   "main": "./src/index.js",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "Internationalization support for Enact using iLib",
   "scripts": {
     "clean": "enact clean",
@@ -41,7 +41,7 @@
     ]
   },
   "dependencies": {
-    "@enact/core": "^4.0.13",
+    "@enact/core": "^4.0.14",
     "prop-types": "^15.7.2",
     "ramda": "^0.24.1",
     "react": "^17.0.1",

diff --git a/packages/i18n/src/Loader.js b/packages/i18n/src/Loader.js
@@ -253,10 +253,12 @@ EnyoLoader.prototype.loadFiles = function (paths, sync, params, callback, rootPa
 				if (this.isAvailable(_root, path)) {
 					getSync(this._pathjoin(_root, path), handler);
 
-					if (this.addPaths && Array.isArray(this.addPaths)) {
+					if (this.addPaths && Array.isArray(this.addPaths) && index === paths.length - 1) {
 						for (let addedRoot of this.addPaths) {
-							if (this.isAvailable(addedRoot, path)) {
-								getSync(this._pathjoin(addedRoot, path), handleAdditionalResourcesPath);
+							for (let i = 0; i <= index; i++) {
+								if (this.isAvailable(addedRoot, paths[i])) {
+									getSync(this._pathjoin(addedRoot, paths[i]), handleAdditionalResourcesPath);
+								}
 							}
 						}
 					}

diff --git a/packages/sampler/CHANGELOG.md b/packages/sampler/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The following is a curated list of changes in the Enact Sampler, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
 ## [4.0.13] - 2022-11-29
 
 - Replaced the deprecated plugin `addon-knobs` with `addon-controls`

diff --git a/packages/sampler/package.json b/packages/sampler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enact-sampler",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "Component and QA samples for Enact",
   "private": true,
   "main": "index.js",
@@ -12,11 +12,11 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@enact/core": "^4.0.13",
-    "@enact/i18n": "^4.0.13",
-    "@enact/spotlight": "^4.0.13",
-    "@enact/ui": "^4.0.13",
-    "@enact/webos": "^4.0.13",
+    "@enact/core": "^4.0.14",
+    "@enact/i18n": "^4.0.14",
+    "@enact/spotlight": "^4.0.14",
+    "@enact/ui": "^4.0.14",
+    "@enact/webos": "^4.0.14",
     "classnames": "^2.2.6",
     "ilib": "^14.4.0",
     "prop-types": "^15.7.2",

diff --git a/packages/spotlight/CHANGELOG.md b/packages/spotlight/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The following is a curated list of changes in the Enact spotlight module, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
 ## [4.0.13] - 2022-11-29
 
 No significant changes.

diff --git a/packages/spotlight/package.json b/packages/spotlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enact/spotlight",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "A focus management library",
   "main": "src/spotlight.js",
   "scripts": {
@@ -18,7 +18,7 @@
     }
   },
   "dependencies": {
-    "@enact/core": "^4.0.13",
+    "@enact/core": "^4.0.14",
     "classnames": "^2.2.6",
     "prop-types": "^15.7.2",
     "ramda": "^0.24.1",

diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The following is a curated list of changes in the Enact ui module, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
 ## [4.0.13] - 2022-11-29
 
 ### Fixed

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enact/ui",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "A collection of simplified unstyled cross-platform UI components for Enact",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     }
   },
   "dependencies": {
-    "@enact/core": "^4.0.13",
+    "@enact/core": "^4.0.14",
     "classnames": "^2.2.5",
     "direction": "^1.0.1",
     "invariant": "^2.2.2",

diff --git a/packages/webos/CHANGELOG.md b/packages/webos/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 The following is a curated list of changes in the Enact webos module, newest changes on the top.
 
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
 ## [4.0.13] - 2022-11-29
 
 No significant changes.

diff --git a/packages/webos/package.json b/packages/webos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enact/webos",
-  "version": "4.0.13",
+  "version": "4.0.14",
   "description": "webOS support library",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     }
   },
   "dependencies": {
-    "@enact/core": "^4.0.13",
+    "@enact/core": "^4.0.14",
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"