@modern-js/server-utils 1.20.1 → 1.21.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/server-utils
 
+## 1.21.0
+
+### Patch Changes
+
+- 8f3674a: fix: reduce compile parameters for dev-server
+  fix: 减少 dev-server 编译所需参数
+- Updated dependencies [28f0a4f]
+  - @modern-js/plugin@1.21.0
+  - @modern-js/utils@1.21.0
+  - @modern-js/babel-preset-lib@1.21.0
+  - @modern-js/babel-compiler@1.21.0
+
 ## 1.20.1
 
 ### Patch Changes

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

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import * as path from 'path';
 import { getBabelChain, applyUserBabelConfig } from '@modern-js/babel-preset-lib';
-import { fs, json5, getAlias, applyOptionsChain } from '@modern-js/utils';
+import { fs, json5, getAlias } from '@modern-js/utils';
 import { compiler } from '@modern-js/babel-compiler';
 import { FILE_EXTENSIONS } from "../../common";
 export * from '@babel/core';
@@ -29,29 +29,18 @@ export const getBabelConfig = (libPresetOption, syntaxOption) => {
     sourceType: 'unambiguous'
   }, chain.toJSON());
 };
-export const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel type can't pass type checking
+export const resolveBabelConfig = (appDirectory, config, option // FIXME: babel type can't pass type checking
 ) => {
   const {
-    source: {
-      envVars,
-      globalVars,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      jsxTransformRuntime = 'automatic'
-    },
-    tools: {
-      lodash: userLodashOption
-    }
-  } = modernConfig; // alias config
+    envVars,
+    globalVars,
+    alias,
+    babelConfig
+  } = config; // alias config
 
