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

package/CHANGELOG.md

@@ -1,14 +1,64 @@
 # @modern-js/server-utils
 
-## 1.0.1
+## 1.1.3-rc.0
 
 ### Patch Changes
 
-- release 1.0.1
-- Updated dependencies [undefined]
-  - @modern-js/babel-preset-lib@1.0.2
-  - @modern-js/plugin@1.0.1
-  - @modern-js/utils@1.0.1
+- 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
+
+## 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
 

package/dist/js/modern/babel.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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

@@ -33,9 +33,9 @@ Object.keys(_core).forEach(function (key) {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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.1",
+  "version": "1.1.3-rc.0",
   "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.2",
-    "@modern-js/plugin": "^1.0.1",
-    "@modern-js/utils": "^1.0.1",
+    "@modern-js/babel-preset-lib": "^1.1.3-rc.0",
+    "@modern-js/plugin": "^1.1.2",
+    "@modern-js/utils": "^1.1.4-rc.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.0.1",
+    "@modern-js/core": "^1.1.4-rc.0",
     "@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.2",
-    "@modern-js/module-tools": "^1.0.2"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -62,5 +62,6 @@
     "new": "modern new",
     "build": "modern build",
     "test": "modern test --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/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/__snapshots__/babel.test.ts.snap

@@ -0,0 +1,174 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`babel resolveBabelConfig 1`] = `
+Object {
+  "plugins": Array [
+    Array [
+      "/babel-plugin-macros/dist/index.js",
+      Object {
+        "twin": Object {
+          "preset": "styled-components",
+        },
+      },
+    ],
+    Array [
+      "/babel-plugin-import/lib/index.js",
+      Object {
+        "libraryDirectory": "es",
+        "libraryName": "antd",
+        "style": true,
+      },
+      "import-antd",
+    ],
+    Array [
+      "/babel-plugin-lodash/lib/index.js",
+      Object {
+        "id": Array [
+          "lodash",
+          "ramda",
+        ],
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-decorators/lib/index.js",
+      Object {
+        "legacy": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-class-properties/lib/index.js",
+      Object {
+        "loose": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-private-methods/lib/index.js",
+      Object {
+        "loose": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-private-property-in-object/lib/index.js",
+      Object {
+        "loose": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-object-rest-spread/lib/index.js",
+      Object {
+        "useBuiltIns": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-transform-runtime/lib/index.js",
+      Object {
+        "corejs": false,
+        "helpers": false,
+        "regenerator": true,
+        "useESModules": false,
+        "version": "7.16.5",
+      },
+    ],
+    Array [
+      "/babel-plugin-transform-react-remove-prop-types/lib/index.js",
+      Object {
+        "removeImport": true,
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-function-bind/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-export-default-from/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-export-namespace-from/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-optional-chaining/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-numeric-separator/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-pipeline-operator/lib/index.js",
+      Object {
+        "proposal": "minimal",
+      },
+    ],
+    Array [
+      "/@babel/plugin-proposal-partial-application/lib/index.js",
+    ],
+    Array [
+      "/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js",
+    ],
+    Array [
+      "/babel-plugin-styled-components/lib/index.js",
+      Object {},
+      "styled-components",
+    ],
+    Array [
+      "/babel-plugin-transform-inline-environment-variables/lib/index.js",
+      Object {
+        "include": Array [],
+      },
+    ],
+    Array [
+      "/babel-plugin-module-resolver/lib/index.js",
+      Object {
+        "alias": Object {
+          "@/*": Array [
+            "./src/*",
+          ],
+        },
+        "extensions": Array [
+          ".ts",
+          ".tsx",
+          ".js",
+          ".jsx",
+          ".es",
+          ".es6",
+          ".mjs",
+        ],
+        "resolvePath": [Function],
+        "root": "/packages/server/utils/tests/fixtures/",
+      },
+    ],
+    Array [
+      "/babel-plugin-transform-typescript-metadata/lib/plugin.js",
+    ],
+  ],
+  "presets": Array [
+    Array [
+      "/@babel/preset-env/lib/index.js",
+      Object {
+        "bugfixes": true,
+        "modules": "commonjs",
+        "shippedProposals": false,
+        "targets": Array [
+          "chrome > 61",
+          "edge > 16",
+          "firefox > 60",
+          "safari > 11",
+          "ios_saf > 11",
+        ],
+      },
+    ],
+    Array [
+      "/@babel/preset-react/lib/index.js",
+      Object {
+        "runtime": "automatic",
+      },
+    ],
+    Array [
+      "/@babel/preset-typescript/lib/index.js",
+      Object {
+        "allExtensions": true,
+        "allowDeclareFields": true,
+        "allowNamespaces": true,
+        "isTSX": true,
+      },
+    ],
+  ],
+}
+`;

package/tests/babel.test.ts

@@ -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),
     });