@ray-js/router-mp 1.6.19 → 1.6.20

package/lib/Router.js

@@ -1,9 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "core-js/modules/es.regexp.constructor.js";
-import "core-js/modules/es.regexp.dot-all.js";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.replace.js";
 import { url } from '@ray-js/library';
 import { navigateBack, navigateTo, reLaunch, switchTab, redirectTo } from '@ray-js/api';
 import { RouterScheduler, currentPage } from './RouterScheduler';
@@ -33,19 +28,15 @@ function pathRelative(fromPath, toPath) {
   return result;
 }
 export class Router {
-  constructor() {
-    // 只有作为其他小程序的子包时，才设置urlPrefix
-    _defineProperty(this, "urlPrefix", '');
-    /**
-     * 功能页模式为 functional，使用相对路径模式
-     * 如果是绝对路径，表示跳转到宿主小程序
-     *
-     * @private
-     */
-    _defineProperty(this, "mode", 'miniprogram');
-    _defineProperty(this, "scheduler", new RouterScheduler());
-  }
-  // functional
+  // 只有作为其他小程序的子包时，才设置urlPrefix
+  urlPrefix = '';
+  /**
+   * 功能页模式为 functional，使用相对路径模式
+   * 如果是绝对路径，表示跳转到宿主小程序
+   *
+   * @private
+   */
+  mode = 'miniprogram'; // functional
 
   /**
    * setUrlPrefix
@@ -56,6 +47,8 @@ export class Router {
   setMode(mode) {
     this.mode = mode;
   }
+  scheduler = (() => new RouterScheduler())();
+
   /**
    * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址
    */
@@ -180,7 +173,7 @@ export class Router {
     const page = currentPage();
     const reg = RegExp('^' + this.urlPrefix + '/');
     const r = page.route.replace(reg, '');
-    const path = url.params("/".concat(r), page.options);
+    const path = url.params(`/${r}`, page.options);
     const {
       pathname,
       query,

package/lib/RouterScheduler.js

@@ -1,10 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.some.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import { compile, match, pathToRegexp } from 'path-to-regexp';
 import { url } from '@ray-js/library';
 import slash from 'slash';
@@ -30,13 +28,9 @@ export function currentPage() {
  * 小程序路由别名机制，将标准化的 web pathname 转化为小程序的 path
  */
 export class RouterScheduler extends IRouterScheduler {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "$entityMap", []);
-    _defineProperty(this, "$subPackageRoute", {});
-    _defineProperty(this, "$pathMap", []);
-  }
-  // 以小程序路径作为键存储关系
+  $entityMap = [];
+  $subPackageRoute = {};
+  $pathMap = []; // 以小程序路径作为键存储关系
 
   getCurrentRoute() {
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/router-mp",
-  "version": "1.6.19",
+  "version": "1.6.20",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -26,19 +26,19 @@
     "@ray-js/api": "1.5.17"
   },
   "dependencies": {
-    "@ray-js/env": "1.6.19",
-    "@ray-js/library": "1.6.19",
-    "@ray-js/types": "1.6.19",
+    "@ray-js/env": "1.6.20",
+    "@ray-js/library": "1.6.20",
+    "@ray-js/types": "1.6.20",
     "@react-navigation/core": "^6.4.17",
     "path-to-regexp": "^6.3.0",
     "slash": "^5.1.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.19"
+    "@ray-js/cli": "1.6.20"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "4ea8520f14ca36fcd9a397609c329421ce5704db"
+  "gitHead": "09a3ae02055470a3c05e953f2a4aec0d34c12952"
 }