@modern-js/server 1.4.11 → 1.4.14

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @modern-js/server
 
+## 1.4.14
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- Updated dependencies [d32f35134]
+- Updated dependencies [86fe5a657]
+- Updated dependencies [aeda91deb]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [1a30be07b]
+- Updated dependencies [948cc4436]
+  - @modern-js/bff-utils@1.2.6
+  - @modern-js/hmr-client@1.2.7
+  - @modern-js/prod-server@1.1.5
+  - @modern-js/server-utils@1.2.6
+  - @modern-js/utils@1.7.3
+
+## 1.4.13
+
+### Patch Changes
+
+- 0e0537005: fix: unlock @babel/core version
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [0e0537005]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/server-utils@1.2.5
+  - @modern-js/bff-utils@1.2.5
+  - @modern-js/hmr-client@1.2.6
+  - @modern-js/prod-server@1.1.4
+
+## 1.4.12
+
+### Patch Changes
+
+- 6fa74d5f: add internal metrics and logger
+- Updated dependencies [0ee4bb4e]
+- Updated dependencies [a4c5fe78]
+- Updated dependencies [6fa74d5f]
+  - @modern-js/utils@1.7.0
+  - @modern-js/prod-server@1.1.3
+  - @modern-js/server-utils@1.2.4
+
 ## 1.4.11
 
 ### Patch Changes

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

