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

package/dist/cjs/createDevServer.js

@@ -1,105 +1,103 @@
 "use strict";
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createDevServer_exports = {};
-__export(createDevServer_exports, {
-  createDevServer: () => createDevServer
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __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__, {
+    createDevServer: ()=>createDevServer
 });
-module.exports = __toCommonJS(createDevServer_exports);
-var import_node_path = __toESM(require("node:path"));
-var import_server_core = require("@modern-js/server-core");
-var import_node = require("@modern-js/server-core/node");
-var import_dev = require("./dev");
-var import_helpers = require("./helpers");
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const server_core_namespaceObject = require("@modern-js/server-core");
+const node_namespaceObject = require("@modern-js/server-core/node");
+const external_dev_js_namespaceObject = require("./dev.js");
+const index_js_namespaceObject = require("./helpers/index.js");
 async function createDevServer(options, applyPlugins) {
-  var _config_output_distPath;
-  const { config, pwd, serverConfigFile, serverConfigPath, builder, metaName } = options;
-  const dev = (0, import_helpers.getDevOptions)(options);
-  const distDir = import_node_path.default.resolve(pwd, ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist");
-  const serverConfig = await (0, import_node.loadServerRuntimeConfig)(distDir, serverConfigFile, serverConfigPath, metaName) || {};
-  const prodServerOptions = {
-    ...options,
-    pwd: distDir,
-    serverConfig: {
-      ...serverConfig,
-      ...options.serverConfig
-    },
-    /**
-    * 1. server plugins from modern.server.ts
-    * 2. server plugins register by cli use _internalServerPlugins
-    * Merge plugins, the plugins from modern.server.ts will run first
-    */
-    plugins: [
-      ...serverConfig.plugins || [],
-      ...options.plugins || []
-    ]
-  };
-  const server = (0, import_server_core.createServerBase)(prodServerOptions);
-  const devHttpsOption = typeof dev === "object" && dev.https;
-  const isHttp2 = devHttpsOption && typeof dev.proxy === "undefined";
-  let nodeServer;
-  if (devHttpsOption) {
-    const { genHttpsOptions } = await Promise.resolve().then(() => __toESM(require("./dev-tools/https")));
-    const httpsOptions = await genHttpsOptions(devHttpsOption, pwd);
-    nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server), httpsOptions, isHttp2);
-  } else {
-    nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
-  }
-  const promise = (0, import_helpers.getDevAssetPrefix)(builder);
-  let compiler = null;
-  builder === null || builder === void 0 ? void 0 : builder.onAfterCreateCompiler((context) => {
-    compiler = context.compiler;
-  });
-  const builderDevServer = await (builder === null || builder === void 0 ? void 0 : builder.createDevServer({
-    runCompile: options.runCompile,
-    compiler: options.compiler
-  }));
-  server.addPlugins([
-    (0, import_dev.devPlugin)({
-      ...options,
-      builderDevServer
-    }, compiler)
-  ]);
-  const assetPrefix = await promise;
-  if (assetPrefix) {
-    prodServerOptions.config.output.assetPrefix = assetPrefix;
-  }
-  await applyPlugins(server, prodServerOptions, nodeServer);
-  await server.init();
-  const afterListen = async () => {
-    await (builderDevServer === null || builderDevServer === void 0 ? void 0 : builderDevServer.afterListen());
-  };
-  return {
-    server: nodeServer,
-    afterListen
-  };
+    const { config, pwd, serverConfigPath, builder } = options;
+    const dev = (0, index_js_namespaceObject.getDevOptions)(options.dev);
+    const distDir = external_node_path_default().resolve(pwd, config.output.distPath?.root || 'dist');
+    const serverConfig = await (0, node_namespaceObject.loadServerRuntimeConfig)(serverConfigPath) || {};
+    const prodServerOptions = {
+        ...options,
+        pwd: distDir,
+        serverConfig: {
+            ...serverConfig,
+            ...options.serverConfig
+        },
+        plugins: [
+            ...serverConfig.plugins || [],
+            ...options.plugins || []
+        ]
+    };
+    const server = (0, server_core_namespaceObject.createServerBase)(prodServerOptions);
+    const devHttpsOption = 'object' == typeof dev && dev.https;
+    const isHttp2 = !!devHttpsOption;
+    let nodeServer;
+    if (devHttpsOption) {
+        const { genHttpsOptions } = await import("./dev-tools/https/index.js");
+        const httpsOptions = await genHttpsOptions(devHttpsOption, pwd);
+        nodeServer = await (0, node_namespaceObject.createNodeServer)(server.handle.bind(server), httpsOptions, isHttp2);
+    } else nodeServer = await (0, node_namespaceObject.createNodeServer)(server.handle.bind(server));
+    const promise = (0, index_js_namespaceObject.getDevAssetPrefix)(builder);
+    let compiler = null;
+    builder?.onAfterCreateCompiler((context)=>{
+        compiler = context.compiler;
+    });
+    const builderDevServer = await builder?.createDevServer({
+        runCompile: options.runCompile,
+        compiler: options.compiler
+    });
+    server.addPlugins([
+        (0, external_dev_js_namespaceObject.devPlugin)({
+            ...options,
+            builderDevServer
+        }, compiler)
+    ]);
+    const assetPrefix = await promise;
+    if (assetPrefix) prodServerOptions.config.output.assetPrefix = assetPrefix;
+    await applyPlugins(server, prodServerOptions, nodeServer);
+    await server.init();
+    const afterListen = async ()=>{
+        await builderDevServer?.afterListen();
+    };
+    return {
+        server: nodeServer,
+        afterListen
+    };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createDevServer
+exports.createDevServer = __webpack_exports__.createDevServer;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createDevServer"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/dev-tools/https/index.js

@@ -1,54 +1,62 @@
 "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 https_exports = {};
-__export(https_exports, {
-  genHttpsOptions: () => genHttpsOptions
+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__, {
+    genHttpsOptions: ()=>genHttpsOptions
 });
-module.exports = __toCommonJS(https_exports);
-var import_utils = require("@modern-js/utils");
-const genHttpsOptions = async (userOptions, pwd) => {
-  const httpsOptions = typeof userOptions === "boolean" ? {} : userOptions;
-  if (!httpsOptions.key || !httpsOptions.cert) {
-    let devcertPath;
-    try {
-      devcertPath = require.resolve("devcert", {
-        paths: [
-          pwd,
-          __dirname
-        ]
-      });
-    } catch (err) {
-      const packageManager = await (0, import_utils.getPackageManager)(pwd);
-      const command = import_utils.chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);
-      import_utils.logger.error(`You have enabled "dev.https" option, but the "devcert" package is not installed.`);
-      import_utils.logger.error(`Please run ${command} to install manually, otherwise the https can not work.`);
-      throw new Error('[https] "devcert" is not found.');
+const utils_namespaceObject = require("@modern-js/utils");
+const genHttpsOptions = async (userOptions, pwd)=>{
+    const httpsOptions = 'boolean' == typeof userOptions ? {} : userOptions;
+    if (!httpsOptions.key || !httpsOptions.cert) {
+        let devcertPath;
+        try {
+            devcertPath = require.resolve('devcert', {
+                paths: [
+                    pwd,
+                    __dirname
+                ]
+            });
+        } catch (err) {
+            const packageManager = await (0, utils_namespaceObject.getPackageManager)(pwd);
+            const command = utils_namespaceObject.chalk.yellow.bold(`${packageManager} add devcert@1.2.2 -D`);
+            utils_namespaceObject.logger.error('You have enabled "dev.https" option, but the "devcert" package is not installed.');
+            utils_namespaceObject.logger.error(`Please run ${command} to install manually, otherwise the https can not work.`);
+            throw new Error('[https] "devcert" is not found.');
+        }
+        const devcert = require(devcertPath);
+        const selfsign = await devcert.certificateFor([
+            'localhost'
+        ]);
+        return selfsign;
     }
-    const devcert = require(devcertPath);
-    const selfsign = await devcert.certificateFor([
-      "localhost"
-    ]);
-    return selfsign;
-  }
-  return httpsOptions;
+    return httpsOptions;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  genHttpsOptions
+exports.genHttpsOptions = __webpack_exports__.genHttpsOptions;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "genHttpsOptions"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/dev-tools/watcher/dependencyTree.js

@@ -1,102 +1,104 @@
 "use strict";
-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(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var dependencyTree_exports = {};
-__export(dependencyTree_exports, {
-  DependencyTree: () => DependencyTree,
-  defaultIgnores: () => defaultIgnores
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __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__, {
+    defaultIgnores: ()=>defaultIgnores,
+    DependencyTree: ()=>DependencyTree
 });
-module.exports = __toCommonJS(dependencyTree_exports);
-var import_minimatch = __toESM(require("minimatch"));
+const external_minimatch_namespaceObject = require("minimatch");
+var external_minimatch_default = /*#__PURE__*/ __webpack_require__.n(external_minimatch_namespaceObject);
 const defaultIgnores = [
-  "**/coverage/**",
-  "**/node_modules/**",
-  "**/.*/**",
-  "**/*.d.ts",
-  "**/*.log"
+    '**/coverage/**',
+    '**/node_modules/**',
+    '**/.*/**',
+    '**/*.d.ts',
+    '**/*.log'
 ];
 class DependencyTree {
-  getNode(path) {
-    return this.tree.get(path);
-  }
-  /**
-  * update dependency tree
-  *
-  * @param cache
-  */
-  update(cache) {
-    this.tree.clear();
-    Object.keys(cache).forEach((path) => {
-      if (!this.shouldIgnore(path)) {
-        const module2 = cache[path];
-        this.tree.set(module2.filename, {
-          module: module2,
-          parent: /* @__PURE__ */ new Set(),
-          children: /* @__PURE__ */ new Set()
+    getNode(path) {
+        return this.tree.get(path);
+    }
+    update(cache) {
+        this.tree.clear();
+        Object.keys(cache).forEach((path)=>{
+            if (!this.shouldIgnore(path)) {
+                const module = cache[path];
+                this.tree.set(module.filename, {
+                    module,
+                    parent: new Set(),
+                    children: new Set()
+                });
+            }
         });
-      }
-    });
-    for (const treeNode of this.tree.values()) {
-      const { parent } = treeNode.module;
-      const { children } = treeNode.module;
-      if (parent && !this.shouldIgnore(parent.filename)) {
-        const parentTreeNode = this.tree.get(parent.filename);
-        if (parentTreeNode) {
-          treeNode.parent.add(parentTreeNode);
-        }
-      }
-      children === null || children === void 0 ? void 0 : children.forEach((child) => {
-        if (!this.shouldIgnore(child.filename)) {
-          const childTreeNode = this.tree.get(child.filename);
-          if (childTreeNode) {
-            treeNode.children.add(childTreeNode);
-            childTreeNode.parent.add(treeNode);
-          }
+        for (const treeNode of this.tree.values()){
+            const { parent } = treeNode.module;
+            const { children } = treeNode.module;
+            if (parent && !this.shouldIgnore(parent.filename)) {
+                const parentTreeNode = this.tree.get(parent.filename);
+                if (parentTreeNode) treeNode.parent.add(parentTreeNode);
+            }
+            children?.forEach((child)=>{
+                if (!this.shouldIgnore(child.filename)) {
+                    const childTreeNode = this.tree.get(child.filename);
+                    if (childTreeNode) {
+                        treeNode.children.add(childTreeNode);
+                        childTreeNode.parent.add(treeNode);
+                    }
+                }
+            });
         }
-      });
     }
-  }
-  shouldIgnore(path) {
-    return !path || Boolean(this.ignore.find((rule) => import_minimatch.default.match([
-      path
-    ], rule, {
-      dot: true
-    }).length > 0));
-  }
-  constructor() {
-    this.tree = /* @__PURE__ */ new Map();
-    this.ignore = [
-      ...defaultIgnores
-    ];
-  }
+    shouldIgnore(path) {
+        return !path || Boolean(this.ignore.find((rule)=>external_minimatch_default().match([
+                path
+            ], rule, {
+                dot: true
+            }).length > 0));
+    }
+    constructor(){
+        this.tree = new Map();
+        this.ignore = [
+            ...defaultIgnores
+        ];
+    }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DependencyTree,
-  defaultIgnores
+exports.DependencyTree = __webpack_exports__.DependencyTree;
+exports.defaultIgnores = __webpack_exports__.defaultIgnores;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "DependencyTree",
+    "defaultIgnores"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });