@modern-js/app-tools 1.4.6 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @modern-js/app-tools
 
+## 1.5.0
+
+### Minor Changes
+
+- d2d1d6b2: feat: support server config
+
+### Patch Changes
+
+- 6aa80baa: fix: Generate config helper file only config file exist
+- Updated dependencies [60855eb2]
+- Updated dependencies [046e58aa]
+- Updated dependencies [ec1b7367]
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/core@1.7.0
+  - @modern-js/plugin-analyze@1.3.6
+  - @modern-js/webpack@1.5.4
+  - @modern-js/utils@1.4.0
+  - @modern-js/prod-server@1.1.0
+  - @modern-js/node-bundle-require@1.3.0
+  - @modern-js/types@1.4.0
+  - @modern-js/plugin-i18n@1.2.3
+  - @modern-js/new-action@1.3.5
+  - @modern-js/plugin-fast-refresh@1.2.3
+  - @modern-js/server@1.4.9
+
 ## 1.4.6
 
 ### Patch Changes

package/dist/js/modern/commands/build.js

@@ -9,10 +9,10 @@ import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
 import { manager, ResolvedConfigContext } from '@modern-js/core';
 import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
+import { buildServerConfig, emitResolvedConfig } from "../utils/config";
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
-
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
 export const build = async (api, options) => {
   const resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -91,10 +91,17 @@ export const build = async (api, options) => {
     }));
   });
   const {
-    distDirectory
+    distDirectory,
+    appDirectory,
+    serverConfigFile
   } = appContext;
   const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
   await emptyDir(distDirectory);
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile
+  });
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',
@@ -138,4 +145,5 @@ export const build = async (api, options) => {
 
   await generateRoutes(appContext);
   await hookRunners.afterBuild();
+  await emitResolvedConfig(appDirectory, resolvedConfig);
 };

package/dist/js/modern/commands/dev.js

@@ -10,6 +10,7 @@ import { createServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { printInstructions } from "../utils/printInstructions";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
+import { buildServerConfig } from "../utils/config";
 export const dev = async (api, options) => {
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
@@ -19,7 +20,8 @@ export const dev = async (api, options) => {
     distDirectory,
     port,
     existSrc,
-    entrypoints
+    entrypoints,
+    serverConfigFile
   } = appContext;
   const checkedEntries = await getSpecifiedEntries(options.entry || false, entrypoints);
   api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
@@ -27,6 +29,16 @@ export const dev = async (api, options) => {
   }));
   appContext.checkedEntries = checkedEntries;
   fs.emptyDirSync(distDirectory);
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
+    }
+  });
   await hookRunners.beforeDev();
   let compiler = null;
 
@@ -48,6 +60,7 @@ export const dev = async (api, options) => {
   const app = await createServer({
     dev: _objectSpread(_objectSpread({}, {
       client: {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',
@@ -65,6 +78,7 @@ export const dev = async (api, options) => {
     compiler,
     pwd: appDirectory,
     config: userConfig,
+    serverConfigFile,
     plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
   });
   app.listen(port, async err => {
@@ -76,7 +90,7 @@ export const dev = async (api, options) => {
       clearConsole();
       logger.log(chalk.cyan(`Starting the development server...`));
     } else {
-      await printInstructions(api, appContext, userConfig);
+      await printInstructions(hookRunners, appContext, userConfig);
     }
   });
 };

package/dist/js/modern/commands/start.js

@@ -4,21 +4,24 @@ import { printInstructions } from "../utils/printInstructions";
 export const start = async api => {
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
-    port
+    port,
+    serverConfigFile
   } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
   const app = await server({
     pwd: appDirectory,
     config: userConfig,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
+    plugins: appContext.plugins.filter(p => p.server).map(p => p.server),
+    serverConfigFile
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
 
-    await printInstructions(api, appContext, userConfig);
+    await printInstructions(hookRunners, appContext, userConfig);
   });
 };

package/dist/js/modern/exports/server.js

@@ -0,0 +1 @@
+export { defineServerConfig as defineConfig } from "../utils/config";

package/dist/js/modern/utils/config.js

@@ -0,0 +1,77 @@
+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 = 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; }
+
+import * as path from 'path';
+import { bundle } from '@modern-js/node-bundle-require';
+import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
+export const defineServerConfig = config => config;
+export const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const configFilePath = await getServerConfig(appDirectory, configFile);
+
+  const getOutputFile = filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+
+  if (configFilePath) {
+    const configHelperFilePath = path.join(distDirectory, './config-helper.js');
+    const helperCode = `
+      export const defineConfig = (config) => config;
+    `;
+    await fs.writeFile(configHelperFilePath, helperCode);
+    await bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
+      getOutputFile,
+      esbuildPlugins: [{
+        name: 'native-build-config',
+
+        setup(ctx) {
+          ctx.onResolve({
+            filter: /app-tools\/server/
+          }, () => {
+            return {
+              path: configHelperFilePath
+            };
+          });
+        }
+
+      }]
+    }));
+  }
+};
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+export const safeReplacer = () => {
+  const cache = [];
+  const keyCache = [];
+  return function (key, value) {
+    if (typeof value === 'object' && value !== null) {
+      const index = cache.indexOf(value);
+
+      if (index !== -1) {
+        return `[Circular ${keyCache[index]}]`;
+      }
+
+      cache.push(value);
+      keyCache.push(key || 'root');
+    }
+
+    return value;
+  };
+};
+export const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
+  var _resolvedConfig$outpu;
+
+  const outputPath = path.join(appDirectory, (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$outpu = resolvedConfig.output) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.path) || './dist', OUTPUT_CONFIG_FILE);
+  await fs.writeJSON(outputPath, resolvedConfig, {
+    spaces: 2,
+    replacer: safeReplacer()
+  });
+};