-  const aliasConfig = getAlias(modernConfig.source.alias, _objectSpread({
+  const aliasConfig = getAlias(alias, _objectSpread({
     appDirectory
-  }, option)); // lodash config
-
-  const lodashOptions = applyOptionsChain({
-    id: ['lodash', 'ramda']
-  }, // TODO: 需要处理类型问题
-  userLodashOption); // babel config
+  }, option)); // babel config
 
   const babelChain = getBabelChain({
     appDirectory,
@@ -59,9 +48,7 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME:
     enableTypescriptPreset: true,
     alias: aliasConfig,
     envVars,
-    globalVars,
-    lodashOptions,
-    jsxTransformRuntime
+    globalVars
   }, {
     type: option.type,
     syntax: option.syntax
@@ -81,17 +68,16 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME:
 
   const internalBabelConfig = _objectSpread({}, babelChain.toJSON());
 
-  const userBabelConfig = modernConfig.tools.babel;
-  return applyUserBabelConfig(internalBabelConfig, userBabelConfig);
+  return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
-export const compileByBabel = async (appDirectory, modernConfig, compileOptions) => {
+export const compileByBabel = async (appDirectory, config, compileOptions) => {
   const {
     sourceDirs,
     distDir,
     tsconfigPath
   } = compileOptions;
   const results = await Promise.all(sourceDirs.map(async sourceDir => {
-    const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+    const babelConfig = resolveBabelConfig(appDirectory, config, {
       tsconfigPath: tsconfigPath ? tsconfigPath : '',
       syntax: 'es6+',
       type: 'commonjs'

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

@@ -34,7 +34,7 @@ const copyFiles = async (from, to, tsconfigPath) => {
   }
 };
 
-export const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
+export const compileByTs = async (appDirectory, config, compileOptions) => {
   logger.info(`Running ts compile...`);
   const {
     sourceDirs,
@@ -53,7 +53,7 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
   const formatHost = getFormatHost(ts);
   const {
     alias
-  } = modernConfig.source;
+  } = config;
   const aliasOption = getAlias(alias || {}, {
     appDirectory,
     tsconfigPath
@@ -96,6 +96,8 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
   for (const source of sourceDirs) {
     await copyFiles(source, distDir, tsconfigPath);
   }
+
+  logger.info(`Ts compile succeed`);
 };
 
 const getFormatHost = ts => {

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

@@ -75,29 +75,18 @@ const getBabelConfig = (libPresetOption, syntaxOption) => {
 
 exports.getBabelConfig = getBabelConfig;
 
-const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel type can't pass type checking
+const resolveBabelConfig = (appDirectory, config, option // FIXME: babel type can't pass type checking
 ) => {
   const {
-    source: {
-      envVars,
-      globalVars,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      jsxTransformRuntime = 'automatic'
-    },
-    tools: {
-      lodash: userLodashOption
-    }
-  } = modernConfig; // alias config
+    envVars,
+    globalVars,
+    alias,
+    babelConfig
+  } = config; // alias config
 
-  const aliasConfig = (0, _utils.getAlias)(modernConfig.source.alias, _objectSpread({
+  const aliasConfig = (0, _utils.getAlias)(alias, _objectSpread({
     appDirectory
-  }, option)); // lodash config
-
-  const lodashOptions = (0, _utils.applyOptionsChain)({
-    id: ['lodash', 'ramda']
-  }, // TODO: 需要处理类型问题
-  userLodashOption); // babel config
+  }, option)); // babel config
 
   const babelChain = (0, _babelPresetLib.getBabelChain)({
     appDirectory,
@@ -105,9 +94,7 @@ const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel t
     enableTypescriptPreset: true,
     alias: aliasConfig,
     envVars,
-    globalVars,
-    lodashOptions,
-    jsxTransformRuntime
+    globalVars
   }, {
     type: option.type,
     syntax: option.syntax
@@ -127,20 +114,19 @@ const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel t
 
   const internalBabelConfig = _objectSpread({}, babelChain.toJSON());
 
-  const userBabelConfig = modernConfig.tools.babel;
-  return (0, _babelPresetLib.applyUserBabelConfig)(internalBabelConfig, userBabelConfig);
+  return (0, _babelPresetLib.applyUserBabelConfig)(internalBabelConfig, babelConfig);
 };
 
 exports.resolveBabelConfig = resolveBabelConfig;
 
-const compileByBabel = async (appDirectory, modernConfig, compileOptions) => {
+const compileByBabel = async (appDirectory, config, compileOptions) => {
   const {
     sourceDirs,
     distDir,
     tsconfigPath
   } = compileOptions;
   const results = await Promise.all(sourceDirs.map(async sourceDir => {
-    const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+    const babelConfig = resolveBabelConfig(appDirectory, config, {
       tsconfigPath: tsconfigPath ? tsconfigPath : '',
       syntax: 'es6+',
       type: 'commonjs'

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

@@ -50,7 +50,7 @@ const copyFiles = async (from, to, tsconfigPath) => {
   }
 };
 
-const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
+const compileByTs = async (appDirectory, config, compileOptions) => {
   _utils.logger.info(`Running ts compile...`);
 
   const {
@@ -70,7 +70,7 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
   const formatHost = getFormatHost(ts);
   const {
     alias
-  } = modernConfig.source;
+  } = config;
   const aliasOption = (0, _utils.getAlias)(alias || {}, {
     appDirectory,
     tsconfigPath
@@ -114,6 +114,8 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
   for (const source of sourceDirs) {
     await copyFiles(source, distDir, tsconfigPath);
   }
+
+  _utils.logger.info(`Ts compile succeed`);
 };
 
 exports.compileByTs = compileByTs;

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

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import * as path from 'path';
 import { getBabelChain, applyUserBabelConfig } from '@modern-js/babel-preset-lib';
-import { fs, json5, getAlias, applyOptionsChain } from '@modern-js/utils';
+import { fs, json5, getAlias } from '@modern-js/utils';
 import { compiler } from '@modern-js/babel-compiler';
 import { FILE_EXTENSIONS } from "../../common";
 export * from '@babel/core';
@@ -28,23 +28,16 @@ export var getBabelConfig = function getBabelConfig(libPresetOption, syntaxOptio
     sourceType: 'unambiguous'
   }, chain.toJSON());
 };
-export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modernConfig, option // FIXME: babel type can't pass type checking
+export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config, option // FIXME: babel type can't pass type checking
 ) {
-  var _modernConfig$source = modernConfig.source,
-      envVars = _modernConfig$source.envVars,
-      globalVars = _modernConfig$source.globalVars,
-      _modernConfig$source$ = _modernConfig$source.jsxTransformRuntime,
-      jsxTransformRuntime = _modernConfig$source$ === void 0 ? 'automatic' : _modernConfig$source$,
-      userLodashOption = modernConfig.tools.lodash; // alias config
+  var envVars = config.envVars,
+      globalVars = config.globalVars,
+      alias = config.alias,
+      babelConfig = config.babelConfig; // alias config
 
-  var aliasConfig = getAlias(modernConfig.source.alias, _objectSpread({
+  var aliasConfig = getAlias(alias, _objectSpread({
     appDirectory: appDirectory
-  }, option)); // lodash config
-
-  var lodashOptions = applyOptionsChain({
-    id: ['lodash', 'ramda']
-  }, // TODO: 需要处理类型问题
-  userLodashOption); // babel config
+  }, option)); // babel config
 
   var babelChain = getBabelChain({
     appDirectory: appDirectory,
@@ -52,9 +45,7 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modern
     enableTypescriptPreset: true,
     alias: aliasConfig,
     envVars: envVars,
-    globalVars: globalVars,
-    lodashOptions: lodashOptions,
-    jsxTransformRuntime: jsxTransformRuntime
+    globalVars: globalVars
   }, {
     type: option.type,
     syntax: option.syntax
@@ -74,11 +65,10 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modern
 
   var internalBabelConfig = _objectSpread({}, babelChain.toJSON());
 
-  var userBabelConfig = modernConfig.tools.babel;
-  return applyUserBabelConfig(internalBabelConfig, userBabelConfig);
+  return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
 export var compileByBabel = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, config, compileOptions) {
     var sourceDirs, distDir, tsconfigPath, results;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -93,7 +83,7 @@ export var compileByBabel = /*#__PURE__*/function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
+                        babelConfig = resolveBabelConfig(appDirectory, config, {
                           tsconfigPath: tsconfigPath ? tsconfigPath : '',
                           syntax: 'es6+',
                           type: 'commonjs'

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

@@ -60,7 +60,7 @@ var copyFiles = /*#__PURE__*/function () {
 }();
 
 export var compileByTs = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, config, compileOptions) {
     var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -83,7 +83,7 @@ export var compileByTs = /*#__PURE__*/function () {
             }).load();
             createProgram = ts.createIncrementalProgram || ts.createProgram;
             formatHost = getFormatHost(ts);
-            alias = modernConfig.source.alias;
+            alias = config.alias;
             aliasOption = getAlias(alias || {}, {
               appDirectory: appDirectory,
               tsconfigPath: tsconfigPath
@@ -155,6 +155,9 @@ export var compileByTs = /*#__PURE__*/function () {
             return _context2.finish(32);
 
           case 35:
+            logger.info("Ts compile succeed");
+
+          case 36:
           case "end":
             return _context2.stop();
         }

package/dist/types/common/index.d.ts

@@ -4,11 +4,20 @@ export interface Pattern {
   to: string;
   tsconfigPath?: string;
 }
+export interface IConfig {
+  alias?: NormalizedConfig['source']['alias'];
+  envVars?: NormalizedConfig['source']['envVars'];
+  globalVars?: NormalizedConfig['source']['globalVars'];
+  babelConfig?: NormalizedConfig['tools']['babel'];
+  server: {
+    compiler?: 'babel' | 'typescript';
+  };
+}
 export interface CompileOptions {
   sourceDirs: string[];
   distDir: string;
   tsconfigPath?: string;
 }
-export declare type CompileFunc = (appDirectory: string, modernConfig: NormalizedConfig, compileOptions: CompileOptions) => Promise<void>;
+export declare type CompileFunc = (appDirectory: string, modernConfig: IConfig, compileOptions: CompileOptions) => Promise<void>;
 export declare const FILE_EXTENSIONS: string[];
 export declare const compile: CompileFunc;

package/dist/types/compilers/babel/index.d.ts

@@ -1,6 +1,5 @@
 import { ILibPresetOption, ISyntaxOption } from '@modern-js/babel-preset-lib';
 import { TransformOptions } from '@babel/core';
-import type { NormalizedConfig } from '@modern-js/core';
 import { CompileFunc } from '../../common';
 export * from '@babel/core';
 export interface ITsconfig {
@@ -25,5 +24,5 @@ export interface IPackageModeValue {
   syntax: 'es5' | 'es6+';
   tsconfigPath: string;
 }
-export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, option: IPackageModeValue) => any;
+export declare const resolveBabelConfig: (appDirectory: string, config: Parameters<CompileFunc>[1], option: IPackageModeValue) => any;
 export declare const compileByBabel: CompileFunc;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.20.1",
+  "version": "1.21.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,18 +35,18 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.20.1",
-    "@modern-js/babel-preset-lib": "1.20.1",
-    "@modern-js/plugin": "1.20.1",
-    "@modern-js/utils": "1.20.1",
+    "@modern-js/babel-compiler": "^1.21.0",
+    "@modern-js/babel-preset-lib": "1.21.0",
+    "@modern-js/plugin": "1.21.0",
+    "@modern-js/utils": "1.21.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "tsconfig-paths": "3.14.1"
   },
   "devDependencies": {
-    "@modern-js/core": "1.20.1",
-    "@scripts/build": "1.20.1",
-    "@scripts/jest-config": "1.20.1",
+    "@modern-js/core": "1.21.0",
+    "@scripts/build": "1.21.0",
+    "@scripts/jest-config": "1.21.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",