@ray-js/ray 1.3.0-beta.2-beta-2 → 1.3.0-beta.3

package/index.d.ts

@@ -5,4 +5,3 @@ export { router as nativeRouter } from '@ray-js/api'
 export { default as location } from '@ray-js/location'
 export { default as router } from '@ray-js/router'
 export { default as platform } from '@ray-js/env'
-export * from '@ray-js/capability'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray",
-  "version": "1.3.0-beta.2-beta-2",
+  "version": "1.3.0-beta.3",
   "description": "ray",
   "keywords": [
     "ray"
@@ -15,18 +15,19 @@
     "unified.mini.js",
     "main",
     "macro.js",
-    "macro.d.ts"
+    "macro.d.ts",
+    "plugins"
   ],
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@ray-core/macro": "^0.2.6",
-    "@ray-js/api": "^1.3.0-beta.2-beta-2",
-    "@ray-js/capability": "^1.3.0-beta.2-beta-2",
-    "@ray-js/components": "^1.3.0-beta.2-beta-2",
-    "@ray-js/framework": "^1.3.0-beta.2-beta-2"
+    "@ray-core/html2mini-plugin": "0.0.6",
+    "@ray-core/macro": "^0.3.0-beta.4",
+    "@ray-js/api": "^1.3.0-beta.3",
+    "@ray-js/components": "^1.3.0-beta.3",
+    "@ray-js/framework": "^1.3.0-beta.3"
   },
   "maintainers": [
     {
@@ -34,6 +35,6 @@
       "ezmail": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "067ce2e382196cd995ebc4774fc5e977ac21115c",
+  "gitHead": "be72a5dad6214ebf9c6653df02956374c735c98e",
   "repository": {}
 }

package/plugins/html2mini-plugin/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+  name: 'html2mini-plugin',
+  registerRuntimePlugin() {
+    return require.resolve('@ray-core/html2mini-plugin')
+  },
+}

package/plugins/i18n-plugin/index.js

@@ -0,0 +1,140 @@
+/**
+ * i18n plugin
+ *
+ * 用于将语言包从项目 src/i18n 目录 或 node_modules/@ray-js/i18n 目录
+ * 且该目录下的以 strings.{js|json|ts} 结尾的文件转换为 strings.json
+ * 并 strings.json 提取到构建目录的 i18n 目录中
+ *
+ */
+
+const pluginName = 'i18n-plugin'
+const path = require('path')
+const fs = require('fs-extra')
+const { requireJSFile } = require('@ray-js/shared')
+
+const exts = ['json', 'js', 'ts']
+const names = exts.map((ext) => `strings.${ext}`)
+
+const throttle = function (fn, timeout) {
+  let id
+  return function (...args) {
+    clearTimeout(id)
+    id = setTimeout(() => fn(...args), timeout)
+  }
+}
+
+const i18nPkgBuilderCreator = function (root, outputFile) {
+  const filenames = names.map((item) => path.join(root, item))
+  let cache
+  const handle = (name) => {
+    if (!fs.existsSync(root)) {
+      return
+    }
+
+    let filename
+    // 因 fs.watch 无法区别文件删除和文件重命名
+    // 所以只能通过判断文件是否存在
+
+    // 更新时name不为空
+    if (name) {
+      filename = path.join(root, name)
+      // 文件不存在，可能是删除操作
+      if (!fs.existsSync(filename)) {
+        delete require.cache[filename]
+        cache && (cache = null)
+        return
+      }
+    }
+
+    const files = filenames.filter((item) => fs.existsSync(item))
+
+    if (files.length > 1) {
+      console.warn(`${pluginName}: Has more than one file: ${files.join('\n')}`)
+      console.warn(`${pluginName}: Will use first file: ${files[0]}`)
+    }
+
+    if (!filename) {
+      // 初始化时filename为空
+      if (files.length) {
+        filename = files[0] // 取第一个文件
+      } else {
+        return
+      }
+    }
+
+    // 记住上一次使用的语言包文件
+    if ((!cache || cache !== filename) && filenames.includes(filename)) {
+      cache = filename
+    }
+    delete require.cache[filename]
+    const data = requireJSFile(cache)
+
+    if (data) {
+      fs.outputFile(outputFile, JSON.stringify(data, null, 2), 'utf-8')
+    }
+  }
+  handle.clear = function () {
+    cache = null
+  }
+  return handle
+}
+
+const i18nHandleCreator = (root, outputFile) => {
+  let i18nDirWatcher
+  const i18nDirName = path.join(root, 'i18n')
+  const i18nPkgBuilder = i18nPkgBuilderCreator(i18nDirName, outputFile)
+  const throttledI18nPkgBuilder = throttle(i18nPkgBuilder, 50)
+
+  const i18nDirHandle = (name) => {
+    if (!i18nDirWatcher && name !== 'i18n') {
+      return
+    }
+
+    const exist = fs.existsSync(i18nDirName)
+
+    // 说明i18n目录被删除了,关闭监听
+    if (i18nDirWatcher && !exist) {
+      i18nDirWatcher.close()
+      i18nDirWatcher = null
+      i18nPkgBuilder.clear()
+      return
+    }
+    // i18n 目录删除后又创建了，需要重新监听之
+    if (!i18nDirWatcher && exist) {
+      i18nDirWatcher = fs.watch(i18nDirName, (_, name) => throttledI18nPkgBuilder(name))
+    }
+  }
+
+  const throttledI18nDirHandle = throttle(i18nDirHandle, 50)
+
+  return {
+    i18nWatcherHandle: function () {
+      // 初始化时判断是否存在 i18n 目录，若存在则监听之
+      const exist = fs.existsSync(i18nDirName)
+      if (exist) {
+        i18nDirWatcher = fs.watch(i18nDirName, (_, name) => throttledI18nPkgBuilder(name))
+      }
+      // 监听 root（即src目录），用于动态判断 i18n 目录是否存在，若存在则监听之
+      fs.watch(root, (_, name) => throttledI18nDirHandle(name))
+    },
+    i18nPkgBuilder,
+  }
+}
+
+module.exports = (ctx) => {
+  const { options } = 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)
+
+  return {
+    name: pluginName,
+    setup() {
+      i18nPkgBuilder()
+      if (watch) {
+        i18nWatcherHandle()
+      }
+    },
+  }
+}

package/unified.js

@@ -17,4 +17,3 @@ export { router as nativeRouter } from '@ray-js/api'
 export { default as router } from '@ray-js/router'
 export { default as location } from '@ray-js/location'
 export { default as platform } from '@ray-js/env'
-export * from '@ray-js/capability'

package/unified.mini.js

@@ -5,4 +5,3 @@ export { router as nativeRouter } from '@ray-js/api'
 export { default as router } from '@ray-js/router'
 export { default as location } from '@ray-js/location'
 export { default as platform } from '@ray-js/env'
-export * from '@ray-js/capability'