@modern-js/server-utils 1.0.0 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @modern-js/server-utils
 
+## 1.1.2
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+  - @modern-js/utils@1.1.3
+
+## 1.1.1
+
+### Patch Changes
+
+- b011e0c5: fix(babel): declare
+- 0fa83663: support more .env files
+- Updated dependencies [b011e0c5]
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+- Updated dependencies [395beb1e]
+  - @modern-js/babel-preset-lib@1.1.1
+  - @modern-js/plugin@1.1.2
+  - @modern-js/utils@1.1.2
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0
+
+### Patch Changes
+
+- Updated dependencies [96119db2]
+  - @modern-js/babel-preset-lib@1.1.0
+  - @modern-js/plugin@1.1.0
+  - @modern-js/utils@1.1.0
+
 ## 1.0.0
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > 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.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

package/dist/js/modern/babel.js

@@ -5,7 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
 import json5 from 'json5';
 export * from '@babel/core';
 export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
@@ -65,14 +65,14 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME:
     syntax: option.syntax
   });
   const envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
 

package/dist/js/modern/gather.js

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { createMiddlewareCollecter } from "./middleware";
 import { requireModule } from "./requireModule";
 const API_DIR_PATH = 'api';

package/dist/js/modern/middleware.js

@@ -1,7 +1,6 @@
 export const createMiddlewareCollecter = () => {
   const webMiddlewares = [];
   const apiMiddlewares = [];
-  const ssrMiddlewares = [];
 
   const addWebMiddleware = input => {
     webMiddlewares.push(input);
@@ -11,21 +10,15 @@ export const createMiddlewareCollecter = () => {
     apiMiddlewares.push(input);
   };
 
-  const addSSRMiddleware = input => {
-    ssrMiddlewares.push(input);
-  };
-
   const getMiddlewares = () => ({
     web: webMiddlewares,
-    api: apiMiddlewares,
-    ssr: ssrMiddlewares
+    api: apiMiddlewares
   });
 
   return {
     getMiddlewares,
     addWebMiddleware,
-    addAPIMiddleware,
-    addSSRMiddleware
+    addAPIMiddleware
   };
 };
 export const hook = attacher => attacher;

package/dist/js/node/babel.js

@@ -106,14 +106,14 @@ const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel t
     syntax: option.syntax
   });
   const envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(_utils.upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(_utils.upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(_utils.upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(_utils.upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
 

package/dist/js/node/gather.js

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.gather = void 0;
 
-var _utils = require("@modern-js/utils");
+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';
@@ -23,13 +25,13 @@ const gather = pwd => {
     addWebMiddleware
   } = (0, _middleware.createMiddlewareCollecter)();
 
-  const apiPath = _utils.path.resolve(pwd, API_DIR_PATH);
+  const apiPath = _path.default.resolve(pwd, API_DIR_PATH);
 
-  const apiAppPath = _utils.path.resolve(apiPath, API_APP_NAME);
+  const apiAppPath = _path.default.resolve(apiPath, API_APP_NAME);
 
-  const serverPath = _utils.path.resolve(pwd, SERVER_DIR_PATH);
+  const serverPath = _path.default.resolve(pwd, SERVER_DIR_PATH);
 
-  const webAppPath = _utils.path.resolve(serverPath, WEB_APP_NAME);
+  const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
 
   const apiAttacher = (0, _requireModule.requireModule)(apiAppPath);
 

package/dist/js/node/middleware.js

@@ -8,7 +8,6 @@ exports.hook = exports.createMiddlewareCollecter = void 0;
 const createMiddlewareCollecter = () => {
   const webMiddlewares = [];
   const apiMiddlewares = [];
-  const ssrMiddlewares = [];
 
   const addWebMiddleware = input => {
     webMiddlewares.push(input);
@@ -18,21 +17,15 @@ const createMiddlewareCollecter = () => {
     apiMiddlewares.push(input);
   };
 
-  const addSSRMiddleware = input => {
-    ssrMiddlewares.push(input);
-  };
-
   const getMiddlewares = () => ({
     web: webMiddlewares,
-    api: apiMiddlewares,
-    ssr: ssrMiddlewares
+    api: apiMiddlewares
   });
 
   return {
     getMiddlewares,
     addWebMiddleware,
-    addAPIMiddleware,
-    addSSRMiddleware
+    addAPIMiddleware
   };
 };
 

package/dist/js/treeshaking/babel.js

@@ -5,7 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
 import json5 from 'json5';
 export * from '@babel/core';
 export var readTsConfig = function readTsConfig(tsconfigPath) {
@@ -61,14 +61,14 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modern
     syntax: option.syntax
   });
   var envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
 

package/dist/js/treeshaking/gather.js

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { createMiddlewareCollecter } from "./middleware";
 import { requireModule } from "./requireModule";
 var API_DIR_PATH = 'api';

package/dist/js/treeshaking/middleware.js

@@ -1,7 +1,6 @@
 export var createMiddlewareCollecter = function createMiddlewareCollecter() {
   var webMiddlewares = [];
   var apiMiddlewares = [];
-  var ssrMiddlewares = [];
 
   var addWebMiddleware = function addWebMiddleware(input) {
     webMiddlewares.push(input);
@@ -11,23 +10,17 @@ export var createMiddlewareCollecter = function createMiddlewareCollecter() {
     apiMiddlewares.push(input);
   };
 
-  var addSSRMiddleware = function addSSRMiddleware(input) {
-    ssrMiddlewares.push(input);
-  };
-
   var getMiddlewares = function getMiddlewares() {
     return {
       web: webMiddlewares,
-      api: apiMiddlewares,
-      ssr: ssrMiddlewares
+      api: apiMiddlewares
     };
   };
 
   return {
     getMiddlewares: getMiddlewares,
     addWebMiddleware: addWebMiddleware,
-    addAPIMiddleware: addAPIMiddleware,
-    addSSRMiddleware: addSSRMiddleware
+    addAPIMiddleware: addAPIMiddleware
   };
 };
 export var hook = function hook(attacher) {

package/dist/types/middleware.d.ts

@@ -1,13 +1,11 @@
 export declare type CollectMiddlewaresResult = {
   web: any[];
   api: any[];
-  ssr: any[];
 };
 export declare const createMiddlewareCollecter: () => {
   getMiddlewares: () => CollectMiddlewaresResult;
   addWebMiddleware: (input: any) => void;
   addAPIMiddleware: (input: any) => void;
-  addSSRMiddleware: (input: any) => void;
 };
 export declare type AttacherOptions = {
   addMiddleware: (...input: any[]) => void;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,15 +34,15 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7",
-    "@modern-js/babel-preset-lib": "^1.0.0",
-    "@modern-js/plugin": "^1.0.0",
-    "@modern-js/utils": "^1.0.0",
+    "@modern-js/babel-preset-lib": "^1.1.1",
+    "@modern-js/plugin": "^1.1.2",
+    "@modern-js/utils": "^1.1.3",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "json5": "^2.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.0.0",
+    "@modern-js/core": "^1.1.3",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",
@@ -50,8 +50,8 @@
     "@types/react-dom": "^17",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/babel.ts

@@ -4,7 +4,7 @@ import {
   ISyntaxOption,
 } from '@modern-js/babel-preset-lib';
 import { TransformOptions } from '@babel/core';
-import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
 import type { NormalizedConfig } from '@modern-js/core';
 import json5 from 'json5';
 
@@ -112,28 +112,30 @@ export const resolveBabelConfig = (
   const envOptions = babelChain.preset('@babel/preset-env').options();
   babelChain
     .preset('@babel/preset-env')
-    .use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [
+    .use(require.resolve('@babel/preset-env'), [
       {
         ...envOptions[0],
         loose: true,
       },
     ]);
 
-  babelChain
-    .plugin('babel-plugin-transform-typescript-metadata')
-    .use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(
+    require.resolve('babel-plugin-transform-typescript-metadata'),
+
+    [],
+  );
 
   babelChain
     .plugin('@babel/plugin-proposal-decorators')
-    .use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [
+    .use(require.resolve('@babel/plugin-proposal-decorators'), [
       { legacy: true },
     ]);
 
-  babelChain
-    .plugin('@babel/plugin-proposal-class-properties')
-    .use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [
-      { loose: true },
-    ]);
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(
+    require.resolve('@babel/plugin-proposal-class-properties'),
+
+    [{ loose: true }],
+  );
 
   const internalBabelConfig = { ...babelChain.toJSON() };
 

package/src/gather.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { createMiddlewareCollecter } from './middleware';
 import { requireModule } from './requireModule';
 

package/src/middleware.ts

@@ -1,13 +1,11 @@
 export type CollectMiddlewaresResult = {
   web: any[];
   api: any[];
-  ssr: any[];
 };
 
 export const createMiddlewareCollecter = () => {
   const webMiddlewares: any[] = [];
   const apiMiddlewares: any[] = [];
-  const ssrMiddlewares: any[] = [];
 
   const addWebMiddleware = (input: any) => {
     webMiddlewares.push(input);
@@ -17,20 +15,14 @@ export const createMiddlewareCollecter = () => {
     apiMiddlewares.push(input);
   };
 
-  const addSSRMiddleware = (input: any) => {
-    ssrMiddlewares.push(input);
-  };
-
   const getMiddlewares = (): CollectMiddlewaresResult => ({
     web: webMiddlewares,
     api: apiMiddlewares,
-    ssr: ssrMiddlewares,
   });
   return {
     getMiddlewares,
     addWebMiddleware,
     addAPIMiddleware,
-    addSSRMiddleware,
   };
 };
 

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

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

@@ -66,7 +66,7 @@ Object {
         "helpers": false,
         "regenerator": true,
         "useESModules": false,
-        "version": "7.15.4",
+        "version": "7.16.3",
       },
     ],
     Array [
@@ -163,8 +163,10 @@ Object {
     Array [
       "/@babel/preset-typescript/lib/index.js",
       Object {
+        "allExtensions": true,
         "allowDeclareFields": true,
         "allowNamespaces": true,
+        "isTSX": true,
       },
     ],
   ],

package/tests/babel.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { defaults } from './helpers';
 import { resolveBabelConfig } from '@/index';
 
@@ -20,7 +20,7 @@ describe('babel', () => {
     expect.addSnapshotSerializer({
       test: val =>
         typeof val === 'string' &&
-        (val.includes('modern-js') ||
+        (val.includes('modern.js') ||
           val.includes('node_modules') ||
           val.includes(root)),
       print: val =>
@@ -28,10 +28,10 @@ describe('babel', () => {
         typeof val === 'string'
           ? // eslint-disable-next-line no-nested-ternary
             val.includes('node_modules')
-            ? `"${val.replace(/.+node_modules/, '')}"`
-            : val.includes('modern-js')
-            ? `"${val.replace(/.+modern-js/, '')}"`
-            : `"${val.replace(root, '')}"`
+            ? `"${val.replace(/.+node_modules/, '').replace(/\\/g, '/')}"`
+            : val.includes('modern.js')
+            ? `"${val.replace(/.+modern\.js/, '').replace(/\\/g, '/')}"`
+            : `"${val.replace(root, '').replace(/\\/g, '/')}"`
           : (val as string),
     });
 

package/tests/gather.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 import { gather } from '@/index';
 
 describe('@modern-js/server-utils', () => {