@shuvi/platform-web 1.0.37 → 1.0.38

package/esm/shuvi-app/app/client.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getRoutes } from '@shuvi/app/core/platform';
-import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
+import { runPreload, runLoaders, createLoaderContext, getRouteMatchesWithInvalidLoader, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createBrowserHistory, createHashHistory } from '@shuvi/router';
 import { historyMode } from '@shuvi/app/files/routerConfig';
@@ -63,6 +63,12 @@ export const createApp = ({ routes, appData, appComponent }) => {
         const runLoadersTrace = clientRenderTrace.traceChild(SHUVI_CLIENT_RUN_LOADERS.name);
         const pageLoaders = yield app.getLoaders();
         const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
+        const loaderContext = createLoaderContext({
+            pathname: to.pathname,
+            query: to.query,
+            params: to.params,
+            getAppContext: () => app.context
+        });
         try {
             const loaderDatas = yield new Promise((resolve, reject) => {
                 let value;
@@ -85,12 +91,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
                     .catch(err => {
                     reject(err);
                 });
-                runLoaders(matches, pageLoaders, {
-                    pathname: to.pathname,
-                    query: to.query,
-                    params: to.params,
-                    getAppContext: () => app.context
-                })
+                runLoaders(matches, pageLoaders, loaderContext)
                     .then(_value => {
                     value = _value;
                     tryResolve();

package/esm/shuvi-app/app/server.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import routes from '@shuvi/app/files/routes';
 import { getRoutes, app as AppComponent } from '@shuvi/app/core/platform';
-import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
+import { runLoaders, createLoaderContext, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createMemoryHistory, pathToString } from '@shuvi/router';
 import { SERVER_CREATE_APP } from '@shuvi/shared/constants/trace';
@@ -33,14 +33,15 @@ export const createApp = options => {
             const runLoadersTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_LOADERS.name, { [SHUVI_SERVER_RUN_LOADERS.attrs.requestId.name]: req._requestId });
             const pageLoaders = yield app.getLoaders();
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
+            const loaderContext = createLoaderContext({
+                req,
+                pathname: to.pathname,
+                query: to.query,
+                params: to.params,
+                getAppContext: () => app.context
+            });
             try {
-                const loaderResult = yield runLoaders(matches, pageLoaders, {
-                    req,
-                    pathname: to.pathname,
-                    query: to.query,
-                    params: to.params,
-                    getAppContext: () => app.context
-                });
+                const loaderResult = yield runLoaders(matches, pageLoaders, loaderContext);
                 app.setLoadersData(loaderResult);
                 runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.error.name, false);
                 runLoadersTrace.stop();
@@ -73,9 +74,7 @@ export const createApp = options => {
                     runLoadersTrace.stop();
                     return;
                 }
-                if (process.env.NODE_ENV === 'development') {
-                    logger.error(error.stack);
-                }
+                logger.error(error.stack);
                 app.setError(serializeServerError(error));
                 next();
                 runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.errorType.name, 'unexpectedError');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "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.37",
-    "@shuvi/hook": "1.0.37",
-    "@shuvi/platform-shared": "1.0.37",
-    "@shuvi/router": "1.0.37",
-    "@shuvi/router-react": "1.0.37",
-    "@shuvi/runtime": "1.0.37",
-    "@shuvi/shared": "1.0.37",
-    "@shuvi/toolpack": "1.0.37",
-    "@shuvi/utils": "1.0.37",
+    "@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",
     "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.37"
+    "@shuvi/service": "1.0.38"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",