package/dist/js/modern/utils/createCompiler.js

@@ -57,7 +57,7 @@ export const createCompiler = async ({
           logger.log(chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
-        await printInstructions(api, appContext, userConfig);
+        await printInstructions(hookRunners, appContext, userConfig);
       }
 
       isFirstCompile = false;

package/dist/js/modern/utils/printInstructions.js

@@ -1,5 +1,5 @@
 import { prettyInstructions, logger, isDev, chalk } from '@modern-js/utils';
-export const printInstructions = async (api, appContext, config) => {
+export const printInstructions = async (hookRunners, appContext, config) => {
   let message = prettyInstructions(appContext, config);
   const {
     existSrc
@@ -10,7 +10,6 @@ export const printInstructions = async (api, appContext, config) => {
   } // call beforePrintInstructions hook.
 
 
-  const hookRunners = api.useHookRunners();
   const {
     instructions
   } = await hookRunners.beforePrintInstructions({

package/dist/js/node/commands/build.js

@@ -15,6 +15,8 @@ var _utils = require("@modern-js/utils");
 
 var _routes = require("../utils/routes");
 
+var _config = require("../utils/config");
+
 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 = 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; }
@@ -23,7 +25,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
 
 const build = async (api, options) => {
   const resolvedConfig = api.useResolvedConfigContext();
@@ -107,10 +109,17 @@ const build = async (api, options) => {
   });
 
   const {
-    distDirectory
+    distDirectory,
+    appDirectory,
+    serverConfigFile
   } = appContext;
   const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(distDirectory);
   await (0, _utils.emptyDir)(distDirectory);
+  await (0, _config.buildServerConfig)({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile
+  });
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',
@@ -154,6 +163,7 @@ const build = async (api, options) => {
 
   await (0, _routes.generateRoutes)(appContext);
   await hookRunners.afterBuild();
+  await (0, _config.emitResolvedConfig)(appDirectory, resolvedConfig);
 };
 
 exports.build = build;

package/dist/js/node/commands/dev.js

@@ -17,6 +17,8 @@ var _printInstructions = require("../utils/printInstructions");
 
 var _getSpecifiedEntries = require("../utils/getSpecifiedEntries");
 
+var _config = require("../utils/config");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -36,7 +38,8 @@ const dev = async (api, options) => {
     distDirectory,
     port,
     existSrc,
-    entrypoints
+    entrypoints,
+    serverConfigFile
   } = appContext;
   const checkedEntries = await (0, _getSpecifiedEntries.getSpecifiedEntries)(options.entry || false, entrypoints);
   api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
@@ -46,6 +49,16 @@ const dev = async (api, options) => {
 
   _utils.fs.emptyDirSync(distDirectory);
 
+  await (0, _config.buildServerConfig)({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
+    }
+  });
   await hookRunners.beforeDev();
   let compiler = null;
 
@@ -67,6 +80,7 @@ const dev = async (api, options) => {
   const app = await (0, _createServer.createServer)({
     dev: _objectSpread(_objectSpread({}, {
       client: {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',
@@ -84,6 +98,7 @@ const dev = async (api, options) => {
     compiler,
     pwd: appDirectory,
     config: userConfig,
+    serverConfigFile,
     plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
   });
   app.listen(port, async err => {
@@ -96,7 +111,7 @@ const dev = async (api, options) => {
 
       _utils.logger.log(_utils.chalk.cyan(`Starting the development server...`));
     } else {
-      await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
+      await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
     }
   });
 };

package/dist/js/node/commands/start.js

@@ -16,9 +16,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const start = async api => {
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
-    port
+    port,
+    serverConfigFile
   } = appContext;
 
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
@@ -26,14 +28,15 @@ const start = async api => {
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
     config: userConfig,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
+    plugins: appContext.plugins.filter(p => p.server).map(p => p.server),
+    serverConfigFile
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
 
-    await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
+    await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
   });
 };
 

package/dist/js/node/exports/server.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "defineConfig", {
+  enumerable: true,
+  get: function () {
+    return _config.defineServerConfig;
+  }
+});
+
+var _config = require("../utils/config");

package/dist/js/node/utils/config.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.safeReplacer = exports.emitResolvedConfig = exports.defineServerConfig = exports.buildServerConfig = void 0;
+
+var path = _interopRequireWildcard(require("path"));
+
+var _nodeBundleRequire = require("@modern-js/node-bundle-require");
+
+var _utils = require("@modern-js/utils");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 = 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; }
+
+const defineServerConfig = config => config;
+
+exports.defineServerConfig = defineServerConfig;
+
+const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);
+
+  const getOutputFile = filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(_utils.CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+
+  if (configFilePath) {
+    const configHelperFilePath = path.join(distDirectory, './config-helper.js');
+    const helperCode = `
+      export const defineConfig = (config) => config;
+    `;
+    await _utils.fs.writeFile(configHelperFilePath, helperCode);
+    await (0, _nodeBundleRequire.bundle)(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
+      getOutputFile,
+      esbuildPlugins: [{
+        name: 'native-build-config',
+
+        setup(ctx) {
+          ctx.onResolve({
+            filter: /app-tools\/server/
+          }, () => {
+            return {
+              path: configHelperFilePath
+            };
+          });
+        }
+
+      }]
+    }));
+  }
+};
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+
+exports.buildServerConfig = buildServerConfig;
+
+const safeReplacer = () => {
+  const cache = [];
+  const keyCache = [];
+  return function (key, value) {
+    if (typeof value === 'object' && value !== null) {
+      const index = cache.indexOf(value);
+
+      if (index !== -1) {
+        return `[Circular ${keyCache[index]}]`;
+      }
+
+      cache.push(value);
+      keyCache.push(key || 'root');
+    }
+
+    return value;
+  };
+};
+
+exports.safeReplacer = safeReplacer;
+
+const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
+  var _resolvedConfig$outpu;
+
+  const outputPath = path.join(appDirectory, (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$outpu = resolvedConfig.output) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.path) || './dist', _utils.OUTPUT_CONFIG_FILE);
+  await _utils.fs.writeJSON(outputPath, resolvedConfig, {
+    spaces: 2,
+    replacer: safeReplacer()
+  });
+};
+
+exports.emitResolvedConfig = emitResolvedConfig;

package/dist/js/node/utils/createCompiler.js

@@ -73,7 +73,7 @@ const createCompiler = async ({
           _utils.logger.log(_utils.chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
-        await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
+        await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
       }
 
       isFirstCompile = false;

package/dist/js/node/utils/printInstructions.js

@@ -7,7 +7,7 @@ exports.printInstructions = void 0;
 
 var _utils = require("@modern-js/utils");
 
-const printInstructions = async (api, appContext, config) => {
+const printInstructions = async (hookRunners, appContext, config) => {
   let message = (0, _utils.prettyInstructions)(appContext, config);
   const {
     existSrc
@@ -18,7 +18,6 @@ const printInstructions = async (api, appContext, config) => {
   } // call beforePrintInstructions hook.
 
 
-  const hookRunners = api.useHookRunners();
   const {
     instructions
   } = await hookRunners.beforePrintInstructions({

package/dist/types/exports/server.d.ts

@@ -0,0 +1 @@
+export { defineServerConfig as defineConfig } from '../utils/config';

package/dist/types/utils/config.d.ts

@@ -0,0 +1,22 @@
+import { bundle } from '@modern-js/node-bundle-require';
+import type { NormalizedConfig } from '@modern-js/core';
+import type { ServerConfig } from '@modern-js/server-core';
+export declare const defineServerConfig: (config: ServerConfig) => ServerConfig;
+export declare const buildServerConfig: ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}: {
+  appDirectory: string;
+  distDirectory: string;
+  configFile: string;
+  options?: Parameters<typeof bundle>[1];
+}) => Promise<void>;
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: NormalizedConfig) => Promise<void>;

package/dist/types/utils/printInstructions.d.ts

@@ -1,2 +1,2 @@
-import type { PluginAPI, IAppContext, NormalizedConfig } from '@modern-js/core';
-export declare const printInstructions: (api: PluginAPI, appContext: IAppContext, config: NormalizedConfig) => Promise<void>;
+import type { IAppContext, NormalizedConfig, ToRunners, CliHooks } from '@modern-js/core';
+export declare const printInstructions: (hookRunners: ToRunners<CliHooks>, appContext: IAppContext, config: NormalizedConfig) => Promise<void>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.6",
+  "version": "1.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -33,6 +33,10 @@
     "./types": {
       "jsnext:source": "./lib/types.d.ts",
       "default": "./lib/types.d.ts"
+    },
+    "./server": {
+      "jsnext:source": "./src/exports/server.ts",
+      "default": "./dist/js/node/exports/server.js"
     }
   },
   "typesVersions": {
@@ -42,6 +46,9 @@
       ],
       "types": [
         "./lib/types.d.ts"
+      ],
+      "server": [
+        "./dist/types/exports/server.d.ts"
       ]
     }
   },
@@ -50,22 +57,24 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.6.1",
+    "@modern-js/core": "^1.7.0",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/new-action": "^1.3.3",
+    "@modern-js/new-action": "^1.3.5",
+    "@modern-js/node-bundle-require": "^1.3.0",
     "@modern-js/plugin": "^1.3.2",
-    "@modern-js/plugin-analyze": "^1.3.5",
+    "@modern-js/plugin-analyze": "^1.3.6",
     "@modern-js/plugin-fast-refresh": "^1.2.3",
-    "@modern-js/plugin-i18n": "^1.2.1",
-    "@modern-js/prod-server": "^1.0.6",
+    "@modern-js/plugin-i18n": "^1.2.3",
+    "@modern-js/prod-server": "^1.1.0",
     "@modern-js/server": "^1.4.9",
-    "@modern-js/types": "^1.3.6",
-    "@modern-js/utils": "^1.3.7",
-    "@modern-js/webpack": "^1.5.3",
+    "@modern-js/types": "^1.4.0",
+    "@modern-js/utils": "^1.4.0",
+    "@modern-js/webpack": "^1.5.4",
     "inquirer": "^8.2.0",
     "webpack": "^5.71.0"
   },
   "devDependencies": {
+    "@modern-js/server-core": "^1.3.0",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/inquirer": "^8.2.0",

package/tests/__snapshots__/utils.test.ts.snap

@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`test app-tools utils safeReplacer should handle circular object 1`] = `"{\\"name\\":\\"a\\",\\"b\\":{\\"name\\":\\"b\\",\\"a\\":\\"[Circular root]\\"}}"`;
+
+exports[`test app-tools utils safeReplacer should handle circular object 2`] = `"{\\"name\\":\\"c\\",\\"d\\":{\\"name\\":\\"d\\",\\"e\\":{\\"name\\":\\"e\\",\\"c\\":\\"[Circular root]\\"}}}"`;

package/tests/utils.test.ts

@@ -6,6 +6,7 @@ import {
   getServer,
 } from '../src/utils/createServer';
 import { getSpecifiedEntries } from '../src/utils/getSpecifiedEntries';
+import { safeReplacer } from '../src/utils/config';
 
 describe('test app-tools utils', () => {
   it('should return all entryNames correctly', async () => {
@@ -63,4 +64,49 @@ describe('test app-tools utils', () => {
     await closeServer();
     expect(getServer()).toBeNull();
   });
+
+  it('safeReplacer should handle circular object', () => {
+    const a: {
+      [key: string]: unknown;
+    } = {
+      name: 'a',
+    };
+
+    const b: {
+      [key: string]: unknown;
+    } = {
+      name: 'b',
+    };
+
+    a.b = b;
+    b.a = a;
+
+    const res1 = JSON.stringify(a, safeReplacer());
+    expect(res1).toMatchSnapshot();
+
+    const c: {
+      [key: string]: unknown;
+    } = {
+      name: 'c',
+    };
+
+    const d: {
+      [key: string]: unknown;
+    } = {
+      name: 'd',
+    };
+
+    const e: {
+      [key: string]: unknown;
+    } = {
+      name: 'e',
+    };
+
+    c.d = d;
+    d.e = e;
+    e.c = c;
+
+    const res2 = JSON.stringify(c, safeReplacer());
+    expect(res2).toMatchSnapshot();
+  });
 });