@shuvi/service 1.0.45-pre.0 → 1.0.46

package/lib/server/plugin.d.ts

@@ -1,13 +1,10 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
 import { IPluginContext } from '../core';
 import { CustomServerPluginHooks } from './pluginTypes';
-import { IRouter } from '@shuvi/router';
-import { ShuviRequest } from './shuviServerTypes';
 export * from './pluginTypes';
 export interface IServerPluginContext extends IPluginContext {
     serverPluginRunner: PluginManager['runner'];
     appConfig: AppConfig;
-    router?: IRouter;
 }
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type PluginRunner = PluginManager['runner'];
@@ -15,18 +12,13 @@ declare const listen: import("@shuvi/hook").AsyncParallelHook<{
     port: number;
     hostname?: string | undefined;
 }, void, void>;
-declare type AppConfigCtx = {
-    req: ShuviRequest;
-};
 declare type AppConfig = {
     router: {
         basename: string;
     };
 };
-declare const getAppConfig: import("@shuvi/hook").SyncBailHook<void, AppConfigCtx, AppConfig>;
 export interface BuiltInServerPluginHooks extends HookMap {
     listen: typeof listen;
-    getAppConfig: typeof getAppConfig;
 }
 export interface ServerPluginHooks extends BuiltInServerPluginHooks, CustomServerPluginHooks {
 }

package/lib/server/plugin.js

@@ -20,10 +20,8 @@ const hook_1 = require("@shuvi/hook");
 const plugins_1 = require("@shuvi/shared/plugins");
 __exportStar(require("./pluginTypes"), exports);
 const listen = (0, hook_1.createAsyncParallelHook)();
-const getAppConfig = (0, hook_1.createSyncBailHook)();
 const internalHooks = {
-    listen,
-    getAppConfig
+    listen
 };
 const getManager = () => (0, hook_1.createHookManager)(internalHooks);
 exports.getManager = getManager;
@@ -31,7 +29,7 @@ _a = (0, plugins_1.createPluginCreator)(), exports.createServerPluginBefore = _a
 const initServerPlugins = (manager, serverPlugins, pluginContext) => {
     const serverContext = Object.assign({
         serverPluginRunner: manager.runner,
-        // default appConfig, can be override by setupAppConfigMiddleware
+        // default appConfig, can be override by `getAppConfig` hook
         appConfig: {
             router: {
                 basename: ''

package/lib/server/shuviDevServer.js

@@ -32,7 +32,6 @@ const devMiddleware_1 = require("./middlewares/dev/devMiddleware");
 const httpProxyMiddleware_1 = require("./middlewares/httpProxyMiddleware");
 const getAssetMiddleware_1 = require("./middlewares/getAssetMiddleware");
 const env_1 = require("../config/env");
-const setupAppConfigMiddleware_1 = require("./middlewares/setupAppConfigMiddleware");
 class ShuviDevServer extends shuviServer_1.ShuviServer {
     constructor(corePluginContext, _a) {
         var { bundler } = _a, options = __rest(_a, ["bundler"]);
@@ -67,7 +66,6 @@ class ShuviDevServer extends shuviServer_1.ShuviServer {
                 }
                 next();
             })));
-            server.use((0, setupAppConfigMiddleware_1.setupAppConfigMiddleware)(context));
             if (this._options.getMiddlewaresBeforeDevMiddlewares) {
                 const serverMiddlewaresBeforeDevMiddleware = [
                     this._options.getMiddlewaresBeforeDevMiddlewares(devMiddleware, context)

package/lib/server/shuviProdServer.js

@@ -12,13 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShuviProdServer = void 0;
 const shuviServer_1 = require("./shuviServer");
 const getAssetMiddleware_1 = require("./middlewares/getAssetMiddleware");
-const setupAppConfigMiddleware_1 = require("./middlewares/setupAppConfigMiddleware");
 class ShuviProdServer extends shuviServer_1.ShuviServer {
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             const { _serverContext: context } = this;
             this._server.use((0, getAssetMiddleware_1.getAssetMiddleware)(context));
-            this._server.use((0, setupAppConfigMiddleware_1.setupAppConfigMiddleware)(context));
             yield this._initMiddlewares();
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.45-pre.0",
+  "version": "1.0.46",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -29,14 +29,14 @@
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "1.0.45-pre.0",
-    "@shuvi/router": "1.0.45-pre.0",
-    "@shuvi/runtime": "1.0.45-pre.0",
-    "@shuvi/shared": "1.0.45-pre.0",
-    "@shuvi/toolpack": "1.0.45-pre.0",
-    "@shuvi/utils": "1.0.45-pre.0",
-    "@shuvi/error-overlay": "1.0.45-pre.0",
-    "@shuvi/reporters": "1.0.45-pre.0",
+    "@shuvi/hook": "1.0.46",
+    "@shuvi/router": "1.0.46",
+    "@shuvi/runtime": "1.0.46",
+    "@shuvi/shared": "1.0.46",
+    "@shuvi/toolpack": "1.0.46",
+    "@shuvi/utils": "1.0.46",
+    "@shuvi/error-overlay": "1.0.46",
+    "@shuvi/reporters": "1.0.46",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",

package/lib/server/middlewares/setupAppConfigMiddleware.d.ts

@@ -1,3 +0,0 @@
-import { IServerPluginContext } from '../plugin';
-import { ShuviRequestHandler } from '../shuviServerTypes';
-export declare const setupAppConfigMiddleware: (context: IServerPluginContext) => ShuviRequestHandler;

package/lib/server/middlewares/setupAppConfigMiddleware.js

@@ -1,25 +0,0 @@
-"use strict";
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupAppConfigMiddleware = void 0;
-const setupAppConfigMiddleware = (context) => {
-    return (req, _res, next) => __awaiter(void 0, void 0, void 0, function* () {
-        const appConfig = context.serverPluginRunner.getAppConfig({ req });
-        if (appConfig) {
-            if (typeof appConfig.router.basename !== 'string') {
-                throw new Error('[ServerPlugin Hook getAppConfig] appConfig.router.basename must be a string');
-            }
-            context.appConfig = appConfig;
-        }
-        next();
-    });
-};
-exports.setupAppConfigMiddleware = setupAppConfigMiddleware;