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

package/dist/js/node/server.js

@@ -1,83 +1,115 @@
-"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 __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+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;
+};
+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 server_exports = {};
+__export(server_exports, {
+  default: () => server_default
 });
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-const _excluded = ["default", "middleware"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-const WEB_APP_NAME = 'index';
-var HOOKS;
-(function (HOOKS) {
-  HOOKS["AFTER_MATCH"] = "afterMatch";
-  HOOKS["AFTER_RENDER"] = "afterRender";
-})(HOOKS || (HOOKS = {}));
+module.exports = __toCommonJS(server_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@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) => {
+        import_utils.logger.warn(
+          "declare hook in default export is to be deprecated, use named export instead"
+        );
+        storage.hooks[name] = fn;
+      };
     }
-    return fn => {
-      _utils.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;
   };
 };
-var _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 = (0, _utils.isProd)() ? distDirectory : appDirectory;
-    const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
+    const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
+    const webAppPath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, WEB_APP_NAME);
+    const middlewarePath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, "_middleware");
     const loadMod = () => {
-      const mod = (0, _utils.requireExistModule)(webAppPath, {
+      const mod = (0, import_utils.requireExistModule)(webAppPath, {
+        interop: false
+      });
+      const middlewareMode = (0, import_utils.requireExistModule)(middlewarePath, {
         interop: false
       });
-      const {
-          default: defaultExports,
-          middleware
-        } = mod,
-        hooks = _objectWithoutProperties(mod, _excluded);
+      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;
@@ -86,6 +118,7 @@ var _default = () => ({
       if (middleware) {
         storage.middlewares = [].concat(middleware);
       }
+      storage.middlewares = storage.middlewares.concat(unstableMiddleware);
     };
     return {
       prepare() {
@@ -95,10 +128,8 @@ var _default = () => ({
         storage.reset();
         loadMod();
       },
-      gather({
-        addWebMiddleware
-      }) {
-        storage.middlewares.forEach(mid => {
+      gather({ addWebMiddleware }) {
+        storage.middlewares.forEach((mid) => {
           addWebMiddleware(mid);
         });
       },
@@ -114,21 +145,15 @@ var _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);
               }
@@ -142,4 +167,5 @@ var _default = () => ({
     };
   }
 });
-exports.default = _default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/treeshaking/cli.js

@@ -1,65 +1,201 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import fs from 'fs';
-import path from 'path';
-import { compile } from '@modern-js/server-utils';
-import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
-var TS_CONFIG_FILENAME = 'tsconfig.json';
-export default (function () {
-  return {
-    name: '@modern-js/plugin-server',
-    setup: function setup(api) {
-      return {
-        config: function config() {
-          return {};
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
         },
-        afterBuild: function afterBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig$source, alias, globalVars, babel;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _api$useAppContext = api.useAppContext(), appDirectory = _api$useAppContext.appDirectory, distDirectory = _api$useAppContext.distDirectory;
-                    modernConfig = api.useResolvedConfigContext();
-                    distDir = path.resolve(distDirectory);
-                    serverDir = path.resolve(appDirectory, SERVER_DIR);
-                    sharedDir = path.resolve(appDirectory, SHARED_DIR);
-                    tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-                    sourceDirs = [];
-                    if (fs.existsSync(serverDir)) {
-                      sourceDirs.push(serverDir);
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
                     }
-                    if (fs.existsSync(sharedDir)) {
-                      sourceDirs.push(sharedDir);
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
                     }
-                    server = modernConfig.server;
-                    _modernConfig$source = modernConfig.source, alias = _modernConfig$source.alias, globalVars = _modernConfig$source.globalVars;
-                    babel = modernConfig.tools.babel;
-                    if (!(sourceDirs.length > 0)) {
-                      _context.next = 15;
-                      break;
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
                     }
-                    _context.next = 15;
-                    return compile(appDirectory, {
-                      server: server,
-                      alias: alias,
-                      globalVars: globalVars,
-                      babelConfig: babel
-                    }, {
-                      sourceDirs: sourceDirs,
-                      distDir: distDir,
-                      tsconfigPath: tsconfigPath
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import fs from "fs";
+import path from "path";
+import { compile } from "@modern-js/server-utils";
+import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
+var TS_CONFIG_FILENAME = "tsconfig.json";
+var cli_default = function() {
+    return {
+        name: "@modern-js/plugin-server",
+        setup: function(api) {
+            return {
+                config: function config() {
+                    return {};
+                },
+                afterBuild: function afterBuild() {
+                    return _asyncToGenerator(function() {
+                        var ref, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, _source, alias, globalVars, babel;
+                        return __generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    ref = api.useAppContext(), appDirectory = ref.appDirectory, distDirectory = ref.distDirectory;
+                                    modernConfig = api.useResolvedConfigContext();
+                                    distDir = path.resolve(distDirectory);
+                                    serverDir = path.resolve(appDirectory, SERVER_DIR);
+                                    sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                                    tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                                    sourceDirs = [];
+                                    if (fs.existsSync(serverDir)) {
+                                        sourceDirs.push(serverDir);
+                                    }
+                                    if (fs.existsSync(sharedDir)) {
+                                        sourceDirs.push(sharedDir);
+                                    }
+                                    server = modernConfig.server;
+                                    _source = modernConfig.source, alias = _source.alias, globalVars = _source.globalVars;
+                                    babel = modernConfig.tools.babel;
+                                    if (!(sourceDirs.length > 0)) return [
+                                        3,
+                                        2
+                                    ];
+                                    return [
+                                        4,
+                                        compile(appDirectory, {
+                                            server: server,
+                                            alias: alias,
+                                            globalVars: globalVars,
+                                            babelConfig: babel
+                                        }, {
+                                            sourceDirs: sourceDirs,
+                                            distDir: distDir,
+                                            tsconfigPath: tsconfigPath
+                                        })
+                                    ];
+                                case 1:
+                                    _state.sent();
+                                    _state.label = 2;
+                                case 2:
+                                    return [
+                                        2
+                                    ];
+                            }
+                        });
+                    })();
+                },
+                collectServerPlugins: function collectServerPlugins(param) {
+                    var plugins = param.plugins;
+                    plugins.push({
+                        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
                     });
-                  case 15:
-                  case "end":
-                    return _context.stop();
+                    return {
+                        plugins: plugins
+                    };
                 }
-              }
-            }, _callee);
-          }))();
+            };
         }
-      };
-    }
-  };
-});
+    };
+};
+export { cli_default as default };

package/dist/js/treeshaking/modern-app-env.d.js

@@ -0,0 +1 @@
+"use strict";