@modern-js/server-utils 2.5.1-alpha.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/server-utils
 
+## 2.7.0
+
+### Minor Changes
+
+- 84bfb439b8: feat: support custom apiDir, lambdaDir and style of writing for bff
+  feat: 支持定制 api 目录，lambda 目录，bff 的写法
+
+### Patch Changes
+
+- 7fff9020e1: chore: make file naming consistent
+
+  chore: 统一文件命名为小驼峰格式
+
+- Updated dependencies [0f15fc597c]
+- Updated dependencies [dcad887024]
+- Updated dependencies [a4672f7c16]
+- Updated dependencies [7fff9020e1]
+- Updated dependencies [84bfb439b8]
+  - @modern-js/utils@2.7.0
+  - @modern-js/babel-preset-lib@2.7.0
+  - @modern-js/babel-compiler@2.7.0
+
+## 2.6.0
+
+### Patch Changes
+
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [0fe658a]
+  - @modern-js/utils@2.6.0
+  - @modern-js/babel-preset-lib@2.6.0
+  - @modern-js/babel-compiler@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

package/dist/cjs/common/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/compilers/babel/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/cjs/compilers/typescript/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -29,8 +33,8 @@ module.exports = __toCommonJS(typescript_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_typescript = __toESM(require("typescript"));
-var import_typescript_loader = require("./typescript-loader");
-var import_tsconfig_paths_plugin = require("./tsconfig-paths-plugin");
+var import_typescriptLoader = require("./typescriptLoader");
+var import_tsconfigPathsPlugin = require("./tsconfigPathsPlugin");
 const readTsConfigByFile = (tsConfigFile) => {
   const parsedCmd = import_typescript.default.getParsedCommandLineOfConfigFile(
     tsConfigFile,
@@ -55,7 +59,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
   if (!tsconfigPath) {
     return;
   }
-  const ts2 = new import_typescript_loader.TypescriptLoader({
+  const ts2 = new import_typescriptLoader.TypescriptLoader({
     appDirectory
   }).load();
   const createProgram = ts2.createIncrementalProgram || ts2.createProgram;
@@ -84,7 +88,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
       ...options
     }
   });
-  const tsconfigPathsPlugin = (0, import_tsconfig_paths_plugin.tsconfigPathsBeforeHookFactory)(
+  const tsconfigPathsPlugin = (0, import_tsconfigPathsPlugin.tsconfigPathsBeforeHookFactory)(
     ts2,
     absoluteBaseUrl,
     paths

package/dist/cjs/compilers/typescript/{tsconfig-paths-plugin.js → tsconfigPathsPlugin.js}

@@ -17,15 +17,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tsconfig_paths_plugin_exports = {};
-__export(tsconfig_paths_plugin_exports, {
+var tsconfigPathsPlugin_exports = {};
+__export(tsconfigPathsPlugin_exports, {
   tsconfigPathsBeforeHookFactory: () => tsconfigPathsBeforeHookFactory
 });
-module.exports = __toCommonJS(tsconfig_paths_plugin_exports);
+module.exports = __toCommonJS(tsconfigPathsPlugin_exports);
 var os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
 var ts = __toESM(require("typescript"));

package/dist/cjs/compilers/typescript/{typescript-loader.js → typescriptLoader.js}

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var typescript_loader_exports = {};
-__export(typescript_loader_exports, {
+var typescriptLoader_exports = {};
+__export(typescriptLoader_exports, {
   TypescriptLoader: () => TypescriptLoader
 });
-module.exports = __toCommonJS(typescript_loader_exports);
+module.exports = __toCommonJS(typescriptLoader_exports);
 class TypescriptLoader {
   constructor({ appDirectory }) {
     this.appDirectory = appDirectory;

package/dist/esm/compilers/typescript/index.js

@@ -153,8 +153,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import path from "path";
 import { logger, getAliasConfig, fs } from "@modern-js/utils";
 import ts from "typescript";
-import { TypescriptLoader } from "./typescript-loader";
-import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
+import { TypescriptLoader } from "./typescriptLoader";
+import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
 var readTsConfigByFile = function(tsConfigFile) {
     var parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, ts.sys);
     var options = parsedCmd.options, fileNames = parsedCmd.fileNames, projectReferences = parsedCmd.projectReferences;

package/dist/esm-node/compilers/typescript/index.js

@@ -1,8 +1,8 @@
 import path from "path";
 import { logger, getAliasConfig, fs } from "@modern-js/utils";
 import ts from "typescript";
-import { TypescriptLoader } from "./typescript-loader";
-import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
+import { TypescriptLoader } from "./typescriptLoader";
+import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
 const readTsConfigByFile = (tsConfigFile) => {
   const parsedCmd = ts.getParsedCommandLineOfConfigFile(
     tsConfigFile,

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.0",
+  "version": "2.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -33,22 +33,22 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "2.5.0",
-    "@modern-js/babel-preset-lib": "2.5.0",
-    "@modern-js/utils": "2.5.0",
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2"
+    "babel-plugin-transform-typescript-metadata": "^0.3.2",
+    "@modern-js/babel-compiler": "2.7.0",
+    "@modern-js/babel-preset-lib": "2.7.0",
+    "@modern-js/utils": "2.7.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "2.5.1-alpha.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "ts-jest": "^27.0.4",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@modern-js/server-core": "2.7.0",
+    "@scripts/build": "2.7.0",
+    "@scripts/jest-config": "2.7.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/js/modern/common/index.js

@@ -1,55 +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 * as path from "path";
-import { fs } from "@modern-js/utils";
-import { compileByTs } from "../compilers/typescript";
-import { compileByBabel } from "../compilers/babel";
-const FILE_EXTENSIONS = [".js", ".ts", ".mjs", ".ejs"];
-const validateAbsolutePath = (filename, message) => {
-  if (!path.isAbsolute(filename)) {
-    throw new Error(message);
-  }
-};
-const validateAbsolutePaths = (filenames, messageFunc) => {
-  filenames.forEach(
-    (filename) => validateAbsolutePath(filename, messageFunc(filename))
-  );
-};
-const compile = (appDirectory, modernConfig, compileOptions) => __async(void 0, null, function* () {
-  var _a;
-  const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  validateAbsolutePaths(
-    sourceDirs,
-    (dir) => `source dir ${dir} is not an absolute path.`
-  );
-  validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
-  const compiler = (_a = modernConfig == null ? void 0 : modernConfig.server) == null ? void 0 : _a.compiler;
-  const isTsProject = tsconfigPath && (yield fs.pathExists(tsconfigPath));
-  if (!isTsProject || compiler === "babel") {
-    yield compileByBabel(appDirectory, modernConfig, compileOptions);
-  } else {
-    yield compileByTs(appDirectory, modernConfig, compileOptions);
-  }
-});
-export {
-  FILE_EXTENSIONS,
-  compile
-};

package/dist/js/modern/compilers/babel/index.js

@@ -1,149 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-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 * as path from "path";
-import {
-  getBabelChain,
-  applyUserBabelConfig
-} from "@modern-js/babel-preset-lib";
-import { fs, json5, getAliasConfig } from "@modern-js/utils";
-import { compiler } from "@modern-js/babel-compiler";
-import { FILE_EXTENSIONS } from "../../common";
-export * from "@babel/core";
-const readTsConfig = (tsconfigPath, noExistReturn = null) => {
-  if (!fs.existsSync(tsconfigPath)) {
-    return noExistReturn;
-  }
-  const content = fs.readFileSync(tsconfigPath, "utf-8");
-  return json5.parse(content);
-};
-const existTsConfigFile = (tsconfigAbsolutePath) => {
-  const tsconfig = readTsConfig(tsconfigAbsolutePath);
-  return Boolean(tsconfig);
-};
-const getBabelConfig = (libPresetOption, syntaxOption) => {
-  const chain = getBabelChain(libPresetOption, syntaxOption);
-  return __spreadValues({
-    sourceType: "unambiguous"
-  }, chain.toJSON());
-};
-const resolveBabelConfig = (appDirectory, config, option) => {
-  const { globalVars, alias, babelConfig, define } = config;
-  const globalDefineVars = define && Object.entries(define).reduce((object, [key, value]) => {
-    object[key] = JSON.stringify(value);
-    return object;
-  }, {});
-  const aliasConfig = getAliasConfig(alias, __spreadValues({
-    appDirectory
-  }, option));
-  const babelChain = getBabelChain(
-    {
-      appDirectory,
-      enableReactPreset: true,
-      enableTypescriptPreset: true,
-      alias: aliasConfig,
-      envVars: [],
-      globalVars: __spreadValues(__spreadValues({}, globalVars), globalDefineVars)
-    },
-    {
-      type: option.type,
-      syntax: option.syntax
-    }
-  );
-  const envOptions = babelChain.preset("@babel/preset-env").options();
-  babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    __spreadProps(__spreadValues({}, envOptions[0]), {
-      loose: true
-    })
-  ]);
-  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(require.resolve("@babel/plugin-proposal-class-properties"), [
-    {
-      loose: true
-    }
-  ]);
-  const internalBabelConfig = __spreadValues({}, babelChain.toJSON());
-  return applyUserBabelConfig(internalBabelConfig, babelConfig);
-};
-const compileByBabel = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
-  const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  const results = yield Promise.all(
-    sourceDirs.map((sourceDir) => __async(void 0, null, function* () {
-      const babelConfig = resolveBabelConfig(appDirectory, config, {
-        tsconfigPath: tsconfigPath ? tsconfigPath : "",
-        syntax: "es6+",
-        type: "commonjs"
-      });
-      if (yield fs.pathExists(sourceDir)) {
-        const basename = path.basename(sourceDir);
-        const targetDir = path.join(distDir, basename);
-        yield fs.copy(sourceDir, targetDir, {
-          filter: (src) => ![".ts", ".js"].includes(path.extname(src)) && src !== tsconfigPath
-        });
-      }
-      return compiler(
-        {
-          rootDir: appDirectory,
-          distDir,
-          sourceDir,
-          extensions: FILE_EXTENSIONS
-        },
-        babelConfig
-      );
-    }))
-  );
-  results.forEach((result) => {
-    if (result.code === 1) {
-      throw new Error(result.message);
-    }
-  });
-});
-export {
-  compileByBabel,
-  existTsConfigFile,
-  getBabelConfig,
-  readTsConfig,
-  resolveBabelConfig
-};

package/dist/js/modern/compilers/typescript/index.js

@@ -1,123 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-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 path from "path";
-import { logger, getAliasConfig, fs } from "@modern-js/utils";
-import ts from "typescript";
-import { TypescriptLoader } from "./typescript-loader";
-import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
-const readTsConfigByFile = (tsConfigFile) => {
-  const parsedCmd = ts.getParsedCommandLineOfConfigFile(
-    tsConfigFile,
-    void 0,
-    ts.sys
-  );
-  const { options, fileNames, projectReferences } = parsedCmd;
-  return { options, fileNames, projectReferences };
-};
-const copyFiles = (from, to, tsconfigPath) => __async(void 0, null, function* () {
-  if (yield fs.pathExists(from)) {
-    const basename = path.basename(from);
-    const targetDir = path.join(to, basename);
-    yield fs.copy(from, targetDir, {
-      filter: (src) => ![".ts"].includes(path.extname(src)) && src !== tsconfigPath
-    });
-  }
-});
-const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
-  logger.info(`Running ts compile...`);
-  const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  if (!tsconfigPath) {
-    return;
-  }
-  const ts2 = new TypescriptLoader({
-    appDirectory
-  }).load();
-  const createProgram = ts2.createIncrementalProgram || ts2.createProgram;
-  const formatHost = getFormatHost(ts2);
-  const { alias } = config;
-  const aliasOption = getAliasConfig(alias, {
-    appDirectory,
-    tsconfigPath
-  });
-  const { paths = {}, absoluteBaseUrl = "./" } = aliasOption;
-  const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath);
-  const sourcePosixPaths = sourceDirs.map(
-    (sourceDir) => sourceDir.split(path.sep).join(path.posix.sep)
-  );
-  const rootNames = fileNames.filter((fileName) => {
-    return fileName.endsWith(".d.ts") || sourcePosixPaths.some((sourceDir) => {
-      return fileName.includes(sourceDir);
-    });
-  });
-  const program = createProgram.call(ts2, {
-    rootNames,
-    projectReferences,
-    options: __spreadValues({
-      rootDir: appDirectory,
-      outDir: distDir
-    }, options)
-  });
-  const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(
-    ts2,
-    absoluteBaseUrl,
-    paths
-  );
-  const emitResult = program.emit(void 0, void 0, void 0, void 0, {
-    before: [tsconfigPathsPlugin]
-  });
-  const allDiagnostics = ts2.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-  if (allDiagnostics.length > 0) {
-    logger.error(
-      ts2.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)
-    );
-    process.exit(1);
-  }
-  for (const source of sourceDirs) {
-    yield copyFiles(source, distDir, tsconfigPath);
-  }
-  logger.info(`Ts compile succeed`);
-});
-const getFormatHost = (ts2) => {
-  return {
-    getCanonicalFileName: (path2) => path2,
-    getCurrentDirectory: ts2.sys.getCurrentDirectory,
-    getNewLine: () => ts2.sys.newLine
-  };
-};
-export {
-  compileByTs
-};