@shuvi/platform-web 1.0.28 → 1.0.30

package/esm/shared/appTypes.d.ts

@@ -1,6 +1,7 @@
 import { IPageRouteRecord, IAppData, IAppState, Application as _Application } from '@shuvi/platform-shared/shared';
 import { ApplicationImpl as _ApplicationImpl } from '@shuvi/platform-shared/shuvi-app/application';
 import type { ShuviRequest } from '@shuvi/service';
+import { Span } from '@shuvi/service/lib/trace';
 export interface AppConfig {
     ssr: boolean;
 }
@@ -10,6 +11,7 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
+        serverCreateAppTrace: Span;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/esm/shared/renderTypes.d.ts

@@ -2,6 +2,7 @@ import type { ShuviRequest } from '@shuvi/service';
 import { Response, IAppData } from '@shuvi/platform-shared/shared';
 import { IManifest } from '../shared';
 import { Application } from './appTypes';
+import { Span } from '@shuvi/service/lib/trace';
 export declare type IRenderViewOptions = {
     app: Application;
 };
@@ -38,6 +39,7 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
 export interface IServerRendererOptions extends IRenderOptions {
     req: ShuviRequest;
     manifest: IManifest;
+    serverRequestTrace: Span;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

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

@@ -13,8 +13,11 @@ import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createBrowserHistory, createHashHistory } from '@shuvi/router';
 import { historyMode } from '@shuvi/app/files/routerConfig';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
+import { CLIENT_RENDER } from '@shuvi/shared/constants/trace';
 import isThirdSite from '../helper/isThirdSite';
+import { clientRenderTrace } from '../entry/client/trace';
 let app;
+const { SHUVI_CLIENT_RUN_LOADERS } = CLIENT_RENDER.events;
 export const createApp = ({ routes, appData, appComponent }) => {
     // app is a singleton in client side
     if (app) {
@@ -57,6 +60,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
             next();
             return;
         }
+        const runLoadersTrace = clientRenderTrace.traceChild(SHUVI_CLIENT_RUN_LOADERS.name);
         const pageLoaders = yield app.getLoaders();
         const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
         try {
@@ -97,8 +101,11 @@ export const createApp = ({ routes, appData, appComponent }) => {
                 });
             });
             app.setLoadersData(loaderDatas);
+            runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.error.name, false);
+            runLoadersTrace.stop();
         }
         catch (error) {
+            runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.error.name, true);
             if (isRedirect(error)) {
                 const location = error.headers.get('Location');
                 if (isThirdSite(location)) {
@@ -110,6 +117,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
                         replace: true
                     });
                 }
+                runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.errorType.name, 'redirect');
+                runLoadersTrace.stop();
                 return;
             }
             if (isResponse(error) && error.status >= 400 && error.status < 600) {
@@ -118,6 +127,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
                     message: error.data
                 });
                 next();
+                runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.errorType.name, 'userError');
+                runLoadersTrace.stop();
                 return;
             }
             // If loader throws a error, we need to rethrow it
@@ -129,6 +140,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
             next(() => {
                 throw error;
             });
