@shuvi/platform-web 1.0.0-rc.2 → 1.0.0-rc.20

package/esm/shared/appTypes.d.ts

@@ -1,15 +1,21 @@
-import { IRequest, IRawPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
-import { Application } from '@shuvi/platform-shared/shuvi-app/application';
+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';
+export interface AppConfig {
+    ssr: boolean;
+}
+export declare type InternalApplication = _ApplicationImpl<AppConfig>;
+export declare type Application = _Application<AppConfig>;
 export interface CreateAppServer {
     (options: {
-        req: IRequest;
+        req: ShuviRequest;
         ssr: boolean;
-    }): Application;
+    }): InternalApplication;
 }
 export interface CreateAppClient {
     (options: {
-        routes: IRawPageRouteRecord[];
+        routes: IPageRouteRecord[];
         appComponent: any;
         appData: IAppData<any, IAppState>;
-    }): Application;
+    }): InternalApplication;
 }

package/esm/shared/configTypes.d.ts

@@ -1,4 +1,4 @@
-import { IRouterHistoryMode, IPageRouteConfig, IMiddlewareRouteConfig, IApiRouteConfig } from '@shuvi/platform-shared/shared';
+import { IRouterHistoryMode, IPageRouteConfig } from '@shuvi/platform-shared/shared';
 export interface IRouterConfig {
     history: IRouterHistoryMode | 'auto';
 }
