@ray-js/ray 1.3.1-beta.4 → 1.3.1-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray",
-  "version": "1.3.1-beta.4",
+  "version": "1.3.1-beta.5",
   "description": "ray",
   "keywords": [
     "ray"
@@ -24,11 +24,11 @@
   },
   "dependencies": {
     "@ray-core/html2mini-plugin": "0.0.6",
-    "@ray-core/macro": "^0.3.0-beta.4",
-    "@ray-js/api": "^1.3.1-beta.4",
-    "@ray-js/capability": "^1.3.1-beta.4",
-    "@ray-js/components": "^1.3.1-beta.4",
-    "@ray-js/framework": "^1.3.1-beta.4"
+    "@ray-core/macro": "^0.3.0-beta.5",
+    "@ray-js/api": "^1.3.1-beta.5",
+    "@ray-js/capability": "^1.3.1-beta.5",
+    "@ray-js/components": "^1.3.1-beta.5",
+    "@ray-js/framework": "^1.3.1-beta.5"
   },
   "maintainers": [
     {
@@ -36,6 +36,6 @@
       "ezmail": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "c0c8886357ff5b3341d30373dc79e7f209cc5047",
+  "gitHead": "a92b86f3b329e95087bee33c396019c1467ce414",
   "repository": {}
 }

package/plugins/i18n-plugin/index.js

@@ -1,8 +1,8 @@
 /**
  * i18n plugin
  *
- * 用于将语言包从项目 src/i18n 目录 或 node_modules/@ray-js/i18n 目录
- * 且该目录下的以 strings.{js|json|ts} 结尾的文件转换为 strings.json
+ * 用于将语言包从项目 src/i18n 或 src/locales 目录 或 node_modules/@ray-js/i18n 目录
+ * 且该目录下的以 {strings|index}.{js|json|ts} 结尾的文件转换为 strings.json
  * 并 strings.json 提取到构建目录的 i18n 目录中
  *
  */
@@ -13,7 +13,7 @@ const fs = require('fs-extra')
 const { requireJSFile } = require('@ray-js/shared')
 
 const exts = ['json', 'js', 'ts']
-const names = exts.map((ext) => `strings.${ext}`)
+const names = exts.map((ext) => `strings.${ext}`).concat(exts.map((ext) => `index.${ext}`))
 
 const throttle = function (fn, timeout) {
   let id
@@ -79,14 +79,14 @@ const i18nPkgBuilderCreator = function (root, outputFile) {
   return handle
 }
 
-const i18nHandleCreator = (root, outputFile) => {
+const i18nHandleCreator = (root, langDirName, outputFile) => {
   let i18nDirWatcher
-  const i18nDirName = path.join(root, 'i18n')
+  const i18nDirName = path.join(root, langDirName)
   const i18nPkgBuilder = i18nPkgBuilderCreator(i18nDirName, outputFile)
   const throttledI18nPkgBuilder = throttle(i18nPkgBuilder, 50)
 
   const i18nDirHandle = (name) => {
-    if (!i18nDirWatcher && name !== 'i18n') {
+    if (!i18nDirWatcher && name !== langDirName) {
       return
     }
 
@@ -112,7 +112,9 @@ const i18nHandleCreator = (root, outputFile) => {
       // 初始化时判断是否存在 i18n 目录，若存在则监听之
       const exist = fs.existsSync(i18nDirName)
       if (exist) {
-        i18nDirWatcher = fs.watch(i18nDirName, (_, name) => throttledI18nPkgBuilder(name))
+        i18nDirWatcher = fs.watch(i18nDirName, { recursive: true }, (_, name) =>
+          throttledI18nPkgBuilder(name)
+        )
       }
       // 监听 root（即src目录），用于动态判断 i18n 目录是否存在，若存在则监听之
       fs.watch(root, (_, name) => throttledI18nDirHandle(name))
@@ -126,14 +128,17 @@ module.exports = (ctx) => {
   const { cwd, source, output, watch } = options
   const i18nDistPath = path.join(output, 'i18n', 'strings.json')
   const srcDir = path.join(cwd, source)
-  const { i18nWatcherHandle, i18nPkgBuilder } = i18nHandleCreator(srcDir, i18nDistPath)
+  const i18n = i18nHandleCreator(srcDir, 'i18n', i18nDistPath)
+  const locales = i18nHandleCreator(srcDir, 'locales', i18nDistPath)
 
   return {
     name: pluginName,
     setup() {
-      i18nPkgBuilder()
+      i18n.i18nPkgBuilder()
+      locales.i18nPkgBuilder()
       if (watch) {
-        i18nWatcherHandle()
+        i18n.i18nWatcherHandle()
+        locales.i18nWatcherHandle()
       }
     },
   }