@modern-js/server-utils 2.6.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @modern-js/server-utils
 
+## 2.8.0
+
+### Patch Changes
+
+- 2c1151271d: fix(builder): fix incorrect browserslist config
+
+  fix(builder): 修复错误的 browserslist 配置
+
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [1f6ca2c7fb]
+  - @modern-js/utils@2.8.0
+  - @modern-js/babel-preset-lib@2.8.0
+  - @modern-js/babel-compiler@2.8.0
+
+## 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

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

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

@@ -33,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,
@@ -44,10 +44,10 @@ const readTsConfigByFile = (tsConfigFile) => {
   const { options, fileNames, projectReferences } = parsedCmd;
   return { options, fileNames, projectReferences };
 };
-const copyFiles = async (from, to, tsconfigPath) => {
+const copyFiles = async (from, to, appDirectory, tsconfigPath) => {
   if (await import_utils.fs.pathExists(from)) {
-    const basename = import_path.default.basename(from);
-    const targetDir = import_path.default.join(to, basename);
+    const relativePath = import_path.default.relative(appDirectory, from);
+    const targetDir = import_path.default.join(to, relativePath);
     await import_utils.fs.copy(from, targetDir, {
       filter: (src) => ![".ts"].includes(import_path.default.extname(src)) && src !== tsconfigPath
     });
@@ -59,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;
@@ -88,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
@@ -104,7 +104,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
     process.exit(1);
   }
   for (const source of sourceDirs) {
-    await copyFiles(source, distDir, tsconfigPath);
+    await copyFiles(source, distDir, appDirectory, tsconfigPath);
   }
   import_utils.logger.info(`Ts compile succeed`);
 };

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

@@ -25,11 +25,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   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;
@@ -165,8 +165,8 @@ var readTsConfigByFile = function(tsConfigFile) {
     };
 };
 var copyFiles = function() {
-    var _ref = _asyncToGenerator(function(from, to, tsconfigPath) {
-        var basename, targetDir;
+    var _ref = _asyncToGenerator(function(from, to, appDirectory, tsconfigPath) {
+        var relativePath, targetDir;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -179,8 +179,8 @@ var copyFiles = function() {
                         3,
                         3
                     ];
-                    basename = path.basename(from);
-                    targetDir = path.join(to, basename);
+                    relativePath = path.relative(appDirectory, from);
+                    targetDir = path.join(to, relativePath);
                     return [
                         4,
                         fs.copy(from, targetDir, {
@@ -201,7 +201,7 @@ var copyFiles = function() {
             }
         });
     });
-    return function copyFiles(from, to, tsconfigPath) {
+    return function copyFiles(from, to, appDirectory, tsconfigPath) {
         return _ref.apply(this, arguments);
     };
 }();
@@ -276,7 +276,7 @@ var compileByTs = function() {
                     source = _step.value;
                     return [
                         4,
-                        copyFiles(source, distDir, tsconfigPath)
+                        copyFiles(source, distDir, appDirectory, tsconfigPath)
                     ];
                 case 3:
                     _state.sent();

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,
@@ -12,10 +12,10 @@ const readTsConfigByFile = (tsConfigFile) => {
   const { options, fileNames, projectReferences } = parsedCmd;
   return { options, fileNames, projectReferences };
 };
-const copyFiles = async (from, to, tsconfigPath) => {
+const copyFiles = async (from, to, appDirectory, tsconfigPath) => {
   if (await fs.pathExists(from)) {
-    const basename = path.basename(from);
-    const targetDir = path.join(to, basename);
+    const relativePath = path.relative(appDirectory, from);
+    const targetDir = path.join(to, relativePath);
     await fs.copy(from, targetDir, {
       filter: (src) => ![".ts"].includes(path.extname(src)) && src !== tsconfigPath
     });
@@ -72,7 +72,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
     process.exit(1);
   }
   for (const source of sourceDirs) {
-    await copyFiles(source, distDir, tsconfigPath);
+    await copyFiles(source, distDir, appDirectory, tsconfigPath);
   }
   logger.info(`Ts compile succeed`);
 };

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/server-utils",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.6.0",
+  "version": "2.8.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -35,9 +35,9 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.6.0",
-    "@modern-js/babel-preset-lib": "2.6.0",
-    "@modern-js/utils": "2.6.0"
+    "@modern-js/babel-compiler": "2.8.0",
+    "@modern-js/babel-preset-lib": "2.8.0",
+    "@modern-js/utils": "2.8.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -46,9 +46,9 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/server-core": "2.6.0",
-    "@scripts/build": "2.6.0",
-    "@scripts/jest-config": "2.6.0"
+    "@modern-js/server-core": "2.8.0",
+    "@scripts/build": "2.8.0",
+    "@scripts/jest-config": "2.8.0"
   },
   "sideEffects": false,
   "publishConfig": {