@modern-js/bff-generator 3.7.29 → 3.7.31

package/dist/index.js

@@ -86984,203 +86984,6 @@ var Language;
   Language2["JS"] = "js";
 })(Language || (Language = {}));
 
-// ../../generator-common/dist/esm-node/newAction/common/index.js
-var ActionType;
-(function(ActionType2) {
-  ActionType2["Function"] = "function";
-  ActionType2["Element"] = "element";
-  ActionType2["Refactor"] = "refactor";
-})(ActionType || (ActionType = {}));
-var ActionElement;
-(function(ActionElement2) {
-  ActionElement2["Entry"] = "entry";
-  ActionElement2["Server"] = "server";
-})(ActionElement || (ActionElement = {}));
-var ActionFunction;
-(function(ActionFunction2) {
-  ActionFunction2["TailwindCSS"] = "tailwindcss";
-  ActionFunction2["BFF"] = "bff";
-  ActionFunction2["MicroFrontend"] = "micro_frontend";
-  ActionFunction2["I18n"] = "i18n";
-  ActionFunction2["StorybookV7"] = "storybookV7";
-  ActionFunction2["RuntimeApi"] = "runtimeApi";
-  ActionFunction2["SSG"] = "ssg";
-  ActionFunction2["Polyfill"] = "polyfill";
-  ActionFunction2["Proxy"] = "proxy";
-  ActionFunction2["SWC"] = "swc";
-  ActionFunction2["ModuleDoc"] = "module_doc";
-})(ActionFunction || (ActionFunction = {}));
-var ActionRefactor;
-(function(ActionRefactor2) {
-  ActionRefactor2["ReactRouter5"] = "react_router_5";
-})(ActionRefactor || (ActionRefactor = {}));
-
-// ../../generator-common/dist/esm-node/mwa/common.js
-var Framework;
-(function(Framework2) {
-  Framework2["Express"] = "express";
-  Framework2["Koa"] = "koa";
-})(Framework || (Framework = {}));
-var getFrameworkSchema = (_extra = {}) => {
-  return {
-    type: "string",
-    title: i18n2.t(localeKeys2.framework.self),
-    enum: Object.values(Framework).map((framework) => ({
-      value: framework,
-      label: i18n2.t(localeKeys2.framework[framework])
-    }))
-  };
-};
-var FrameworkAppendTypeContent = {
-  ["express"]: `/// <reference types='@modern-js/plugin-express/types' />`,
-  ["koa"]: `/// <reference types='@modern-js/plugin-koa/types' />`
-};
-
-// ../../generator-common/dist/esm-node/newAction/mwa/index.js
-var MWAActionTypes = [
-  ActionType.Element,
-  ActionType.Function,
-  ActionType.Refactor
-];
-var MWAActionFunctions = [
-  ActionFunction.TailwindCSS,
-  ActionFunction.BFF,
-  ActionFunction.SSG,
-  ActionFunction.SWC,
-  ActionFunction.MicroFrontend,
-  ActionFunction.Polyfill,
-  ActionFunction.Proxy,
-  ActionFunction.StorybookV7
-];
-var MWAActionElements = [
-  ActionElement.Entry,
-  ActionElement.Server
-];
-var MWAActionReactors = [
-  ActionRefactor.ReactRouter5
-];
-var MWAActionTypesMap = {
-  [ActionType.Element]: MWAActionElements,
-  [ActionType.Function]: MWAActionFunctions,
-  [ActionType.Refactor]: MWAActionReactors
-};
-var MWAActionFunctionsDevDependencies = {
-  [ActionFunction.SSG]: "@modern-js/plugin-ssg",
-  [ActionFunction.StorybookV7]: "@modern-js/storybook",
-  [ActionFunction.Proxy]: "@modern-js/plugin-proxy",
-  [ActionFunction.TailwindCSS]: "tailwindcss",
-  [ActionFunction.SWC]: "@modern-js/plugin-swc"
-};
-var MWAActionFunctionsDependencies = {
-  [ActionFunction.BFF]: "@modern-js/plugin-bff",
-  [ActionFunction.MicroFrontend]: "@modern-js/plugin-garfish",
-  [ActionFunction.TailwindCSS]: "@modern-js/plugin-tailwindcss",
-  [ActionFunction.Polyfill]: "@modern-js/plugin-polyfill"
-};
-var MWAActionFunctionsAppendTypeContent = {
-  [ActionFunction.MicroFrontend]: `/// <reference types='@modern-js/plugin-garfish/types' />`
-};
-var MWAActionRefactorDependencies = {
-  [ActionRefactor.ReactRouter5]: "@modern-js/plugin-router-v5"
-};
-var MWAActionReactorAppendTypeContent = {
-  [ActionRefactor.ReactRouter5]: `/// <reference types='@modern-js/plugin-router-v5/types' />`
-};
-var MWANewActionGenerators = {
-  [ActionType.Element]: {
-    [ActionElement.Entry]: "@modern-js/entry-generator",
-    [ActionElement.Server]: "@modern-js/server-generator"
-  },
-  [ActionType.Function]: {
-    [ActionFunction.TailwindCSS]: "@modern-js/tailwindcss-generator",
-    [ActionFunction.BFF]: "@modern-js/bff-generator",
-    [ActionFunction.MicroFrontend]: "@modern-js/dependence-generator",
-    [ActionFunction.StorybookV7]: "@modern-js/storybook-next-generator",
-    [ActionFunction.SSG]: "@modern-js/ssg-generator",
-    [ActionFunction.Polyfill]: "@modern-js/dependence-generator",
-    [ActionFunction.Proxy]: "@modern-js/dependence-generator",
-    [ActionFunction.SWC]: "@modern-js/dependence-generator"
-  },
-  [ActionType.Refactor]: {
-    [ActionRefactor.ReactRouter5]: "@modern-js/router-v5-generator"
-  }
-};
-var MWANewActionPluginName = {
-  [ActionType.Element]: {
-    [ActionElement.Server]: "serverPlugin"
-  },
-  [ActionType.Function]: {
-    [ActionFunction.TailwindCSS]: "tailwindcssPlugin",
-    [ActionFunction.BFF]: "bffPlugin",
-    [ActionFunction.MicroFrontend]: "garfishPlugin",
-    [ActionFunction.SSG]: "ssgPlugin",
-    [ActionFunction.Polyfill]: "polyfillPlugin",
-    [ActionFunction.Proxy]: "proxyPlugin",
-    [ActionFunction.SWC]: "swcPlugin"
-  },
-  [ActionType.Refactor]: {
-    [ActionRefactor.ReactRouter5]: "routerPlugin"
-  }
-};
-var MWANewActionPluginDependence = {
-  [ActionType.Element]: {
-    [ActionElement.Server]: "@modern-js/plugin-server"
-  },
-  [ActionType.Function]: {
-    [ActionFunction.TailwindCSS]: "@modern-js/plugin-tailwindcss",
-    [ActionFunction.BFF]: "@modern-js/plugin-bff",
-    [ActionFunction.MicroFrontend]: "@modern-js/plugin-garfish",
-    [ActionFunction.SSG]: "@modern-js/plugin-ssg",
-    [ActionFunction.Polyfill]: "@modern-js/plugin-polyfill",
-    [ActionFunction.Proxy]: "@modern-js/plugin-proxy",
-    [ActionFunction.SWC]: "@modern-js/plugin-swc"
-  },
-  [ActionType.Refactor]: {
-    [ActionRefactor.ReactRouter5]: "@modern-js/plugin-router-v5"
-  }
-};
-var BFFPluginName = {
-  [Framework.Express]: "expressPlugin",
-  [Framework.Koa]: "koaPlugin"
-};
-var BFFPluginDependence = {
-  [Framework.Express]: "@modern-js/plugin-express",
-  [Framework.Koa]: "@modern-js/plugin-koa"
-};
-
-// ../../generator-common/dist/esm-node/mwa/bff.js
-var BFFType;
-(function(BFFType2) {
-  BFFType2["Func"] = "func";
-  BFFType2["Framework"] = "framework";
-})(BFFType || (BFFType = {}));
-var getBFFTypeSchema = (_extra = {}) => {
-  return {
-    type: "string",
-    title: i18n2.t(localeKeys2.bff.bffType.self),
-    enum: Object.values(BFFType).map((bffType) => ({
-      value: bffType,
-      label: i18n2.t(localeKeys2.bff.bffType[bffType])
-    }))
-  };
-};
-var getBFFchemaProperties = (extra) => {
-  return {
-    bffType: getBFFTypeSchema(extra),
-    framework: getFrameworkSchema(extra)
-  };
-};
-var getBFFSchema = (extra = {}) => {
-  return {
-    type: "object",
-    properties: getBFFchemaProperties(extra)
-  };
-};
-var MWADefaultBffConfig = {
-  bffType: "func",
-  frameWork: Framework.Express
-};
-
 // ../../generator-utils/dist/esm/index.js
 var import_path5 = __toESM(require("path"));
 
