@modern-js/server 2.5.1-alpha.1 → 2.6.0

package/dist/js/modern/dev-tools/watcher/index.js

@@ -1,106 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-import path from "path";
-import { fs, chokidar } from "@modern-js/utils";
-import { DependencyTree } from "./dependency-tree";
-import { StatsCache } from "./stats-cache";
-const defaultWatchOptions = {
-  ignoreInitial: true,
-  ignored: /api\/typings\/.*/
-};
-const getWatchedFiles = (watcher) => {
-  const watched = watcher.getWatched();
-  const files = [];
-  Object.keys(watched).forEach((dir) => {
-    watched[dir].forEach((fileName) => {
-      files.push(path.join(dir, fileName));
-    });
-  });
-  return files;
-};
-const mergeWatchOptions = (options) => {
-  const watchOptions = __spreadValues({}, options);
-  if (watchOptions) {
-    const { ignored } = watchOptions;
-    const finalIgnored = ignored ? [
-      defaultWatchOptions.ignored,
-      ...Array.isArray(ignored) ? ignored : [ignored]
-    ] : ignored;
-    if (finalIgnored) {
-      watchOptions.ignored = finalIgnored;
-    }
-  }
-  const finalWatchOptions = __spreadValues(__spreadValues({}, defaultWatchOptions), watchOptions);
-  return finalWatchOptions;
-};
-class Watcher {
-  constructor() {
-    this.dependencyTree = null;
-  }
-  listen(files, options, callback) {
-    const watched = files.filter(Boolean);
-    const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
-    const cache = new StatsCache();
-    const watcher = chokidar.watch(filenames, options);
-    watcher.on("ready", () => {
-      cache.add(getWatchedFiles(watcher));
-    });
-    watcher.on("change", (changed) => {
-      if (!fs.existsSync(changed) || cache.isDiff(changed)) {
-        cache.refresh(changed);
-        callback(changed, "change");
-      }
-    });
-    watcher.on("add", (changed) => {
-      if (!cache.has(changed)) {
-        cache.add([changed]);
-        callback(changed, "add");
-      }
-    });
-    watcher.on("unlink", (changed) => {
-      cache.del(changed);
-      callback(changed, "unlink");
-    });
-    this.watcher = watcher;
-  }
-  createDepTree() {
-    this.dependencyTree = new DependencyTree();
-  }
-  updateDepTree() {
-    var _a;
-    (_a = this.dependencyTree) == null ? void 0 : _a.update(require.cache);
-  }
-  cleanDepCache(filepath) {
-    var _a;
-    const node = (_a = this.dependencyTree) == null ? void 0 : _a.getNode(filepath);
-    if (node && require.cache[filepath]) {
-      delete require.cache[filepath];
-      for (const parentNode of node.parent.values()) {
-        this.cleanDepCache(parentNode.module.filename);
-      }
-    }
-  }
-  close() {
-    return this.watcher.close();
-  }
-}
-export {
-  Watcher as default,
-  defaultWatchOptions,
-  getWatchedFiles,
-  mergeWatchOptions
-};

package/dist/js/modern/dev-tools/watcher/stats-cache.js

@@ -1,58 +0,0 @@
-import fs from "fs";
-import crypto from "crypto";
-class StatsCache {
-  constructor() {
-    this.cachedHash = {};
-    this.cachedSize = {};
-  }
-  add(files) {
-    const { cachedHash, cachedSize } = this;
-    for (const filename of files) {
-      if (fs.existsSync(filename)) {
-        const stats = fs.statSync(filename);
-        if (stats.isFile() && !cachedHash[filename]) {
-          cachedHash[filename] = this.hash(stats, filename);
-          cachedSize[filename] = stats.size;
-        }
-      }
-    }
-  }
-  refresh(filename) {
-    const { cachedHash, cachedSize } = this;
-    if (fs.existsSync(filename)) {
-      const stats = fs.statSync(filename);
-      if (stats.isFile()) {
-        cachedHash[filename] = this.hash(stats, filename);
-        cachedSize[filename] = stats.size;
-      }
-    }
-  }
-  del(filename) {
-    if (this.cachedHash[filename]) {
-      delete this.cachedHash[filename];
-      delete this.cachedSize[filename];
-    }
-  }
-  isDiff(filename) {
-    const { cachedHash, cachedSize } = this;
-    const stats = fs.statSync(filename);
-    const hash = cachedHash[filename];
-    const size = cachedSize[filename];
-    if (stats.size !== size) {
-      return true;
-    }
-    if (this.hash(stats, filename) !== hash) {
-      return true;
-    }
-    return false;
-  }
-  has(filename) {
-    return Boolean(this.cachedHash[filename]);
-  }
-  hash(stats, filename) {
-    return crypto.createHash("md5").update(fs.readFileSync(filename)).digest("hex");
-  }
-}
-export {
-  StatsCache
-};

