@ray-js/router-mp 0.10.2 → 0.20.0-beta.0

package/lib/Router.d.ts

@@ -1,6 +1,11 @@
 import { Router as TRouter, RouteOptions } from '@ray-js/types';
 import { RouterScheduler } from './RouterScheduler';
 export declare class Router implements TRouter {
+    private urlPrefix;
+    /**
+     * setUrlPrefix
+     */
+    setUrlPrefix(prefix: string): void;
     scheduler: RouterScheduler;
     /**
      * 标准化路由路径，将 web 标准的地址栏转化到 小程序地址

package/lib/Router.js

@@ -7,6 +7,10 @@ import "core-js/modules/es.promise.js";
 import "core-js/modules/es.array.slice.js";
 import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.string.replace.js";
+import "core-js/modules/es.regexp.constructor.js";
+import "core-js/modules/es.regexp.dot-all.js";
+import "core-js/modules/es.regexp.sticky.js";
+import "core-js/modules/es.regexp.to-string.js";
 import { url } from '@ray-js/library';
 import { navigateBack, navigateTo, reLaunch, switchTab, redirectTo, getLaunchOptionsSync } from '@ray-js/api';
 import { isThing } from '@ray-js/env';
@@ -33,10 +37,21 @@ export var Router = /*#__PURE__*/function () {
   function Router() {
     _classCallCheck(this, Router);
 
+    _defineProperty(this, "urlPrefix", '');
+
     _defineProperty(this, "scheduler", new RouterScheduler());
   }
 
   _createClass(Router, [{
+    key: "setUrlPrefix",
+    value:
+    /**
+     * setUrlPrefix
+     */
+    function setUrlPrefix(prefix) {
+      this.urlPrefix = prefix;
+    }
+  }, {
     key: "normalizeRoute",
     value:
     /**
@@ -53,6 +68,11 @@ export var Router = /*#__PURE__*/function () {
 
       if (!matchedPage) {
         return Promise.reject(undefined);
+      } // 作为其他小程序时不能作为tabBar
+
+
+      if (this.urlPrefix) {
+        matchedPage.isTabBar = false;
       }
 
       var finalPath = matchedPage.path; // FIXME: tabBar.list里的页面不能有query，也不能有hash
@@ -70,11 +90,19 @@ export var Router = /*#__PURE__*/function () {
       /**
        * 坑点之一
        * 微信小程序: app.json 里的页面配置不能以`/`开头，wx.navigatorTo 却需要
-       * 涂药小程序: 都不能以`/`开头
+       * 涂鸦小程序: 都不能以`/`开头
        */
 
 
-      matchedPage.path = isThing ? finalPath.replace(/^\//, '') : finalPath;
+      if (this.urlPrefix) {
+        finalPath = ('/' + this.urlPrefix + '/' + finalPath).replace(/\/+/g, '/');
+      }
+
+      if (isThing) {
+        finalPath = finalPath.replace(/^\//, '');
+      }
+
+      matchedPage.path = finalPath;
       return Promise.resolve(matchedPage);
     }
   }, {
@@ -142,7 +170,9 @@ export var Router = /*#__PURE__*/function () {
     key: "href",
     get: function get() {
       var page = currentPage();
-      var path = url.params("/".concat(page.route), page.options);
+      var reg = RegExp('^' + this.urlPrefix + '/');
+      var r = page.route.replace(reg, '');
+      var path = url.params("/".concat(r), page.options);
 
       var _url$parse2 = url.parse(path),
           pathname = _url$parse2.pathname,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/router-mp",
-  "version": "0.10.2",
+  "version": "0.20.0-beta.0",
   "description": "Ray Core",
   "keywords": [
     "ray"
@@ -20,16 +20,16 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-js/api": "^0.10.2",
-    "@ray-js/env": "^0.10.2",
-    "@ray-js/library": "^0.10.2",
-    "@ray-js/types": "^0.10.2",
+    "@ray-js/api": "^0.20.0-beta.0",
+    "@ray-js/env": "^0.20.0-beta.0",
+    "@ray-js/library": "^0.20.0-beta.0",
+    "@ray-js/types": "^0.20.0-beta.0",
     "@react-navigation/core": "^6.1.0",
     "path-to-regexp": "^6.2.0",
     "slash": "^5.0.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.10.2"
+    "@ray-js/cli": "^0.20.0-beta.0"
   },
   "maintainers": [
     {
@@ -37,6 +37,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "05f65fee00b3174d78bd9201df6eb8cedfcfe03f",
+  "gitHead": "5f36d50a16fb4a25a16b04d35b211af44b677dce",
   "repository": {}
 }