@@ -88491,7 +88294,6 @@ function isEmptyApiDir(apiDir) {
 }
 var handleTemplateFile = (context, generator, appApi) => __async(void 0, null, function* () {
   const jsonAPI = new JsonAPI(generator);
-  const ans = yield appApi.getInputBySchemaFunc(getBFFSchema, context.config);
   const appDir = context.materials.default.basePath;
   const apiDir = import_path6.default.join(appDir, "api");
   if (import_fs_extra.default.existsSync(apiDir) && !isEmptyApiDir(apiDir)) {
@@ -88501,7 +88303,6 @@ var handleTemplateFile = (context, generator, appApi) => __async(void 0, null, f
       throw Error("The 'api' directory is already exist");
     }
   }
-  const { bffType, framework } = ans;
   const language = isTsProject(appDir) ? Language.TS : Language.JS;
   const getBffPluginVersion = (packageName) => {
     return getModernPluginVersion(Solution.MWA, packageName, {
@@ -88510,34 +88311,18 @@ var handleTemplateFile = (context, generator, appApi) => __async(void 0, null, f
       cwd: context.materials.default.basePath
     });
   };
-  context.config.bffPluginName = BFFPluginName[framework];
-  context.config.bffPluginDependence = BFFPluginDependence[framework];
-  let updateInfo = {};
-  if (framework === Framework.Express || framework === Framework.Koa) {
-    updateInfo = {
-      [`devDependencies.@types/${framework}`]: `~${yield getPackageVersion(`@types/${framework}`)}`
-    };
-  }
-  updateInfo = __spreadProps(__spreadValues({}, updateInfo), {
-    [`dependencies.${framework}`]: `~${yield getPackageVersion(
-      framework
-    )}`
-  });
   yield jsonAPI.update(
     context.materials.default.get(import_path6.default.join(appDir, "package.json")),
     {
       query: {},
       update: {
-        $set: __spreadValues({
+        $set: {
           "dependencies.@modern-js/plugin-bff": `${yield getBffPluginVersion(
             "@modern-js/plugin-bff"
           )}`,
-          [`dependencies.@modern-js/plugin-${framework}`]: `${yield getBffPluginVersion(
-            `@modern-js/plugin-${framework}`
-          )}`,
           "devDependencies.ts-node": "~10.8.1",
           "devDependencies.tsconfig-paths": "~3.14.1"
-        }, updateInfo)
+        }
       }
     },
     true
@@ -88559,81 +88344,24 @@ var handleTemplateFile = (context, generator, appApi) => __async(void 0, null, f
       );
     }
   }
-  if (bffType === BFFType.Func) {
-    if (language === Language.TS) {
-      yield jsonAPI.update(
-        context.materials.default.get(import_path6.default.join(appDir, "tsconfig.json")),
-        {
-          query: {},
-          update: {
-            $set: {
-              "compilerOptions.paths.@api/*": ["./api/*"]
-            }
+  if (language === Language.TS) {
+    yield jsonAPI.update(
+      context.materials.default.get(import_path6.default.join(appDir, "tsconfig.json")),
+      {
+        query: {},
+        update: {
+          $set: {
+            "compilerOptions.paths.@api/*": ["./api/lambda/*"]
           }
-        },
-        true
-      );
-    }
-    yield appApi.forgeTemplate(
-      "templates/function/base/*",
-      void 0,
-      (resourceKey) => resourceKey.replace("templates/function/base/", "api/").replace(".handlebars", `.${language}`)
-    );
-    yield appApi.forgeTemplate(
-      `templates/function/info/*`,
-      (resourceKey) => resourceKey.includes(language),
-      (resourceKey) => resourceKey.replace("templates/function/info/", "api/info/").replace(".handlebars", ``)
+        }
+      },
+      true
     );
-    yield appApi.forgeTemplate(
-      `templates/function/app/${language}/${framework}.${language}.handlebars`,
-      void 0,
-      (resourceKey) => resourceKey.replace(
-        `templates/function/app/${language}/${framework}.${language}.handlebars`,
-        `api/_app.${language}`
-      )
-    );
-  } else {
-    if (language === Language.TS) {
-      yield jsonAPI.update(
-        context.materials.default.get(import_path6.default.join(appDir, "tsconfig.json")),
-        {
-          query: {},
-          update: {
-            $set: {
-              "compilerOptions.paths.@api/*": ["./api/lambda/*"]
-            }
-          }
-        },
-        true
-      );
-    }
     yield appApi.forgeTemplate(
       `templates/framework/lambda/*`,
       void 0,
       (resourceKey) => resourceKey.replace(`templates/framework/`, "api/").replace(".handlebars", `.${language}`)
     );
-    yield appApi.forgeTemplate(
-      `templates/framework/app/${framework}/**/*`,
-      (resourceKey) => framework === Framework.Koa ? resourceKey.includes(language) : true,
-      (resourceKey) => resourceKey.replace(`templates/framework/app/${framework}/`, "api/").replace(
-        ".handlebars",
-        framework === Framework.Express ? `.${language}` : ""
-      )
-    );
-  }
-  const appendTypeContent = FrameworkAppendTypeContent[framework];
-  if (appendTypeContent && language === Language.TS) {
-    const typePath = import_path6.default.join(appDir, "src", "modern-app-env.d.ts");
-    if (import_fs_extra.default.existsSync(typePath)) {
-      const npmrc = import_fs_extra.default.readFileSync(typePath, "utf-8");
-      if (!npmrc.includes(appendTypeContent)) {
-        import_fs_extra.default.writeFileSync(typePath, `${npmrc}${appendTypeContent}
-`, "utf-8");
-      }
-    } else {
-      import_fs_extra.default.ensureFileSync(typePath);
-      import_fs_extra.default.writeFileSync(typePath, appendTypeContent, "utf-8");
-    }
   }
 });
 var src_default = (context, generator) => __async(void 0, null, function* () {
@@ -88664,13 +88392,7 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
       const appDir = context.materials.default.basePath;
       const configFile = yield getModernConfigFile(appDir);
       const isTS = configFile.endsWith("ts");
-      const {
-        pluginName,
-        bffPluginName,
-        pluginDependence,
-        bffPluginDependence,
-        shouldUsePluginNameExport
-      } = context.config;
+      const { pluginName, pluginDependence, shouldUsePluginNameExport } = context.config;
       console.info(
         import_chalk.default.green(`
 [INFO]`),
@@ -88685,33 +88407,23 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
             `import { ${pluginName} } from '${pluginDependence}';`
           )
         );
-        console.info(
-          import_chalk.default.yellow.bold(
-            `import { ${bffPluginName} } from '${bffPluginDependence}';`
-          )
-        );
       } else {
         console.info(
           import_chalk.default.yellow.bold(`import ${pluginName} from '${pluginDependence}';`)
         );
-        console.info(
-          import_chalk.default.yellow.bold(
-            `import ${bffPluginName} from '${bffPluginDependence}';`
-          )
-        );
       }
       if (isTS) {
         console.info(`
 export default defineConfig({
   ...,
-  plugins: [..., ${import_chalk.default.yellow.bold(`${pluginName}(), ${bffPluginName}()`)}],
+  plugins: [..., ${import_chalk.default.yellow.bold(`${pluginName}()`)}],
 });
 `);
       } else {
         console.info(`
 module.exports = {
   ...,
-  plugins: [..., ${import_chalk.default.yellow.bold(`${pluginName}(), ${bffPluginName}()`)}],
+  plugins: [..., ${import_chalk.default.yellow.bold(`${pluginName}()`)}],
 };
 `);
       }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.7.29",
+  "version": "3.7.31",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -32,9 +32,9 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-common": "3.7.29",
-    "@modern-js/generator-utils": "3.7.29",
-    "@modern-js/plugin-i18n": "2.67.4",
+    "@modern-js/generator-common": "3.7.31",
+    "@modern-js/generator-utils": "3.7.31",
+    "@modern-js/plugin-i18n": "2.67.6",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },

package/templates/framework/app/express/app.handlebars

@@ -1,9 +0,0 @@
-import express from 'express';
-
-const app = express();
-app.use(async (req, res, next) => {
-  console.info(`access url: ${req.url}`);
-  next();
-});
-
-export default app;

package/templates/framework/app/koa/app.js.handlebars

@@ -1,12 +0,0 @@
-import Koa from 'koa';
-import koaBody from 'koa-body';
-
-const app = new Koa();
-app.use(async (ctx, next) => {
-  console.info(`access url: ${ctx.url}`);
-  await next();
-});
-
-app.use(koaBody());
-
-export default app;

package/templates/framework/app/koa/app.ts.handlebars

@@ -1,12 +0,0 @@
-import Koa, { Context } from 'koa';
-import koaBody from 'koa-body';
-
-const app = new Koa();
-app.use(async (ctx: Context, next) => {
-  console.info(`access url: ${ctx.url}`);
-  await next();
-});
-
-app.use(koaBody());
-
-export default app;

package/templates/function/app/js/express.js.handlebars

@@ -1,8 +0,0 @@
-import { hook } from '@modern-js/runtime/server';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware(async (req, res, next) => {
-    console.info(`access url: ${req.url}`);
-    next();
-  });
-});

