@ray-js/builder-mp 0.5.10 → 0.6.0

package/lib/build.js

@@ -62,7 +62,12 @@ function build(options, context) {
         if (debug) {
             process.env.REMAX_DEBUG = 'true'; // ray 运行时日志
         }
-        const outputPath = (0, shared_1.resolvePath)([output, target], { cwd });
+        let outputTarget = target;
+        // 适配
+        if (target === 'thing') {
+            outputTarget = 'tuya';
+        }
+        const outputPath = (0, shared_1.resolvePath)([output, outputTarget], { cwd });
         shared_1.log.info(LOG_PREFIX, '@ray-core/cli:'.green, `v${package_json_1.default.version}`);
         shared_1.log.info(LOG_PREFIX, 'cwd:'.green, cwd.underline);
         shared_1.log.info(LOG_PREFIX, 'outputDir:'.green, outputPath.underline);
@@ -156,35 +161,35 @@ function build(options, context) {
                     .use('env-loader')
                     .loader(require.resolve('@ray-js/env-loader'))
                     .options({ platform: target })
+                    .end()
+                    .end()
+                    // context
+                    .rule('ray-context')
+                    .test(moduleMatcher)
+                    .include.add(path_1.default.join(builder_1.builder.options.cwd, builder_1.builder.options.source))
+                    .end()
+                    .exclude.add((m) => /\.rjs/i.test(m))
+                    .end()
+                    .pre()
+                    .use('context-loader')
+                    .loader(require.resolve('babel-loader'))
+                    .options({
+                    babelrc: false,
+                    presets: ['@babel/preset-typescript'],
+                    plugins: [
+                        // 对项目下的文件进行 context 实例的包裹 透传如 pageConfig appConfig
+                        [require.resolve('./babel/plugins/ray-page-context/index')],
+                        '@babel/plugin-syntax-jsx',
+                        [
+                            '@babel/plugin-proposal-decorators',
+                            {
+                                legacy: true,
+                            },
+                        ],
+                    ],
+                })
                     .end()
                     .end();
-                // context
-                // .rule('ray-context')
-                // .test(moduleMatcher)
-                // .include.add(path.join(builder.options.cwd!, builder.options.source!))
-                // .end()
-                // .exclude.add((m: string) => /\.rjs/i.test(m))
-                // .end()
-                // .pre()
-                // .use('context-loader')
-                // .loader(require.resolve('babel-loader'))
-                // .options({
-                //   babelrc: false,
-                //   presets: ['@babel/preset-typescript'],
-                //   plugins: [
-                //     // 对项目下的文件进行 context 实例的包裹 透传如 pageConfig appConfig
-                //     [require.resolve('./babel/plugins/ray-page-context/index')],
-                //     '@babel/plugin-syntax-jsx',
-                //     [
-                //       '@babel/plugin-proposal-decorators',
-                //       {
-                //         legacy: true,
-                //       },
-                //     ],
-                //   ],
-                // })
-                // .end()
-                // .end()
                 config.module
                     .rule('rjs')
                     .test(/\.rjs$/)
@@ -211,9 +216,9 @@ function build(options, context) {
         // FIXME: ray 支持注册其他平台适配器
         remaxApi.registerAdapterPlugins = function (target) {
             // @ts-ignore
-            if (target === 'tuya') {
+            if (target === 'thing') {
                 this.adapter.target = target;
-                this.adapter.packageName = '@ray-js/remax-tuya';
+                this.adapter.packageName = '@ray-js/adapter';
                 const packagePath = this.adapter.packageName + '/node';
                 let plugin = require(packagePath).default || require(packagePath);
                 plugin = typeof plugin === 'function' ? plugin() : plugin;

package/lib/webpack/plugins/app-entry/index.d.ts

@@ -1,7 +1,7 @@
 import Config from 'webpack-chain';
-declare const _default: (config: Config) => void;
 /**
  * 小程序框架启动, 在文件顶部增加 .ray/main.mini 的适配
  * 读取 TabBar 信息，注册页面到 router 上。实现 web 路由的跳转
  */
+declare const _default: (config: Config) => void;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.5.10",
+  "version": "0.6.0",
   "description": "Ray builder for mini program",
   "keywords": [
     "ray"
@@ -28,9 +28,9 @@
     "@ray-core/build-store": "^0.0.x",
     "@ray-core/cli": "^0.0.x",
     "@ray-core/ray": "^0.0.x",
-    "@ray-js/remax-tuya": "^0.5.10",
-    "@ray-js/shared": "^0.5.10",
-    "@ray-js/types": "^0.5.10",
+    "@ray-js/adapter": "^0.6.0",
+    "@ray-js/shared": "^0.6.0",
+    "@ray-js/types": "^0.6.0",
     "babel-loader": "^8.2.3",
     "babel-plugin-minify-dead-code-elimination": "^0.5.1",
     "babel-plugin-transform-prune-unused-imports": "^1.0.1",
@@ -61,6 +61,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "955dd59a037cbfbafd76f6f8f82d74d447e6a152",
+  "gitHead": "d7e74c750c02eda67af6e54da93aad14d001acb3",
   "repository": {}
 }