@modern-js/utils 1.0.1 → 1.1.3

package/CHANGELOG.md

@@ -1,10 +1,34 @@
 # @modern-js/utils
 
-## 1.0.1
+## 1.1.3
 
 ### Patch Changes
 
-- release 1.0.1
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- d280ea33: chore: runtime exports can choose to generate d.ts file
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+
+## 1.1.2
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- f594fbc8: fix apple icon and favicon support
+
+## 1.1.1
+
+### Patch Changes
+
+- c0fc0700: feat: support deploy plugin
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0
 
 ## 1.0.0
 

package/dist/js/modern/FileSizeReporter.js

@@ -19,7 +19,7 @@ import filesize from 'filesize';
 import recursive from 'recursive-readdir';
 import stripAnsi from 'strip-ansi';
 import gzipSize from 'gzip-size';
-import { logger } from '.';
+import { logger } from "./logger";
 
 function canReadAsset(asset) {
   return /\.(js|css)$/.test(asset) && !/service-worker\.js/.test(asset) && !/precache-manifest\.[0-9a-f]+\.js/.test(asset);

package/dist/js/modern/applyOptionsChain.js

@@ -1,4 +1,5 @@
-import { isFunction, logger, isPlainObject } from '.';
+// eslint-disable-next-line import/no-useless-path-segments
+import { isFunction, logger, isPlainObject } from "./index";
 export const applyOptionsChain = (defaults, options, utils, mergeFn = Object.assign) => {
   if (!options) {
     return defaults;

package/dist/js/modern/compatRequire.js

@@ -1,10 +1,21 @@
+import { findExists } from "./findExists";
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
  * @returns module export object.
  */
+
 export const compatRequire = filePath => {
   const mod = require(filePath);
 
   return mod !== null && mod !== void 0 && mod.__esModule ? mod.default : mod;
+};
+export const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
+  const exist = findExists(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
 };

package/dist/js/modern/constants.js

@@ -17,6 +17,11 @@ export const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
  */
 
 export const ROUTE_SPEC_FILE = 'route.json';
+/**
+ * main entry name
+ */
+
+export const MAIN_ENTRY_NAME = 'main';
 /**
  * open editor request path
  */
@@ -42,7 +47,18 @@ export const SERVER_RENDER_FUNCTION_NAME = 'serverRender';
  */
 
 export const LOADABLE_STATS_FILE = 'loadable-stats.json';
+/**
+ * real entry generate by modern.js
+ */
+
 export const HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
+/**
+ * internal specified folder
+ */
+
+export const API_DIR = 'api';
+export const SERVER_DIR = 'server';
+export const SHARED_DIR = 'shared';
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -113,6 +129,10 @@ export const INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -121,6 +141,24 @@ export const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-tailwindcss': {
     cli: '@modern-js/plugin-tailwindcss/cli'
+  },
+  '@modern-js/plugin-lambda-fc': {
+    cli: '@modern-js/plugin-lambda-fc/cli'
+  },
+  '@modern-js/plugin-lambda-scf': {
+    cli: '@modern-js/plugin-lambda-scf/cli'
+  },
+  '@modern-js/plugin-cdn-oss': {
+    cli: '@modern-js/plugin-cdn-oss/cli'
+  },
+  '@modern-js/plugin-cdn-cos': {
+    cli: '@modern-js/plugin-cdn-cos/cli'
+  },
+  '@modern-js/plugin-static-hosting': {
+    cli: '@modern-js/plugin-static-hosting/cli'
+  },
+  '@modern-js/plugin-polyfill': {
+    server: '@modern-js/plugin-polyfill'
   }
 };
 /**
@@ -152,7 +190,10 @@ export const PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -160,7 +201,7 @@ export const PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }
@@ -217,6 +258,8 @@ export const PLUGIN_SCHEMAS = {
     schema: {
       oneOf: [{
         type: 'boolean'
+      }, {
+        type: 'object'
       }, {
         instanceof: 'Function'
       }]

package/dist/js/modern/getEntryOptions.js

@@ -5,11 +5,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { isPlainObject } from "./is";
-export const getEntryOptions = (name, baseOptions, optionsByEntries) => {
+import { MAIN_ENTRY_NAME } from "./constants";
+export const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries); // compatible with main entry using packageName as the key
+
+    if (optionsByEntry === undefined && name === MAIN_ENTRY_NAME && packageName) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    } // eslint-disable-next-line no-nested-ternary
+
+
+    return optionsByEntry !== undefined ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
-};
+};
+
+const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/dist/js/modern/is/type.js

@@ -22,4 +22,7 @@ export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+export function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/modern/prettyInstructions.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { isDev } from "./is"; // TODO: type
 
 // TODO: remove hard code 'main'
-const isSPA = entrypoints => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
+export const isSingleEntry = entrypoints => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
 
 const normalizeUrl = url => url.replace(/([^:]\/)\/+/g, '$1');
 
@@ -44,7 +44,7 @@ export const prettyInstructions = (appContext, config) => {
   const routes = serverRoutes.filter(route => route.entryName);
   let message = 'App running at:\n\n';
 
-  if (isSPA(entrypoints)) {
+  if (isSingleEntry(entrypoints)) {
     message += urls.map(({
       type,
       url

package/dist/js/modern/runtimeExports.js

@@ -18,8 +18,9 @@ const memo = fn => {
   };
 };
 
-export const createRuntimeExportsUtils = memo((pwd, namespace) => {
-  const entryExportFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
+export const createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
+  const entryExportFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`);
+  const entryExportTsFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -32,9 +33,11 @@ export const createRuntimeExportsUtils = memo((pwd, namespace) => {
 
     try {
       fs.ensureFileSync(entryExportFile);
+      fs.ensureFileSync(entryExportTsFile);
 
       if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         fs.appendFileSync(entryExportFile, `${statement}\n`);
+        ts && fs.appendFileSync(entryExportTsFile, `${statement.replace('.js', '.d')}\n`);
       }
     } catch (_unused) {// FIXME:
     }

package/dist/js/node/FileSizeReporter.js

@@ -32,7 +32,7 @@ var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
 
 var _gzipSize = _interopRequireDefault(require("gzip-size"));
 
-var _ = require(".");
+var _logger = require("./logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -101,13 +101,13 @@ function printFileSizesAfterBuild(webpackStats, previousSizeMap, buildFolder, ma
       suggestBundleSplitting = true;
     }
 
-    _.logger.log('  ' + fileNameLabel + '    ' + sizeLabel + '    ' + (isLarge ? _chalk.default.yellow(gzipSizeLabel) : gzipSizeLabel));
+    _logger.logger.log('  ' + fileNameLabel + '    ' + sizeLabel + '    ' + (isLarge ? _chalk.default.yellow(gzipSizeLabel) : gzipSizeLabel));
   });
 
   if (suggestBundleSplitting) {
-    _.logger.log();
+    _logger.logger.log();
 
-    _.logger.warn('The bundle size is significantly larger than recommended.');
+    _logger.logger.warn('The bundle size is significantly larger than recommended.');
   }
 }
 
@@ -124,7 +124,7 @@ function printFileSizesHeader(longestFileNameLength, longestSizeLabelLength) {
     return prev + curLabel + '    ';
   }, '  ');
 
-  _.logger.log(_chalk.default.bold(_chalk.default.blue(headerRow)));
+  _logger.logger.log(_chalk.default.bold(_chalk.default.blue(headerRow)));
 }
 
 function removeFileNameHash(buildFolder, fileName) {

package/dist/js/node/applyOptionsChain.js

@@ -5,21 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyOptionsChain = void 0;
 
-var _ = require(".");
+var _index = require("./index");
 
+// eslint-disable-next-line import/no-useless-path-segments
 const applyOptionsChain = (defaults, options, utils, mergeFn = Object.assign) => {
   if (!options) {
     return defaults;
   }
 
-  if ((0, _.isPlainObject)(options)) {
+  if ((0, _index.isPlainObject)(options)) {
     return mergeFn(defaults, options);
-  } else if ((0, _.isFunction)(options)) {
+  } else if ((0, _index.isFunction)(options)) {
     const ret = options(defaults, utils);
 
     if (ret) {
-      if (!(0, _.isPlainObject)(ret)) {
-        _.logger.warn(`${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`);
+      if (!(0, _index.isPlainObject)(ret)) {
+        _index.logger.warn(`${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`);
       }
 
       return ret;

package/dist/js/node/compatRequire.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compatRequire = void 0;
+exports.requireExistModule = exports.compatRequire = void 0;
+
+var _findExists = require("./findExists");
 
 /**
  * Require function compatible with esm and cjs module.
@@ -16,4 +18,16 @@ const compatRequire = filePath => {
   return mod !== null && mod !== void 0 && mod.__esModule ? mod.default : mod;
 };
 
-exports.compatRequire = compatRequire;
+exports.compatRequire = compatRequire;
+
+const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
+  const exist = (0, _findExists.findExists)(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
+};
+
+exports.requireExistModule = requireExistModule;

package/dist/js/node/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SERVER_RENDER_FUNCTION_NAME = exports.SERVER_BUNDLE_DIRECTORY = exports.ROUTE_SPEC_FILE = exports.PLUGIN_SCHEMAS = exports.LOADABLE_STATS_FILE = exports.LAUNCH_EDITOR_ENDPOINT = exports.INTERNAL_SRC_ALIAS = exports.INTERNAL_PLUGINS = exports.INTERNAL_DIR_ALAIS = exports.HMR_SOCK_PATH = exports.HIDE_MODERN_JS_DIR = exports.ENTRY_NAME_PATTERN = void 0;
+exports.SHARED_DIR = exports.SERVER_RENDER_FUNCTION_NAME = exports.SERVER_DIR = exports.SERVER_BUNDLE_DIRECTORY = exports.ROUTE_SPEC_FILE = exports.PLUGIN_SCHEMAS = exports.MAIN_ENTRY_NAME = exports.LOADABLE_STATS_FILE = exports.LAUNCH_EDITOR_ENDPOINT = exports.INTERNAL_SRC_ALIAS = exports.INTERNAL_PLUGINS = exports.INTERNAL_DIR_ALAIS = exports.HMR_SOCK_PATH = exports.HIDE_MODERN_JS_DIR = exports.ENTRY_NAME_PATTERN = exports.API_DIR = void 0;
 
 /**
  * alias to src directory
@@ -28,10 +28,16 @@ const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 exports.HMR_SOCK_PATH = HMR_SOCK_PATH;
 const ROUTE_SPEC_FILE = 'route.json';
 /**
- * open editor request path
+ * main entry name
  */
 
 exports.ROUTE_SPEC_FILE = ROUTE_SPEC_FILE;
+const MAIN_ENTRY_NAME = 'main';
+/**
+ * open editor request path
+ */
+
+exports.MAIN_ENTRY_NAME = MAIN_ENTRY_NAME;
 const LAUNCH_EDITOR_ENDPOINT = '/__open-stack-frame-in-editor';
 /**
  * server side bundles directory, which relative to dist.
@@ -57,13 +63,27 @@ const SERVER_RENDER_FUNCTION_NAME = 'serverRender';
 
 exports.SERVER_RENDER_FUNCTION_NAME = SERVER_RENDER_FUNCTION_NAME;
 const LOADABLE_STATS_FILE = 'loadable-stats.json';
+/**
+ * real entry generate by modern.js
+ */
+
 exports.LOADABLE_STATS_FILE = LOADABLE_STATS_FILE;
 const HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
 /**
- * Internal plugins that work as soon as they are installed.
+ * internal specified folder
  */
 
 exports.HIDE_MODERN_JS_DIR = HIDE_MODERN_JS_DIR;
+const API_DIR = 'api';
+exports.API_DIR = API_DIR;
+const SERVER_DIR = 'server';
+exports.SERVER_DIR = SERVER_DIR;
+const SHARED_DIR = 'shared';
+/**
+ * Internal plugins that work as soon as they are installed.
+ */
+
+exports.SHARED_DIR = SHARED_DIR;
 const INTERNAL_PLUGINS = {
   '@modern-js/app-tools': {
     cli: '@modern-js/app-tools/cli'
@@ -130,6 +150,10 @@ const INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -138,6 +162,24 @@ const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-tailwindcss': {
     cli: '@modern-js/plugin-tailwindcss/cli'
+  },
+  '@modern-js/plugin-lambda-fc': {
+    cli: '@modern-js/plugin-lambda-fc/cli'
+  },
+  '@modern-js/plugin-lambda-scf': {
+    cli: '@modern-js/plugin-lambda-scf/cli'
+  },
+  '@modern-js/plugin-cdn-oss': {
+    cli: '@modern-js/plugin-cdn-oss/cli'
+  },
+  '@modern-js/plugin-cdn-cos': {
+    cli: '@modern-js/plugin-cdn-cos/cli'
+  },
+  '@modern-js/plugin-static-hosting': {
+    cli: '@modern-js/plugin-static-hosting/cli'
+  },
+  '@modern-js/plugin-polyfill': {
+    server: '@modern-js/plugin-polyfill'
   }
 };
 /**
@@ -170,7 +212,10 @@ const PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -178,7 +223,7 @@ const PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }
@@ -235,6 +280,8 @@ const PLUGIN_SCHEMAS = {
     schema: {
       oneOf: [{
         type: 'boolean'
+      }, {
+        type: 'object'
       }, {
         instanceof: 'Function'
       }]

package/dist/js/node/getEntryOptions.js

@@ -7,19 +7,29 @@ exports.getEntryOptions = void 0;
 
 var _is = require("./is");
 
+var _constants = require("./constants");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 getEntryOptions = (name, baseOptions, optionsByEntries) => {
+const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? (0, _is.isPlainObject)(optionsByEntries[name]) && (0, _is.isPlainObject)(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries); // compatible with main entry using packageName as the key
+
+    if (optionsByEntry === undefined && name === _constants.MAIN_ENTRY_NAME && packageName) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    } // eslint-disable-next-line no-nested-ternary
+
+
+    return optionsByEntry !== undefined ? (0, _is.isPlainObject)(optionsByEntry) && (0, _is.isPlainObject)(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
 };
 
-exports.getEntryOptions = getEntryOptions;
+exports.getEntryOptions = getEntryOptions;
+
+const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/dist/js/node/is/type.js

@@ -8,6 +8,7 @@ exports.isFunction = isFunction;
 exports.isObject = isObject;
 exports.isPlainObject = isPlainObject;
 exports.isPromise = isPromise;
+exports.isRegExp = isRegExp;
 exports.isString = isString;
 exports.isUndefined = isUndefined;
 
@@ -41,4 +42,8 @@ function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+
+function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/node/prettyInstructions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prettyInstructions = void 0;
+exports.prettyInstructions = exports.isSingleEntry = void 0;
 
 var _os = _interopRequireDefault(require("os"));
 
@@ -14,7 +14,9 @@ var _is = require("./is");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // TODO: remove hard code 'main'
-const isSPA = entrypoints => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
+const isSingleEntry = entrypoints => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
+
+exports.isSingleEntry = isSingleEntry;
 
 const normalizeUrl = url => url.replace(/([^:]\/)\/+/g, '$1');
 
@@ -56,7 +58,7 @@ const prettyInstructions = (appContext, config) => {
   const routes = serverRoutes.filter(route => route.entryName);
   let message = 'App running at:\n\n';
 
-  if (isSPA(entrypoints)) {
+  if (isSingleEntry(entrypoints)) {
     message += urls.map(({
       type,
       url

package/dist/js/node/runtimeExports.js

@@ -29,8 +29,10 @@ const memo = fn => {
   };
 };
 
-const createRuntimeExportsUtils = memo((pwd, namespace) => {
-  const entryExportFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
+const createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
+  const entryExportFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`);
+
+  const entryExportTsFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -45,8 +47,12 @@ const createRuntimeExportsUtils = memo((pwd, namespace) => {
     try {
       _fsExtra.default.ensureFileSync(entryExportFile);
 
+      _fsExtra.default.ensureFileSync(entryExportTsFile);
+
       if (!_fsExtra.default.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         _fsExtra.default.appendFileSync(entryExportFile, `${statement}\n`);
+
+        ts && _fsExtra.default.appendFileSync(entryExportTsFile, `${statement.replace('.js', '.d')}\n`);
       }
     } catch (_unused) {// FIXME:
     }

package/dist/js/treeshaking/FileSizeReporter.js

@@ -31,7 +31,7 @@ import filesize from 'filesize';
 import recursive from 'recursive-readdir';
 import stripAnsi from 'strip-ansi';
 import gzipSize from 'gzip-size';
-import { logger } from '.';
+import { logger } from "./logger";
 
 function canReadAsset(asset) {
   return /\.(js|css)$/.test(asset) && !/service-worker\.js/.test(asset) && !/precache-manifest\.[0-9a-f]+\.js/.test(asset);

package/dist/js/treeshaking/applyOptionsChain.js

@@ -1,4 +1,5 @@
-import { isFunction, logger, isPlainObject } from '.';
+// eslint-disable-next-line import/no-useless-path-segments
+import { isFunction, logger, isPlainObject } from "./index";
 export var applyOptionsChain = function applyOptionsChain(defaults, options, utils) {
   var mergeFn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : Object.assign;
 

package/dist/js/treeshaking/compatRequire.js

@@ -1,10 +1,24 @@
+import { findExists } from "./findExists";
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
  * @returns module export object.
  */
+
 export var compatRequire = function compatRequire(filePath) {
   var mod = require(filePath);
 
   return mod !== null && mod !== void 0 && mod.__esModule ? mod["default"] : mod;
+};
+export var requireExistModule = function requireExistModule(filename) {
+  var extensions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['.ts', '.js'];
+  var exist = findExists(extensions.map(function (ext) {
+    return "".concat(filename).concat(ext);
+  }));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
 };

package/dist/js/treeshaking/constants.js

@@ -19,6 +19,11 @@ export var HMR_SOCK_PATH = '/_modern_js_hmr_ws';
  */
 
 export var ROUTE_SPEC_FILE = 'route.json';
+/**
+ * main entry name
+ */
+
+export var MAIN_ENTRY_NAME = 'main';
 /**
  * open editor request path
  */
@@ -44,7 +49,18 @@ export var SERVER_RENDER_FUNCTION_NAME = 'serverRender';
  */
 
 export var LOADABLE_STATS_FILE = 'loadable-stats.json';
+/**
+ * real entry generate by modern.js
+ */
+
 export var HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
+/**
+ * internal specified folder
+ */
+
+export var API_DIR = 'api';
+export var SERVER_DIR = 'server';
+export var SHARED_DIR = 'shared';
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -115,6 +131,10 @@ export var INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -123,6 +143,24 @@ export var INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-tailwindcss': {
     cli: '@modern-js/plugin-tailwindcss/cli'
+  },
+  '@modern-js/plugin-lambda-fc': {
+    cli: '@modern-js/plugin-lambda-fc/cli'
+  },
+  '@modern-js/plugin-lambda-scf': {
+    cli: '@modern-js/plugin-lambda-scf/cli'
+  },
+  '@modern-js/plugin-cdn-oss': {
+    cli: '@modern-js/plugin-cdn-oss/cli'
+  },
+  '@modern-js/plugin-cdn-cos': {
+    cli: '@modern-js/plugin-cdn-cos/cli'
+  },
+  '@modern-js/plugin-static-hosting': {
+    cli: '@modern-js/plugin-static-hosting/cli'
+  },
+  '@modern-js/plugin-polyfill': {
+    server: '@modern-js/plugin-polyfill'
   }
 };
 /**
@@ -152,7 +190,10 @@ export var PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -160,7 +201,7 @@ export var PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }
@@ -217,6 +258,8 @@ export var PLUGIN_SCHEMAS = {
     schema: {
       oneOf: [{
         type: 'boolean'
+      }, {
+        type: 'object'
       }, {
         "instanceof": 'Function'
       }]

package/dist/js/treeshaking/getEntryOptions.js

@@ -5,11 +5,22 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { isPlainObject } from "./is";
-export var getEntryOptions = function getEntryOptions(name, baseOptions, optionsByEntries) {
+import { MAIN_ENTRY_NAME } from "./constants";
+export var getEntryOptions = function getEntryOptions(name, baseOptions, optionsByEntries, packageName) {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    var optionsByEntry = getOptionsByEntryName(name, optionsByEntries); // compatible with main entry using packageName as the key
+
+    if (optionsByEntry === undefined && name === MAIN_ENTRY_NAME && packageName) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    } // eslint-disable-next-line no-nested-ternary
+
+
+    return optionsByEntry !== undefined ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
+};
+
+var getOptionsByEntryName = function getOptionsByEntryName(name, optionsByEntries) {
+  return optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;
 };

package/dist/js/treeshaking/is/type.js

@@ -24,4 +24,7 @@ export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (_typeof(obj) === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+export function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/treeshaking/prettyInstructions.js

@@ -15,7 +15,7 @@ import chalk from 'chalk';
 import { isDev } from "./is"; // TODO: type
 
 // TODO: remove hard code 'main'
-var isSPA = function isSPA(entrypoints) {
+export var isSingleEntry = function isSingleEntry(entrypoints) {
   return entrypoints.length === 1 && entrypoints[0].entryName === 'main';
 };
 
@@ -63,7 +63,7 @@ export var prettyInstructions = function prettyInstructions(appContext, config)
   });
   var message = 'App running at:\n\n';
 
-  if (isSPA(entrypoints)) {
+  if (isSingleEntry(entrypoints)) {
     message += urls.map(function (_ref2) {
       var type = _ref2.type,
           url = _ref2.url;

package/dist/js/treeshaking/runtimeExports.js

@@ -22,8 +22,12 @@ var memo = function memo(fn) {
   };
 };
 
-export var createRuntimeExportsUtils = memo(function (pwd, namespace) {
-  var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".js") : 'index.js')); // const ensure = () => {
+export var createRuntimeExportsUtils = memo(function () {
+  var pwd = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var namespace = arguments.length > 1 ? arguments[1] : undefined;
+  var ts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".js") : 'index.js'));
+  var entryExportTsFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".d.ts") : 'index.d.ts')); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -36,9 +40,11 @@ export var createRuntimeExportsUtils = memo(function (pwd, namespace) {
 
     try {
       fs.ensureFileSync(entryExportFile);
+      fs.ensureFileSync(entryExportTsFile);
 
       if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         fs.appendFileSync(entryExportFile, "".concat(statement, "\n"));
+        ts && fs.appendFileSync(entryExportTsFile, "".concat(statement.replace('.js', '.d'), "\n"));
       }
     } catch (_unused) {// FIXME:
     }

package/dist/types/compatRequire.d.ts

@@ -3,4 +3,5 @@
  * @param filePath - File to required.
  * @returns module export object.
  */