package/templates/function/app/js/koa.js.handlebars

@@ -1,8 +0,0 @@
-import { hook } from '@modern-js/runtime/server';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware(async (ctx, next) => {
-    console.info(`access url: ${ctx.url}`);
-    await next();
-  });
-});

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

@@ -1,9 +0,0 @@
-import { hook } from '@modern-js/runtime/server';
-import { Request, Response, NextFunction } from 'express';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware(async (req: Request, res: Response, next: NextFunction) => {
-    console.info(`access url: ${req.url}`);
-    next();
-  });
-});

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

@@ -1,9 +0,0 @@
-import { hook } from '@modern-js/runtime/server';
-import { Context, Next } from 'koa';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware(async (ctx: Context, next: Next) => {
-    console.info(`access url: ${ctx.url}`);
-    await next();
-  });
-});

package/templates/function/base/index.handlebars

@@ -1,7 +0,0 @@
-export default async () => ({
-  message: 'Hello Modern.js',
-});
-
-export const post = async () => ({
-  message: 'Hello Modern.js',
-});

package/templates/function/info/[type].js.handlebars

@@ -1,18 +0,0 @@
-export default async (type, { query }) => {
-  const { username } = query;
-  return {
-    type,
-    username,
-    message: 'Hello Modern.js',
-  };
-};
-
-export const post = async (type, { query, data }) => {
-  const { username } = query;
-  const { message } = data;
-  return Promise.resolve({
-    type,
-    username,
-    message: `Hello Modern.js. Your message: ${message}`,
-  });
-};

package/templates/function/info/[type].ts.handlebars

@@ -1,24 +0,0 @@
-type UserQuery = { username: string };
-type UserPostData = { message: string };
-
-export default async (type: string, { query }: { query: UserQuery }) => {
-  const { username } = query;
-  return {
-    type,
-    username,
-    message: 'Hello Modern.js',
-  };
-};
-
-export const post = async (
-  type: string,
-  { query, data }: { query: UserQuery; data: UserPostData },
-) => {
-  const { username } = query;
-  const { message } = data;
-  return Promise.resolve({
-    type,
-    username,
-    message: `Hello Modern.js. Your message: ${message}`,
-  });
-};