@modern-js/plugin-server 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,12 +1,21 @@
 # @modern-js/plugin-server
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
-  - @modern-js/server-utils@2.4.1-beta.0
+  - @modern-js/server-utils@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/cli.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default
@@ -57,41 +37,39 @@ var cli_default = () => ({
     config() {
       return {};
     },
-    afterBuild() {
-      return __async(this, null, function* () {
-        const { appDirectory, distDirectory } = api.useAppContext();
-        const modernConfig = api.useResolvedConfigContext();
-        const distDir = import_path.default.resolve(distDirectory);
-        const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
-        const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
-        const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const sourceDirs = [];
-        if (import_fs.default.existsSync(serverDir)) {
-          sourceDirs.push(serverDir);
-        }
-        if (import_fs.default.existsSync(sharedDir)) {
-          sourceDirs.push(sharedDir);
-        }
-        const { server } = modernConfig;
-        const { alias, globalVars } = modernConfig.source;
-        const { babel } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          yield (0, import_server_utils.compile)(
-            appDirectory,
-            {
-              server,
-              alias,
-              globalVars,
-              babelConfig: babel
-            },
-            {
-              sourceDirs,
-              distDir,
-              tsconfigPath
-            }
-          );
-        }
-      });
+    async afterBuild() {
+      const { appDirectory, distDirectory } = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
+      const distDir = import_path.default.resolve(distDirectory);
+      const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
+      const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+      const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const sourceDirs = [];
+      if (import_fs.default.existsSync(serverDir)) {
+        sourceDirs.push(serverDir);
+      }
+      if (import_fs.default.existsSync(sharedDir)) {
+        sourceDirs.push(sharedDir);
+      }
+      const { server } = modernConfig;
+      const { alias, globalVars } = modernConfig.source;
+      const { babel } = modernConfig.tools;
+      if (sourceDirs.length > 0) {
+        await (0, import_server_utils.compile)(
+          appDirectory,
+          {
+            server,
+            alias,
+            globalVars,
+            babelConfig: babel
+          },
+          {
+            sourceDirs,
+            distDir,
+            tsconfigPath
+          }
+        );
+      }
     },
     collectServerPlugins({ plugins }) {
       plugins.push({

package/dist/{js/node → cjs}/server.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -104,7 +90,7 @@ var server_default = () => ({
       const middlewareMode = (0, import_utils.requireExistModule)(middlewarePath, {
         interop: false
       });
-      const _a = mod || {}, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
+      const { default: defaultExports, middleware, ...hooks } = mod || {};
       const { middleware: unstableMiddleware = [] } = middlewareMode || {};
       if (defaultExports) {
         defaultExports(transformAPI);

package/dist/esm-node/cli.js

@@ -0,0 +1,56 @@
+import fs from "fs";
+import path from "path";
+import { compile } from "@modern-js/server-utils";
+import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
+const TS_CONFIG_FILENAME = "tsconfig.json";
+var cli_default = () => ({
+  name: "@modern-js/plugin-server",
+  setup: (api) => ({
+    config() {
+      return {};
+    },
+    async afterBuild() {
+      const { appDirectory, distDirectory } = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
+      const distDir = path.resolve(distDirectory);
+      const serverDir = path.resolve(appDirectory, SERVER_DIR);
+      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const sourceDirs = [];
+      if (fs.existsSync(serverDir)) {
+        sourceDirs.push(serverDir);
+      }
+      if (fs.existsSync(sharedDir)) {
+        sourceDirs.push(sharedDir);
+      }
+      const { server } = modernConfig;
+      const { alias, globalVars } = modernConfig.source;
+      const { babel } = modernConfig.tools;
+      if (sourceDirs.length > 0) {
+        await compile(
+          appDirectory,
+          {
+            server,
+            alias,
+            globalVars,
+            babelConfig: babel
+          },
+          {
+            sourceDirs,
+            distDir,
+            tsconfigPath
+          }
+        );
+      }
+    },
+    collectServerPlugins({ plugins }) {
+      plugins.push({
+        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+      });
+      return { plugins };
+    }
+  })
+});
+export {
+  cli_default as default
+};

package/dist/{js/modern → esm-node}/server.js

@@ -1,18 +1,3 @@
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 import path from "path";
 import {
   isProd,
@@ -82,7 +67,7 @@ var server_default = () => ({
       const middlewareMode = requireExistModule(middlewarePath, {
         interop: false
       });
-      const _a = mod || {}, { default: defaultExports, middleware } = _a, hooks = __objRest(_a, ["default", "middleware"]);
+      const { default: defaultExports, middleware, ...hooks } = mod || {};
       const { middleware: unstableMiddleware = [] } = middlewareMode || {};
       if (defaultExports) {
         defaultExports(transformAPI);

package/package.json

@@ -11,22 +11,22 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "types": "./dist/types/cli.d.ts",
   "jsnext:source": "./src/cli",
-  "main": "./dist/js/node/cli.js",
+  "main": "./dist/cjs/cli.js",
   "exports": {
     ".": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/js/node/cli.js"
+      "default": "./dist/cjs/cli.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/js/node/cli.js"
+      "default": "./dist/cjs/cli.js"
     },
     "./server": {
       "jsnext:source": "./src/server.ts",
-      "default": "./dist/js/node/server.js"
+      "default": "./dist/cjs/server.js"
     }
   },
   "typesVersions": {
@@ -44,20 +44,20 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/server-utils": "2.4.1-beta.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/server-utils": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "typescript": "^4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/server-core": "2.5.0",
+    "@modern-js/app-tools": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0"
   },
   "sideEffects": [
     "*.css",

package/dist/js/modern/cli.js

@@ -1,78 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import fs from "fs";
-import path from "path";
-import { compile } from "@modern-js/server-utils";
-import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
-const TS_CONFIG_FILENAME = "tsconfig.json";
-var cli_default = () => ({
-  name: "@modern-js/plugin-server",
-  setup: (api) => ({
-    config() {
-      return {};
-    },
-    afterBuild() {
-      return __async(this, null, function* () {
-        const { appDirectory, distDirectory } = api.useAppContext();
-        const modernConfig = api.useResolvedConfigContext();
-        const distDir = path.resolve(distDirectory);
-        const serverDir = path.resolve(appDirectory, SERVER_DIR);
-        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const sourceDirs = [];
-        if (fs.existsSync(serverDir)) {
-          sourceDirs.push(serverDir);
-        }
-        if (fs.existsSync(sharedDir)) {
-          sourceDirs.push(sharedDir);
-        }
-        const { server } = modernConfig;
-        const { alias, globalVars } = modernConfig.source;
-        const { babel } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          yield compile(
-            appDirectory,
-            {
-              server,
-              alias,
-              globalVars,
-              babelConfig: babel
-            },
-            {
-              sourceDirs,
-              distDir,
-              tsconfigPath
-            }
-          );
-        }
-      });
-    },
-    collectServerPlugins({ plugins }) {
-      plugins.push({
-        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
-      });
-      return { plugins };
-    }
-  })
-});
-export {
-  cli_default as default
-};