package/dist/js/modern/index.js

@@ -1,12 +0,0 @@
-import { DevServer as Server } from "./server";
-var src_default = (options) => {
-  if (options == null) {
-    throw new Error("can not start server without options");
-  }
-  const server = new Server(options);
-  return server.init();
-};
-export {
-  Server,
-  src_default as default
-};

package/dist/js/modern/server/dev-server.js

@@ -1,293 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
-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 { createServer } from "http";
-import path from "path";
-import { createServer as createHttpsServer } from "https";
-import {
-  API_DIR,
-  SERVER_BUNDLE_DIRECTORY,
-  SERVER_DIR,
-  SHARED_DIR
-} from "@modern-js/utils";
-import {
-  createProxyHandler,
-  ModernServer,
-  AGGRED_DIR
-} from "@modern-js/prod-server";
-import { LOADABLE_STATS_FILE } from "@modern-js/utils/constants";
-import { getDefaultDevOptions } from "../constants";
-import { createMockHandler } from "../dev-tools/mock";
-import { enableRegister } from "../dev-tools/register";
-import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
-import DevMiddleware from "../dev-tools/dev-middleware";
-class ModernDevServer extends ModernServer {
-  constructor(options) {
-    super(options);
-    this.mockHandler = null;
-    this.workDir = this.pwd;
-    this.dev = this.getDevOptions(options);
-    this.devMiddleware = new DevMiddleware({
-      dev: this.dev,
-      devMiddleware: options.devMiddleware
-    });
-    enableRegister(this.pwd, this.conf);
-  }
-  getDevOptions(options) {
-    const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
-    const defaultOptions = getDefaultDevOptions();
-    return __spreadProps(__spreadValues(__spreadValues({}, defaultOptions), devOptions), {
-      client: __spreadValues(__spreadValues({}, defaultOptions.client), devOptions == null ? void 0 : devOptions.client)
-    });
-  }
-  addMiddlewareHandler(handlers) {
-    handlers.forEach((handler) => {
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        return handler(req, res, next);
-      });
-    });
-  }
-  applySetupMiddlewares() {
-    const setupMiddlewares = this.dev.setupMiddlewares || [];
-    const serverOptions = {
-      sockWrite: (type, data) => this.devMiddleware.sockWrite(type, data)
-    };
-    const befores = [];
-    const afters = [];
-    setupMiddlewares.forEach((handler) => {
-      handler(
-        {
-          unshift: (...handlers) => befores.unshift(...handlers),
-          push: (...handlers) => afters.push(...handlers)
-        },
-        serverOptions
-      );
-    });
-    return { befores, afters };
-  }
-  onInit(runner, app) {
-    return __async(this, null, function* () {
-      this.runner = runner;
-      const { dev } = this;
-      const { befores, afters } = this.applySetupMiddlewares();
-      const beforeHandlers = yield this.setupBeforeDevMiddleware();
-      this.addMiddlewareHandler([...beforeHandlers, ...befores]);
-      yield this.applyDefaultMiddlewares(app);
-      const afterHandlers = yield this.setupAfterDevMiddleware();
-      this.addMiddlewareHandler([...afters, ...afterHandlers]);
-      yield __superGet(ModernDevServer.prototype, this, "onInit").call(this, runner, app);
-      if (dev.watch) {
-        this.startWatcher();
-        app.on("close", () => __async(this, null, function* () {
-          var _a;
-          yield (_a = this.watcher) == null ? void 0 : _a.close();
-        }));
-      }
-    });
-  }
-  applyDefaultMiddlewares(app) {
-    return __async(this, null, function* () {
-      const { pwd, dev, devMiddleware } = this;
-      this.addHandler((ctx, next) => {
-        ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-        if (ctx.path.includes("hot-update")) {
-          ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
-        }
-        const confHeaders = dev.headers;
-        if (confHeaders) {
-          for (const [key, value] of Object.entries(confHeaders)) {
-            ctx.res.setHeader(key, value);
-          }
-        }
-        next();
-      });
-      this.mockHandler = createMockHandler({ pwd });
-      this.addHandler((ctx, next) => {
-        if (this.mockHandler) {
-          this.mockHandler(ctx, next);
-        } else {
-          next();
-        }
-      });
-      const proxyHandlers = createProxyHandler(dev.proxy);
-      if (proxyHandlers) {
-        proxyHandlers.forEach((handler) => {
-          this.addHandler(handler);
-        });
-      }
-      devMiddleware.init(app);
-      devMiddleware.on("change", (stats) => {
-        if (stats.toJson({ all: false }).name === "client") {
-          this.onRepack({ routes: this.getRoutes() });
-        }
-      });
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        if (devMiddleware.middleware) {
-          devMiddleware.middleware(req, res, next);
-        } else {
-          next();
-        }
-      });
-      if (dev.historyApiFallback) {
-        const { default: connectHistoryApiFallback } = yield import("connect-history-api-fallback");
-        const historyApiFallbackMiddleware = connectHistoryApiFallback(
-          typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
-        );
-        this.addHandler(
-          (ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next)
-        );
-      }
-    });
-  }
-  onRepack(options = {}) {
-    if (Array.isArray(options.routes)) {
-      this.router.reset(this.filterRoutes(options.routes));
-    }
-    this.cleanSSRCache();
-    this.reader.updateFile();
-    super.onRepack(options);
-  }
-  createHTTPServer(handler) {
-    return __async(this, null, function* () {
-      const { dev } = this;
-      const devHttpsOption = typeof dev === "object" && dev.https;
-      if (devHttpsOption) {
-        const { genHttpsOptions } = require("../dev-tools/https");
-        const httpsOptions = yield genHttpsOptions(devHttpsOption, this.pwd);
-        return createHttpsServer(httpsOptions, handler);
-      } else {
-        return createServer(handler);
-      }
-    });
-  }
-  warmupSSRBundle() {
-  }
-  onServerChange({
-    filepath,
-    event
-  }) {
-    const { pwd } = this;
-    const { mock } = AGGRED_DIR;
-    const mockPath = path.normalize(path.join(pwd, mock));
-    this.runner.reset();
-    if (filepath.startsWith(mockPath)) {
-      this.mockHandler = createMockHandler({ pwd });
-    } else {
-      try {
-        const success = this.runner.onApiChange([
-          { filename: filepath, event }
-        ]);
-        if (success !== true) {
-          super.onServerChange({ filepath });
-        }
-      } catch (e) {
-        this.logger.error(e);
-      }
-    }
-  }
-  createContext(req, res) {
-    return super.createContext(req, res, { etag: true });
-  }
-  setupBeforeDevMiddleware() {
-    return __async(this, null, function* () {
-      const { runner, conf, dev } = this;
-      const setupMids = dev.before || [];
-      const pluginMids = yield runner.beforeDevServer(conf);
-      return [...setupMids, ...pluginMids].flat();
-    });
-  }
-  setupAfterDevMiddleware() {
-    return __async(this, null, function* () {
-      const { runner, conf, dev } = this;
-      const setupMids = dev.after || [];
-      const pluginMids = yield runner.afterDevServer(conf);
-      return [...pluginMids, ...setupMids].flat();
-    });
-  }
-  cleanSSRCache() {
-    const { distDir } = this;
-    const bundles = this.router.getBundles();
-    bundles.forEach((bundle) => {
-      const filepath = path.join(distDir, bundle);
-      if (require.cache[filepath]) {
-        delete require.cache[filepath];
-      }
-    });
-    const loadable = path.join(distDir, LOADABLE_STATS_FILE);
-    if (require.cache[loadable]) {
-      delete require.cache[loadable];
-    }
-  }
-  startWatcher() {
-    var _a;
-    const { pwd, distDir } = this;
-    const { mock } = AGGRED_DIR;
-    const defaultWatched = [
-      `${mock}/**/*`,
-      `${SERVER_DIR}/**/*`,
-      `${API_DIR}/**`,
-      `${SHARED_DIR}/**/*`,
-      `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
-    ];
-    const watchOptions = mergeWatchOptions((_a = this.conf.server) == null ? void 0 : _a.watchOptions);
-    const defaultWatchedPaths = defaultWatched.map((p) => {
-      const finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
-      return path.normalize(finalPath);
-    });
-    const watcher = new Watcher();
-    watcher.createDepTree();
-    watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
-      watcher.updateDepTree();
-      watcher.cleanDepCache(filepath);
-      this.onServerChange({
-        filepath,
-        event
-      });
-    });
-    this.watcher = watcher;
-  }
-}
-export {
-  ModernDevServer
-};

package/dist/js/modern/server/index.js

@@ -1,16 +0,0 @@
-import { Server } from "@modern-js/prod-server";
-import { ModernDevServer } from "./dev-server";
-const createDevServer = (options) => {
-  return new ModernDevServer(options);
-};
-class DevServer extends Server {
-  constructor(options) {
-    super(options);
-    if (options.dev) {
-      this.serverImpl = createDevServer;
-    }
-  }
-}
-export {
-  DevServer
-};

package/dist/js/node/constants.js

@@ -1,42 +0,0 @@
-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 constants_exports = {};
-__export(constants_exports, {
-  getDefaultDevOptions: () => getDefaultDevOptions
-});
-module.exports = __toCommonJS(constants_exports);
-var import_utils = require("@modern-js/utils");
-const getDefaultDevOptions = () => {
-  const network = (0, import_utils.getIpv4Interfaces)().find((item) => !item.internal);
-  return {
-    client: {
-      port: "8080",
-      path: import_utils.HMR_SOCK_PATH,
-      host: (network == null ? void 0 : network.address) || "localhost"
-    },
-    https: false,
-    devMiddleware: { writeToDisk: true },
-    watch: true,
-    hot: true,
-    liveReload: true
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getDefaultDevOptions
-});

package/dist/js/node/dev-tools/dev-middleware/hmr-client/createSocketUrl.js

@@ -1,65 +0,0 @@
-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 createSocketUrl_exports = {};
-__export(createSocketUrl_exports, {
-  createSocketUrl: () => createSocketUrl,
-  formatURL: () => formatURL
-});
-module.exports = __toCommonJS(createSocketUrl_exports);
-var import_constants = require("@modern-js/utils/constants");
-function createSocketUrl(resourceQuery) {
-  const searchParams = resourceQuery.substr(1).split("&");
-  const options = {};
-  for (const pair of searchParams) {
-    const ary = pair.split("=");
-    options[ary[0]] = decodeURIComponent(ary[1]);
-  }
-  const currentLocation = self.location;
-  return getSocketUrl(options, currentLocation);
-}
-function formatURL({
-  port,
-  protocol,
-  hostname,
-  pathname
-}) {
-  if (window.URL) {
-    const url = new URL("http://localhost");
-    url.port = port;
-    url.hostname = hostname;
-    url.protocol = protocol;
-    url.pathname = pathname;
-    return url.toString();
-  }
-  const colon = protocol.indexOf(":") === -1 ? ":" : "";
-  return `${protocol}${colon}//${hostname}:${port}${pathname}`;
-}
-function getSocketUrl(urlParts, location) {
-  const { host, port, path, protocol } = urlParts;
-  return formatURL({
-    protocol: protocol || (location.protocol === "https:" ? "wss" : "ws"),
-    hostname: host || location.hostname,
-    port: port || location.port,
-    pathname: path || import_constants.HMR_SOCK_PATH
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createSocketUrl,
-  formatURL
-});