@modern-js/plugin-server 2.0.0-beta.3 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @modern-js/plugin-server
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f711]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/babel-compiler@2.0.0-beta.6
+
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [7879e8f]
+- Updated dependencies [d4e8e6fb90]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [c2bb0f1745]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.4
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/babel-compiler@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/cli.js

@@ -1,53 +1,78 @@
-import fs from 'fs';
-import path from 'path';
-import { compile } from '@modern-js/server-utils';
-import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-export default (() => ({
-  name: '@modern-js/plugin-server',
-  setup: api => ({
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import fs from "fs";
+import path from "path";
+import { compile } from "@modern-js/server-utils";
+import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var cli_default = () => ({
+  name: "@modern-js/plugin-server",
+  setup: (api) => ({
     config() {
       return {};
     },
-    async afterBuild() {
-      const {
-        appDirectory,
-        distDirectory
-      } = api.useAppContext();
-      const modernConfig = api.useResolvedConfigContext();
-      const distDir = path.resolve(distDirectory);
-      const serverDir = path.resolve(appDirectory, SERVER_DIR);
-      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-      const sourceDirs = [];
-      if (fs.existsSync(serverDir)) {
-        sourceDirs.push(serverDir);
-      }
-      if (fs.existsSync(sharedDir)) {
-        sourceDirs.push(sharedDir);
-      }
-      const {
-        server
-      } = modernConfig;
-      const {
-        alias,
-        globalVars
-      } = modernConfig.source;
-      const {
-        babel
-      } = modernConfig.tools;
-      if (sourceDirs.length > 0) {
-        await compile(appDirectory, {
-          server,
-          alias,
-          globalVars,
-          babelConfig: babel
-        }, {
-          sourceDirs,
-          distDir,
-          tsconfigPath
-        });
-      }
+    afterBuild() {
+      return __async(this, null, function* () {
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = path.resolve(distDirectory);
+        const serverDir = path.resolve(appDirectory, SERVER_DIR);
+        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (fs.existsSync(serverDir)) {
+          sourceDirs.push(serverDir);
+        }
+        if (fs.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
+        const { server } = modernConfig;
+        const { alias, globalVars } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          yield compile(
+            appDirectory,
+            {
+              server,
+              alias,
+              globalVars,
+              babelConfig: babel
+            },
+            {
+              sourceDirs,
+              distDir,
+              tsconfigPath
+            }
+          );
+        }
+      });
+    },
+    collectServerPlugins({ plugins }) {
+      plugins.push({
+        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+      });
+      return { plugins };
     }
   })
-}));
+});
+export {
+  cli_default as default
+};

package/dist/js/modern/server.js

@@ -1,76 +1,93 @@
-const _excluded = ["default", "middleware"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
-const WEB_APP_NAME = 'index';
-var HOOKS;
-(function (HOOKS) {
-  HOOKS["AFTER_MATCH"] = "afterMatch";
-  HOOKS["AFTER_RENDER"] = "afterRender";
-})(HOOKS || (HOOKS = {}));
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+import path from "path";
+import {
+  isProd,
+  logger,
+  requireExistModule,
+  SERVER_DIR
+} from "@modern-js/utils";
+const WEB_APP_NAME = "index";
+var HOOKS = /* @__PURE__ */ ((HOOKS2) => {
+  HOOKS2["AFTER_MATCH"] = "afterMatch";
+  HOOKS2["AFTER_RENDER"] = "afterRender";
+  return HOOKS2;
+})(HOOKS || {});
 class Storage {
   constructor() {
-    _defineProperty(this, "middlewares", []);
-    _defineProperty(this, "hooks", {});
+    this.middlewares = [];
+    this.hooks = {};
   }
   reset() {
     this.middlewares = [];
     this.hooks = {};
   }
 }
-const createTransformAPI = storage => new Proxy({}, {
-  get(target, name) {
-    if (name === 'addMiddleware') {
-      return fn => storage.middlewares.push(fn);
+const createTransformAPI = (storage) => new Proxy(
+  {},
+  {
+    get(target, name) {
+      if (name === "addMiddleware") {
+        return (fn) => storage.middlewares.push(fn);
+      }
+      return (fn) => {
+        logger.warn(
+          "declare hook in default export is to be deprecated, use named export instead"
+        );
+        storage.hooks[name] = fn;
+      };
     }
-    return fn => {
-      logger.warn('declare hook in default export is to be deprecated, use named export instead');
-      storage.hooks[name] = fn;
-    };
   }
-});
-const compose = middlewares => {
+);
+const compose = (middlewares) => {
   return (ctx, resolve, reject) => {
     let i = 0;
     const dispatch = () => {
-      var _handler, _handler$catch;
+      var _a, _b;
       const handler = middlewares[i++];
       if (!handler) {
         return resolve();
       }
-      return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler.catch) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
+      return (_b = (_a = handler(ctx, dispatch)) == null ? void 0 : _a.catch) == null ? void 0 : _b.call(_a, reject);
     };
     return dispatch;
   };
 };
-export default (() => ({
-  name: '@modern-js/plugin-server',
-  setup: api => {
-    const {
-      appDirectory,
-      distDirectory
-    } = api.useAppContext();
+var server_default = () => ({
+  name: "@modern-js/plugin-server",
+  setup: (api) => {
+    const { appDirectory, distDirectory } = api.useAppContext();
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = isProd() ? distDirectory : appDirectory;
     const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+    const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
     const loadMod = () => {
       const mod = requireExistModule(webAppPath, {
         interop: false
       });
-      const {
-          default: defaultExports,
-          middleware
-        } = mod,
-        hooks = _objectWithoutProperties(mod, _excluded);
+      const middlewareMode = requireExistModule(middlewarePath, {
+        interop: false
+      });
+      const _a = mod || {}, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
+      const { middleware: unstableMiddleware = [] } = middlewareMode || {};
       if (defaultExports) {
         defaultExports(transformAPI);
       }
-
-      // named export hooks will overrides hooks in default export function
-      Object.values(HOOKS).forEach(key => {
+      Object.values(HOOKS).forEach((key) => {
         const fn = hooks[key];
         if (fn) {
           storage.hooks[key] = fn;
@@ -79,6 +96,7 @@ export default (() => ({
       if (middleware) {
         storage.middlewares = [].concat(middleware);
       }
+      storage.middlewares = storage.middlewares.concat(unstableMiddleware);
     };
     return {
       prepare() {
@@ -88,10 +106,8 @@ export default (() => ({
         storage.reset();
         loadMod();
       },
-      gather({
-        addWebMiddleware
-      }) {
-        storage.middlewares.forEach(mid => {
+      gather({ addWebMiddleware }) {
+        storage.middlewares.forEach((mid) => {
           addWebMiddleware(mid);
         });
       },
@@ -107,21 +123,15 @@ export default (() => ({
         }
         return storage.hooks.afterRender(context, next);
       },
-      prepareWebServer({
-        config
-      }) {
-        const {
-          middleware
-        } = config;
+      prepareWebServer({ config }) {
+        const { middleware } = config;
         const factory = compose(middleware);
-        return ctx => {
+        return (ctx) => {
           const {
-            source: {
-              res
-            }
+            source: { res }
           } = ctx;
           return new Promise((resolve, reject) => {
-            res.on('finish', err => {
+            res.on("finish", (err) => {
               if (err) {
                 return reject(err);
               }
@@ -134,4 +144,7 @@ export default (() => ({
       }
     };
   }
-}));
+});
+export {
+  server_default as default
+};

package/dist/js/node/cli.js

@@ -1,61 +1,105 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default
 });
-exports.default = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _serverUtils = require("@modern-js/server-utils");
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-var _default = () => ({
-  name: '@modern-js/plugin-server',
-  setup: api => ({
+module.exports = __toCommonJS(cli_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_server_utils = require("@modern-js/server-utils");
+var import_utils = require("@modern-js/utils");
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var cli_default = () => ({
+  name: "@modern-js/plugin-server",
+  setup: (api) => ({
     config() {
       return {};
     },
-    async afterBuild() {
-      const {
-        appDirectory,
-        distDirectory
-      } = api.useAppContext();
-      const modernConfig = api.useResolvedConfigContext();
-      const distDir = _path.default.resolve(distDirectory);
-      const serverDir = _path.default.resolve(appDirectory, _utils.SERVER_DIR);
-      const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
-      const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-      const sourceDirs = [];
-      if (_fs.default.existsSync(serverDir)) {
-        sourceDirs.push(serverDir);
-      }
-      if (_fs.default.existsSync(sharedDir)) {
-        sourceDirs.push(sharedDir);
-      }
-      const {
-        server
-      } = modernConfig;
-      const {
-        alias,
-        globalVars
-      } = modernConfig.source;
-      const {
-        babel
-      } = modernConfig.tools;
-      if (sourceDirs.length > 0) {
-        await (0, _serverUtils.compile)(appDirectory, {
-          server,
-          alias,
-          globalVars,
-          babelConfig: babel
-        }, {
-          sourceDirs,
-          distDir,
-          tsconfigPath
-        });
-      }
+    afterBuild() {
+      return __async(this, null, function* () {
+        const { appDirectory, distDirectory } = api.useAppContext();
+        const modernConfig = api.useResolvedConfigContext();
+        const distDir = import_path.default.resolve(distDirectory);
+        const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
+        const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+        const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+        const sourceDirs = [];
+        if (import_fs.default.existsSync(serverDir)) {
+          sourceDirs.push(serverDir);
+        }
+        if (import_fs.default.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
+        const { server } = modernConfig;
+        const { alias, globalVars } = modernConfig.source;
+        const { babel } = modernConfig.tools;
+        if (sourceDirs.length > 0) {
+          yield (0, import_server_utils.compile)(
+            appDirectory,
+            {
+              server,
+              alias,
+              globalVars,
+              babelConfig: babel
+            },
+            {
+              sourceDirs,
+              distDir,
+              tsconfigPath
+            }
+          );
+        }
+      });
+    },
+    collectServerPlugins({ plugins }) {
+      plugins.push({
+        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+      });
+      return { plugins };
     }
   })
 });
-exports.default = _default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});