+            runLoadersTrace.setAttribute(SHUVI_CLIENT_RUN_LOADERS.attrs.errorType.name, 'unexpectedError');
+            runLoadersTrace.stop();
             return;
         }
         next(() => {

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

@@ -12,10 +12,12 @@ import { getRoutes, app as AppComponent } from '@shuvi/app/core/platform';
 import { runLoaders, 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';
 import logger from '@shuvi/utils/logger';
 import { serializeServerError } from '../helper/serializeServerError';
+const { SHUVI_SERVER_RUN_LOADERS } = SERVER_CREATE_APP.events;
 export const createApp = options => {
-    const { req, ssr } = options;
+    const { req, ssr, serverCreateAppTrace } = options;
     const history = createMemoryHistory({
         initialEntries: [(req && req.url) || '/'],
         initialIndex: 0
@@ -27,6 +29,7 @@ export const createApp = options => {
     let app;
     if (ssr) {
         router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
+            const runLoadersTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_LOADERS.name);
             const pageLoaders = yield app.getLoaders();
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
             try {
@@ -38,8 +41,11 @@ export const createApp = options => {
                     getAppContext: () => app.context
                 });
                 app.setLoadersData(loaderResult);
+                runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.error.name, false);
+                runLoadersTrace.stop();
             }
             catch (error) {
+                runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.error.name, true);
                 if (isRedirect(error)) {
                     const location = error.headers.get('Location');
                     const status = error.status;
@@ -52,6 +58,8 @@ export const createApp = options => {
                             status
                         }
                     });
+                    runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.errorType.name, 'redirect');
+                    runLoadersTrace.stop();
                     return;
                 }
                 if (isResponse(error) && error.status >= 400 && error.status < 600) {
@@ -60,6 +68,8 @@ export const createApp = options => {
                         message: error.data
                     });
                     next();
+                    runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.errorType.name, 'userError');
+                    runLoadersTrace.stop();
                     return;
                 }
                 if (process.env.NODE_ENV === 'development') {
@@ -67,6 +77,8 @@ export const createApp = options => {
                 }
                 app.setError(serializeServerError(error));
                 next();
+                runLoadersTrace.setAttribute(SHUVI_SERVER_RUN_LOADERS.attrs.errorType.name, 'unexpectedError');
+                runLoadersTrace.stop();
                 return;
             }
             next();

package/esm/shuvi-app/dev/hotDevClient.js

