@modern-js/server 2.0.0-beta.3 → 2.0.0-beta.4

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

@@ -1,94 +1,111 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(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 { resolveBabelConfig } from '@modern-js/server-utils';
-import { fs, getAliasConfig, createDebugger } from '@modern-js/utils';
-const debug = createDebugger('server');
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+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;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import path from "path";
+import { resolveBabelConfig } from "@modern-js/server-utils";
+import { fs, getAliasConfig, createDebugger } from "@modern-js/utils";
+const debug = createDebugger("server");
 const checkDep = (depName, paths) => {
-  let packagePath = '';
+  let packagePath = "";
   try {
     packagePath = require.resolve(depName, {
       paths
     });
-  } catch (error) {}
+  } catch (error) {
+  }
   return Boolean(packagePath);
 };
-export const enableRegister = (projectRoot, config
-// eslint-disable-next-line consistent-return
-) => {
-  const registerDirs = ['./api', './server', './config/mock', './shared'];
+const enableRegister = (projectRoot, config) => {
+  var _a, _b, _c;
+  const registerDirs = ["./api", "./server", "./config/mock", "./shared"];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
   const isTsProject = fs.existsSync(tsconfigPath);
-  const existTsNode = checkDep('ts-node', [projectRoot]);
-  const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
+  const existTsNode = checkDep("ts-node", [projectRoot]);
+  const existTsConfigPaths = checkDep("tsconfig-paths", [projectRoot]);
   if (isTsProject && existTsNode && existTsConfigPaths) {
-    var _config$output$distPa;
-    debug('use ts-node');
-    const distPath = ((_config$output$distPa = config.output.distPath) === null || _config$output$distPa === void 0 ? void 0 : _config$output$distPa.root) || 'dist';
-    const tsNode = require('ts-node');
-    const tsConfigPaths = require('tsconfig-paths');
-    const {
-      alias
-    } = config.source;
+    debug("use ts-node");
+    const distPath = ((_a = config.output.distPath) == null ? void 0 : _a.root) || "dist";
+    const tsNode = require("ts-node");
+    const tsConfigPaths = require("tsconfig-paths");
+    const { alias } = config.source;
     const aliasConfig = getAliasConfig(alias, {
       appDirectory: projectRoot,
       tsconfigPath
     });
-    const {
-      paths = {},
-      absoluteBaseUrl = './'
-    } = aliasConfig;
+    const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
     const tsPaths = Object.keys(paths).reduce((o, key) => {
       let tsPath = paths[key];
-      if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
+      if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
         tsPath = path.relative(absoluteBaseUrl, tsPath);
       }
-      if (typeof tsPath === 'string') {
+      if (typeof tsPath === "string") {
         tsPath = [tsPath];
       }
-      return _objectSpread(_objectSpread({}, o), {}, {
+      return __spreadProps(__spreadValues({}, o), {
         [`${key}`]: tsPath
       });
     }, {});
     tsConfigPaths.register({
-      baseUrl: absoluteBaseUrl || './',
+      baseUrl: absoluteBaseUrl || "./",
       paths: tsPaths
     });
     tsNode.register({
       project: tsconfigPath,
-      // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
       files: true,
       transpileOnly: true,
-      ignore: ['(?:^|/)node_modules/', `(?:^|/)${distPath}/`]
+      ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]
     });
   } else {
-    var _config$tools, _config$server;
-    debug('use @babel/register');
-    const babelConfig = resolveBabelConfig(projectRoot, _objectSpread(_objectSpread({}, config.source), {}, {
-      babelConfig: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.babel,
-      server: {
-        compiler: (_config$server = config.server) === null || _config$server === void 0 ? void 0 : _config$server.compiler
+    debug("use @babel/register");
+    const babelConfig = resolveBabelConfig(
+      projectRoot,
+      __spreadProps(__spreadValues({}, config.source), {
+        babelConfig: (_b = config.tools) == null ? void 0 : _b.babel,
+        server: {
+          compiler: (_c = config.server) == null ? void 0 : _c.compiler
+        }
+      }),
+      {
+        tsconfigPath,
+        syntax: "es6+",
+        type: "commonjs"
       }
-    }), {
-      tsconfigPath,
-      syntax: 'es6+',
-      type: 'commonjs'
-    });
-    return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
-      only: [function (filePath) {
-        // TODO: wait params
-        // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
-        if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
-          return true;
+    );
+    return require("@babel/register")(__spreadProps(__spreadValues({}, babelConfig), {
+      only: [
+        function(filePath) {
+          if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
+            return true;
+          }
+          return registerDirs.some(
+            (registerDir) => filePath.startsWith(path.join(projectRoot, registerDir))
+          );
         }
-        return registerDirs.some(registerDir => filePath.startsWith(path.join(projectRoot, registerDir)));
-      }],
-      extensions: ['.js', '.ts'],
+      ],
+      extensions: [".js", ".ts"],
       babelrc: false,
       configFile: false,
       root: projectRoot
     }));
   }
-};
+};
+export {
+  enableRegister
+};

package/dist/js/modern/dev-tools/watcher/dependency-tree.js

@@ -1,57 +1,42 @@
-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 minimatch from 'minimatch';
-export const defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/node_modules/**', '**/.*/**', '**/*.d.ts', '**/*.log'];
-/**
- * `require.cache` already is a dependency tree, however require cache's
- * `module.parent` is the module that first required. so we have to implement
- *  a new tree which revisit the cache tree to find all parent node
- */
-export class DependencyTree {
+import minimatch from "minimatch";
+const defaultIgnores = [
+  "**/bower_components/**",
+  "**/coverage/**",
+  "**/node_modules/**",
+  "**/.*/**",
+  "**/*.d.ts",
+  "**/*.log"
+];
+class DependencyTree {
   constructor() {
-    _defineProperty(this, "tree", void 0);
-    _defineProperty(this, "ignore", void 0);
-    this.tree = new Map();
+    this.tree = /* @__PURE__ */ new Map();
     this.ignore = [...defaultIgnores];
   }
   getNode(path) {
     return this.tree.get(path);
   }
-
-  /**
-   * update dependency tree
-   *
-   * @param cache
-   */
   update(cache) {
     this.tree.clear();
-
-    // insert all module that not ignored
-    Object.keys(cache).forEach(path => {
+    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()
+          parent: /* @__PURE__ */ new Set(),
+          children: /* @__PURE__ */ new Set()
         });
       }
     });
-
-    // update treeNode parent and children
     for (const treeNode of this.tree.values()) {
-      const {
-        parent
-      } = treeNode.module;
-      const {
-        children
-      } = treeNode.module;
+      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 => {
+      children.forEach((child) => {
         if (!this.shouldIgnore(child.filename)) {
           const childTreeNode = this.tree.get(child.filename);
           if (childTreeNode) {
@@ -63,6 +48,12 @@ export class DependencyTree {
     }
   }
   shouldIgnore(path) {
-    return !path || Boolean(this.ignore.find(rule => minimatch.match([path], rule).length > 0));
+    return !path || Boolean(
+      this.ignore.find((rule) => minimatch.match([path], rule).length > 0)
+    );
   }
-}
+}
+export {
+  DependencyTree,
+  defaultIgnores
+};

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

@@ -1,67 +1,79 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(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 { fs, chokidar } from '@modern-js/utils';
+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";
-export const defaultWatchOptions = {
-  // 初始化的时候不触发 add、addDir 事件
+const defaultWatchOptions = {
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };
-export const getWatchedFiles = watcher => {
+const getWatchedFiles = (watcher) => {
   const watched = watcher.getWatched();
   const files = [];
-  Object.keys(watched).forEach(dir => {
-    watched[dir].forEach(fileName => {
+  Object.keys(watched).forEach((dir) => {
+    watched[dir].forEach((fileName) => {
       files.push(path.join(dir, fileName));
     });
   });
   return files;
 };
-export const mergeWatchOptions = options => {
-  const watchOptions = _objectSpread({}, options);
+const mergeWatchOptions = (options) => {
+  const watchOptions = __spreadValues({}, options);
   if (watchOptions) {
-    const {
-      ignored
-    } = watchOptions;
-    const finalIgnored = ignored ? [defaultWatchOptions.ignored, ...(Array.isArray(ignored) ? ignored : [ignored])] : ignored;
+    const { ignored } = watchOptions;
+    const finalIgnored = ignored ? [
+      defaultWatchOptions.ignored,
+      ...Array.isArray(ignored) ? ignored : [ignored]
+    ] : ignored;
     if (finalIgnored) {
       watchOptions.ignored = finalIgnored;
     }
   }
-  const finalWatchOptions = _objectSpread(_objectSpread({}, defaultWatchOptions), watchOptions);
+  const finalWatchOptions = __spreadValues(__spreadValues({}, defaultWatchOptions), watchOptions);
   return finalWatchOptions;
 };
-export default class Watcher {
+class Watcher {
   constructor() {
-    _defineProperty(this, "dependencyTree", null);
-    _defineProperty(this, "watcher", void 0);
+    this.dependencyTree = null;
   }
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
-    const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
+    const filenames = watched.map((filename) => filename.replace(/\\/g, "/"));
     const cache = new StatsCache();
     const watcher = chokidar.watch(filenames, options);
-    watcher.on('ready', () => {
+    watcher.on("ready", () => {
       cache.add(getWatchedFiles(watcher));
     });
-    watcher.on('change', changed => {
+    watcher.on("change", (changed) => {
       if (!fs.existsSync(changed) || cache.isDiff(changed)) {
         cache.refresh(changed);
-        callback(changed, 'change');
+        callback(changed, "change");
       }
     });
-    watcher.on('add', changed => {
+    watcher.on("add", (changed) => {
       if (!cache.has(changed)) {
         cache.add([changed]);
-        callback(changed, 'add');
+        callback(changed, "add");
       }
     });
-    watcher.on('unlink', changed => {
+    watcher.on("unlink", (changed) => {
       cache.del(changed);
-      callback(changed, 'unlink');
+      callback(changed, "unlink");
     });
     this.watcher = watcher;
   }
@@ -69,12 +81,12 @@ export default class Watcher {
     this.dependencyTree = new DependencyTree();
   }
   updateDepTree() {
-    var _this$dependencyTree;
-    (_this$dependencyTree = this.dependencyTree) === null || _this$dependencyTree === void 0 ? void 0 : _this$dependencyTree.update(require.cache);
+    var _a;
+    (_a = this.dependencyTree) == null ? void 0 : _a.update(require.cache);
   }
   cleanDepCache(filepath) {
-    var _this$dependencyTree2;
-    const node = (_this$dependencyTree2 = this.dependencyTree) === null || _this$dependencyTree2 === void 0 ? void 0 : _this$dependencyTree2.getNode(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()) {
@@ -85,4 +97,10 @@ export default class Watcher {
   close() {
     return this.watcher.close();
   }
-}
+}
+export {
+  Watcher as default,
+  defaultWatchOptions,
+  getWatchedFiles,
+  mergeWatchOptions
+};

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

@@ -1,16 +1,12 @@
-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 fs from 'fs';
-import crypto from 'crypto';
-export class StatsCache {
+import fs from "fs";
+import crypto from "crypto";
+class StatsCache {
   constructor() {
-    _defineProperty(this, "cachedHash", {});
-    _defineProperty(this, "cachedSize", {});
+    this.cachedHash = {};
+    this.cachedSize = {};
   }
   add(files) {
-    const {
-      cachedHash,
-      cachedSize
-    } = this;
+    const { cachedHash, cachedSize } = this;
     for (const filename of files) {
       if (fs.existsSync(filename)) {
         const stats = fs.statSync(filename);
@@ -22,10 +18,7 @@ export class StatsCache {
     }
   }
   refresh(filename) {
-    const {
-      cachedHash,
-      cachedSize
-    } = this;
+    const { cachedHash, cachedSize } = this;
     if (fs.existsSync(filename)) {
       const stats = fs.statSync(filename);
       if (stats.isFile()) {
@@ -41,10 +34,7 @@ export class StatsCache {
     }
   }
   isDiff(filename) {
-    const {
-      cachedHash,
-      cachedSize
-    } = this;
+    const { cachedHash, cachedSize } = this;
     const stats = fs.statSync(filename);
     const hash = cachedHash[filename];
     const size = cachedSize[filename];
@@ -60,6 +50,9 @@ export class StatsCache {
     return Boolean(this.cachedHash[filename]);
   }
   hash(stats, filename) {
-    return crypto.createHash('md5').update(fs.readFileSync(filename)).digest('hex');
+    return crypto.createHash("md5").update(fs.readFileSync(filename)).digest("hex");
   }
-}
+}
+export {
+  StatsCache
+};

package/dist/js/modern/index.js

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