@shuvi/platform-web 1.0.38 → 1.0.39

package/esm/shuvi-app/react/Link.jsx

@@ -37,6 +37,7 @@ function prefetchViaDom(href, id, as) {
     return new Promise((res, rej) => {
         const selector = `
         link[rel="prefetch"][href^="${href}"],
+        link[rel="preload"][href^="${href}"],
         script[src^="${href}"]`;
         if (document.querySelector(selector)) {
             return res();

package/lib/node/features/filesystem-routes/page/routes.js

@@ -10,9 +10,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRoutesContent = exports.normalizeRoutes = exports.serializeRoutes = void 0;
 const crypto_1 = require("crypto");
+const path_1 = __importDefault(require("path"));
 const constants_1 = require("@shuvi/shared/constants");
 const file_1 = require("@shuvi/utils/file");
 const paths_1 = require("../../../paths");
@@ -43,9 +47,11 @@ function serializeRoutes(routes, { includeMeta, useEmptyComponent }) {
                 if (useEmptyComponent) {
                     componentRequest = EmptyComponnetPath;
                 }
+                const fileExtension = path_1.default.extname(component);
+                const fileName = path_1.default.basename(component, fileExtension);
                 strRoute += `
 __import__: () => import(
-  /* webpackChunkName: "page-${id}" */
+  /* webpackChunkName: "${fileName}-${id}" */
   /* webpackExports: "default" */
   "${componentRequest}"),
 __resolveWeak__: () => [require.resolveWeak("${componentRequest}")]`.trim();

package/lib/node/features/html-render/lib/generateFilesByRoutId.js

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function generateFilesByRoutId(assetMap, routes) {
     let filesByRoutId = {};
-    const loadable = assetMap.loadble;
-    routes.forEach(({ id, __componentRawRequest__ }) => {
-        if (__componentRawRequest__ && loadable[__componentRawRequest__]) {
-            filesByRoutId[id] = loadable[__componentRawRequest__].files;
+    const processRoute = (route) => {
+        const { id, __componentRawRequest__, children } = route;
+        // Process the current route
+        if (__componentRawRequest__ && assetMap.loadble[__componentRawRequest__]) {
+            filesByRoutId[id] = assetMap.loadble[__componentRawRequest__].files;
         }
-    });
+        // Recursively process children
+        if (children) {
+            children.forEach(processRoute);
+        }
+    };
+    routes.forEach(processRoute);
     return filesByRoutId;
 }
 exports.default = generateFilesByRoutId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,15 +72,15 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.38",
-    "@shuvi/hook": "1.0.38",
-    "@shuvi/platform-shared": "1.0.38",
-    "@shuvi/router": "1.0.38",
-    "@shuvi/router-react": "1.0.38",
-    "@shuvi/runtime": "1.0.38",
-    "@shuvi/shared": "1.0.38",
-    "@shuvi/toolpack": "1.0.38",
-    "@shuvi/utils": "1.0.38",
+    "@shuvi/error-overlay": "1.0.39",
+    "@shuvi/hook": "1.0.39",
+    "@shuvi/platform-shared": "1.0.39",
+    "@shuvi/router": "1.0.39",
+    "@shuvi/router-react": "1.0.39",
+    "@shuvi/runtime": "1.0.39",
+    "@shuvi/shared": "1.0.39",
+    "@shuvi/toolpack": "1.0.39",
+    "@shuvi/utils": "1.0.39",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "doura": "0.0.13",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.38"
+    "@shuvi/service": "1.0.39"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",