-export declare const compatRequire: (filePath: string) => any;
+export declare const compatRequire: (filePath: string) => any;
+export declare const requireExistModule: (filename: string, extensions?: string[]) => any;

package/dist/types/constants.d.ts

@@ -17,6 +17,11 @@ export declare const HMR_SOCK_PATH = "/_modern_js_hmr_ws";
  */
 
 export declare const ROUTE_SPEC_FILE = "route.json";
+/**
+ * main entry name
+ */
+
+export declare const MAIN_ENTRY_NAME = "main";
 /**
  * open editor request path
  */
@@ -42,7 +47,18 @@ export declare const SERVER_RENDER_FUNCTION_NAME = "serverRender";
  */
 
 export declare const LOADABLE_STATS_FILE = "loadable-stats.json";
+/**
+ * real entry generate by modern.js
+ */
+
 export declare const HIDE_MODERN_JS_DIR = "./node_modules/.modern-js";
+/**
+ * internal specified folder
+ */
+
+export declare const API_DIR = "api";
+export declare const SERVER_DIR = "server";
+export declare const SHARED_DIR = "shared";
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -83,7 +99,10 @@ export declare const PLUGIN_SCHEMAS: {
       type: string;
       properties: {
         prefix: {
-          type: string;
+          type: string[];
+          items: {
+            type: string;
+          };
         };
         fetcher: {
           type: string;
@@ -91,7 +110,7 @@ export declare const PLUGIN_SCHEMAS: {
         proxy: {
           type: string;
         };
-        requestCreater: {
+        requestCreator: {
           type: string;
         };
       };

package/dist/types/getEntryOptions.d.ts

@@ -1 +1 @@
-export declare const getEntryOptions: <T>(name: string, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined) => T | undefined;
+export declare const getEntryOptions: <T>(name: string, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined, packageName?: string | undefined) => T | undefined;

package/dist/types/is/type.d.ts

@@ -4,4 +4,5 @@ export declare function isArray(obj: any): obj is any[];
 export declare function isFunction(func: any): func is Function;
 export declare function isObject(obj: any): obj is object;
 export declare function isPlainObject(obj: any): obj is Record<string, any>;
-export declare function isPromise(obj: any): obj is Promise<any>;
+export declare function isPromise(obj: any): obj is Promise<any>;
+export declare function isRegExp(obj: any): obj is RegExp;

package/dist/types/prettyInstructions.d.ts

@@ -1 +1,6 @@
-export declare const prettyInstructions: (appContext: any, config: any) => string;
+interface EntryPoint {
+  entryName: string;
+}
+export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export declare const prettyInstructions: (appContext: any, config: any) => string;
+export {};

package/dist/types/runtimeExports.d.ts

@@ -1,4 +1,4 @@
-export declare const createRuntimeExportsUtils: (pwd: string, namespace: string) => {
+export declare const createRuntimeExportsUtils: (pwd: any, namespace: string, ts?: any) => {
   addExport: (statement: string) => void;
   getPath: () => string;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -65,8 +65,8 @@
     "@types/recursive-readdir": "^2.2.0",
     "typescript": "^4",
     "webpack": "^5.54.0",
-    "@modern-js/plugin-testing": "^1.0.2",
-    "@modern-js/module-tools": "^1.0.2"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "peerDependencies": {
     "typescript": "^4.4.3"

package/src/FileSizeReporter.ts

@@ -18,7 +18,7 @@ import filesize from 'filesize';
 import recursive from 'recursive-readdir';
 import stripAnsi from 'strip-ansi';
 import gzipSize from 'gzip-size';
-import { logger } from '.';
+import { logger } from './logger';
 
 
 function canReadAsset(asset:string) {

package/src/applyOptionsChain.ts

@@ -1,4 +1,5 @@
-import { isFunction, logger, isPlainObject } from '.';
+// eslint-disable-next-line import/no-useless-path-segments
+import { isFunction, logger, isPlainObject } from './index';
 
 export const applyOptionsChain = <T, U>(
   defaults: T,

package/src/compatRequire.ts

@@ -1,3 +1,5 @@
+import { findExists } from './findExists';
+
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
@@ -8,3 +10,16 @@ export const compatRequire = (filePath: string) => {
 
   return mod?.__esModule ? mod.default : mod;
 };
+
+export const requireExistModule = (
+  filename: string,
+  extensions = ['.ts', '.js'],
+) => {
+  const exist = findExists(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
+};

package/src/constants.ts

@@ -18,6 +18,11 @@ export const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
  */
 export const ROUTE_SPEC_FILE = 'route.json';
 
+/**
+ * main entry name
+ */
+export const MAIN_ENTRY_NAME = 'main';
+
 /**
  * open editor request path
  */
@@ -43,8 +48,20 @@ export const SERVER_RENDER_FUNCTION_NAME = 'serverRender';
  */
 export const LOADABLE_STATS_FILE = 'loadable-stats.json';
 
+/**
+ * real entry generate by modern.js
+ */
 export const HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
 
+/**
+ * internal specified folder
+ */
+export const API_DIR = 'api';
+
+export const SERVER_DIR = 'server';
+
+export const SHARED_DIR = 'shared';
+
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -86,11 +103,23 @@ export const INTERNAL_PLUGINS: {
   },
   '@modern-js/plugin-unbundle': { cli: '@modern-js/plugin-unbundle' },
   '@modern-js/plugin-server-build': { cli: '@modern-js/plugin-server-build' },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server',
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli',
   },
   '@modern-js/plugin-jarvis': { cli: '@modern-js/plugin-jarvis/cli' },
   '@modern-js/plugin-tailwindcss': { cli: '@modern-js/plugin-tailwindcss/cli' },
+  '@modern-js/plugin-lambda-fc': { cli: '@modern-js/plugin-lambda-fc/cli' },
+  '@modern-js/plugin-lambda-scf': { cli: '@modern-js/plugin-lambda-scf/cli' },
+  '@modern-js/plugin-cdn-oss': { cli: '@modern-js/plugin-cdn-oss/cli' },
+  '@modern-js/plugin-cdn-cos': { cli: '@modern-js/plugin-cdn-cos/cli' },
+  '@modern-js/plugin-static-hosting': {
+    cli: '@modern-js/plugin-static-hosting/cli',
+  },
+  '@modern-js/plugin-polyfill': { server: '@modern-js/plugin-polyfill' },
 };
 
 /**
@@ -120,10 +149,13 @@ export const PLUGIN_SCHEMAS = {
       schema: {
         type: 'object',
         properties: {
-          prefix: { type: 'string' },
+          prefix: {
+            type: ['string', 'array'],
+            items: { type: 'string' },
+          },
           fetcher: { type: 'string' },
           proxy: { type: 'object' },
-          requestCreater: { type: 'string' },
+          requestCreator: { type: 'string' },
         },
       },
     },
@@ -175,7 +207,13 @@ export const PLUGIN_SCHEMAS = {
   '@modern-js/plugin-ssg': [
     {
       target: 'output.ssg',
-      schema: { oneOf: [{ type: 'boolean' }, { instanceof: 'Function' }] },
+      schema: {
+        oneOf: [
+          { type: 'boolean' },
+          { type: 'object' },
+          { instanceof: 'Function' },
+        ],
+      },
     },
   ],
   '@modern-js/plugin-ssr': [

package/src/getEntryOptions.ts

@@ -1,18 +1,37 @@
 import { isPlainObject } from './is';
+import { MAIN_ENTRY_NAME } from './constants';
 
 export const getEntryOptions = <T>(
   name: string,
   baseOptions?: T,
   optionsByEntries?: Record<string, T>,
+  packageName?: string,
 ) => {
   if (optionsByEntries) {
+    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
+
+    // compatible with main entry using packageName as the key
+    if (
+      optionsByEntry === undefined &&
+      name === MAIN_ENTRY_NAME &&
+      packageName
+    ) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    }
+
     // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name)
-      ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions)
-        ? { ...baseOptions, ...optionsByEntries[name] }
-        : optionsByEntries[name]
+    return optionsByEntry !== undefined
+      ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions)
+        ? { ...baseOptions, ...optionsByEntry }
+        : optionsByEntry
       : baseOptions;
   } else {
     return baseOptions;
   }
 };
+
+const getOptionsByEntryName = <T>(
+  name: string,
+  optionsByEntries: Record<string, T>,
+) =>
+  optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/src/is/type.ts

@@ -37,3 +37,7 @@ export function isPromise(obj: any): obj is Promise<any> {
   );
   /* eslint-enable promise/prefer-await-to-then */
 }
+
+export function isRegExp(obj: any): obj is RegExp {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
+}

package/src/prettyInstructions.ts

@@ -14,7 +14,7 @@ interface ServerRoute {
 }
 
 // TODO: remove hard code 'main'
-const isSPA = (entrypoints: EntryPoint[]) =>
+export const isSingleEntry = (entrypoints: EntryPoint[]) =>
   entrypoints.length === 1 && entrypoints[0].entryName === 'main';
 
 const normalizeUrl = (url: string) => url.replace(/([^:]\/)\/+/g, '$1');
@@ -62,7 +62,7 @@ export const prettyInstructions = (appContext: any, config: any) => {
 
   let message = 'App running at:\n\n';
 
-  if (isSPA(entrypoints)) {
+  if (isSingleEntry(entrypoints)) {
     message += urls
       .map(
         ({ type, url }) =>

package/src/runtimeExports.ts

@@ -21,11 +21,15 @@ const memo = <T extends (...args: any[]) => any>(fn: T) => {
 };
 
 export const createRuntimeExportsUtils = memo(
-  (pwd: string, namespace: string) => {
+  (pwd = '', namespace: string, ts = false) => {
     const entryExportFile = path.join(
       pwd,
       `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`,
     );
+    const entryExportTsFile = path.join(
+      pwd,
+      `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`,
+    );
 
     // const ensure = () => {
     //   if (!fs.existsSync(entryExportFile)) {
@@ -39,8 +43,15 @@ export const createRuntimeExportsUtils = memo(
       statement = normalizeOutputPath(statement);
       try {
         fs.ensureFileSync(entryExportFile);
+        fs.ensureFileSync(entryExportTsFile);
+
         if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
           fs.appendFileSync(entryExportFile, `${statement}\n`);
+          ts &&
+            fs.appendFileSync(
+              entryExportTsFile,
+              `${statement.replace('.js', '.d')}\n`,
+            );
         }
       } catch {
         // FIXME:

package/tests/ensureAbsolutePath.test.ts

@@ -1,13 +1,16 @@
+import path from 'path';
 import { ensureAbsolutePath } from '@/ensureAbsolutePath';
 
 describe('ensure absolute file path', () => {
   test('should return filePath directly', () => {
-    expect(ensureAbsolutePath('/a/b', '/a/b/c/d/e.jsx')).toEqual(
-      '/a/b/c/d/e.jsx',
-    );
+    expect(
+      path.isAbsolute(ensureAbsolutePath('/a/b', '/a/b/c/d/e.jsx')),
+    ).toBeTruthy();
   });
 
   test(`should resolve absolute path`, () => {
-    expect(ensureAbsolutePath('/a/b', 'c/d/e.jsx')).toEqual('/a/b/c/d/e.jsx');
+    expect(
+      path.isAbsolute(ensureAbsolutePath('/a/b', 'c/d/e.jsx')),
+    ).toBeTruthy();
   });
 });

package/tests/getEntryOptions.test.ts

@@ -15,6 +15,17 @@ describe('get entry options', () => {
     ).toEqual('a');
   });
 
+  test(`should compatible with main entry using packageName as key`, () => {
+    expect(
+      getEntryOptions(
+        'main',
+        'default value',
+        { 'package-name': 'a' },
+        'package-name',
+      ),
+    ).toEqual('a');
+  });
+
   expect(
     getEntryOptions(
       'page-a',