@modern-js/server 2.69.4 → 3.0.0-alpha.0

package/dist/cjs/dev.js

@@ -1,117 +1,111 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dev_exports = {};
-__export(dev_exports, {
-  devPlugin: () => devPlugin
-});
-module.exports = __toCommonJS(dev_exports);
-var import_node = require("@modern-js/server-core/node");
-var import_utils = require("@modern-js/utils");
-var import_helpers = require("./helpers");
-const devPlugin = (options, compiler) => ({
-  name: "@modern-js/plugin-dev",
-  setup(api) {
-    const { config, pwd, builder, builderDevServer } = options;
-    const closeCb = [];
-    const dev = (0, import_helpers.getDevOptions)(options);
-    return {
-      async prepare() {
-        var _dev_after, _dev_before;
-        const { middlewares: builderMiddlewares, close, connectWebSocket } = builderDevServer || {};
-        close && closeCb.push(close);
-        const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
-        connectWebSocket && nodeServer && connectWebSocket({
-          server: nodeServer
-        });
-        const hooks = api.getHooks();
-        builder === null || builder === void 0 ? void 0 : builder.onDevCompileDone(({ stats }) => {
-          if (stats.toJson({
-            all: false
-          }).name !== "server") {
-            (0, import_helpers.onRepack)(distDirectory, hooks);
-          }
-        });
-        if (dev.watch) {
-          const { watchOptions } = config.server;
-          const watcher = (0, import_helpers.startWatcher)({
-            pwd,
-            distDir: distDirectory,
-            apiDir: apiDirectory || import_utils.API_DIR,
-            sharedDir: sharedDirectory || import_utils.SHARED_DIR,
-            watchOptions,
-            server: serverBase
-          });
-          closeCb.push(watcher.close.bind(watcher));
-        }
-        closeCb.length > 0 && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("close", () => {
-          closeCb.forEach((cb) => {
-            cb();
-          });
-        }));
-        const before = [];
-        const after = [];
-        const { setupMiddlewares = [] } = dev;
-        if (((_dev_after = dev.after) === null || _dev_after === void 0 ? void 0 : _dev_after.length) || ((_dev_before = dev.before) === null || _dev_before === void 0 ? void 0 : _dev_before.length)) {
-          setupMiddlewares.push((middlewares2) => {
-            middlewares2.unshift(...dev.before || []);
-            middlewares2.push(...dev.after || []);
-          });
-        }
-        setupMiddlewares.forEach((handler) => {
-          handler({
-            unshift: (...handlers) => before.unshift(...handlers),
-            push: (...handlers) => after.push(...handlers)
-          }, {
-            sockWrite: () => {
-            }
-          });
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
         });
-        before.forEach((middleware, index) => {
-          middlewares.push({
-            name: `before-dev-server-${index}`,
-            handler: (0, import_node.connectMid2HonoMid)(middleware)
-          });
-        });
-        const mockMiddleware = await (0, import_helpers.getMockMiddleware)(pwd);
-        middlewares.push({
-          name: "mock-dev",
-          handler: mockMiddleware
-        });
-        builderMiddlewares && middlewares.push({
-          name: "rsbuild-dev",
-          handler: (0, import_node.connectMid2HonoMid)(builderMiddlewares)
-        });
-        after.forEach((middleware, index) => {
-          middlewares.push({
-            name: `after-dev-server-${index}`,
-            handler: (0, import_node.connectMid2HonoMid)(middleware)
-          });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
         });
-        middlewares.push({
-          name: "init-file-reader",
-          handler: (0, import_helpers.initFileReader)(compiler)
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
         });
-      }
     };
-  }
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    devPlugin: ()=>devPlugin
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  devPlugin
+const node_namespaceObject = require("@modern-js/server-core/node");
+const utils_namespaceObject = require("@modern-js/utils");
+const index_js_namespaceObject = require("./helpers/index.js");
+const devPlugin = (options, compiler)=>({
+        name: '@modern-js/plugin-dev',
+        setup (api) {
+            const { config, pwd, builder, builderDevServer } = options;
+            const closeCb = [];
+            const dev = (0, index_js_namespaceObject.getDevOptions)(options.dev);
+            api.onPrepare(async ()=>{
+                const { middlewares: builderMiddlewares, close, connectWebSocket } = builderDevServer || {};
+                close && closeCb.push(close);
+                const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.getServerContext();
+                connectWebSocket && nodeServer && connectWebSocket({
+                    server: nodeServer
+                });
+                const hooks = api.getHooks();
+                builder?.onDevCompileDone(({ stats })=>{
+                    if ('server' !== stats.toJson({
+                        all: false
+                    }).name) (0, index_js_namespaceObject.onRepack)(distDirectory, hooks);
+                });
+                const { watchOptions } = config.server;
+                const watcher = (0, index_js_namespaceObject.startWatcher)({
+                    pwd,
+                    distDir: distDirectory,
+                    apiDir: apiDirectory || utils_namespaceObject.API_DIR,
+                    sharedDir: sharedDirectory || utils_namespaceObject.SHARED_DIR,
+                    watchOptions,
+                    server: serverBase
+                });
+                closeCb.push(watcher.close.bind(watcher));
+                closeCb.length > 0 && nodeServer?.on('close', ()=>{
+                    closeCb.forEach((cb)=>{
+                        cb();
+                    });
+                });
+                const before = [];
+                const after = [];
+                const { setupMiddlewares = [] } = dev;
+                setupMiddlewares.forEach((handler)=>{
+                    handler({
+                        unshift: (...handlers)=>before.unshift(...handlers),
+                        push: (...handlers)=>after.push(...handlers)
+                    }, {
+                        sockWrite: ()=>{}
+                    });
+                });
+                before.forEach((middleware, index)=>{
+                    middlewares.push({
+                        name: `before-dev-server-${index}`,
+                        handler: (0, node_namespaceObject.connectMid2HonoMid)(middleware)
+                    });
+                });
+                const mockMiddleware = await (0, index_js_namespaceObject.getMockMiddleware)(pwd);
+                middlewares.push({
+                    name: 'mock-dev',
+                    handler: mockMiddleware
+                });
+                builderMiddlewares && middlewares.push({
+                    name: 'rsbuild-dev',
+                    handler: (0, node_namespaceObject.connectMid2HonoMid)(builderMiddlewares)
+                });
+                after.forEach((middleware, index)=>{
+                    middlewares.push({
+                        name: `after-dev-server-${index}`,
+                        handler: (0, node_namespaceObject.connectMid2HonoMid)(middleware)
+                    });
+                });
+                middlewares.push({
+                    name: 'init-file-reader',
+                    handler: (0, index_js_namespaceObject.initFileReader)(compiler)
+                });
+            });
+        }
+    });
+exports.devPlugin = __webpack_exports__.devPlugin;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "devPlugin"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/helpers/devOptions.js

@@ -1,60 +1,61 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var devOptions_exports = {};
-__export(devOptions_exports, {
-  getDevAssetPrefix: () => getDevAssetPrefix,
-  getDevOptions: () => getDevOptions
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    getDevAssetPrefix: ()=>getDevAssetPrefix,
+    getDevOptions: ()=>getDevOptions
 });
-module.exports = __toCommonJS(devOptions_exports);
-var import_lodash = require("@modern-js/utils/lodash");
-var import_constants = require("./constants");
-const getDevOptions = (options) => {
-  const devOptions = options.dev;
-  const defaultOptions = (0, import_constants.getDefaultDevOptions)();
-  return (0, import_lodash.merge)(defaultOptions, devOptions);
+const getDevOptions = (devOptions)=>{
+    const defaultOptions = {
+        https: false,
+        server: {}
+    };
+    return {
+        ...defaultOptions,
+        ...devOptions
+    };
 };
-const getDevAssetPrefix = (builder) => {
-  return new Promise((resolve) => {
-    if (!builder) {
-      return resolve("");
-    }
-    builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((params) => {
-      var _webCompiler_options_output, _webCompiler_options;
-      let webCompiler;
-      if ("compilers" in params.compiler) {
-        webCompiler = params.compiler.compilers.find((c) => {
-          return c.name === "web" || c.name === "client";
+const getDevAssetPrefix = (builder)=>new Promise((resolve)=>{
+        if (!builder) return resolve('');
+        builder?.onAfterCreateCompiler((params)=>{
+            let webCompiler;
+            webCompiler = 'compilers' in params.compiler ? params.compiler.compilers.find((c)=>'web' === c.name || 'client' === c.name) : params.compiler;
+            const publicPath = webCompiler?.options?.output?.publicPath;
+            if (publicPath && 'string' == typeof publicPath) {
+                const formatPublicPath = publicPath.replace(/^https?:\/\/[^/]+/, '');
+                return resolve(formatPublicPath);
+            }
+            return resolve('');
         });
-      } else {
-        webCompiler = params.compiler;
-      }
-      const publicPath = webCompiler === null || webCompiler === void 0 ? void 0 : (_webCompiler_options = webCompiler.options) === null || _webCompiler_options === void 0 ? void 0 : (_webCompiler_options_output = _webCompiler_options.output) === null || _webCompiler_options_output === void 0 ? void 0 : _webCompiler_options_output.publicPath;
-      if (publicPath && typeof publicPath === "string") {
-        const formatPublicPath = publicPath.replace(/^https?:\/\/[^/]+/, "");
-        return resolve(formatPublicPath);
-      }
-      return resolve("");
     });
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getDevAssetPrefix,
-  getDevOptions
+exports.getDevAssetPrefix = __webpack_exports__.getDevAssetPrefix;
+exports.getDevOptions = __webpack_exports__.getDevOptions;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getDevAssetPrefix",
+    "getDevOptions"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/helpers/fileReader.js

@@ -1,48 +1,52 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var fileReader_exports = {};
-__export(fileReader_exports, {
-  initFileReader: () => initFileReader
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    initFileReader: ()=>initFileReader
 });
-module.exports = __toCommonJS(fileReader_exports);
-var import_fileReader = require("@modern-js/runtime-utils/fileReader");
-const initFileReader = (compiler) => {
-  let isInit = false;
-  return async (ctx, next) => {
-    if (isInit) {
-      return next();
-    }
-    isInit = true;
-    if (!compiler) {
-      import_fileReader.fileReader.reset();
-      return next();
-    }
-    const { outputFileSystem } = "compilers" in compiler ? compiler.compilers[0] : compiler;
-    if (outputFileSystem) {
-      import_fileReader.fileReader.reset(outputFileSystem);
-    } else {
-      import_fileReader.fileReader.reset();
-    }
-    return next();
-  };
+const fileReader_namespaceObject = require("@modern-js/runtime-utils/fileReader");
+const initFileReader = (compiler)=>{
+    let isInit = false;
+    return async (ctx, next)=>{
+        if (isInit) return next();
+        isInit = true;
+        const { res } = ctx.env.node;
+        if (!compiler) {
+            fileReader_namespaceObject.fileReader.reset();
+            return next();
+        }
+        const { outputFileSystem } = 'compilers' in compiler ? compiler.compilers[0] : compiler;
+        if (outputFileSystem) fileReader_namespaceObject.fileReader.reset(outputFileSystem);
+        else fileReader_namespaceObject.fileReader.reset();
+        return next();
+    };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  initFileReader
+exports.initFileReader = __webpack_exports__.initFileReader;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "initFileReader"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });