-> v0.25.0

Merge pull request #484 from mrkishi/goto-temporary-fix
Ensure deepest layout is always refreshed on goto
2026-01-13 11:35:28 +00:00 · 2019-02-01 06:45:08 -05:00 · 2019-02-01 06:40:43 -05:00 · 2019-02-01 06:39:25 -05:00 · 2019-02-01 06:15:30 -05:00 · 2019-02-01 06:04:43 -05:00
12 changed files with 205 additions and 86 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # sapper changelog

+## 0.25.0
+
+* Force refresh on `goto(current_url)` ([#484](https://github.com/sveltejs/sapper/pull/484))
+* Fix preloading navigation bug ([#532](https://github.com/sveltejs/sapper/issues/532))
+* Don't mutate opts.headers ([#528](https://github.com/sveltejs/sapper/issues/528))
+* Don't crawl hundreds of pages simultaneously ([#369](https://github.com/sveltejs/sapper/pull/369))
+
 ## 0.24.3

 * Add service-worker-index.html shell file for offline support ([#422](https://github.com/sveltejs/sapper/issues/422))
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.24.2",
+  "version": "0.24.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -2334,24 +2334,28 @@
      "dependencies": {
        "abbrev": {
          "version": "1.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
          "dev": true,
          "optional": true
        },
        "ansi-regex": {
          "version": "2.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
          "dev": true
        },
        "aproba": {
          "version": "1.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
          "dev": true,
          "optional": true
        },
        "are-we-there-yet": {
          "version": "1.1.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2361,12 +2365,14 @@
        },
        "balanced-match": {
          "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
          "dev": true
        },
        "brace-expansion": {
          "version": "1.1.11",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
          "dev": true,
          "requires": {
            "balanced-match": "^1.0.0",
@@ -2375,34 +2381,40 @@
        },
        "chownr": {
          "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
          "dev": true,
          "optional": true
        },
        "code-point-at": {
          "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
          "dev": true
        },
        "concat-map": {
          "version": "0.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
          "dev": true
        },
        "console-control-strings": {
          "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
          "dev": true
        },
        "core-util-is": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
          "dev": true,
          "optional": true
        },
        "debug": {
          "version": "2.6.9",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2411,25 +2423,29 @@
        },
        "deep-extend": {
          "version": "0.5.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==",
          "dev": true,
          "optional": true
        },
        "delegates": {
          "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
          "dev": true,
          "optional": true
        },
        "detect-libc": {
          "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
          "dev": true,
          "optional": true
        },
        "fs-minipass": {
          "version": "1.2.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2438,13 +2454,15 @@
        },
        "fs.realpath": {
          "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
          "dev": true,
          "optional": true
        },
        "gauge": {
          "version": "2.7.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2460,7 +2478,8 @@
        },
        "glob": {
          "version": "7.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2474,13 +2493,15 @@
        },
        "has-unicode": {
          "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
          "dev": true,
          "optional": true
        },
        "iconv-lite": {
          "version": "0.4.21",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2489,7 +2510,8 @@
        },
        "ignore-walk": {
          "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2498,7 +2520,8 @@
        },
        "inflight": {
          "version": "1.0.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2508,18 +2531,21 @@
        },
        "inherits": {
          "version": "2.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
          "dev": true
        },
        "ini": {
          "version": "1.3.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
          "dev": true,
          "optional": true
        },
        "is-fullwidth-code-point": {
          "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "dev": true,
          "requires": {
            "number-is-nan": "^1.0.0"
@@ -2527,13 +2553,15 @@
        },
        "isarray": {
          "version": "1.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
          "dev": true,
          "optional": true
        },
        "minimatch": {
          "version": "3.0.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
          "dev": true,
          "requires": {
            "brace-expansion": "^1.1.7"
@@ -2541,12 +2569,14 @@
        },
        "minimist": {
          "version": "0.0.8",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
          "dev": true
        },
        "minipass": {
          "version": "2.2.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
          "dev": true,
          "requires": {
            "safe-buffer": "^5.1.1",
@@ -2555,7 +2585,8 @@
        },
        "minizlib": {
          "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2564,7 +2595,8 @@
        },
        "mkdirp": {
          "version": "0.5.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
          "dev": true,
          "requires": {
            "minimist": "0.0.8"
@@ -2572,13 +2604,15 @@
        },
        "ms": {
          "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
          "dev": true,
          "optional": true
        },
        "needle": {
          "version": "2.2.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-eFagy6c+TYayorXw/qtAdSvaUpEbBsDwDyxYFgLZ0lTojfH7K+OdBqAF7TAFwDokJaGpubpSGG0wO3iC0XPi8w==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2589,7 +2623,8 @@
        },
        "node-pre-gyp": {
          "version": "0.10.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2607,7 +2642,8 @@
        },
        "nopt": {
          "version": "4.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2617,13 +2653,15 @@
        },
        "npm-bundled": {
          "version": "1.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==",
          "dev": true,
          "optional": true
        },
        "npm-packlist": {
          "version": "1.1.10",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2633,7 +2671,8 @@
        },
        "npmlog": {
          "version": "4.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2645,18 +2684,21 @@
        },
        "number-is-nan": {
          "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
          "dev": true
        },
        "object-assign": {
          "version": "4.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
          "dev": true,
          "optional": true
        },
        "once": {
          "version": "1.4.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
          "dev": true,
          "requires": {
            "wrappy": "1"
@@ -2664,19 +2706,22 @@
        },
        "os-homedir": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
          "dev": true,
          "optional": true
        },
        "os-tmpdir": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
          "dev": true,
          "optional": true
        },
        "osenv": {
          "version": "0.1.5",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2686,19 +2731,22 @@
        },
        "path-is-absolute": {
          "version": "1.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
          "dev": true,
          "optional": true
        },
        "process-nextick-args": {
          "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
          "dev": true,
          "optional": true
        },
        "rc": {
          "version": "1.2.7",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2710,7 +2758,8 @@
          "dependencies": {
            "minimist": {
              "version": "1.2.0",
-              "bundled": true,
+              "resolved": false,
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
              "dev": true,
              "optional": true
            }
@@ -2718,7 +2767,8 @@
        },
        "readable-stream": {
          "version": "2.3.6",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2733,7 +2783,8 @@
        },
        "rimraf": {
          "version": "2.6.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2742,42 +2793,49 @@
        },
        "safe-buffer": {
          "version": "5.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
          "dev": true
        },
        "safer-buffer": {
          "version": "2.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
          "dev": true,
          "optional": true
        },
        "sax": {
          "version": "1.2.4",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
          "dev": true,
          "optional": true
        },
        "semver": {
          "version": "5.5.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
          "dev": true,
          "optional": true
        },
        "set-blocking": {
          "version": "2.0.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
          "dev": true,
          "optional": true
        },
        "signal-exit": {
          "version": "3.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
          "dev": true,
          "optional": true
        },
        "string-width": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
          "dev": true,
          "requires": {
            "code-point-at": "^1.0.0",
@@ -2787,7 +2845,8 @@
        },
        "string_decoder": {
          "version": "1.1.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2796,7 +2855,8 @@
        },
        "strip-ansi": {
          "version": "3.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
          "dev": true,
          "requires": {
            "ansi-regex": "^2.0.0"
@@ -2804,13 +2864,15 @@
        },
        "strip-json-comments": {
          "version": "2.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
          "dev": true,
          "optional": true
        },
        "tar": {
          "version": "4.4.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2825,13 +2887,15 @@
        },
        "util-deprecate": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
          "dev": true,
          "optional": true
        },
        "wide-align": {
          "version": "1.1.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
          "dev": true,
          "optional": true,
          "requires": {
@@ -2840,12 +2904,14 @@
        },
        "wrappy": {
          "version": "1.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
          "dev": true
        },
        "yallist": {
          "version": "3.0.2",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
          "dev": true
        }
      }
@@ -6625,6 +6691,12 @@
      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
      "dev": true
+    },
+    "yootils": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/yootils/-/yootils-0.0.14.tgz",
+      "integrity": "sha512-yWoA/a/4aVUp5nqfqdjbTdyXcR8d0OAbRQ8Ktu3ZsfQnArwLpS81oqZl3adIszX3p8NEhT0aNHARPsaTwBH/Qw==",
+      "dev": true
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.24.3",
+  "version": "0.25.0",
  "description": "Military-grade apps, engineered by Svelte",
  "bin": {
    "sapper": "./sapper"
@@ -63,7 +63,8 @@
    "ts-node": "^7.0.1",
    "typescript": "^3.1.3",
    "webpack": "^4.20.2",
-    "webpack-format-messages": "^2.0.3"
+    "webpack-format-messages": "^2.0.3",
+    "yootils": "0.0.14"
  },
  "scripts": {
    "test": "mocha --opts mocha.opts",
--- a/src/api/build.ts
+++ b/src/api/build.ts
@@ -42,7 +42,6 @@ export async function build({
 	routes = path.resolve(cwd, routes);
 	output = path.resolve(cwd, output);
 	static_files = path.resolve(cwd, static_files);
-	dest = path.resolve(cwd, dest);

 	if (legacy && bundler === 'webpack') {
 		throw new Error(`Legacy builds are not supported for projects using webpack`);
--- a/src/api/export.ts
+++ b/src/api/export.ts
@@ -3,6 +3,7 @@ import * as path from 'path';
 import * as sander from 'sander';
 import * as url from 'url';
 import fetch from 'node-fetch';
+import * as yootils from 'yootils';
 import * as ports from 'port-authority';
 import clean_html from './utils/clean_html';
 import minify_html from './utils/minify_html';
@@ -144,10 +145,11 @@ async function _export({

 		if (range === 2) {
 			if (type === 'text/html' && pathname !== '/service-worker-index.html') {
-				const urls: URL[] = [];
-
 				const cleaned = clean_html(body);

+				const q = yootils.queue(8);
+				let promise;
+
 				const base_match = /<base ([\s\S]+?)>/m.exec(cleaned);
 				const base_href = base_match && get_href(base_match[1]);
 				const base = resolve(url.href, base_href);
@@ -163,12 +165,12 @@ async function _export({
 						const url = resolve(base.href, href);

 						if (url.protocol === protocol && url.host === host) {
-							urls.push(url);
+							promise = q.add(() => handle(url));
 						}
 					}
 				}

-				await Promise.all(urls.map(handle));
+				await promise;
 			}
 		}

--- a/templates/src/client/app.ts
+++ b/templates/src/client/app.ts
@@ -36,7 +36,7 @@ const root_props: RootProps = {

 export let prefetching: {
 	href: string;
-	promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number }>;
+	promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number, new_segments?: any }>;
 } = null;
 export function set_prefetching(href, promise) {
 	prefetching = { href, promise };
@@ -137,10 +137,13 @@ export function navigate(target: Target, id: number, noscroll?: boolean, hash?:

 	const token = current_token = {};

-	return loaded.then(({ redirect, data, nullable_depth }) => {
+	return loaded.then(({ redirect, data, nullable_depth, new_segments }) => {
 		if (redirect) {
 			return goto(redirect.location, { replaceState: true });
 		}
+		if (new_segments) {
+			segments = new_segments;
+		}
 		render(data, nullable_depth, scroll_history[id], noscroll, hash, token);
 		if (document.activeElement) document.activeElement.blur();
 	});
@@ -220,6 +223,10 @@ export function prepare_page(target: Target): Promise<{
 		segments[changed_from] === new_segments[changed_from]
 	) changed_from += 1;

+	if (changed_from === new_segments.length) {
+		changed_from -= 1;
+	}
+
 	let redirect: Redirect = null;
 	let error: { statusCode: number, message: Error | string } = null;

@@ -285,11 +292,9 @@ export function prepare_page(target: Target): Promise<{
 		}
 	}).then(results => {
 		if (redirect) {
-			return { redirect };
+			return { redirect, new_segments };
 		}

-		segments = new_segments;
-
 		const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
 		const params = get_params(target.match);

@@ -303,6 +308,7 @@ export function prepare_page(target: Target): Promise<{
 			};

 			return {
+				new_segments,
 				data: Object.assign({}, props, {
 					preloading: false,
 					child: {
@@ -318,7 +324,7 @@ export function prepare_page(target: Target): Promise<{
 			path,
 			preloading: false,
 			child: Object.assign({}, root_props.child, {
-				segment: segments[0]
+				segment: new_segments[0]
 			})
 		};
 		if (changed(query, root_props.query)) data.query = query;
@@ -349,10 +355,10 @@ export function prepare_page(target: Target): Promise<{
 			}

 			level = level.props.child;
-			level.segment = segments[i + 1];
+			level.segment = new_segments[i + 1];
 		}

-		return { data, nullable_depth };
+		return { data, nullable_depth, new_segments };
 	});
 }

@@ -386,4 +392,4 @@ function detach(node: Node) {

 function changed(a: Record<string, string | true>, b: Record<string, string | true>) {
 	return JSON.stringify(a) !== JSON.stringify(b);
-}
+}
--- a/templates/src/server/middleware/get_page_handler.ts
+++ b/templates/src/server/middleware/get_page_handler.ts
@@ -105,7 +105,7 @@ export function get_page_handler(
 					);

 					if (include_cookies) {
-						if (!opts.headers) opts.headers = {};
+						opts.headers = Object.assign({}, opts.headers);

 						const cookies = Object.assign(
 							{},
--- a/test/apps/preloading/src/routes/index.html
+++ b/test/apps/preloading/src/routes/index.html
@@ -1,4 +1,6 @@
 <h1>Great success!</h1>

 <a href="slow-preload">slow preload</a>
-<a href="foo">foo</a>
+<a href="foo">foo</a>
+<a href="prefetch/qwe" rel=prefetch>prefetch qwe</a>
+<a href="prefetch/xyz" rel=prefetch>prefetch xyz</a>
--- a/test/apps/preloading/src/routes/prefetch/[slug]/index.html
+++ b/test/apps/preloading/src/routes/prefetch/[slug]/index.html
@@ -0,0 +1 @@
+<h1>{params.slug}</h1>
--- a/test/apps/preloading/src/routes/prefetch/_layout.html
+++ b/test/apps/preloading/src/routes/prefetch/_layout.html
@@ -0,0 +1 @@
+<svelte:component this={child.component} {...child.props}/>
--- a/test/apps/preloading/src/routes/prefetch/index.html
+++ b/test/apps/preloading/src/routes/prefetch/index.html
@@ -0,0 +1 @@
+<h1>prefetch</h1>
--- a/test/apps/preloading/test.ts
+++ b/test/apps/preloading/test.ts
@@ -83,4 +83,31 @@ describe('preloading', function() {
 		assert.equal(page.url(), `${base}/foo`);
 		assert.equal(await title(), 'foo');
 	});
-});
+
+	it('navigates to prefetched urls', async () => {
+		await page.goto(base);
+		await start();
+		await prefetchRoutes();
+
+		await page.hover('a[href="prefetch/qwe"]');
+		await wait(100);
+		await page.hover('a[href="prefetch/xyz"]');
+		await wait(100);
+
+		await page.click('a[href="prefetch/qwe"]');
+		await wait(50);
+
+		assert.equal(
+			await title(),
+			'qwe'
+		);
+
+		await page.goto(`${base}/prefetch`);
+		await wait(50);
+
+		assert.equal(
+			await title(),
+			'prefetch'
+		);
+	});
+});
Author	SHA1	Message	Date
Richard Harris	83c8d7f855	-> v0.25.0	2019-02-01 06:45:08 -05:00
Rich Harris	fdfe282130	Merge pull request #484 from mrkishi/goto-temporary-fix Ensure deepest layout is always refreshed on goto	2019-02-01 06:40:43 -05:00
Rich Harris	b5fbc7e0e8	Merge pull request #539 from cudr/nested-routes-navigate-fix Fix nested routes navigates	2019-02-01 06:39:25 -05:00
Rich Harris	64eb3f856a	Merge pull request #369 from sveltejs/crawl-queue Don't try to crawl hundreds of pages simultaneously	2019-02-01 06:15:30 -05:00
Richard Harris	18d8e61ecb	remove unused declaration	2019-02-01 06:04:43 -05:00
Richard Harris	2a635f92a9	merge master -> crawl-queue	2019-02-01 06:04:00 -05:00
Richard Harris	44bcbeb7d6	remove redundant line	2019-02-01 05:57:17 -05:00
Rich Harris	4023831b18	Merge pull request #542 from sveltejs/gh-528 avoid mutating `opts.headers` in `this.fetch` (#528)	2019-02-01 05:47:54 -05:00
Conduitry	92206742d4	avoid mutating `opts.headers` in `this.fetch` (#528 )	2018-12-31 17:08:29 -05:00
cudr	b6bc90cea9	add test	2018-12-26 14:12:49 +03:00
cudr	cfba9b2168	fix nested routes navigate	2018-12-25 19:05:00 +03:00
mrkishi	8108642845	Ensure deepest layout is always refreshed on goto	2018-10-18 18:14:23 -03:00
Rich Harris	18e6f29de7	merge master -> crawl-queue	2018-08-22 18:39:28 -04:00
Rich Harris	d0c6b9cdca	limit parallel crawls	2018-08-19 12:49:58 -04:00
				`@@ -0,0 +1 @@`
				`<svelte:component this={child.component} {...child.props}/>`