@@ -11,7 +11,8 @@ const {
 } = Webpack;
 export default class DevServerPlugin {
   constructor(options) {
-    this.options = void 0;
+    _defineProperty(this, "options", void 0);
+
     this.options = options;
   }
 

package/dist/js/modern/dev-tools/mock/getMockData.js

@@ -56,10 +56,10 @@ const _blank = ' ';
 
 const parseKey = key => {
   // 'Method /pathname' | '/pathname'
-  const splited = key.split(_blank).filter(Boolean);
+  const splitted = key.split(_blank).filter(Boolean);
 
-  if (splited.length > 1) {
-    const [method, pathname] = splited;
+  if (splitted.length > 1) {
+    const [method, pathname] = splitted;
     return {
       method: method.toLowerCase(),
       path: pathname

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

@@ -1,13 +1,21 @@
+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 ws from 'ws';
 import { logger } from '@modern-js/utils';
 export default class SocketServer {
   constructor(options) {
-    this.wsServer = void 0;
-    this.sockets = [];
-    this.options = void 0;
-    this.app = void 0;
-    this.stats = void 0;
-    this.timer = null;
+    _defineProperty(this, "wsServer", void 0);
+
+    _defineProperty(this, "sockets", []);
+
+    _defineProperty(this, "options", void 0);
+
+    _defineProperty(this, "app", void 0);
+
+    _defineProperty(this, "stats", void 0);
+
+    _defineProperty(this, "timer", null);
+
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -150,7 +158,7 @@ export default class SocketServer {
 
 
   sendStats(force = false) {
-    const stats = this.getStats(); // this should never happend
+    const stats = this.getStats(); // this should never happened
 
     if (!stats) {
       return null;

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

@@ -1,3 +1,5 @@
+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'];
 
@@ -8,8 +10,10 @@ export const defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/n
  */
 export class DependencyTree {
   constructor() {
-    this.tree = void 0;
-    this.ignore = void 0;
+    _defineProperty(this, "tree", void 0);
+
+    _defineProperty(this, "ignore", void 0);
+
     this.tree = new Map();
     this.ignore = [...defaultIgnores];
   }

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

@@ -1,3 +1,5 @@
+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';
 import { DependencyTree } from "./dependency-tree";
@@ -14,8 +16,9 @@ export const getWatchedFiles = watcher => {
 };
 export default class Watcher {
   constructor() {
-    this.dependencyTree = null;
-    this.watcher = void 0;
+    _defineProperty(this, "dependencyTree", null);
+
+    _defineProperty(this, "watcher", void 0);
   }
 
   listen(files, options, callback) {

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

@@ -1,9 +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 {
   constructor() {
-    this.cachedHash = {};
-    this.cachedSize = {};
+    _defineProperty(this, "cachedHash", {});
+
+    _defineProperty(this, "cachedSize", {});
   }
 
   add(files) {

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

@@ -9,9 +9,9 @@ export class ModernSSRDevServer extends ModernDevServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -31,9 +31,9 @@ export class ModernAPIDevServer extends ModernDevServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

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

@@ -21,12 +21,18 @@ export class ModernDevServer extends ModernServer {
   constructor(options) {
     super(options); // dev server should work in pwd
 
-    this.mockHandler = null;
-    this.dev = void 0;
-    this.compiler = void 0;
-    this.socketServer = void 0;
-    this.watcher = void 0;
-    this.devMiddleware = void 0;
+    _defineProperty(this, "mockHandler", null);
+
+    _defineProperty(this, "dev", void 0);
+
+    _defineProperty(this, "compiler", void 0);
+
+    _defineProperty(this, "socketServer", void 0);
+
+    _defineProperty(this, "watcher", void 0);
+
+    _defineProperty(this, "devMiddleware", void 0);
+
     this.workDir = this.pwd; // set webpack compiler
 
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
@@ -80,7 +86,7 @@ export class ModernDevServer extends ModernServer {
 
     if (compiler) {
       // init socket server
-      this.socketServer = new SocketServer(dev); // open file in edtor.
+      this.socketServer = new SocketServer(dev); // open file in editor.
 
       this.addHandler(createLaunchEditorHandler()); // setup compiler in server, also add dev-middleware to handler static file in memory
 

package/dist/js/node/dev-tools/dev-server-plugin.js

@@ -23,7 +23,8 @@ const {
 
 class DevServerPlugin {
   constructor(options) {
-    this.options = void 0;
+    _defineProperty(this, "options", void 0);
+
     this.options = options;
   }
 

package/dist/js/node/dev-tools/mock/getMockData.js

@@ -65,10 +65,10 @@ const _blank = ' ';
 
 const parseKey = key => {
   // 'Method /pathname' | '/pathname'
-  const splited = key.split(_blank).filter(Boolean);
+  const splitted = key.split(_blank).filter(Boolean);
 
-  if (splited.length > 1) {
-    const [method, pathname] = splited;
+  if (splitted.length > 1) {
+    const [method, pathname] = splitted;
     return {
       method: method.toLowerCase(),
       path: pathname

package/dist/js/node/dev-tools/socket-server.js

@@ -11,14 +11,22 @@ var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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; }
+
 class SocketServer {
   constructor(options) {
-    this.wsServer = void 0;
-    this.sockets = [];
-    this.options = void 0;
-    this.app = void 0;
-    this.stats = void 0;
-    this.timer = null;
+    _defineProperty(this, "wsServer", void 0);
+
+    _defineProperty(this, "sockets", []);
+
+    _defineProperty(this, "options", void 0);
+
+    _defineProperty(this, "app", void 0);
+
+    _defineProperty(this, "stats", void 0);
+
+    _defineProperty(this, "timer", null);
+
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -161,7 +169,7 @@ class SocketServer {
 
 
   sendStats(force = false) {
-    const stats = this.getStats(); // this should never happend
+    const stats = this.getStats(); // this should never happened
 
     if (!stats) {
       return null;

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

@@ -9,6 +9,8 @@ var _minimatch = _interopRequireDefault(require("minimatch"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/node_modules/**', '**/.*/**', '**/*.d.ts', '**/*.log'];
 exports.defaultIgnores = defaultIgnores;
 
@@ -19,8 +21,10 @@ exports.defaultIgnores = defaultIgnores;
  */
 class DependencyTree {
   constructor() {
-    this.tree = void 0;
-    this.ignore = void 0;
+    _defineProperty(this, "tree", void 0);
+
+    _defineProperty(this, "ignore", void 0);
+
     this.tree = new Map();
     this.ignore = [...defaultIgnores];
   }

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

@@ -15,6 +15,8 @@ var _statsCache = require("./stats-cache");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 getWatchedFiles = watcher => {
   const watched = watcher.getWatched();
   const files = [];
@@ -30,8 +32,9 @@ exports.getWatchedFiles = getWatchedFiles;
 
 class Watcher {
   constructor() {
-    this.dependencyTree = null;
-    this.watcher = void 0;
+    _defineProperty(this, "dependencyTree", null);
+
+    _defineProperty(this, "watcher", void 0);
   }
 
   listen(files, options, callback) {

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

@@ -11,10 +11,13 @@ var _crypto = _interopRequireDefault(require("crypto"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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; }
+
 class StatsCache {
   constructor() {
-    this.cachedHash = {};
-    this.cachedSize = {};
+    _defineProperty(this, "cachedHash", {});
+
+    _defineProperty(this, "cachedSize", {});
   }
 
   add(files) {

package/dist/js/node/server/dev-server-split.js

@@ -18,9 +18,9 @@ class ModernSSRDevServer extends _devServer.ModernDevServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -43,9 +43,9 @@ class ModernAPIDevServer extends _devServer.ModernDevServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _prodServer.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

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

@@ -43,12 +43,18 @@ class ModernDevServer extends _prodServer.ModernServer {
   constructor(options) {
     super(options); // dev server should work in pwd
 
-    this.mockHandler = null;
-    this.dev = void 0;
-    this.compiler = void 0;
-    this.socketServer = void 0;
-    this.watcher = void 0;
-    this.devMiddleware = void 0;
+    _defineProperty(this, "mockHandler", null);
+
+    _defineProperty(this, "dev", void 0);
+
+    _defineProperty(this, "compiler", void 0);
+
+    _defineProperty(this, "socketServer", void 0);
+
+    _defineProperty(this, "watcher", void 0);
+
+    _defineProperty(this, "devMiddleware", void 0);
+
     this.workDir = this.pwd; // set webpack compiler
 
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
@@ -102,7 +108,7 @@ class ModernDevServer extends _prodServer.ModernServer {
 
     if (compiler) {
       // init socket server
-      this.socketServer = new _socketServer.default(dev); // open file in edtor.
+      this.socketServer = new _socketServer.default(dev); // open file in editor.
 
       this.addHandler((0, _launchEditor.createLaunchEditorHandler)()); // setup compiler in server, also add dev-middleware to handler static file in memory
 

package/dist/types/server/dev-server-split.d.ts

@@ -5,12 +5,12 @@ import { ModernDevServer } from './dev-server';
 export declare class ModernSSRDevServer extends ModernDevServer {
   protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
 }
 export declare class ModernAPIDevServer extends ModernDevServer {
   protected prepareWebHandler(_: APIServerStartInput['config']): any;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected emitRouteHook(_: HookNames, _input: any): Promise<void>;
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.11",
+  "version": "1.4.14",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,13 +28,13 @@
     }
   },
   "dependencies": {
-    "@babel/core": "7.16.7",
+    "@babel/core": "^7.17.0",
     "@babel/register": "^7.15.3",
-    "@modern-js/bff-utils": "^1.2.4",
-    "@modern-js/hmr-client": "^1.2.5",
-    "@modern-js/prod-server": "^1.1.2",
-    "@modern-js/server-utils": "^1.2.4",
-    "@modern-js/utils": "^1.6.0",
+    "@modern-js/bff-utils": "^1.2.6",
+    "@modern-js/hmr-client": "^1.2.7",
+    "@modern-js/prod-server": "^1.1.5",
+    "@modern-js/server-utils": "^1.2.6",
+    "@modern-js/utils": "^1.7.3",
     "devcert": "^1.1.3",
     "launch-editor": "^2.2.1",
     "minimatch": "^3.0.4",
@@ -44,12 +44,12 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.9.0",
-    "@modern-js/server-core": "1.3.2",
-    "@modern-js/types": "1.5.1",
+    "@modern-js/core": "1.10.2",
+    "@modern-js/server-core": "1.3.5",
+    "@modern-js/types": "1.5.3",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
-    "@types/jest": "^26",
+    "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
     "@types/webpack-dev-middleware": "^5.0.2",
@@ -72,11 +72,33 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "wireit": {
+    "build": {
+      "command": "modern build",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
+    "build": "wireit",
     "dev": "modern build --watch",
-    "test": "jest"
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,8 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
-};

package/jest.config.js

@@ -1,8 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  testEnvironment: 'node',
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,6 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  output: {
-    disableSourceMap: true,
-  },
-};

package/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "esModuleInterop": true,
-    "paths": {}
-  },
-  "include": ["src"]
-}