@ray-js/builder-mp 0.7.9-beta-1 → 0.7.13

package/lib/loaders/rjs/index.js

@@ -4,17 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const slash_1 = __importDefault(require("slash"));
+const shared_1 = require("@ray-js/shared");
+const rjs = '@ray-js/rjs-for-wechat';
 const RjsLoader = function RjsLoader(source, map) {
-    let rjsMethods = '';
-    try {
-        const x = require('@ray-js/rjs-for-wechat');
-        rjsMethods = Object.keys(x).join(', ');
+    let content = `module.exports = __minipack_require__("${(0, slash_1.default)(this._module.resource)}")`;
+    const { builder } = this.getOptions();
+    const cwd = builder.options.cwd;
+    if (process.env.PLATFORM !== 'thing') {
+        try {
+            const obj = require(rjs);
+            const rjsMethods = Object.keys(obj).join(', ');
+            content = `import { ${rjsMethods} } from '${rjs}';\n${source}`;
+        }
+        catch (e) {
+            shared_1.log.warn('rjs-loader', `Can't resolve module '${rjs}' in ${cwd}`.yellow);
+            content = source;
+        }
     }
-    catch (e) { }
-    source =
-        process.env.PLATFORM === 'thing'
-            ? `module.exports = __minipack_require__("${(0, slash_1.default)(this._module.resource)}")`
-            : `import { ${rjsMethods} } from '@ray-js/rjs-for-wechat';\n${source}`;
-    this.callback(null, source, map);
+    this.callback(null, content, map);
 };
 exports.default = RjsLoader;

package/lib/plugins/resolve-alias.js

@@ -59,11 +59,13 @@ exports.default = {
             .test(/\.rjs$/)
             .use('rjs-loader')
             .loader(require.resolve('../loaders/rjs/index'))
+            .options({ builder: builder_1.builder })
             .end();
         config.plugin('webpack-define-plugin').tap(([args]) => {
             return [Object.assign(Object.assign({}, args), { 'process.env.PLATFORM': JSON.stringify(target) })];
         });
         config.resolve.alias.set('@ray-core/ray', path_1.default.dirname(require.resolve('@ray-core/ray/package.json')));
+        config.resolve.alias.set('@ray-js/rjs-for-wechat', path_1.default.dirname(require.resolve('@ray-js/rjs-for-wechat/package.json')));
         config.resolve.alias.set('@ray-core/runtime', path_1.default.dirname(require.resolve('@ray-core/runtime/package.json')));
         // @ray-core/plugin-error-screen 使用到的 @ray-core one
         config.resolve.alias.set('@ray-core/one', path_1.default.dirname(require.resolve('@ray-js/components/package.json')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.7.9-beta-1",
+  "version": "0.7.13",
   "description": "Ray builder for mini program",
   "keywords": [
     "ray"
@@ -28,9 +28,10 @@
     "@ray-core/build-store": "^0.1.3",
     "@ray-core/cli": "^0.1.3",
     "@ray-core/ray": "^0.1.3",
-    "@ray-js/adapter": "^0.7.9-beta-1",
-    "@ray-js/shared": "^0.7.9-beta-1",
-    "@ray-js/types": "^0.7.9-beta-1",
+    "@ray-js/adapter": "^0.7.13",
+    "@ray-js/rjs-for-wechat": "^0.0.3",
+    "@ray-js/shared": "^0.7.13",
+    "@ray-js/types": "^0.7.13",
     "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 +62,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "2601f82682526ffbd3f97ce4d1e3a3390f693064",
+  "gitHead": "9a7d91dcc6beffeda2babc1565ac549a29434da5",
   "repository": {}
 }