@tarojs/taro-h5 3.4.0-beta.0 → 3.5.0-canary.0

package/dist/index.cjs.js

@@ -1574,6 +1574,94 @@ var runtime = {exports: {}};
 
 var regenerator = runtime.exports;
 
+var toConsumableArray = {exports: {}};
+
+var arrayWithoutHoles = {exports: {}};
+
+var arrayLikeToArray = {exports: {}};
+
+(function (module) {
+  function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+
+    for (var i = 0, arr2 = new Array(len); i < len; i++) {
+      arr2[i] = arr[i];
+    }
+
+    return arr2;
+  }
+
+  module.exports = _arrayLikeToArray;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(arrayLikeToArray);
+
+(function (module) {
+  var arrayLikeToArray$1 = arrayLikeToArray.exports;
+
+  function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return arrayLikeToArray$1(arr);
+  }
+
+  module.exports = _arrayWithoutHoles;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(arrayWithoutHoles);
+
+var iterableToArray = {exports: {}};
+
+(function (module) {
+  function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+  }
+
+  module.exports = _iterableToArray;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(iterableToArray);
+
+var unsupportedIterableToArray = {exports: {}};
+
+(function (module) {
+  var arrayLikeToArray$1 = arrayLikeToArray.exports;
+
+  function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return arrayLikeToArray$1(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(o);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return arrayLikeToArray$1(o, minLen);
+  }
+
+  module.exports = _unsupportedIterableToArray;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(unsupportedIterableToArray);
+
+var nonIterableSpread = {exports: {}};
+
+(function (module) {
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+
+  module.exports = _nonIterableSpread;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(nonIterableSpread);
+
+(function (module) {
+  var arrayWithoutHoles$1 = arrayWithoutHoles.exports;
+  var iterableToArray$1 = iterableToArray.exports;
+  var unsupportedIterableToArray$1 = unsupportedIterableToArray.exports;
+  var nonIterableSpread$1 = nonIterableSpread.exports;
+
+  function _toConsumableArray(arr) {
+    return arrayWithoutHoles$1(arr) || iterableToArray$1(arr) || unsupportedIterableToArray$1(arr) || nonIterableSpread$1();
+  }
+
+  module.exports = _toConsumableArray;
+  module.exports["default"] = module.exports, module.exports.__esModule = true;
+})(toConsumableArray);
+
+var _toConsumableArray = /*@__PURE__*/getDefaultExportFromCjs(toConsumableArray.exports);
+
 var slicedToArray = {exports: {}};
 
 var arrayWithHoles = {exports: {}};
@@ -1624,41 +1712,6 @@ var iterableToArrayLimit = {exports: {}};
   module.exports["default"] = module.exports, module.exports.__esModule = true;
 })(iterableToArrayLimit);
 
-var unsupportedIterableToArray = {exports: {}};
-
-var arrayLikeToArray = {exports: {}};
-
-(function (module) {
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) {
-      arr2[i] = arr[i];
-    }
-
-    return arr2;
-  }
-
-  module.exports = _arrayLikeToArray;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(arrayLikeToArray);
-
-(function (module) {
-  var arrayLikeToArray$1 = arrayLikeToArray.exports;
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return arrayLikeToArray$1(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return arrayLikeToArray$1(o, minLen);
-  }
-
-  module.exports = _unsupportedIterableToArray;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(unsupportedIterableToArray);
-
 var nonIterableRest = {exports: {}};
 
 (function (module) {
@@ -1754,59 +1807,6 @@ var createForOfIteratorHelper = {exports: {}};
 
 var _createForOfIteratorHelper = /*@__PURE__*/getDefaultExportFromCjs(createForOfIteratorHelper.exports);
 
-var toConsumableArray = {exports: {}};
-
-var arrayWithoutHoles = {exports: {}};
-
-(function (module) {
-  var arrayLikeToArray$1 = arrayLikeToArray.exports;
-
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return arrayLikeToArray$1(arr);
-  }
-
-  module.exports = _arrayWithoutHoles;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(arrayWithoutHoles);
-
-var iterableToArray = {exports: {}};
-
-(function (module) {
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-
-  module.exports = _iterableToArray;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(iterableToArray);
-
-var nonIterableSpread = {exports: {}};
-
-(function (module) {
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-
-  module.exports = _nonIterableSpread;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(nonIterableSpread);
-
-(function (module) {
-  var arrayWithoutHoles$1 = arrayWithoutHoles.exports;
-  var iterableToArray$1 = iterableToArray.exports;
-  var unsupportedIterableToArray$1 = unsupportedIterableToArray.exports;
-  var nonIterableSpread$1 = nonIterableSpread.exports;
-
-  function _toConsumableArray(arr) {
-    return arrayWithoutHoles$1(arr) || iterableToArray$1(arr) || unsupportedIterableToArray$1(arr) || nonIterableSpread$1();
-  }
-
-  module.exports = _toConsumableArray;
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-})(toConsumableArray);
-
-var _toConsumableArray = /*@__PURE__*/getDefaultExportFromCjs(toConsumableArray.exports);
-
 var r,
     B = r || (r = {});
 B.Pop = "POP";
@@ -2286,6 +2286,17 @@ var Stacks = /*#__PURE__*/function () {
     value: function getItem(index) {
       return this.stacks[index];
     }
+  }, {
+    key: "getLastIndex",
+    value: function getLastIndex(pathname) {
+      var list = _toConsumableArray(this.stacks).reverse();
+
+      return list.findIndex(function (page) {
+        var _page$path;
+
+        return ((_page$path = page.path) === null || _page$path === void 0 ? void 0 : _page$path.replace(/\?.*/g, '')) === pathname;
+      });
+    }
   }, {
     key: "getDelta",
     value: function getDelta(pathname) {
@@ -2294,17 +2305,18 @@ var Stacks = /*#__PURE__*/function () {
       } // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
 
 
-      var prevIndex = this.stacks.findIndex(function (r) {
-        var _r$path;
-
-        return ((_r$path = r.path) === null || _r$path === void 0 ? void 0 : _r$path.replace(/\?.*/g, '')) === pathname;
-      });
-      return this.length - 1 - prevIndex;
+      return this.getLastIndex(pathname) || 1;
     }
   }, {
     key: "getPrevIndex",
     value: function getPrevIndex(pathname) {
-      return this.length - 1 - this.getDelta(pathname);
+      var lastIndex = this.getLastIndex(pathname);
+
+      if (lastIndex < 0) {
+        return -1;
+      }
+
+      return this.length - 1 - lastIndex;
     }
   }, {
     key: "pop",
@@ -3819,10 +3831,10 @@ function pageOnReady(page) {
   var pageEl = document.getElementById(page.path);
 
   if (pageEl && !(pageEl !== null && pageEl !== void 0 && pageEl['__isReady'])) {
-    var _el$componentOnReady;
+    var _el$componentOnReady, _el$componentOnReady$;
 
     var el = pageEl.firstElementChild;
-    el === null || el === void 0 ? void 0 : (_el$componentOnReady = el['componentOnReady']) === null || _el$componentOnReady === void 0 ? void 0 : _el$componentOnReady.call(el).then(function () {
+    el === null || el === void 0 ? void 0 : (_el$componentOnReady = el['componentOnReady']) === null || _el$componentOnReady === void 0 ? void 0 : (_el$componentOnReady$ = _el$componentOnReady.call(el)) === null || _el$componentOnReady$ === void 0 ? void 0 : _el$componentOnReady$.then(function () {
       runtime$1.requestAnimationFrame(function () {
         page.onReady();
         pageEl['__isReady'] = true;
@@ -4045,7 +4057,7 @@ function createRouter(app, config, framework) {
               shouldLoad = true;
 
             case 46:
-              if (!shouldLoad) {
+              if (!(shouldLoad || stacks.length < 1)) {
                 _context.next = 54;
                 break;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.4.0-beta.0",
+  "version": "3.5.0-canary.0",
   "description": "Taro h5 framework",
   "main:h5": "src/index.js",
   "main": "dist/index.cjs.js",
@@ -33,13 +33,13 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.4.0-beta.0",
-    "@tarojs/router": "3.4.0-beta.0",
-    "@tarojs/runtime": "3.4.0-beta.0",
+    "@tarojs/api": "3.5.0-canary.0",
+    "@tarojs/router": "3.5.0-canary.0",
+    "@tarojs/runtime": "3.5.0-canary.0",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
     "whatwg-fetch": "^3.4.0"
   },
-  "gitHead": "107670bc2360ee9136a0e558e6d5fad1db640fba"
+  "gitHead": "a0222bc41bc05b0e34413d6db3de963d777a5015"
 }