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

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

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageMiddleware = void 0;
 const utils_1 = require("@shuvi/service/lib/server/utils");
-const renderToHTML_1 = require("./renderToHTML");
 const shared_1 = require("@shuvi/platform-shared/shared");
+const renderToHTML_1 = require("./renderToHTML");
 function createPageHandler(serverPluginContext) {
     return function (req, res) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40,17 +40,22 @@ function createPageHandler(serverPluginContext) {
     };
 }
 function getPageMiddleware(api) {
-    let pageHandler = createPageHandler(api);
-    return function (req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                pageHandler = yield api.serverPluginRunner.handlePageRequest(pageHandler);
-                yield pageHandler(req, res);
-            }
-            catch (error) {
-                next(error);
-            }
-        });
-    };
+    return __awaiter(this, void 0, void 0, function* () {
+        const defaultPageHandler = createPageHandler(api);
+        let pageHandler;
+        return function (req, res, next) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (!pageHandler) {
+                    pageHandler = yield api.serverPluginRunner.handlePageRequest(defaultPageHandler);
+                }
+                try {
+                    yield pageHandler(req, res);
+                }
+                catch (error) {
+                    next(error);
+                }
+            });
+        };
+    });
 }
 exports.getPageMiddleware = getPageMiddleware;

package/lib/node/features/html-render/lib/index.d.ts

@@ -1,4 +1,2 @@
 export { getPageMiddleware } from './getPageMiddleware';
-export { renderToHTML } from './renderToHTML';
 export * from './renderer';
-export * from './pageLoader';

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

@@ -14,10 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderToHTML = exports.getPageMiddleware = void 0;
+exports.getPageMiddleware = void 0;
 var getPageMiddleware_1 = require("./getPageMiddleware");
 Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: function () { return getPageMiddleware_1.getPageMiddleware; } });
-var renderToHTML_1 = require("./renderToHTML");
-Object.defineProperty(exports, "renderToHTML", { enumerable: true, get: function () { return renderToHTML_1.renderToHTML; } });
 __exportStar(require("./renderer"), exports);
-__exportStar(require("./pageLoader"), exports);

package/lib/node/features/html-render/lib/renderToHTML.d.ts

@@ -1,6 +1,6 @@
-import { IRequest, IServerPluginContext } from '@shuvi/service';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
 import { Response } from '@shuvi/platform-shared/shared';
 export declare function renderToHTML({ req, serverPluginContext }: {
-    req: IRequest;
+    req: ShuviRequest;
     serverPluginContext: IServerPluginContext;
 }): Promise<Response>;

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

@@ -8,69 +8,29 @@ 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 });
 exports.renderToHTML = void 0;
-const resources_1 = require("@shuvi/service/lib/resources");
-const shared_1 = require("@shuvi/platform-shared/shared");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
 const renderer_1 = require("./renderer");
-const htmlTag_1 = require("./renderer/htmlTag");
-function addEssentialTagsIfMissing(document) {
-    let hasMetaCharset = false;
-    let hasMetaViewport = false;
-    for (const { tagName, attrs } of document.headTags) {
-        if (hasMetaCharset && hasMetaViewport) {
-            break;
-        }
-        if (tagName === 'meta') {
-            if (attrs.charset) {
-                hasMetaCharset = true;
-            }
-            else if (attrs.name === 'viewport') {
-                hasMetaViewport = true;
-            }
-        }
-    }
-    if (!hasMetaCharset) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            charset: 'utf-8'
-        }));
-    }
-    if (!hasMetaViewport) {
-        document.headTags.unshift((0, htmlTag_1.tag)('meta', {
-            name: 'viewport',
-            content: 'width=device-width,minimum-scale=1,initial-scale=1'
-        }));
-    }
-    return document;
-}
 function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
         const renderer = new renderer_1.Renderer({ serverPluginContext });