@@ -6,8 +6,6 @@ export interface PlatformWebCustomConfig {
     ssr: boolean;
     router: IRouterConfig;
     routes?: IPageRouteConfig[];
-    middlewareRoutes?: IMiddlewareRouteConfig[];
-    apiRoutes?: IApiRouteConfig[];
     conventionRoutes: {
         exclude?: string[];
     };

package/esm/shared/constants.d.ts

@@ -0,0 +1,8 @@
+export { BUNDLER_TARGET_CLIENT, BUNDLER_TARGET_SERVER, CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/lib/constants';
+export declare const CLIENT_BUILD_MANIFEST_PATH = "../build-manifest.client.json";
+export declare const SERVER_BUILD_MANIFEST_PATH = "../build-manifest.server.json";
+export declare const BUILD_CLIENT_RUNTIME_POLYFILLS = "static/polyfills";
+export declare const BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL: unique symbol;
+export declare const BUILD_CLIENT_RUNTIME_WEBPACK = "static/webpack-runtime";
+export declare const BUILD_CLIENT_RUNTIME_MAIN = "static/main";
+export declare const BUILD_SERVER_FILE_SERVER = "server";

package/esm/shared/constants.js

@@ -0,0 +1,8 @@
+export { BUNDLER_TARGET_CLIENT, BUNDLER_TARGET_SERVER, CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/lib/constants';
+export const CLIENT_BUILD_MANIFEST_PATH = '../build-manifest.client.json';
+export const SERVER_BUILD_MANIFEST_PATH = '../build-manifest.server.json';
+export const BUILD_CLIENT_RUNTIME_POLYFILLS = `static/polyfills`;
+export const BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL = Symbol(`polyfills`);
+export const BUILD_CLIENT_RUNTIME_WEBPACK = `static/webpack-runtime`;
+export const BUILD_CLIENT_RUNTIME_MAIN = `static/main`;
+export const BUILD_SERVER_FILE_SERVER = `server`;

package/esm/shared/htmlRenderer.d.ts

@@ -0,0 +1,33 @@
+export interface IModuleItem {
+    id: string;
+    name: string;
+}
+export interface IModule {
+    files: string[];
+    children: IModuleItem[];
+}
+export declare type IAssetMap = {
+    js: string[];
+    css?: string[];
+} & {
+    [ext: string]: string[];
+};
+export interface IChunk {
+    file: string;
+    request: string;
+}
+export interface IManifest {
+    polyfillFiles?: string[];
+    entries: {
+        [s: string]: IAssetMap;
+    };
+    bundles: {
+        [name: string]: string;
+    };
+    chunkRequest: {
+        [file: string]: string;
+    };
+    loadble: {
+        [s: string]: IModule;
+    };
+}

package/esm/shared/index.d.ts

@@ -1,5 +1,6 @@
 export * from './appTypes';
 export * from './configTypes';
+export * from './constants';
+export * from './htmlRenderer';
 export * from './renderTypes';
 export * from './routeTypes';
-export * from './serverTypes';

package/esm/shared/index.js

@@ -1,5 +1,6 @@
 export * from './appTypes';
 export * from './configTypes';
+export * from './constants';
+export * from './htmlRenderer';
 export * from './renderTypes';
 export * from './routeTypes';
-export * from './serverTypes';

package/esm/shared/renderTypes.d.ts

@@ -1,10 +1,11 @@
-import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
-import { Response, IApplication, IRequest, IAppData } from '@shuvi/platform-shared/shared';
-export declare type IRenderDocumentOptions = {
-    app: IApplication;
-    req?: IRequest;
+import type { ShuviRequest } from '@shuvi/service';
+import { Response, IAppData } from '@shuvi/platform-shared/shared';
+import { IManifest } from '../shared';
+import { Application } from './appTypes';
+export declare type IRenderViewOptions = {
+    app: Application;
 };
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export interface IView<RenderOption extends IRenderOptions = any, RenderResult = void> {
     renderApp(options: RenderOption): RenderResult;
@@ -35,8 +36,8 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
     appData: IAppData<ExtraAppData>;
 }
 export interface IServerRendererOptions extends IRenderOptions {
+    req: ShuviRequest;
     manifest: IManifest;
-    getAssetPublicUrl(path: string): string;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/esm/shared/routeTypes.d.ts

@@ -1,10 +1,5 @@
-import { IURLParams, IURLQuery } from '@shuvi/platform-shared/shared';
-import { IRequestHandlerWithNext } from '@shuvi/service';
-import { IResponse, IRequest } from '@shuvi/service';
+import { ShuviRequest, ShuviResponse, ShuviRequestHandler } from '@shuvi/service';
 export interface IApiReq {
-    pathname: string;
-    query: IURLQuery;
-    params: IURLParams;
     cookies: {
         [key: string]: string;
     };
@@ -12,7 +7,7 @@ export interface IApiReq {
         [key: string]: any;
     };
 }
-export declare type IApiRequest = IRequest & IApiReq;
+export declare type IApiRequest = ShuviRequest & IApiReq;
 export declare type Send<T> = (body: T) => void;
 export declare type IApiRes<T = any> = {
     send: Send<T>;
@@ -21,7 +16,7 @@ export declare type IApiRes<T = any> = {
     redirect(url: string): IApiRes<T>;
     redirect(status: number, url: string): IApiRes<T>;
 };
-export declare type IApiResponse<T = any> = IResponse & IApiRes<T>;
+export declare type IApiResponse<T = any> = ShuviResponse & IApiRes<T>;
 export declare type IApiRequestHandler<T = any> = (req: IApiRequest, res: IApiResponse<T>) => void | Promise<void>;
 export interface IApiConfig {
     api?: {
@@ -35,7 +30,7 @@ export interface IApiHandler {
     config?: IApiConfig;
 }
 export interface IMiddlewareConfig {
-    default: IRequestHandlerWithNext;
+    default: ShuviRequestHandler;
 }
 export declare type IApiRoutes = {
     path: string;

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

@@ -1,2 +1,3 @@
-import { CreateAppClient } from '../../shared';
+import { InternalApplication, CreateAppClient } from '../../shared';
+export { InternalApplication };
 export declare const createApp: CreateAppClient;

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

@@ -8,19 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getRoutes } from '@shuvi/app/core/platform';
-import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, getLoaderManager, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
+import { runPreload, runLoaders, 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 pageLoaders from '@shuvi/app/files/page-loaders';
 import { historyMode } from '@shuvi/app/files/routerConfig';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
+import { serializeServerError } from '../helper/serializeServerError';
 let app;
 export const createApp = ({ routes, appData, appComponent }) => {
     // app is a singleton in client side
     if (app) {
         return app;
     }
-    const { loadersData = {}, appState, ssr } = appData;
+    const { appState, ssr } = appData;
     let history;
     if (historyMode === 'hash') {
         history = createHashHistory();
@@ -35,16 +36,17 @@ export const createApp = ({ routes, appData, appComponent }) => {
     app = application({
         initialState: appState,
         AppComponent: appComponent,
-        router
+        router,
+        config: { ssr }
     });
+    const loadersData = app.getLoadersData();
     const hasHydrateData = Object.keys(loadersData).length > 0;
-    const loaderManager = getLoaderManager();
     let shouldHydrate = ssr && hasHydrateData;
-    let hasServerError = app.error.hasError;
+    let hasServerError = !!app.error;
     router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
         if (shouldHydrate) {
             shouldHydrate = false;
-            loaderManager.setDatas(loadersData);
+            app.setLoadersData(loadersData);
             return next();
         }
         if (hasServerError) {
@@ -52,12 +54,11 @@ export const createApp = ({ routes, appData, appComponent }) => {
             return next();
         }
         if (!to.matches.length) {
-            app.error.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+            app.setError(SHUVI_ERROR.PAGE_NOT_FOUND);
             next();
             return;
         }
         const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
-        let isPreloadError = false;
         try {
             const loaderDatas = yield new Promise((resolve, reject) => {
                 let value;
@@ -78,11 +79,9 @@ export const createApp = ({ routes, appData, appComponent }) => {
                 runPreload(to)
                     .then(tryResolve)
                     .catch(err => {
-                    isPreloadError = true;
                     reject(err);
                 });
                 runLoaders(matches, pageLoaders, {
-                    isServer: false,
                     query: to.query,
                     getAppContext: () => app.context
                 })
@@ -95,7 +94,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
                     tryResolve();
                 });
             });
-            loaderManager.setDatas(loaderDatas);
+            app.setLoadersData(loaderDatas);
         }
         catch (error) {
             if (isRedirect(error)) {
@@ -103,22 +102,19 @@ export const createApp = ({ routes, appData, appComponent }) => {
                 return;
             }
             if (isResponse(error) && error.status >= 400 && error.status < 600) {
-                app.error.error({
+                app.setError({
                     code: error.status,
                     message: error.data
                 });
                 next();
                 return;
             }
-            app.error.error({
-                code: SHUVI_ERROR.APP_ERROR.code,
-                message: error.message || isPreloadError ? 'Preload Error' : 'Loader Error'
-            });
+            app.setError(serializeServerError(error));
             next();
             return;
         }
         next(() => {
-            app.error.clear();
+            app.clearError();
         });
     }));
     return app;

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

@@ -9,10 +9,12 @@ 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, getLoaderManager } from '@shuvi/platform-shared/shared';
+import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
 import pageLoaders from '@shuvi/app/files/page-loaders';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createMemoryHistory } from '@shuvi/router';
+import logger from '@shuvi/utils/lib/logger';
+import { serializeServerError } from '../helper/serializeServerError';
 export const createApp = options => {
     const { req, ssr } = options;
     const history = createMemoryHistory({
@@ -24,18 +26,16 @@ export const createApp = options => {
         routes: getRoutes(routes)
     });
     let app;
-    const loaderManager = getLoaderManager();
     if (ssr) {
         router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
             try {
                 const loaderResult = yield runLoaders(matches, pageLoaders, {
-                    isServer: true,
                     req,
                     query: to.query,
                     getAppContext: () => app.context
                 });
-                loaderManager.setDatas(loaderResult);
+                app.setLoadersData(loaderResult);
             }
             catch (error) {
                 if (isRedirect(error)) {
@@ -43,16 +43,17 @@ export const createApp = options => {
                     return;
                 }
                 if (isResponse(error) && error.status >= 400 && error.status < 600) {
-                    app.error.error({
+                    app.setError({
                         code: error.status,
                         message: error.data
                     });
                     next();
                     return;
                 }
-                app.error.error({
-                    message: error.message || 'Loader Error'
-                });
+                if (process.env.NODE_ENV === 'development') {
+                    logger.error(error.stack);
+                }
+                app.setError(serializeServerError(error));
                 next();
                 return;
             }
@@ -61,7 +62,10 @@ export const createApp = options => {
     }
     app = application({
         AppComponent,
-        router
+        router,
+        config: {
+            ssr
+        }
     });
     return app;
 };

package/esm/shuvi-app/dev/eventsource.d.ts

@@ -0,0 +1 @@
+export function getEventSourceWrapper(options: any): any;

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

@@ -0,0 +1,60 @@
+const eventCallbacks = [];
+function EventSourceWrapper(options) {
+    var source;
+    var lastActivity = new Date();
+    var listeners = [];
+    if (!options.timeout) {
+        options.timeout = 20 * 1000;
+    }
+    init();
+    var timer = setInterval(function () {
+        if (new Date() - lastActivity > options.timeout) {
+            handleDisconnect();
+        }
+    }, options.timeout / 2);
+    function init() {
+        source = new window.EventSource(options.path);
+        source.onopen = handleOnline;
+        source.onerror = handleDisconnect;
+        source.onmessage = handleMessage;
+    }
+    function handleOnline() {
+        if (options.log)
+            console.log('[HMR] connected');
+        lastActivity = new Date();
+    }
+    function handleMessage(event) {
+        lastActivity = new Date();
+        for (var i = 0; i < listeners.length; i++) {
+            listeners[i](event);
+        }
+        if (event.data.indexOf('action') !== -1) {
+            eventCallbacks.forEach(cb => cb(event));
+        }
+    }
+    function handleDisconnect() {
+        clearInterval(timer);
+        source.close();
+        setTimeout(init, options.timeout);
+    }
+    return {
+        onclose: () => {
+            clearTimeout(timer);
+            source.close();
+        },
+        addMessageListener: function (fn) {
+            listeners.push(fn);
+        }
+    };
+}
+export function getEventSourceWrapper(options) {
+    if (!window.__whmEventSourceWrapper) {
+        window.__whmEventSourceWrapper = {};
+    }
+    if (!window.__whmEventSourceWrapper[options.path]) {
+        // cache the wrapper for other entries loaded on
+        // the same page with the same options.path
+        window.__whmEventSourceWrapper[options.path] = EventSourceWrapper(options);
+    }
+    return window.__whmEventSourceWrapper[options.path];
+}

package/esm/shuvi-app/dev/hotDevClient.d.ts

@@ -0,0 +1,32 @@
+/**
+MIT License
+
+Copyright (c) 2013-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+export declare type HotDevClient = {
+    sendMessage: (data: any) => void;
+    subscribeToHmrEvent: (handler: any) => void;
+};
+export default function connect(options: {
+    launchEditorEndpoint: string;
+    path: string;
+    location: Location;
+}): HotDevClient;