Merge branch 'develop' into feature/WRQ-222

enactjs · May 29, 2024 · b0717f0 · b0717f0
2 parents b44fc93 + ecb1029
commit b0717f0
Show file tree

Hide file tree

Showing 16 changed files with 1,373 additions and 1,281 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 The following is a curated list of changes in the Enact project, newest changes on the top.
 
+## [4.9.0-alpha.2] - 2024-05-24
+
+No significant changes.
+
+## [4.0.14] - 2024-05-14
+
+### Fixed
+
+- `i18n` resource loader to prioritize strings from additional resources files
+
+## [4.7.11] - 2024-05-13
+
+No significant changes.
+
 ## [4.9.0-alpha.1] - 2024-04-09
 
 ### Deprecated

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.9.0-alpha.1",
+  "version": "4.9.0-alpha.2",
   "packages": [
     "packages/*"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "enact",
-  "version": "4.9.0-alpha.1",
+  "version": "4.9.0-alpha.2",
   "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,18 @@
 
 The following is a curated list of changes in the Enact core module, newest changes on the top.
 
+## [4.9.0-alpha.2] - 2024-05-24
+
+No significant changes.
+
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
+## [4.7.11] - 2024-05-13
+
+No significant changes.
+
 ## [4.9.0-alpha.1] - 2024-04-09
 
 ### Deprecated

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enact/core",
-  "version": "4.9.0-alpha.1",
+  "version": "4.9.0-alpha.2",
   "description": "Enact is an open source JavaScript framework containing everything you need to create a fast, scalable mobile or web application.",
   "repository": {
     "type": "git",

diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 The following is a curated list of changes in the Enact i18n module, newest changes on the top.
 
+## [4.9.0-alpha.2] - 2024-05-24
+
+No significant changes.
+
+## [4.0.14] - 2024-05-14
+
+### Fixed
+
+- `i18n` resource loader to prioritize strings from additional resources files
+
+## [4.7.11] - 2024-05-13
+
+No significant changes.
+
 ## [4.9.0-alpha.1] - 2024-04-09
 
 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.9.0-alpha.1",
+  "version": "4.9.0-alpha.2",
   "description": "Internationalization support for Enact using iLib",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     ]
   },
   "dependencies": {
-    "@enact/core": "^4.9.0-alpha.1",
+    "@enact/core": "^4.9.0-alpha.2",
     "prop-types": "^15.8.1",
     "ramda": "^0.29.1",
     "react": "^19.0.0-rc-81c5ff2e04-20240521",

diff --git a/packages/sampler/CHANGELOG.md b/packages/sampler/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 The following is a curated list of changes in the Enact Sampler, newest changes on the top.
 
+## [4.9.0-alpha.2] - 2024-05-24
+
+No significant changes.
+
+## [4.0.14] - 2024-05-14
+
+No significant changes.
+
+## [4.7.11] - 2024-05-13
+
+No significant changes.
+
 ## [4.9.0-alpha.1] - 2024-04-09
 
 No significant changes.