-        const { application } = resources_1.server;
+        const { application } = resources_1.default.server;
         const app = application.createApp({
             req,
             ssr: serverPluginContext.config.ssr
         });
         try {
             yield app.init();
-            const publicApp = app.getPublicAPI();
-            let doc = yield renderer.renderDocument({
-                app: publicApp,
-                req
+            result = yield renderer.renderView({
+                req,
+                app: app.getPublicAPI(),
+                ssr: serverPluginContext.config.ssr
             });
-            if ((0, shared_1.isResponse)(doc)) {
-                result = doc;
-            }
-            else {
-                addEssentialTagsIfMissing(doc);
-                yield serverPluginContext.serverPluginRunner.modifyHtml(doc, app.context);
-                const htmlStr = renderer.renderDocumentToString(doc);
-                const appError = app.error.getError;
-                result = (0, shared_1.text)(htmlStr, {
-                    status: appError && typeof appError.code !== 'undefined' ? appError.code : 200
-                });
-            }
         }
         finally {
             yield app.dispose();

package/lib/node/features/html-render/lib/renderer/base.d.ts

@@ -1,17 +1,16 @@
-import { IAppData, Response } from '@shuvi/platform-shared/shared';
-import { IServerPluginContext } from '@shuvi/service';
-import { IHtmlDocument, IHtmlTag, IApplication } from './types';
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
+import { IAppData } from '@shuvi/platform-shared/shared';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
+import { IHtmlTag, Application, IRendererConstructorOptions, IRenderViewOptions, IRenderDocumentResult } from './types';
 export declare type AppData = Omit<IAppData, 'filesByRoutId' | 'publicPath'>;
 export declare abstract class BaseRenderer {
     protected _serverPluginContext: IServerPluginContext;
-    protected _app?: IApplication;
+    protected _app?: Application;
     constructor({ serverPluginContext }: IRendererConstructorOptions);
-    abstract renderDocument({ app, req }: IRenderDocumentOptions): Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
-    protected _getMainAssetTags(): {
+    abstract renderDocument({ app, req }: IRenderViewOptions): IRenderDocumentResult;
+    protected _getMainAssetTags(req: ShuviRequest): {
         styles: IHtmlTag<any>[];
         scripts: IHtmlTag<any>[];
     };
     protected _getAppContainerTag(html?: string): IHtmlTag<'div'>;
-    protected _getInlineAppData(app: IApplication, appData: AppData): IHtmlTag;
+    protected _getInlineAppData(app: Application, appData: AppData): IHtmlTag;
 }

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

@@ -5,33 +5,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseRenderer = void 0;
 const htmlescape_1 = require("@shuvi/utils/lib/htmlescape");
-const service_1 = require("@shuvi/service");
 const constants_1 = require("@shuvi/shared/lib/constants");
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const shared_1 = require("../../../../../shared");
 const generateFilesByRoutId_1 = __importDefault(require("../generateFilesByRoutId"));
 const htmlTag_1 = require("./htmlTag");
+function getPolyfillScripts(req, manifest) {
+    if (!manifest.polyfillFiles) {
+        return [];
+    }
+    return manifest.polyfillFiles
+        .filter(polyfill => polyfill.endsWith('.js'))
+        .map(polyfill => (0, htmlTag_1.tag)('script', {
+        src: req.getAssetUrl(polyfill),
+        nomodule: true
+    }));
+}
 class BaseRenderer {
     constructor({ serverPluginContext }) {
         this._serverPluginContext = serverPluginContext;
     }
-    _getMainAssetTags() {
+    _getMainAssetTags(req) {
         const styles = [];
         const scripts = [];
-        const entrypoints = resources_1.clientManifest.entries[service_1.BUILD_CLIENT_RUNTIME_MAIN];
-        const polyfill = resources_1.clientManifest.bundles[service_1.BUILD_CLIENT_RUNTIME_POLYFILL];
-        scripts.push((0, htmlTag_1.tag)('script', {
-            src: this._serverPluginContext.getAssetPublicUrl(polyfill)
-        }));
+        const entrypoints = resources_1.default.clientManifest.entries[shared_1.BUILD_CLIENT_RUNTIME_MAIN];
+        getPolyfillScripts(req, resources_1.default.clientManifest).forEach(item => scripts.push(item));
         entrypoints.js.forEach((asset) => {
             scripts.push((0, htmlTag_1.tag)('script', {
-                src: this._serverPluginContext.getAssetPublicUrl(asset)
+                src: req.getAssetUrl(asset)
             }));
         });
         if (entrypoints.css) {
             entrypoints.css.forEach((asset) => {
                 styles.push((0, htmlTag_1.tag)('link', {
                     rel: 'stylesheet',
-                    href: this._serverPluginContext.getAssetPublicUrl(asset)
+                    href: req.getAssetUrl(asset)
                 }));
             });
         }
@@ -60,7 +68,7 @@ class BaseRenderer {
     }
     _getInlineAppData(app, appData) {
         const routes = app.router.routes || [];
-        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.clientManifest, routes), publicPath: this._serverPluginContext.getAssetPublicUrl() }));
+        const data = JSON.stringify(Object.assign(Object.assign({}, appData), { filesByRoutId: (0, generateFilesByRoutId_1.default)(resources_1.default.clientManifest, routes), publicPath: this._serverPluginContext.assetPublicPath }));
         return (0, htmlTag_1.tag)('script', {
             id: constants_1.CLIENT_APPDATA_ID,
             type: 'application/json'

package/lib/node/features/html-render/lib/renderer/index.d.ts

@@ -1,5 +1,5 @@
-import { IRendererConstructorOptions, IRenderDocumentOptions } from './types';
-import { IHtmlDocument } from './types';
+import { Response } from '@shuvi/platform-shared/shared';
+import { IRendererConstructorOptions, IRenderViewOptions } from './types';
 export * from './types';
 export interface ITemplateData {
     [x: string]: any;
@@ -10,6 +10,7 @@ export declare class Renderer {
     private _ssrRenderer;
     private _spaRenderer;
     constructor(options: IRendererConstructorOptions);
-    renderDocument(options: IRenderDocumentOptions): import("@shuvi/platform-shared/shared").Response | IHtmlDocument | Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
-    renderDocumentToString(document: IHtmlDocument, templateData?: ITemplateData): string;
+    renderView(options: IRenderViewOptions): Promise<Response>;
+    private _renderDocument;
+    private _renderDocumentToString;
 }

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

@@ -13,28 +13,97 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
 exports.Renderer = void 0;
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const shared_1 = require("@shuvi/platform-shared/shared");
 const htmlTag_1 = require("./htmlTag");
 const viewTemplate_1 = require("../viewTemplate");
 const spa_1 = require("./spa");
 const ssr_1 = require("./ssr");
+const htmlTag_2 = require("./htmlTag");
 __exportStar(require("./types"), exports);
+function addEssentialTagsIfMissing(document) {
+    let hasMetaCharset = false;
+    let hasMetaViewport = false;
+    for (const { tagName, attrs } of document.headTags) {
+        if (hasMetaCharset && hasMetaViewport) {
+            break;
+        }
+        if (tagName === 'meta') {
+            if (attrs.charset) {
+                hasMetaCharset = true;
+            }
+            else if (attrs.name === 'viewport') {
+                hasMetaViewport = true;
+            }
+        }
+    }
+    if (!hasMetaCharset) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            charset: 'utf-8'
+        }));
+    }
+    if (!hasMetaViewport) {
+        document.headTags.unshift((0, htmlTag_2.tag)('meta', {
+            name: 'viewport',
+            content: 'width=device-width,minimum-scale=1,initial-scale=1'
+        }));
+    }
+    return document;
+}
 class Renderer {
     constructor(options) {
         this._serverPluginContext = options.serverPluginContext;
-        this._documentTemplate = (0, viewTemplate_1.parseTemplateFile)(resources_1.documentPath);
+        this._documentTemplate = (0, viewTemplate_1.parseTemplateFile)(resources_1.default.documentPath);
         this._ssrRenderer = new ssr_1.SsrRenderer(options);
         this._spaRenderer = new spa_1.SpaRenderer(options);
     }
-    renderDocument(options) {
-        if (this._serverPluginContext.config.ssr) {
-            return this._ssrRenderer.renderDocument(options);
-        }
-        return this._spaRenderer.renderDocument(options);
+    renderView(options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let result;
+            const { app, req } = options;
+            const doc = yield this._renderDocument(options);
+            if ((0, shared_1.isResponse)(doc)) {
+                result = doc;
+            }
+            else {
+                addEssentialTagsIfMissing(doc);
+                yield this._serverPluginContext.serverPluginRunner.modifyHtml(doc, {
+                    req,
+                    appContext: app.context
+                });
+                const htmlStr = this._renderDocumentToString(doc);
+                result = (0, shared_1.text)(htmlStr, {
+                    status: (_b = (_a = app.error) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : 200
+                });
+            }
+            return result;
+        });
+    }
+    _renderDocument(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // todo: fallback to spa
+            if (options.ssr) {
+                return yield this._ssrRenderer.renderDocument(options);
+            }
+            return yield this._spaRenderer.renderDocument(options);
+        });
     }
-    renderDocumentToString(document, templateData = {}) {
+    _renderDocumentToString(document, templateData = {}) {
         const htmlAttrs = (0, htmlTag_1.stringifyAttrs)(document.htmlAttrs);
         const head = document.headTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');
         const main = document.mainTags.map(tag => (0, htmlTag_1.stringifyTag)(tag)).join('');

package/lib/node/features/html-render/lib/renderer/spa.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IRenderDocumentOptions, IHtmlDocument } from './types';
+import { IRenderViewOptions, IHtmlDocument } from './types';
 export declare class SpaRenderer extends BaseRenderer {
-    renderDocument({ app }: IRenderDocumentOptions): IHtmlDocument;
+    renderDocument({ req, app }: IRenderViewOptions): IHtmlDocument;
 }

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

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpaRenderer = void 0;
 const base_1 = require("./base");
 class SpaRenderer extends base_1.BaseRenderer {
-    renderDocument({ app }) {
-        const assets = this._getMainAssetTags();
-        const serverPluginContext = this._serverPluginContext;
+    renderDocument({ req, app }) {
+        const assets = this._getMainAssetTags(req);
         const appData = {
-            pageData: {},
-            ssr: serverPluginContext.config.ssr,
-            loadersData: {}
+            ssr: false,
+            pageData: {}
         };
         const document = {
             htmlAttrs: {},

package/lib/node/features/html-render/lib/renderer/ssr.d.ts

@@ -1,5 +1,5 @@
 import { BaseRenderer } from './base';
-import { IHtmlDocument, IRenderDocumentOptions } from './types';
+import { IHtmlDocument, IRenderViewOptions } from './types';
 export declare class SsrRenderer extends BaseRenderer {
-    renderDocument({ app, req }: IRenderDocumentOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
+    renderDocument({ app, req }: IRenderViewOptions): Promise<import("@shuvi/platform-shared/shared").Response | IHtmlDocument>;
 }

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

@@ -8,40 +8,39 @@ 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 });
 exports.SsrRenderer = void 0;
 const shared_1 = require("@shuvi/platform-shared/shared");
 const shuvi_singleton_runtimeConfig_1 = require("@shuvi/platform-shared/shared/shuvi-singleton-runtimeConfig");
-const constants_1 = require("@shuvi/shared/lib/constants");
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
 const base_1 = require("./base");
-const htmlTag_1 = require("./htmlTag");
 class SsrRenderer extends base_1.BaseRenderer {
     renderDocument({ app, req }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { router, context } = app;
+            const { store, router, context } = app;
             const serverPluginContext = this._serverPluginContext;
-            const { view } = resources_1.server;
-            const { getAssetPublicUrl } = serverPluginContext;
+            const { view } = resources_1.default.server;
             if (!router) {
                 throw new Error('router is null');
             }
             const result = yield view.renderApp({
                 app,
                 req,
-                manifest: resources_1.clientManifest,
-                getAssetPublicUrl
+                manifest: resources_1.default.clientManifest
             });
             if ((0, shared_1.isResponse)(result)) {
                 return result;
             }
-            const mainAssetsTags = this._getMainAssetTags();
+            const mainAssetsTags = this._getMainAssetTags(req);
             const pageDataList = yield serverPluginContext.serverPluginRunner.getPageData(context);
             const pageData = pageDataList.reduce((acc, data) => {
                 Object.assign(acc, data);
                 return acc;
             }, {});
-            const appData = Object.assign(Object.assign({}, result.appData), { pageData, ssr: serverPluginContext.config.ssr });
+            const appData = Object.assign(Object.assign({}, result.appData), { ssr: true, appState: store.getState(), pageData });
             appData.runtimeConfig = (0, shuvi_singleton_runtimeConfig_1.getPublicRuntimeConfig)() || {};
             const document = {
                 htmlAttrs: Object.assign({}, result.htmlAttrs),
@@ -57,7 +56,6 @@ class SsrRenderer extends base_1.BaseRenderer {
                     ...(result.mainEndTags || [])
                 ],
                 scriptTags: [
-                    (0, htmlTag_1.tag)('script', {}, `${constants_1.IDENTITY_RUNTIME_PUBLICPATH} = "${serverPluginContext.assetPublicPath}"`),
                     ...(result.scriptBeginTags || []),
                     ...mainAssetsTags.scripts,
                     ...(result.scriptEndTags || [])

package/lib/node/features/html-render/lib/renderer/types.d.ts

@@ -1,20 +1,22 @@
-import { IApplication, IRequest } from '@shuvi/platform-shared/shared';
-import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult } from '../../../../../shared';
-import { IServerPluginContext } from '@shuvi/service';
-export { IHtmlAttrs, IHtmlTag, IApplication };
+import { Response } from '@shuvi/platform-shared/shared';
+import { ShuviRequest, IServerPluginContext } from '@shuvi/service';
+import { IHtmlAttrs, IHtmlTag, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer, IRenderAppServerResult, Application } from '../../../../../shared';
+export { IHtmlAttrs, IHtmlTag, Application };
 export interface IRendererConstructorOptions {
     serverPluginContext: IServerPluginContext;
 }
-export declare type IRenderDocumentOptions = {
-    app: IApplication;
-    req: IRequest;
+export declare type IRenderViewOptions = {
+    app: Application;
+    req: ShuviRequest;
+    ssr: boolean;
 };
+export declare type IRenderDocumentResult = Promise<IHtmlDocument | Response> | IHtmlDocument | Response;
 export interface IHtmlDocument {
     htmlAttrs: IHtmlAttrs;
     headTags: IHtmlTag<'meta' | 'link' | 'style' | 'script' | 'noscript' | 'title'>[];
     mainTags: IHtmlTag[];
     scriptTags: IHtmlTag<'script'>[];
 }
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export { IRenderAppServerResult, IClientRendererOptions, IServerRendererOptions, IViewClient, IViewServer };

package/lib/node/features/html-render/lib/webpack/build-manifest-plugin.d.ts

@@ -0,0 +1,27 @@
+import { Compiler, Compilation, Plugin } from '@shuvi/toolpack/lib/webpack';
+interface Options {
+    filename: string;
+    modules: boolean;
+    chunkRequest: boolean;
+}
+export default class BuildManifestPlugin implements Plugin {
+    private _options;
+    private _manifest;
+    constructor(options?: Partial<Options>);
+    createAssets(compiler: Compiler, compilation: Compilation): {
+        entries: {};
+        bundles: {};
+        chunkRequest: {};
+        loadble: {};
+    };
+    apply(compiler: Compiler): void;
+    private _collectEntries;
+    private _collect;
+    private _collectChunk;
+    private _collectChunkModule;
+    private _pushEntries;
+    private _pushBundle;
+    private _pushChunkRequest;
+    private _pushLoadableModules;
+}
+export {};