@@ -280,7 +280,6 @@ function tryApplyUpdates(onHotUpdateSuccess) {
             return;
         }
         function handleApplyUpdates(err, updatedModules) {
-            const hasUpdates = Boolean(updatedModules === null || updatedModules === void 0 ? void 0 : updatedModules.length);
             if (hadRuntimeError) {
                 hadRuntimeError = false;
                 window.location.reload();
@@ -289,6 +288,11 @@ function tryApplyUpdates(onHotUpdateSuccess) {
             if (err) {
                 hadRuntimeError = true;
             }
+            const hasUpdates = Boolean(updatedModules === null || updatedModules === void 0 ? void 0 : updatedModules.length);
+            if (!hasUpdates) {
+                window.location.reload();
+                return;
+            }
             if (typeof onHotUpdateSuccess === 'function') {
                 // Maybe we want to do something.
                 onHotUpdateSuccess(hasUpdates);

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

@@ -13,13 +13,17 @@ import { CLIENT_CONTAINER_ID } from '@shuvi/shared/constants';
 import { view, getRoutes, app as PlatformAppComponent } from '@shuvi/app/core/platform';
 import routes from '@shuvi/app/files/routes';
 import { getAppData } from '@shuvi/platform-shared/shared/helper/getAppData';
+import { CLIENT_ENTRY } from '@shuvi/shared/constants/trace';
 import { createApp } from '../../app/client';
+import { clientEntryTrace } from './trace';
 const appData = getAppData();
-const app = createApp({
+const app = clientEntryTrace
+    .traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_CREATE_APP.name)
+    .traceFn(() => createApp({
     appComponent: PlatformAppComponent,
     routes,
     appData
-});
+}));
 const render = () => __awaiter(void 0, void 0, void 0, function* () {
     const appContainer = document.getElementById(CLIENT_CONTAINER_ID);
     yield view.renderApp({
@@ -29,8 +33,12 @@ const render = () => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield app.init();
+    const runAppTrace = clientEntryTrace.traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_RUN_APP.name);
+    yield clientEntryTrace
+        .traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_APP_INIT.name)
+        .traceAsyncFn(() => app.init());
     yield render();
+    runAppTrace.stop();
 });
 export { run, app };
 if (module.hot) {

package/esm/shuvi-app/entry/client/setup-env.js

@@ -5,6 +5,12 @@
 import setRuntimeConfig from '@shuvi/app/core/setRuntimeConfig';
 import runtimeConfig from '@shuvi/app/core/runtimeConfig';
 import { getAppData } from '@shuvi/platform-shared/shared';
+import { CLIENT_ENTRY } from '@shuvi/shared/constants/trace';
+import { clientEntryTrace } from './trace';
+clientEntryTrace
+    .traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_ENTRY_START.name)
+    .stop();
+const setupEnvTrace = clientEntryTrace.traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_SETUP_ENV.name);
 // === set runtime config ===
 const appData = getAppData();
 // build-time config for none-ssr
@@ -15,3 +21,4 @@ if (runtimeConfig) {
 if (appData.runtimeConfig) {
     setRuntimeConfig(appData.runtimeConfig);
 }
+setupEnvTrace.stop();

package/esm/shuvi-app/entry/client/trace.d.ts

@@ -0,0 +1,2 @@
+export declare const clientEntryTrace: import("@shuvi/service/lib/trace").Span;
+export declare const clientRenderTrace: import("@shuvi/service/lib/trace").Span;

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

@@ -0,0 +1,4 @@
+import { trace } from '@shuvi/service/lib/trace';
+import { CLIENT_ENTRY, CLIENT_RENDER } from '@shuvi/shared/constants/trace';
+export const clientEntryTrace = trace(CLIENT_ENTRY.name);
+export const clientRenderTrace = trace(CLIENT_RENDER.name);

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

@@ -1,9 +1,13 @@
 import * as React from 'react';
+import { useCurrentRoute, useRouter } from '@shuvi/router-react';
 import { errorModel, errorModelName } from '@shuvi/platform-shared/shared';
 import { AppProvider } from './ApplicationContext';
 import ErrorPage from './ErrorPage';
 import { ErrorBoundary } from './ErrorBoundary';
 import { Provider, useSharedModel } from './store';
+import { clientRenderTrace } from '../entry/client/trace';
+import { CLIENT_RENDER } from '@shuvi/shared/constants/trace';
+const { SHUVI_NAVIGATION_TRIGGERED, SHUVI_NAVIGATION_DONE, SHUVI_PAGE_READY } = CLIENT_RENDER.events;
 function ErrorGuard({ children = null }) {
     const errorState = useSharedModel(errorModelName, errorModel);
     const { error, hasError } = errorState;
@@ -12,7 +16,42 @@ function ErrorGuard({ children = null }) {
     }
     return <>{children}</>;
 }
+const uuid = () => {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = (Math.random() * 16) | 0, v = c == 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};
+function useTrace() {
+    const router = useRouter();
+    const route = useCurrentRoute();
+    let navigationTrace = React.useRef();
+    React.useEffect(() => {
+        clientRenderTrace.traceChild(SHUVI_PAGE_READY.name).stop();
+        router.beforeEach((to, from, next) => {
+            const fromPath = `${from.pathname}${from.search}`;
+            const toPath = `${to.pathname}${to.search}`;
+            const navigationId = uuid();
+            const traceAttrs = {
+                [SHUVI_NAVIGATION_DONE.attrs.from.name]: fromPath,
+                [SHUVI_NAVIGATION_DONE.attrs.to.name]: toPath,
+                [SHUVI_NAVIGATION_DONE.attrs.navigationId.name]: navigationId
+            };
+            clientRenderTrace
+                .traceChild(SHUVI_NAVIGATION_TRIGGERED.name, traceAttrs)
+                .stop();
+            navigationTrace.current = clientRenderTrace.traceChild(SHUVI_NAVIGATION_DONE.name);
+            navigationTrace.current.setAttributes(traceAttrs);
+            next();
+        });
+    }, []);
+    React.useEffect(() => {
+        var _a;
+        (_a = navigationTrace.current) === null || _a === void 0 ? void 0 : _a.stop();
+    }, [route]);
+}
 export default function AppContainer({ app, children }) {
+    useTrace();
     return (<AppProvider app={app}>
       <ErrorBoundary>
         <Provider store={app.store}>

package/esm/shuvi-app/react/view/ReactView.client.jsx

@@ -9,11 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as React from 'react';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
+import { CLIENT_ENTRY } from '@shuvi/shared/constants/trace';
 import { Router } from '@shuvi/router-react';
 import AppContainer from '../AppContainer';
 import { HeadManager, HeadManagerContext } from '../head';
 import Loadable from '../loadable';
 import { doRender } from './render';
+import { clientEntryTrace } from '../../entry/client/trace';
 const headManager = new HeadManager();
 export class ReactClientView {
     constructor() {
@@ -63,12 +65,16 @@ export class ReactClientView {
           </HeadManagerContext.Provider>
         </AppContainer>
       </Router>);
-            doRender({
-                root,
-                appContainer,
-                shouldHydrate
-            }, () => {
-                this._isInitialRender = false;
+            clientEntryTrace
+                .traceChild(CLIENT_ENTRY.events.SHUVI_CLIENT_DO_RENDER.name)
+                .traceFn(() => {
+                doRender({
+                    root,
+                    appContainer,
+                    shouldHydrate
+                }, () => {
+                    this._isInitialRender = false;
+                });
             });
         });
     }

package/esm/shuvi-app/react/view/ReactView.server.jsx

@@ -11,6 +11,7 @@ import * as React from 'react';
 import { renderToString } from 'react-dom/server';
 import { redirect } from '@shuvi/platform-shared/shared';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
+import { SERVER_REQUEST } from '@shuvi/shared/constants/trace';
 import { Router } from '@shuvi/router-react';
 import logger from '@shuvi/utils/logger';
 import Loadable, { LoadableContext } from '../loadable';
@@ -18,9 +19,10 @@ import AppContainer from '../AppContainer';
 import { Head } from '../head';
 import { serializeServerError } from '../../helper/serializeServerError';
 import isThirdSite from '../../helper/isThirdSite';
+const { SHUVI_SERVER_RENDER_TO_STRING } = SERVER_REQUEST.events;
 export class ReactServerView {
     constructor() {
-        this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
+        this.renderApp = ({ req, app, manifest, serverRequestTrace }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
             const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
@@ -52,10 +54,13 @@ export class ReactServerView {
           </LoadableContext.Provider>
         </AppContainer>
       </Router>);
+            const renderToStringTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RENDER_TO_STRING.name);
             try {
                 htmlContent = renderToString(RootApp);
+                renderToStringTrace.setAttribute(SHUVI_SERVER_RENDER_TO_STRING.attrs.error.name, false);
             }
             catch (error) {
+                renderToStringTrace.setAttribute(SHUVI_SERVER_RENDER_TO_STRING.attrs.error.name, true);
                 if (process.env.NODE_ENV === 'development') {
                     logger.error(error.stack);
                 }
@@ -64,6 +69,7 @@ export class ReactServerView {
             }
             finally {
                 head = Head.rewind() || [];
+                renderToStringTrace.stop();
             }
             const { loadble } = manifest;
             const dynamicImportIdSet = new Set();

package/lib/node/external-internal-libs.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
+};
+export default _default;

package/lib/node/external-internal-libs.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const service_1 = require("@shuvi/service");
+const shared_1 = require("../shared");
+const paths_1 = require("./paths");
+const configWebpack = (config, { name, helpers }) => {
+    if (name === shared_1.BUNDLER_TARGET_SERVER) {
+        helpers.addExternals(config, ({ request }, next) => {
+            if (/@shuvi[/\\](hook$|router$|utils)/.test(request)) {
+                return next(null, (0, paths_1.resolveDep)(request));
+            }
+            else {
+                return next(null, 'next');
+            }
+        });
+    }
+    return config;
+};
+exports.default = {
+    core: (0, service_1.createPlugin)({
+        configWebpack
+    })
+};

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

@@ -12,19 +12,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageMiddleware = void 0;
 const utils_1 = require("@shuvi/service/lib/server/utils");
 const shared_1 = require("@shuvi/platform-shared/shared");
+const trace_1 = require("@shuvi/shared/constants/trace");
 const renderToHTML_1 = require("./renderToHTML");
+const { SHUVI_SERVER_SEND_HTML_ORIGINAL, SHUVI_SERVER_SEND_HTML_HOOK, SHUVI_SERVER_RENDER_TO_HTML, SHUVI_SERVER_RUN_PAGE_MIDDLEWARE } = trace_1.SERVER_REQUEST.events;
 function createPageHandler(serverPluginContext) {
+    const { traces: { serverRequestTrace } } = serverPluginContext;
     const wrappedSendHtml = (html, { req, res }) => __awaiter(this, void 0, void 0, function* () {
+        const sendHtmlOriginalTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_ORIGINAL.name);
         (0, utils_1.sendHTML)(req, res, html);
+        sendHtmlOriginalTrace.stop();
     });
     let sendHtml;
     let pendingSendHtml;
     return function (req, res) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield (0, renderToHTML_1.renderToHTML)({
+            const result = yield serverRequestTrace
+                .traceChild(SHUVI_SERVER_RENDER_TO_HTML.name)
+                .traceAsyncFn(() => (0, renderToHTML_1.renderToHTML)({
                 req: req,
                 serverPluginContext
-            });
+            }));
             if ((0, shared_1.isRedirect)(result)) {
                 const redirectResp = result;
                 res.writeHead(redirectResp.status, {
@@ -42,7 +49,10 @@ function createPageHandler(serverPluginContext) {
                     }
                     sendHtml = yield pendingSendHtml;
                 }
+                const { traces: { serverRequestTrace } } = serverPluginContext;
+                const sendHtmlHookTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_HOOK.name);
                 yield sendHtml(textResp.data, { req, res });
+                sendHtmlHookTrace.stop();
             }
             else {
                 // shuold never reach here
@@ -58,6 +68,8 @@ function getPageMiddleware(api) {
         let pendingPageHandler;
         return function (req, res, next) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { traces: { serverRequestTrace } } = api;
+                const runPageMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.name);
                 if (!pageHandler) {
                     if (!pendingPageHandler) {
                         pendingPageHandler =
@@ -67,8 +79,18 @@ function getPageMiddleware(api) {
                 }
                 try {
                     yield pageHandler(req, res);
+                    runPageMiddlewareTrace.setAttributes({
+                        [SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.attrs.error.name]: false,
+                        [SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.attrs.statusCode.name]: res.statusCode
+                    });
+                    runPageMiddlewareTrace.stop();
                 }
                 catch (error) {
+                    runPageMiddlewareTrace.setAttributes({
+                        [SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.attrs.error.name]: true,
+                        [SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.attrs.statusCode.name]: res.statusCode
+                    });
+                    runPageMiddlewareTrace.stop();
                     next(error);
                 }
             });

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

@@ -14,18 +14,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderToHTML = void 0;
 const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const trace_1 = require("@shuvi/shared/constants/trace");
 const renderer_1 = require("./renderer");
 function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
         const renderer = new renderer_1.Renderer({ serverPluginContext });
+        const { traces: { serverCreateAppTrace } } = serverPluginContext;
         const { application } = resources_1.default.server;
-        const app = application.createApp({
+        const app = serverCreateAppTrace
+            .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_CREATE_APP.name)
+            .traceFn(() => application.createApp({
             req,
-            ssr: serverPluginContext.config.ssr
-        });
+            ssr: serverPluginContext.config.ssr,
+            serverCreateAppTrace
+        }));
         try {
-            yield app.init();
+            yield serverCreateAppTrace
+                .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_APP_INIT.name)
+                .traceAsyncFn(() => app.init());
             result = yield renderer.renderView({
                 req,
                 app: app.getPublicAPI(),

package/lib/node/features/html-render/lib/renderer/ssr.js

@@ -22,6 +22,7 @@ class SsrRenderer extends base_1.BaseRenderer {
         return __awaiter(this, void 0, void 0, function* () {
             const { store, router, context } = app;
             const serverPluginContext = this._serverPluginContext;
+            const { traces: { serverRequestTrace } } = serverPluginContext;
             const { view } = resources_1.default.server;
             if (!router) {
                 throw new Error('router is null');
@@ -29,7 +30,8 @@ class SsrRenderer extends base_1.BaseRenderer {
             const result = yield view.renderApp({
                 app,
                 req,
-                manifest: resources_1.default.clientManifest
+                manifest: resources_1.default.clientManifest,
+                serverRequestTrace
             });
             if ((0, shared_1.isResponse)(result)) {
                 return result;

package/lib/node/index.js

@@ -22,8 +22,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@shuvi/platform-shared/node");
+const trace_1 = __importDefault(require("./trace"));
+const external_internal_libs_1 = __importDefault(require("./external-internal-libs"));
 const features_1 = require("./features");
 const paths_1 = require("./paths");
 __exportStar(require("../shared"), exports);
@@ -38,6 +43,8 @@ const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaite
             (0, paths_1.resolvePkgFile)('shuvi-image.d.ts')
         ],
         plugins: [
+            external_internal_libs_1.default,
+            trace_1.default,
             ...node_1.SharedPlugins,
             ...(0, features_1.getPlugins)(platformContext),
             ...platformFrameworkContent.plugins

package/lib/node/paths.d.ts

@@ -1,3 +1,4 @@
 export declare const resolveDep: (module: string) => string;
 export declare const resolveLib: (module: string) => string;
 export declare const resolvePkgFile: (...paths: string[]) => string;
+export declare const resolveLocal: (m: string, sub?: string) => string;

package/lib/node/paths.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
+exports.resolveLocal = exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
 const path = __importStar(require("path"));
 const PACKAGE_DIR = path.resolve(__dirname, '..', '..');
 const resolveDep = (module) => require.resolve(module);
@@ -32,3 +32,8 @@ const resolveLib = (module) => path.dirname((0, exports.resolveDep)(path.join(mo
 exports.resolveLib = resolveLib;
 const resolvePkgFile = (...paths) => path.join(PACKAGE_DIR, ...paths);
 exports.resolvePkgFile = resolvePkgFile;
+const resolveLocal = (m, sub) => {
+    const pck = (0, exports.resolveLib)(m);
+    return sub ? `${pck}/${sub}` : pck;
+};
+exports.resolveLocal = resolveLocal;

package/lib/node/targets/react/bundler/index.js

@@ -29,13 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
 const ReactRefreshWebpackPlugin_1 = __importDefault(require("@next/react-refresh-utils/ReactRefreshWebpackPlugin"));
+const paths_1 = require("../../../paths");
 const shared_1 = require("../../../../shared");
 const isDefined = (value) => Boolean(value);
 const configWebpack = (config, { name, webpack }, context) => {
-    const resolveLocal = (m, sub) => {
-        const pck = path.dirname(require.resolve(`${m}/package.json`));
-        return sub ? `${pck}/${sub}` : pck;
-    };
     const resolveUser = (m, sub) => {
         const { rootDir } = context.paths;
         let userPkg = {
@@ -69,32 +66,32 @@ const configWebpack = (config, { name, webpack }, context) => {
         }
         catch (_a) { }
         if (!version) {
-            version = require(resolveLocal('react-dom')).version;
+            version = require((0, paths_1.resolveLocal)('react-dom')).version;
         }
         const majorVersion = parseInt(version.split('.')[0] || '', 10);
         return majorVersion >= 18;
     };
-    config.resolve.alias.set('@shuvi/service', resolveLocal('@shuvi/service'));
-    config.resolve.alias.set('@shuvi/router$', resolveLocal('@shuvi/router'));
-    config.resolve.alias.set('@shuvi/router-react$', resolveLocal('@shuvi/router-react'));
+    config.resolve.alias.set('@shuvi/service', (0, paths_1.resolveLocal)('@shuvi/service'));
+    config.resolve.alias.set('@shuvi/router$', (0, paths_1.resolveLocal)('@shuvi/router'));
+    config.resolve.alias.set('@shuvi/router-react$', (0, paths_1.resolveLocal)('@shuvi/router-react'));
     config.resolve.alias.set('react$', 
     // @ts-ignore
-    [resolveUser('react'), resolveLocal('react')].filter(isDefined));
+    [resolveUser('react'), (0, paths_1.resolveLocal)('react')].filter(isDefined));
     config.resolve.alias.set('react/jsx-runtime$', 
     // @ts-ignore
     [
         resolveUser('react', 'jsx-runtime'),
-        resolveLocal('react', 'jsx-runtime')
+        (0, paths_1.resolveLocal)('react', 'jsx-runtime')
     ].filter(isDefined));
     config.resolve.alias.set('react/jsx-dev-runtime$', 
     // @ts-ignore
     [
         resolveUser('react', 'jsx-dev-runtime'),
-        resolveLocal('react', 'jsx-dev-runtime')
+        (0, paths_1.resolveLocal)('react', 'jsx-dev-runtime')
     ].filter(isDefined));
     config.resolve.alias.set('react-dom$', 
     // @ts-ignore
-    [resolveUser('react-dom'), resolveLocal('react-dom')].filter(isDefined));
+    [resolveUser('react-dom'), (0, paths_1.resolveLocal)('react-dom')].filter(isDefined));
     if (name === shared_1.BUNDLER_TARGET_CLIENT) {
         config.plugin('version-env-plugin').use(webpack.DefinePlugin, [
             {

package/lib/node/trace.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
+};
+export default _default;

package/lib/node/trace.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const service_1 = require("@shuvi/service");
+const shared_1 = require("../shared");
+const paths_1 = require("./paths");
+const configWebpack = (config, { name, helpers }) => {
+    if (name === shared_1.BUNDLER_TARGET_SERVER) {
+        const tracePath = (0, paths_1.resolveLocal)('@shuvi/service', 'lib/trace');
+        helpers.addExternals(config, ({ request }, next) => {
+            switch (request) {
+                // trace is a singleton, so we don't want to bundle it
+                case '@shuvi/service/lib/trace': {
+                    next(null, `commonjs ${tracePath}`);
+                    break;
+                }
+                default: {
+                    next(null, 'next');
+                }
+            }
+        });
+    }
+    return config;
+};
+exports.default = {
+    core: (0, service_1.createPlugin)({
+        configWebpack
+    })
+};

package/lib/shared/appTypes.d.ts

@@ -1,6 +1,7 @@
 import { IPageRouteRecord, IAppData, IAppState, Application as _Application } from '@shuvi/platform-shared/shared';
 import { ApplicationImpl as _ApplicationImpl } from '@shuvi/platform-shared/shuvi-app/application';
 import type { ShuviRequest } from '@shuvi/service';
+import { Span } from '@shuvi/service/lib/trace';
 export interface AppConfig {
     ssr: boolean;
 }
@@ -10,6 +11,7 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
+        serverCreateAppTrace: Span;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/lib/shared/renderTypes.d.ts

@@ -2,6 +2,7 @@ import type { ShuviRequest } from '@shuvi/service';
 import { Response, IAppData } from '@shuvi/platform-shared/shared';
 import { IManifest } from '../shared';
 import { Application } from './appTypes';
+import { Span } from '@shuvi/service/lib/trace';
 export declare type IRenderViewOptions = {
     app: Application;
 };
@@ -38,6 +39,7 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
 export interface IServerRendererOptions extends IRenderOptions {
     req: ShuviRequest;
     manifest: IManifest;
+    serverRequestTrace: Span;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "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.28",
-    "@shuvi/hook": "1.0.28",
-    "@shuvi/platform-shared": "1.0.28",
-    "@shuvi/router": "1.0.28",
-    "@shuvi/router-react": "1.0.28",
-    "@shuvi/runtime": "1.0.28",
-    "@shuvi/shared": "1.0.28",
-    "@shuvi/toolpack": "1.0.28",
-    "@shuvi/utils": "1.0.28",
+    "@shuvi/error-overlay": "1.0.30",
+    "@shuvi/hook": "1.0.30",
+    "@shuvi/platform-shared": "1.0.30",
+    "@shuvi/router": "1.0.30",
+    "@shuvi/router-react": "1.0.30",
+    "@shuvi/runtime": "1.0.30",
+    "@shuvi/shared": "1.0.30",
+    "@shuvi/toolpack": "1.0.30",
+    "@shuvi/utils": "1.0.30",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "doura": "0.0.11",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.28"
+    "@shuvi/service": "1.0.30"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",