@modern-js/bff-generator 1.2.1 → 1.2.2

package/dist/js/node/index.js

@@ -0,0 +1,209 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleTemplateFile = exports.default = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _generatorUtils = require("@modern-js/generator-utils");
+
+var _codesmithApiApp = require("@modern-js/codesmith-api-app");
+
+var _codesmithApiJson = require("@modern-js/codesmith-api-json");
+
+var _generatorCommon = require("@modern-js/generator-common");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+function isEmptyApiDir(apiDir) {
+  const files = _generatorUtils.fs.readdirSync(apiDir);
+
+  if (files.length === 0) {
+    return true;
+  }
+
+  return files.every(file => {
+    if (_generatorUtils.fs.statSync(_path.default.join(apiDir, file)).isDirectory()) {
+      const childFiles = _generatorUtils.fs.readdirSync(_path.default.join(apiDir, file));
+
+      return childFiles.length === 0;
+    }
+
+    return false;
+  });
+} // eslint-disable-next-line max-statements
+
+
+const handleTemplateFile = async (context, generator, appApi) => {
+  const jsonAPI = new _codesmithApiJson.JsonAPI(generator);
+  const ans = await appApi.getInputBySchema(_generatorCommon.BFFSchema, context.config);
+  const appDir = context.materials.default.basePath;
+
+  const apiDir = _path.default.join(appDir, 'api');
+
+  if (_generatorUtils.fs.existsSync(apiDir) && !isEmptyApiDir(apiDir)) {
+    const files = _generatorUtils.fs.readdirSync(apiDir);
+
+    if (files.length > 0) {
+      generator.logger.warn("'api' is already exist");
+      throw Error("'api' is already exist");
+    }
+  }
+
+  const {
+    bffType,
+    framework
+  } = ans;
+  const language = (0, _generatorUtils.isTsProject)(appDir) ? _generatorCommon.Language.TS : _generatorCommon.Language.JS;
+
+  if (language === _generatorCommon.Language.JS && framework === _generatorCommon.Framework.Nest) {
+    generator.logger.warn('nest not support js project');
+    throw Error('nest not support js project');
+  }
+
+  let updateInfo = {};
+
+  if (framework === _generatorCommon.Framework.Express || framework === _generatorCommon.Framework.Koa) {
+    updateInfo = {
+      [`devDependencies.@types/${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@types/${framework}`)}`
+    };
+  }
+
+  if (framework === _generatorCommon.Framework.Nest) {
+    updateInfo = {
+      'dependencies.@nestjs/core': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/core')}`,
+      'dependencies.@nestjs/common': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/common')}`
+    };
+
+    if (bffType === _generatorCommon.BFFType.Func) {
+      updateInfo['dependencies.express'] = `^${await (0, _generatorUtils.getPackageVersion)('express')}`;
+      updateInfo['devDependencies.@types/express'] = `^${await (0, _generatorUtils.getPackageVersion)('@types/express')}`;
+    }
+  } else {
+    updateInfo = _objectSpread(_objectSpread({}, updateInfo), {}, {
+      [`dependencies.${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(framework)}`
+    });
+  }
+
+  await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'package.json')), {
+    query: {},
+    update: {
+      $set: _objectSpread({
+        'dependencies.@modern-js/plugin-bff': `^${await (0, _generatorUtils.getPackageVersion)('@modern-js/plugin-bff')}`,
+        [`dependencies.@modern-js/plugin-${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@modern-js/plugin-${framework}`)}`
+      }, updateInfo)
+    }
+  });
+
+  if (language === _generatorCommon.Language.TS) {
+    const tsconfigJSON = (0, _generatorUtils.readTsConfigByFile)(_path.default.join(appDir, 'tsconfig.json'));
+
+    if (!(tsconfigJSON.include || []).includes('api')) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            include: [...(tsconfigJSON.include || []), 'api']
+          }
+        }
+      });
+    }
+  } else {
+    await appApi.forgeTemplate('templates/js-template/**/*', undefined, resourceKey => resourceKey.replace('templates/js-template/', 'api/').replace('.handlebars', `.${language}`));
+  }
+
+  if (bffType === _generatorCommon.BFFType.Func) {
+    if (language === _generatorCommon.Language.TS) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            'compilerOptions.paths.@api/*': ['./api/*']
+          }
+        }
+      });
+    }
+
+    await appApi.forgeTemplate('templates/function/base/*', undefined, resourceKey => resourceKey.replace('templates/function/base/', 'api/').replace('.handlebars', `.${language}`));
+    await appApi.forgeTemplate(`templates/function/info/*`, resourceKey => resourceKey.includes(language), resourceKey => resourceKey.replace('templates/function/info/', 'api/info/').replace('.handlebars', ``));
+    await appApi.forgeTemplate(`templates/function/app/${language}/${framework}.${language}.handlebars`, undefined, resourceKey => resourceKey.replace(`templates/function/app/${language}/${framework}.${language}.handlebars`, `api/_app.${language}`));
+  } else {
+    if (language === _generatorCommon.Language.TS) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            'compilerOptions.paths.@api/*': ['./api/lambda/*']
+          }
+        }
+      });
+    }
+
+    await appApi.forgeTemplate(`templates/framework/lambda/*`, undefined, resourceKey => resourceKey.replace(`templates/framework/`, 'api/').replace('.handlebars', `.${language}`));
+    await appApi.forgeTemplate(`templates/framework/app/${framework}/**/*`, resourceKey => framework === _generatorCommon.Framework.Egg || framework === _generatorCommon.Framework.Koa ? resourceKey.includes(language) : true, resourceKey => resourceKey.replace(`templates/framework/app/${framework}/`, 'api/').replace('.handlebars', framework === _generatorCommon.Framework.Express ? `.${language}` : ''));
+  }
+
+  const appendTypeContent = _generatorCommon.FrameworkAppendTypeContent[framework];
+
+  if (appendTypeContent) {
+    const typePath = _path.default.join(appDir, 'src', 'modern-app-env.d.ts');
+
+    if (_generatorUtils.fs.existsSync(typePath)) {
+      const npmrc = _generatorUtils.fs.readFileSync(typePath, 'utf-8');
+
+      if (!npmrc.includes(appendTypeContent)) {
+        _generatorUtils.fs.writeFileSync(typePath, `${npmrc}${appendTypeContent}\n`, 'utf-8');
+      }
+    } else {
+      _generatorUtils.fs.ensureFileSync(typePath);
+
+      _generatorUtils.fs.writeFileSync(typePath, appendTypeContent, 'utf-8');
+    }
+  }
+};
+
+exports.handleTemplateFile = handleTemplateFile;
+
+var _default = async (context, generator) => {
+  const appApi = new _codesmithApiApp.AppAPI(context, generator);
+  const {
+    locale
+  } = context.config;
+
+  _generatorCommon.i18n.changeLanguage({
+    locale
+  });
+
+  appApi.i18n.changeLanguage({
+    locale
+  });
+
+  if (!(await appApi.checkEnvironment())) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`start run @modern-js/bff-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  try {
+    await handleTemplateFile(context, generator, appApi);
+  } catch (e) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  await appApi.runInstall();
+  generator.logger.debug(`forge @modern-js/bff-generator succeed `);
+};
+
+exports.default = _default;

package/dist/js/node/main.js

@@ -466,7 +466,7 @@ Object.defineProperty(exports, "I18n", ({
 }));
 exports.localeKeys = exports.i18n = void 0;
 
-var _pluginI18n = __webpack_require__(80539);
+var _pluginI18n = __webpack_require__(54207);
 
 var _zh = __webpack_require__(57724);
 
@@ -5689,7 +5689,7 @@ exports.pointer = pointer;
 
 /***/ }),
 
