@modern-js/server-utils 1.1.3-rc.0 → 1.2.0

package/CHANGELOG.md

@@ -1,20 +1,24 @@
 # @modern-js/server-utils
 
-## 1.1.3-rc.0
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
 
 ### Patch Changes
 
-- Updated dependencies [d927bc83]
-- Updated dependencies [d73ff455]
-- Updated dependencies [9c1ab865]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d927bc83]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-  - @modern-js/utils@1.1.4-rc.0
-  - @modern-js/babel-preset-lib@1.1.3-rc.0
-  - @modern-js/plugin@1.1.2
+- 146dcd85: modify server framework plugin hook types and hook context
+- 146dcd85: modify server framework plugin hook types
+- 146dcd85: fix test case in babel compiler
+- 1ebc7ee2: fix: @babel/core version
+- Updated dependencies [2da09c69]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/babel-preset-lib@1.2.0
+  - @modern-js/plugin@1.2.0
 
 ## 1.1.2
 

package/dist/js/modern/index.js

@@ -1,3 +1 @@
-export * from "./middleware";
-export * from "./gather";
 export * from "./babel";

package/dist/js/node/index.js

@@ -4,32 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _middleware = require("./middleware");
-
-Object.keys(_middleware).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _middleware[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _middleware[key];
-    }
-  });
-});
-
-var _gather = require("./gather");
-
-Object.keys(_gather).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _gather[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _gather[key];
-    }
-  });
-});
-
 var _babel = require("./babel");
 
 Object.keys(_babel).forEach(function (key) {

package/dist/js/treeshaking/index.js

@@ -1,3 +1 @@
-export * from "./middleware";
-export * from "./gather";
 export * from "./babel";

package/dist/types/index.d.ts

@@ -1,3 +1 @@
-export * from './middleware';
-export * from './gather';
 export * from './babel';

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/modern.config.js

@@ -1,15 +1,2 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  testing: {
-    jest: {
-      collectCoverage: true,
-      collectCoverageFrom: ['./src/**/*.ts'],
-      coveragePathIgnorePatterns: ['/node_modules/'],
-      testEnvironment: 'jsdom',
-      moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json'],
-      transform: {
-        '^.+\\.tsx?$': 'ts-jest',
-      },
-    },
-  },
-};
+module.exports = {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,6 +20,7 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
@@ -28,21 +29,21 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.15.0",
-    "@babel/core": "^7.15.0",
+    "@babel/core": "7.16.7",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-decorators": "^7.15.4",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7",
-    "@modern-js/babel-preset-lib": "^1.1.3-rc.0",
-    "@modern-js/plugin": "^1.1.2",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@modern-js/babel-preset-lib": "^1.2.0",
+    "@modern-js/plugin": "^1.2.0",
+    "@modern-js/utils": "^1.2.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "json5": "^2.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.1.4-rc.0",
+    "@modern-js/core": "^1.3.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",
@@ -50,18 +51,20 @@
     "@types/react-dom": "^17",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "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/src/index.ts

@@ -1,3 +1 @@
-export * from './middleware';
-export * from './gather';
 export * from './babel';

package/tests/__snapshots__/babel.test.ts.snap

@@ -66,7 +66,7 @@ Object {
         "helpers": false,
         "regenerator": true,
         "useESModules": false,
-        "version": "7.16.5",
+        "version": "7.16.7",
       },
     ],
     Array [

package/tests/babel.test.ts

@@ -1,6 +1,6 @@
 import path from 'path';
+import { resolveBabelConfig } from '../src';
 import { defaults } from './helpers';
-import { resolveBabelConfig } from '@/index';
 
 describe('babel', () => {
   it('resolveBabelConfig', () => {

package/tests/fixtures/api/_app.ts

@@ -1,4 +1,4 @@
-import { hook } from '../../..';
+import { hook } from '../../../src';
 
 export default hook(({ addMiddleware }) => {
   addMiddleware('@koa/api');

package/tests/fixtures/server/index.ts

@@ -1,4 +1,4 @@
-import { hook } from '../../..';
+import { hook } from '../../../src';
 
 export default hook(({ addMiddleware }) => {
   addMiddleware('@koa/web');

package/tests/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["../src/*"]
-    },
+    "paths": {},
     "types": ["node", "jest"]
   }
 }

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    },
+    "paths": {},
     "types": ["node", "jest"]
   },
   "include": ["src"]

package/dist/js/modern/gather.js

@@ -1,35 +0,0 @@
-import path from 'path';
-import { createMiddlewareCollecter } from "./middleware";
-import { requireModule } from "./requireModule";
-const API_DIR_PATH = 'api';
-const API_APP_NAME = '_app';
-const SERVER_DIR_PATH = 'server';
-const WEB_APP_NAME = 'index';
-export const gather = pwd => {
-  const {
-    getMiddlewares,
-    addAPIMiddleware,
-    addWebMiddleware
-  } = createMiddlewareCollecter();
-  const apiPath = path.resolve(pwd, API_DIR_PATH);
-  const apiAppPath = path.resolve(apiPath, API_APP_NAME);
-  const serverPath = path.resolve(pwd, SERVER_DIR_PATH);
-  const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-  const apiAttacher = requireModule(apiAppPath);
-
-  if (apiAttacher) {
-    apiAttacher({
-      addMiddleware: addAPIMiddleware
-    });
-  }
-
-  const webAttacher = requireModule(webAppPath);
-
-  if (webAttacher) {
-    webAttacher({
-      addMiddleware: addWebMiddleware
-    });
-  }
-
-  return getMiddlewares();
-};

package/dist/js/modern/middleware.js

@@ -1,24 +0,0 @@
-export const createMiddlewareCollecter = () => {
-  const webMiddlewares = [];
-  const apiMiddlewares = [];
-
-  const addWebMiddleware = input => {
-    webMiddlewares.push(input);
-  };
-
-  const addAPIMiddleware = input => {
-    apiMiddlewares.push(input);
-  };
-
-  const getMiddlewares = () => ({
-    web: webMiddlewares,
-    api: apiMiddlewares
-  });
-
-  return {
-    getMiddlewares,
-    addWebMiddleware,
-    addAPIMiddleware
-  };
-};
-export const hook = attacher => attacher;

package/dist/js/modern/requireModule.js

@@ -1,24 +0,0 @@
-import { findExists } from '@modern-js/utils';
-const FILE_EXTENSIONS = ['.ts', '.js'];
-export const requireModule = filename => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  const mod = require(exist);
-
-  return interopRequire(mod);
-};
-
-function interopRequire(obj) {
-  return interopRequireDefault(obj).default;
-}
-
-function interopRequireDefault(obj) {
-  return obj !== null && obj !== void 0 && obj.__esModule ? obj : {
-    default: obj
-  };
-}

package/dist/js/node/gather.js

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.gather = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _middleware = require("./middleware");
-
-var _requireModule = require("./requireModule");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const API_DIR_PATH = 'api';
-const API_APP_NAME = '_app';
-const SERVER_DIR_PATH = 'server';
-const WEB_APP_NAME = 'index';
-
-const gather = pwd => {
-  const {
-    getMiddlewares,
-    addAPIMiddleware,
-    addWebMiddleware
-  } = (0, _middleware.createMiddlewareCollecter)();
-
-  const apiPath = _path.default.resolve(pwd, API_DIR_PATH);
-
-  const apiAppPath = _path.default.resolve(apiPath, API_APP_NAME);
-
-  const serverPath = _path.default.resolve(pwd, SERVER_DIR_PATH);
-
-  const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
-
-  const apiAttacher = (0, _requireModule.requireModule)(apiAppPath);
-
-  if (apiAttacher) {
-    apiAttacher({
-      addMiddleware: addAPIMiddleware
-    });
-  }
-
-  const webAttacher = (0, _requireModule.requireModule)(webAppPath);
-
-  if (webAttacher) {
-    webAttacher({
-      addMiddleware: addWebMiddleware
-    });
-  }
-
-  return getMiddlewares();
-};
-
-exports.gather = gather;

package/dist/js/node/middleware.js

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hook = exports.createMiddlewareCollecter = void 0;
-
-const createMiddlewareCollecter = () => {
-  const webMiddlewares = [];
-  const apiMiddlewares = [];
-
-  const addWebMiddleware = input => {
-    webMiddlewares.push(input);
-  };
-
-  const addAPIMiddleware = input => {
-    apiMiddlewares.push(input);
-  };
-
-  const getMiddlewares = () => ({
-    web: webMiddlewares,
-    api: apiMiddlewares
-  });
-
-  return {
-    getMiddlewares,
-    addWebMiddleware,
-    addAPIMiddleware
-  };
-};
-
-exports.createMiddlewareCollecter = createMiddlewareCollecter;
-
-const hook = attacher => attacher;
-
-exports.hook = hook;

package/dist/js/node/requireModule.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.requireModule = void 0;
-
-var _utils = require("@modern-js/utils");
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-const requireModule = filename => {
-  const exist = (0, _utils.findExists)(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  const mod = require(exist);
-
-  return interopRequire(mod);
-};
-
-exports.requireModule = requireModule;
-
-function interopRequire(obj) {
-  return interopRequireDefault(obj).default;
-}
-
-function interopRequireDefault(obj) {
-  return obj !== null && obj !== void 0 && obj.__esModule ? obj : {
-    default: obj
-  };
-}

package/dist/js/treeshaking/gather.js

@@ -1,35 +0,0 @@
-import path from 'path';
-import { createMiddlewareCollecter } from "./middleware";
-import { requireModule } from "./requireModule";
-var API_DIR_PATH = 'api';
-var API_APP_NAME = '_app';
-var SERVER_DIR_PATH = 'server';
-var WEB_APP_NAME = 'index';
-export var gather = function gather(pwd) {
-  var _createMiddlewareColl = createMiddlewareCollecter(),
-      getMiddlewares = _createMiddlewareColl.getMiddlewares,
-      addAPIMiddleware = _createMiddlewareColl.addAPIMiddleware,
-      addWebMiddleware = _createMiddlewareColl.addWebMiddleware;
-
-  var apiPath = path.resolve(pwd, API_DIR_PATH);
-  var apiAppPath = path.resolve(apiPath, API_APP_NAME);
-  var serverPath = path.resolve(pwd, SERVER_DIR_PATH);
-  var webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-  var apiAttacher = requireModule(apiAppPath);
-
-  if (apiAttacher) {
-    apiAttacher({
-      addMiddleware: addAPIMiddleware
-    });
-  }
-
-  var webAttacher = requireModule(webAppPath);
-
-  if (webAttacher) {
-    webAttacher({
-      addMiddleware: addWebMiddleware
-    });
-  }
-
-  return getMiddlewares();
-};

package/dist/js/treeshaking/middleware.js

@@ -1,28 +0,0 @@
-export var createMiddlewareCollecter = function createMiddlewareCollecter() {
-  var webMiddlewares = [];
-  var apiMiddlewares = [];
-
-  var addWebMiddleware = function addWebMiddleware(input) {
-    webMiddlewares.push(input);
-  };
-
-  var addAPIMiddleware = function addAPIMiddleware(input) {
-    apiMiddlewares.push(input);
-  };
-
-  var getMiddlewares = function getMiddlewares() {
-    return {
-      web: webMiddlewares,
-      api: apiMiddlewares
-    };
-  };
-
-  return {
-    getMiddlewares: getMiddlewares,
-    addWebMiddleware: addWebMiddleware,
-    addAPIMiddleware: addAPIMiddleware
-  };
-};
-export var hook = function hook(attacher) {
-  return attacher;
-};

package/dist/js/treeshaking/requireModule.js

@@ -1,26 +0,0 @@
-import { findExists } from '@modern-js/utils';
-var FILE_EXTENSIONS = ['.ts', '.js'];
-export var requireModule = function requireModule(filename) {
-  var exist = findExists(FILE_EXTENSIONS.map(function (ext) {
-    return "".concat(filename).concat(ext);
-  }));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  var mod = require(exist);
-
-  return interopRequire(mod);
-};
-
-function interopRequire(obj) {
-  return interopRequireDefault(obj)["default"];
-}
-
-function interopRequireDefault(obj) {
-  return obj !== null && obj !== void 0 && obj.__esModule ? obj : {
-    "default": obj
-  };
-}

package/dist/types/gather.d.ts

@@ -1 +0,0 @@
-export declare const gather: (pwd: string) => import("./middleware").CollectMiddlewaresResult;

package/dist/types/middleware.d.ts

@@ -1,14 +0,0 @@
-export declare type CollectMiddlewaresResult = {
-  web: any[];
-  api: any[];
-};
-export declare const createMiddlewareCollecter: () => {
-  getMiddlewares: () => CollectMiddlewaresResult;
-  addWebMiddleware: (input: any) => void;
-  addAPIMiddleware: (input: any) => void;
-};
-export declare type AttacherOptions = {
-  addMiddleware: (...input: any[]) => void;
-};
-export declare type Attacher = (options: AttacherOptions) => void;
-export declare const hook: (attacher: Attacher) => Attacher;

package/dist/types/requireModule.d.ts

@@ -1 +0,0 @@
-export declare const requireModule: (filename: string) => any;

package/src/gather.ts

@@ -1,30 +0,0 @@
-import path from 'path';
-import { createMiddlewareCollecter } from './middleware';
-import { requireModule } from './requireModule';
-
-const API_DIR_PATH = 'api';
-const API_APP_NAME = '_app';
-const SERVER_DIR_PATH = 'server';
-const WEB_APP_NAME = 'index';
-
-export const gather = (pwd: string) => {
-  const { getMiddlewares, addAPIMiddleware, addWebMiddleware } =
-    createMiddlewareCollecter();
-
-  const apiPath = path.resolve(pwd, API_DIR_PATH);
-  const apiAppPath = path.resolve(apiPath, API_APP_NAME);
-  const serverPath = path.resolve(pwd, SERVER_DIR_PATH);
-  const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-
-  const apiAttacher = requireModule(apiAppPath);
-  if (apiAttacher) {
-    apiAttacher({ addMiddleware: addAPIMiddleware });
-  }
-
-  const webAttacher = requireModule(webAppPath);
-  if (webAttacher) {
-    webAttacher({ addMiddleware: addWebMiddleware });
-  }
-
-  return getMiddlewares();
-};

package/src/middleware.ts

@@ -1,35 +0,0 @@
-export type CollectMiddlewaresResult = {
-  web: any[];
-  api: any[];
-};
-
-export const createMiddlewareCollecter = () => {
-  const webMiddlewares: any[] = [];
-  const apiMiddlewares: any[] = [];
-
-  const addWebMiddleware = (input: any) => {
-    webMiddlewares.push(input);
-  };
-
-  const addAPIMiddleware = (input: any) => {
-    apiMiddlewares.push(input);
-  };
-
-  const getMiddlewares = (): CollectMiddlewaresResult => ({
-    web: webMiddlewares,
-    api: apiMiddlewares,
-  });
-  return {
-    getMiddlewares,
-    addWebMiddleware,
-    addAPIMiddleware,
-  };
-};
-
-export type AttacherOptions = {
-  addMiddleware: (...input: any[]) => void;
-};
-
-export type Attacher = (options: AttacherOptions) => void;
-
-export const hook = (attacher: Attacher) => attacher;

package/src/requireModule.ts

@@ -1,23 +0,0 @@
-import { findExists } from '@modern-js/utils';
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-export const requireModule = (filename: string) => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  }
-
-  // throw errors directly if require fail
-  const mod = require(exist);
-  return interopRequire(mod);
-};
-
-function interopRequire(obj: any) {
-  return interopRequireDefault(obj).default;
-}
-
-function interopRequireDefault(obj: any) {
-  return obj?.__esModule ? obj : { default: obj };
-}

package/tests/gather.test.ts

@@ -1,22 +0,0 @@
-import path from 'path';
-import { gather } from '@/index';
-
-describe('@modern-js/server-utils', () => {
-  it('should work well', () => {
-    const pwd = path.resolve(__dirname, './fixtures');
-    const result = gather(pwd);
-
-    expect(result.api.length).toBe(1);
-    expect(result.api[0]).toBe('@koa/api');
-    expect(result.web.length).toBe(1);
-    expect(result.web[0]).toBe('@koa/web');
-  });
-
-  it('should get empty when pass a empty dir', () => {
-    const pwd = path.resolve(__dirname, './fixtures/empty');
-    const result = gather(pwd);
-
-    expect(result.api.length).toBe(0);
-    expect(result.web.length).toBe(0);
-  });
-});