@ray-js/builder-mp 0.7.5 → 0.7.7

package/lib/babel/plugins/rjs-method.d.ts

@@ -0,0 +1,2 @@
+declare const getMethods: (input: string, filename: string) => any[];
+export default getMethods;

package/lib/babel/plugins/rjs-method.js

@@ -0,0 +1,80 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const babel = __importStar(require("@babel/core"));
+const traverse_1 = __importDefault(require("@babel/traverse"));
+const getMethods = (input, filename) => {
+    const methods = [];
+    const collect = (name) => methods.push(name);
+    const handle = (code, filename) => {
+        const visitor = {
+            Identifier(path, state) {
+                const name = path.node.name;
+                if (name === 'exports' || name === 'module')
+                    return;
+                state(name);
+            },
+        };
+        const ast = babel.parse(code, {
+            babelrc: false,
+            configFile: false,
+            sourceType: 'module',
+        });
+        (0, traverse_1.default)(ast, {
+            ExportNamedDeclaration(path) {
+                path.traverse(visitor, collect);
+            },
+            MemberExpression(path) {
+                const { object: { name }, property: { name: key }, } = path.node;
+                if ((name === 'module' && key === 'exports') || name === 'exports') {
+                    path.parentPath.traverse(visitor, collect);
+                }
+            },
+            ExportAllDeclaration(path) {
+                path.node.source.value;
+            },
+        });
+    };
+    handle(input, filename);
+    return methods;
+};
+exports.default = getMethods;
+const m = getMethods(`
+export default {}
+export * from './b'
+export const a = 1
+exports.q = 1
+a1.xxxx = {
+  a:1,b:2
+}
+module.exports = {
+  x:'aaa',
+  y(){},
+}
+`, './a.ts');
+console.log(m);

package/lib/build.rjs.d.ts

@@ -13,7 +13,7 @@ export declare class RjsBuilder {
     print: (prefix: string, stats: Stats[]) => void;
     parentDoneHook(): void;
     rjsDoneHook(): void;
-    createWebpackHook(): void;
+    recomposeAssets(): void;
     extractRjsModuleHook(): void;
 }
 declare const rjsBuilder: RjsBuilder;

package/lib/build.rjs.js

@@ -46,8 +46,13 @@ class RjsBuilder {
         this.init = (parentCompiler, compileOptions) => {
             this.parentCompiler = parentCompiler;
             this.compileOptions = compileOptions;
-            this.createWebpackHook();
-            this.extractRjsModuleHook();
+            this.parentDoneHook();
+            if (process.env.PLATFORM === 'thing') {
+                this.initWebpack(this.webpackConfig);
+                this.rjsDoneHook();
+                this.recomposeAssets();
+                this.extractRjsModuleHook();
+            }
         };
         this.print = (prefix, stats) => {
             setTimeout(() => {
@@ -128,10 +133,7 @@ class RjsBuilder {
             this.print(LOG_PREFIX_RJS, [stats]);
         });
     }
-    createWebpackHook() {
-        this.initWebpack(this.webpackConfig);
-        this.parentDoneHook();
-        this.rjsDoneHook();
+    recomposeAssets() {
         const PLUGIN_NAME = 'rjs-building';
         this.compiler.hooks.thisCompilation.tap('rjs-building', (compilation) => {
             compilation.hooks.processAssets.tapAsync({

package/lib/loaders/rjs/index.js

@@ -5,6 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const slash_1 = __importDefault(require("slash"));
 const RjsLoader = function RjsLoader(source, map) {
-    this.callback(null, `module.exports = __minipack_require__("${(0, slash_1.default)(this._module.resource)}")`, map);
+    let rjsMethods = '';
+    try {
+        const x = require('@ray-js/rjs-for-wechat');
+        rjsMethods = Object.keys(x).join(', ');
+    }
+    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);
 };
 exports.default = RjsLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Ray builder for mini program",
   "keywords": [
     "ray"
@@ -24,13 +24,13 @@
     "@babel/template": "^7.16.0",
     "@babel/traverse": "^7.16.3",
     "@babel/types": "^7.16.0",
-    "@ray-core/babel-preset-remax": "^0.1.x",
-    "@ray-core/build-store": "^0.1.x",
-    "@ray-core/cli": "^0.1.x",
-    "@ray-core/ray": "^0.1.x",
-    "@ray-js/adapter": "^0.7.5",
-    "@ray-js/shared": "^0.7.5",
-    "@ray-js/types": "^0.7.5",
+    "@ray-core/babel-preset-remax": "^0.1.1",
+    "@ray-core/build-store": "^0.1.1",
+    "@ray-core/cli": "^0.1.1",
+    "@ray-core/ray": "^0.1.1",
+    "@ray-js/adapter": "^0.7.7",
+    "@ray-js/shared": "^0.7.7",
+    "@ray-js/types": "^0.7.7",
     "babel-loader": "^8.2.3",
     "babel-plugin-minify-dead-code-elimination": "^0.5.1",
     "babel-plugin-transform-prune-unused-imports": "^1.0.1",
@@ -47,7 +47,7 @@
     "webpack-virtual-modules": "^0.4.4"
   },
   "devDependencies": {
-    "@ray-core/types": "^0.1.x",
+    "@ray-core/types": "^0.1.1",
     "@types/jest": "^27.0.2",
     "@types/node": "^16.9.1",
     "babel-plugin-tester": "^10.1.0",
@@ -61,6 +61,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "81eff5dbfa6fb43c3522e523a35f98ffb94cb297",
+  "gitHead": "0ee288ce478ec2b37011ff82aa927c05d78efb09",
   "repository": {}
 }