-/***/ 80539:
+/***/ 54207:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -5702,7 +5702,7 @@ exports.I18n = void 0;
 
 var _get2 = _interopRequireDefault(__webpack_require__(71189));
 
-var _utils = __webpack_require__(4960);
+var _utils = __webpack_require__(41083);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -5771,7 +5771,7 @@ exports.I18n = I18n;
 
 /***/ }),
 
-/***/ 4960:
+/***/ 41083:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -269421,7 +269421,7 @@ const SubSolutionSchema = {
       }));
 
       if (data.solution && data.solution !== 'custom') {
-        items.push({
+        items.unshift({
           key: data.solution,
           label: `${SubSolutionText[data.solution]()}(${_locale.i18n.t(_locale.localeKeys.solution.default)})`
         });
@@ -269870,7 +269870,7 @@ const ZH_LOCALE = {
       runtime_api: '启用「Rumtime API」',
       mwa_storybook: '启用「Visual Testing (Storybook)」模式',
       ssg: '启用「SSG」功能',
-      polyfill: '启用基于「UA 的 Polyfill」功能',
+      polyfill: '启用「基于 UA 的 Polyfill」功能',
       deploy: '启用「部署」功能'
     },
     element: {
@@ -270965,7 +270965,7 @@ const MWAActionFunctionsDependencies = {
   [_common.ActionFunction.Less]: '@modern-js/plugin-less',
   [_common.ActionFunction.Sass]: '@modern-js/plugin-sass',
   [_common.ActionFunction.BFF]: '@modern-js/plugin-bff',
-  [_common.ActionFunction.MicroFrontend]: '@modern-js/plugin-micro-frontend',
+  [_common.ActionFunction.MicroFrontend]: '@modern-js/plugin-garfish',
   [_common.ActionFunction.I18n]: '@modern-js/plugin-i18n',
   [_common.ActionFunction.SSG]: '@modern-js/plugin-ssg',
   [_common.ActionFunction.Polyfill]: '@modern-js/plugin-polyfill'
@@ -270973,7 +270973,7 @@ const MWAActionFunctionsDependencies = {
 exports.MWAActionFunctionsDependencies = MWAActionFunctionsDependencies;
 const MWAActionFunctionsAppendTypeContent = {
   [_common.ActionFunction.Test]: `/// <reference types='@modern-js/plugin-testing/type' />`,
-  [_common.ActionFunction.MicroFrontend]: `/// <reference types='@modern-js/plugin-micro-frontend/type' />`
+  [_common.ActionFunction.MicroFrontend]: `/// <reference types='@modern-js/plugin-garfish/type' />`
 };
 exports.MWAActionFunctionsAppendTypeContent = MWAActionFunctionsAppendTypeContent;
 const MWANewActionGenerators = {
@@ -271371,6 +271371,222 @@ function stripAnsi(string) {
 
 /***/ }),
 
+/***/ 34701:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.handleTemplateFile = exports["default"] = void 0;
+
+var _path = _interopRequireDefault(__webpack_require__(71017));
+
+var _generatorUtils = __webpack_require__(89489);
+
+var _codesmithApiApp = __webpack_require__(83028);
+
+var _codesmithApiJson = __webpack_require__(54517);
+
+var _generatorCommon = __webpack_require__(50828);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+function isEmptyApiDir(apiDir) {
+  const files = _generatorUtils.fs.readdirSync(apiDir);
+
+  if (files.length === 0) {
+    return true;
+  }
+
+  return files.every(file => {
+    if (_generatorUtils.fs.statSync(_path.default.join(apiDir, file)).isDirectory()) {
+      const childFiles = _generatorUtils.fs.readdirSync(_path.default.join(apiDir, file));
+
+      return childFiles.length === 0;
+    }
+
+    return false;
+  });
+} // eslint-disable-next-line max-statements
+
+
+const handleTemplateFile = async (context, generator, appApi) => {
+  const jsonAPI = new _codesmithApiJson.JsonAPI(generator);
+  const ans = await appApi.getInputBySchema(_generatorCommon.BFFSchema, context.config);
+  const appDir = context.materials.default.basePath;
+
+  const apiDir = _path.default.join(appDir, 'api');
+
+  if (_generatorUtils.fs.existsSync(apiDir) && !isEmptyApiDir(apiDir)) {
+    const files = _generatorUtils.fs.readdirSync(apiDir);
+
+    if (files.length > 0) {
+      generator.logger.warn("'api' is already exist");
+      throw Error("'api' is already exist");
+    }
+  }
+
+  const {
+    bffType,
+    framework
+  } = ans;
+  const language = (0, _generatorUtils.isTsProject)(appDir) ? _generatorCommon.Language.TS : _generatorCommon.Language.JS;
+
+  if (language === _generatorCommon.Language.JS && framework === _generatorCommon.Framework.Nest) {
+    generator.logger.warn('nest not support js project');
+    throw Error('nest not support js project');
+  }
+
+  let updateInfo = {};
+
+  if (framework === _generatorCommon.Framework.Express || framework === _generatorCommon.Framework.Koa) {
+    updateInfo = {
+      [`devDependencies.@types/${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@types/${framework}`)}`
+    };
+  }
+
+  if (framework === _generatorCommon.Framework.Nest) {
+    updateInfo = {
+      'dependencies.@nestjs/core': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/core')}`,
+      'dependencies.@nestjs/common': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/common')}`
+    };
+
+    if (bffType === _generatorCommon.BFFType.Func) {
+      updateInfo['dependencies.express'] = `^${await (0, _generatorUtils.getPackageVersion)('express')}`;
+      updateInfo['devDependencies.@types/express'] = `^${await (0, _generatorUtils.getPackageVersion)('@types/express')}`;
+    }
+  } else {
+    updateInfo = _objectSpread(_objectSpread({}, updateInfo), {}, {
+      [`dependencies.${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(framework)}`
+    });
+  }
+
+  await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'package.json')), {
+    query: {},
+    update: {
+      $set: _objectSpread({
+        'dependencies.@modern-js/plugin-bff': `^${await (0, _generatorUtils.getPackageVersion)('@modern-js/plugin-bff')}`,
+        [`dependencies.@modern-js/plugin-${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@modern-js/plugin-${framework}`)}`
+      }, updateInfo)
+    }
+  });
+
+  if (language === _generatorCommon.Language.TS) {
+    const tsconfigJSON = (0, _generatorUtils.readTsConfigByFile)(_path.default.join(appDir, 'tsconfig.json'));
+
+    if (!(tsconfigJSON.include || []).includes('api')) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            include: [...(tsconfigJSON.include || []), 'api']
+          }
+        }
+      });
+    }
+  } else {
+    await appApi.forgeTemplate('templates/js-template/**/*', undefined, resourceKey => resourceKey.replace('templates/js-template/', 'api/').replace('.handlebars', `.${language}`));
+  }
+
+  if (bffType === _generatorCommon.BFFType.Func) {
+    if (language === _generatorCommon.Language.TS) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            'compilerOptions.paths.@api/*': ['./api/*']
+          }
+        }
+      });
+    }
+
+    await appApi.forgeTemplate('templates/function/base/*', undefined, resourceKey => resourceKey.replace('templates/function/base/', 'api/').replace('.handlebars', `.${language}`));
+    await appApi.forgeTemplate(`templates/function/info/*`, resourceKey => resourceKey.includes(language), resourceKey => resourceKey.replace('templates/function/info/', 'api/info/').replace('.handlebars', ``));
+    await appApi.forgeTemplate(`templates/function/app/${language}/${framework}.${language}.handlebars`, undefined, resourceKey => resourceKey.replace(`templates/function/app/${language}/${framework}.${language}.handlebars`, `api/_app.${language}`));
+  } else {
+    if (language === _generatorCommon.Language.TS) {
+      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
+        query: {},
+        update: {
+          $set: {
+            'compilerOptions.paths.@api/*': ['./api/lambda/*']
+          }
+        }
+      });
+    }
+
+    await appApi.forgeTemplate(`templates/framework/lambda/*`, undefined, resourceKey => resourceKey.replace(`templates/framework/`, 'api/').replace('.handlebars', `.${language}`));
+    await appApi.forgeTemplate(`templates/framework/app/${framework}/**/*`, resourceKey => framework === _generatorCommon.Framework.Egg || framework === _generatorCommon.Framework.Koa ? resourceKey.includes(language) : true, resourceKey => resourceKey.replace(`templates/framework/app/${framework}/`, 'api/').replace('.handlebars', framework === _generatorCommon.Framework.Express ? `.${language}` : ''));
+  }
+
+  const appendTypeContent = _generatorCommon.FrameworkAppendTypeContent[framework];
+
+  if (appendTypeContent) {
+    const typePath = _path.default.join(appDir, 'src', 'modern-app-env.d.ts');
+
+    if (_generatorUtils.fs.existsSync(typePath)) {
+      const npmrc = _generatorUtils.fs.readFileSync(typePath, 'utf-8');
+
+      if (!npmrc.includes(appendTypeContent)) {
+        _generatorUtils.fs.writeFileSync(typePath, `${npmrc}${appendTypeContent}\n`, 'utf-8');
+      }
+    } else {
+      _generatorUtils.fs.ensureFileSync(typePath);
+
+      _generatorUtils.fs.writeFileSync(typePath, appendTypeContent, 'utf-8');
+    }
+  }
+};
+
+exports.handleTemplateFile = handleTemplateFile;
+
+var _default = async (context, generator) => {
+  const appApi = new _codesmithApiApp.AppAPI(context, generator);
+  const {
+    locale
+  } = context.config;
+
+  _generatorCommon.i18n.changeLanguage({
+    locale
+  });
+
+  appApi.i18n.changeLanguage({
+    locale
+  });
+
+  if (!(await appApi.checkEnvironment())) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`start run @modern-js/bff-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  try {
+    await handleTemplateFile(context, generator, appApi);
+  } catch (e) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  await appApi.runInstall();
+  generator.logger.debug(`forge @modern-js/bff-generator succeed `);
+};
+
+exports["default"] = _default;
+
+/***/ }),
+
 /***/ 13076:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -271735,7 +271951,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.clearConsole = void 0;
 
 const clearConsole = () => {
-  if (process.stdout.isTTY) {
+  if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write('\x1B[H\x1B[2J');
   }
 };
@@ -271745,7 +271961,7 @@ exports.clearConsole = clearConsole;
 /***/ }),
 
 /***/ 4002:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -271753,7 +271969,7 @@ exports.clearConsole = clearConsole;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.requireExistModule = exports.compatRequire = void 0;
+exports.requireExistModule = exports.compatRequire = exports.cleanRequireCache = void 0;
 
 var _findExists = __webpack_require__(3664);
 
@@ -271782,6 +271998,14 @@ const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
 
 exports.requireExistModule = requireExistModule;
 
+const cleanRequireCache = filelist => {
+  filelist.forEach(filepath => {
+    delete __webpack_require__.c[filepath];
+  });
+};
+
+exports.cleanRequireCache = cleanRequireCache;
+
 /***/ }),
 
 /***/ 36762:
@@ -271793,23 +272017,11 @@ exports.requireExistModule = requireExistModule;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-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;
+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_PLUGINS = exports.HMR_SOCK_PATH = exports.ENTRY_NAME_PATTERN = exports.API_DIR = void 0;
 
-/**
- * alias to src directory
- */
-const INTERNAL_SRC_ALIAS = '@_modern_js_src';
-/**
- * alias to node_modules/.modern-js
- */
-
-exports.INTERNAL_SRC_ALIAS = INTERNAL_SRC_ALIAS;
-const INTERNAL_DIR_ALAIS = '@_modern_js_internal';
 /**
  * hmr socket connect path
  */
-
-exports.INTERNAL_DIR_ALAIS = INTERNAL_DIR_ALAIS;
 const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 /**
  * route specification file
@@ -271853,17 +272065,11 @@ 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 specified folder
  */
 
-exports.HIDE_MODERN_JS_DIR = HIDE_MODERN_JS_DIR;
+exports.LOADABLE_STATS_FILE = LOADABLE_STATS_FILE;
 const API_DIR = 'api';
 exports.API_DIR = API_DIR;
 const SERVER_DIR = 'server';
@@ -271944,8 +272150,8 @@ const INTERNAL_PLUGINS = {
     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-garfish': {
+    cli: '@modern-js/plugin-garfish/cli'
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
@@ -272113,7 +272319,7 @@ const PLUGIN_SCHEMAS = {
       typeof: ['object', 'function']
     }
   }],
-  '@modern-js/plugin-micro-frontend': [{
+  '@modern-js/plugin-garfish': [{
     target: 'runtime.masterApp',
     schema: {
       type: ['object']
@@ -273093,6 +273299,20 @@ Object.keys(_nodeEnv).forEach(function (key) {
   });
 });
 
+var _wait = __webpack_require__(96649);
+
+Object.keys(_wait).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _wait[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _wait[key];
+    }
+  });
+});
+
 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; }
@@ -273835,13 +274055,14 @@ const prettyInstructions = (appContext, config) => {
   const {
     entrypoints,
     serverRoutes,
-    port
+    port,
+    existSrc
   } = appContext;
   const urls = getAddressUrls(config.dev.https && (0, _is.isDev)() ? 'https' : 'http', port);
-  const routes = serverRoutes.filter(route => route.entryName);
+  const routes = existSrc ? serverRoutes.filter(route => route.entryName) : serverRoutes;
   let message = 'App running at:\n\n';
 
-  if (isSingleEntry(entrypoints)) {
+  if (isSingleEntry(entrypoints) || !existSrc) {
     message += urls.map(({
       type,
       url
@@ -274065,6 +274286,25 @@ exports.createRuntimeExportsUtils = createRuntimeExportsUtils;
 
 /***/ }),
 
+/***/ 96649:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.wait = void 0;
+
+const wait = (time = 0) => new Promise(resolve => {
+  setTimeout(resolve, time);
+});
+
+exports.wait = wait;
+
+/***/ }),
+
 /***/ 31116:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -281096,6 +281336,9 @@ module.exports = JSON.parse('{"v0.8":{"start":"2012-06-25","end":"2014-07-31"},"
 /******/ 		return module.exports;
 /******/ 	}
 /******/ 	
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = __webpack_module_cache__;
+/******/ 	
 /************************************************************************/
 /******/ 	/* webpack/runtime/define property getters */
 /******/ 	(() => {
@@ -281135,214 +281378,12 @@ module.exports = JSON.parse('{"v0.8":{"start":"2012-06-25","end":"2014-07-31"},"
 /******/ 	})();
 /******/ 	
 /************************************************************************/
-var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be in strict mode.
-(() => {
-"use strict";
-var exports = __webpack_exports__;
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _path = _interopRequireDefault(__webpack_require__(71017));
-
-var _generatorUtils = __webpack_require__(89489);
-
-var _codesmithApiApp = __webpack_require__(83028);
-
-var _codesmithApiJson = __webpack_require__(54517);
-
-var _generatorCommon = __webpack_require__(50828);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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; }
-
-function isEmptyApiDir(apiDir) {
-  const files = _generatorUtils.fs.readdirSync(apiDir);
-
-  if (files.length === 0) {
-    return true;
-  }
-
-  return files.every(file => {
-    if (_generatorUtils.fs.statSync(_path.default.join(apiDir, file)).isDirectory()) {
-      const childFiles = _generatorUtils.fs.readdirSync(_path.default.join(apiDir, file));
-
-      return childFiles.length === 0;
-    }
-
-    return false;
-  });
-} // eslint-disable-next-line max-statements
-
-
-const handleTemplateFile = async (context, generator, appApi) => {
-  const jsonAPI = new _codesmithApiJson.JsonAPI(generator);
-  const ans = await appApi.getInputBySchema(_generatorCommon.BFFSchema, context.config);
-  const appDir = context.materials.default.basePath;
-
-  const apiDir = _path.default.join(appDir, 'api');
-
-  if (_generatorUtils.fs.existsSync(apiDir) && !isEmptyApiDir(apiDir)) {
-    const files = _generatorUtils.fs.readdirSync('api');
-
-    if (files.length > 0) {
-      generator.logger.warn("'api' is already exist"); // eslint-disable-next-line no-process-exit
-
-      process.exit(1);
-    }
-  }
-
-  const {
-    bffType,
-    framework
-  } = ans;
-  const language = (0, _generatorUtils.isTsProject)(appDir) ? _generatorCommon.Language.TS : _generatorCommon.Language.JS;
-
-  if (language === _generatorCommon.Language.JS && framework === _generatorCommon.Framework.Nest) {
-    generator.logger.warn('nest not support js project'); // eslint-disable-next-line no-process-exit
-
-    process.exit(1);
-  }
-
-  let updateInfo = {};
-
-  if (framework === _generatorCommon.Framework.Express || framework === _generatorCommon.Framework.Koa) {
-    updateInfo = {
-      [`devDependencies.@types/${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@types/${framework}`)}`
-    };
-  }
-
-  if (framework === _generatorCommon.Framework.Nest) {
-    updateInfo = {
-      'dependencies.@nestjs/core': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/core')}`,
-      'dependencies.@nestjs/common': `^${await (0, _generatorUtils.getPackageVersion)('@nestjs/common')}`
-    };
-
-    if (bffType === _generatorCommon.BFFType.Func) {
-      updateInfo['dependencies.express'] = `^${await (0, _generatorUtils.getPackageVersion)('express')}`;
-    }
-  } else {
-    updateInfo = _objectSpread(_objectSpread({}, updateInfo), {}, {
-      [`dependencies.${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(framework)}`
-    });
-  }
-
-  await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'package.json')), {
-    query: {},
-    update: {
-      $set: _objectSpread({
-        'dependencies.@modern-js/plugin-bff': `^${await (0, _generatorUtils.getPackageVersion)('@modern-js/plugin-bff')}`,
-        [`dependencies.@modern-js/plugin-${framework}`]: `^${await (0, _generatorUtils.getPackageVersion)(`@modern-js/plugin-${framework}`)}`
-      }, updateInfo)
-    }
-  });
-
-  if (language === _generatorCommon.Language.TS) {
-    const tsconfigJSON = (0, _generatorUtils.readTsConfigByFile)(_path.default.join(appDir, 'tsconfig.json'));
-
-    if (!(tsconfigJSON.include || []).includes('api')) {
-      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
-        query: {},
-        update: {
-          $set: {
-            include: [...(tsconfigJSON.include || []), 'api']
-          }
-        }
-      });
-    }
-  } else {
-    await appApi.forgeTemplate('templates/js-template/**/*', undefined, resourceKey => resourceKey.replace('templates/js-template/', 'api/').replace('.handlebars', `.${language}`));
-  }
-
-  if (bffType === _generatorCommon.BFFType.Func) {
-    if (language === _generatorCommon.Language.TS) {
-      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
-        query: {},
-        update: {
-          $set: {
-            'compilerOptions.paths.@api/*': ['./api/*']
-          }
-        }
-      });
-    }
-
-    await appApi.forgeTemplate('templates/function/base/*', undefined, resourceKey => resourceKey.replace('templates/function/base/', 'api/').replace('.handlebars', `.${language}`));
-    await appApi.forgeTemplate(`templates/function/info/*`, resourceKey => resourceKey.includes(language), resourceKey => resourceKey.replace('templates/function/info/', 'api/info/').replace('.handlebars', ``));
-    await appApi.forgeTemplate(`templates/function/app/${language}/${framework}.${language}.handlebars`, undefined, resourceKey => resourceKey.replace(`templates/function/app/${language}/${framework}.${language}.handlebars`, `api/_app.${language}`));
-  } else {
-    if (language === _generatorCommon.Language.TS) {
-      await jsonAPI.update(context.materials.default.get(_path.default.join(appDir, 'tsconfig.json')), {
-        query: {},
-        update: {
-          $set: {
-            'compilerOptions.paths.@api/*': ['./api/lambda/*']
-          }
-        }
-      });
-    }
-
-    await appApi.forgeTemplate(`templates/framework/lambda/*`, undefined, resourceKey => resourceKey.replace(`templates/framework/`, 'api/').replace('.handlebars', `.${language}`));
-    await appApi.forgeTemplate(`templates/framework/app/${framework}/**/*`, resourceKey => framework === _generatorCommon.Framework.Egg || framework === _generatorCommon.Framework.Koa ? resourceKey.includes(language) : true, resourceKey => resourceKey.replace(`templates/framework/app/${framework}/`, 'api/').replace('.handlebars', framework === _generatorCommon.Framework.Express ? `.${language}` : ''));
-  }
-
-  const appendTypeContent = _generatorCommon.FrameworkAppendTypeContent[framework];
-
-  if (appendTypeContent) {
-    const typePath = _path.default.join(appDir, 'src', 'modern-app-env.d.ts');
-
-    if (_generatorUtils.fs.existsSync(typePath)) {
-      const npmrc = _generatorUtils.fs.readFileSync(typePath, 'utf-8');
-
-      if (!npmrc.includes(appendTypeContent)) {
-        _generatorUtils.fs.writeFileSync(typePath, `${npmrc}${appendTypeContent}\n`, 'utf-8');
-      }
-    } else {
-      _generatorUtils.fs.ensureFileSync(typePath);
-
-      _generatorUtils.fs.writeFileSync(typePath, appendTypeContent, 'utf-8');
-    }
-  }
-};
-
-var _default = async (context, generator) => {
-  const appApi = new _codesmithApiApp.AppAPI(context, generator);
-  const {
-    locale
-  } = context.config;
-
-  _generatorCommon.i18n.changeLanguage({
-    locale
-  });
-
-  appApi.i18n.changeLanguage({
-    locale
-  });
-
-  if (!(await appApi.checkEnvironment())) {
-    // eslint-disable-next-line no-process-exit
-    process.exit(1);
-  }
-
-  generator.logger.debug(`start run @modern-js/bff-generator`);
-  generator.logger.debug(`context=${JSON.stringify(context)}`);
-  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
-  await handleTemplateFile(context, generator, appApi);
-  await appApi.runInstall();
-  generator.logger.debug(`forge @modern-js/bff-generator succeed `);
-};
-
-exports["default"] = _default;
-})();
-
-module.exports = __webpack_exports__;
+/******/ 	
+/******/ 	// module cache are used so entry inlining is disabled
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	var __webpack_exports__ = __webpack_require__(34701);
+/******/ 	module.exports = __webpack_exports__;
+/******/ 	
 /******/ })()
 ;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1",
+  "version": "1.2.2",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/js/node/main.js",
@@ -25,7 +25,7 @@
     "@modern-js/codesmith-api-app": "^1.0.7",
     "@modern-js/codesmith-api-json": "^1.0.7",
     "@modern-js/codesmith-tools": "^1.0.9",
-    "@modern-js/generator-common": "^1.3.1",
+    "@modern-js/generator-common": "^1.4.0",
     "@modern-js/generator-utils": "^1.2.1",
     "@types/jest": "^26",
     "@types/lodash": "^4.14.168",

package/templates/function/app/ts/nest.ts.handlebars

@@ -15,7 +15,9 @@ export class LoggerMiddleware implements NestMiddleware {
   }
 }
 
-@Module()
+@Module({
+  imports: []
+})
 export class AppModule {
   configure(consumer: MiddlewareConsumer) {
     consumer.apply(LoggerMiddleware).forRoutes('*');