@modern-js/server-generator 3.5.0 → 3.6.1

package/dist/index.js

@@ -52688,12 +52688,12 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_path7 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var FS_RESOURCE = "_codesmith_core_fs_resource";
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
 var import_utils2 = require("@modern-js/utils");
 async function fsExists(path7) {
   try {
@@ -52704,13 +52704,13 @@ async function fsExists(path7) {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
 var import_ejs = __toESM(require_ejs());
 function renderString(template, fullData) {
   return import_ejs.default.render(template, fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
 var EjsAPI = class {
   async renderTemplate(templateResource, target, parameters = {}) {
     if (templateResource._type !== FS_RESOURCE) {
@@ -52742,7 +52742,7 @@ var EjsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
 var import_path2 = __toESM(require("path"));
 var import_utils4 = require("@modern-js/utils");
 var FsAPI = class {
@@ -52769,7 +52769,7 @@ var FsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
 var import_utils5 = require("@modern-js/utils");
 async function canUseGit() {
   try {
@@ -52844,7 +52844,7 @@ async function gitCommit(cwd, commitMessage) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
 var GitAPI = class {
   async isInGitRepo(cwd = this.generatorCore.outputPath) {
     const canUse = await canUseGit();
@@ -52894,7 +52894,7 @@ var GitAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
 var import_handlebars = __toESM(require_lib());
 function renderString2(template, fullData, registers) {
   const helpers = {
@@ -52908,7 +52908,7 @@ function renderString2(template, fullData, registers) {
   return import_handlebars.default.compile(template)(fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
 var HandlebarsAPI = class {
   async registerHelp(helpers) {
     this.registers.helpers = {
@@ -52956,7 +52956,7 @@ var HandlebarsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
 var import_utils8 = require("@modern-js/utils");
 async function canUseNvm() {
   try {
@@ -53006,7 +53006,7 @@ async function canUsePnpm() {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
 var import_utils9 = require("@modern-js/utils");
 function execaWithStreamLog(command, args, options) {
   const promise = (0, import_utils9.execa)(command, args, {
@@ -53102,7 +53102,7 @@ async function pnpmInstall({ cwd, registryUrl, ignoreScripts, useNvm }) {
   throw new Error("please install pnpm first");
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
 var NpmAPI = class {
   npmInstall({ cwd, registryUrl, ignoreScripts }) {
     return npmInstall({
@@ -62686,10 +62686,10 @@ var Schema = (
   }()
 );
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var import_inquirer = __toESM(require_inquirer());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
 var import_lodash = require("@modern-js/utils/lodash");
 function validateSchema(schema) {
   const { type, properties } = schema;
@@ -62781,7 +62781,7 @@ function transformForm(schema, configValue = {}, validateMap, initValue) {
   return getQuestionFromSchema(schema, configValue, validateMap, initValue);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var compileRule = (rule, scope) => {
   const state = Schema.compile(rule, {
     $self: {},
@@ -62885,7 +62885,7 @@ async function prompt(schema, configValue = {}, validateMap, initValue) {
   return answers;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
 var CLIReader = class {
   getAnswers() {
     return this.answers;
@@ -62914,7 +62914,7 @@ var CLIReader = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var import_utils13 = require("@modern-js/utils");
 var import_lodash5 = require("@modern-js/utils/lodash");
 var import_comment_json = __toESM(require_src2());
@@ -62983,7 +62983,7 @@ var I18n = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
 var EN_LOCALE = {
   environment: {
     node_version: "please upgrade node to lts version",
@@ -63010,7 +63010,7 @@ var EN_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
 var ZH_LOCALE = {
   environment: {
     node_version: "请升级 Node 版本至 LIS",
@@ -63037,14 +63037,14 @@ var ZH_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
 var i18n = new I18n();
 var localeKeys = i18n.init("zh", {
   zh: ZH_LOCALE,
   en: EN_LOCALE
 });
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
 var import_path4 = __toESM(require("path"));
 var import_utils12 = require("@modern-js/utils");
 var NODE_MAJOR_VERSION_MAP = {
@@ -63092,7 +63092,7 @@ async function checkUseNvm(cwd, logger2) {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
 var import_lodash4 = require("@modern-js/utils/lodash");
 function transformInquirerSchema(questions, configValue = {}, validateMap = {}, initValue = {}) {
   for (const question of questions) {
@@ -63120,7 +63120,7 @@ function transformInquirerSchema(questions, configValue = {}, validateMap = {},
   return questions;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var AppAPI = class {
   async checkEnvironment(nodeVersion) {
     if (import_utils13.semver.lt(process.versions.node, nodeVersion || "12.22.12")) {
@@ -63352,11 +63352,11 @@ var AppAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
 var import_comment_json2 = __toESM(require_src2());
 var declarationUpdate = __toESM(require_dist());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/utils/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/utils/index.js
 async function editJson(generatorCore, resource, getNewJsonValue) {
   const originJsonValue = await resource.value();
   const newJsonString = await getNewJsonValue(originJsonValue.content);
@@ -63369,7 +63369,7 @@ async function editJson(generatorCore, resource, getNewJsonValue) {
   return newJsonString;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
 var JsonAPI = class {
   async get(resource) {
     const originJsonValue = await resource.value();
@@ -63381,27 +63381,27 @@ var JsonAPI = class {
       throw new Error("resource content is not a legal json");
     }
   }
-  async extend(resource, obj) {
+  async extend(resource, obj, endWithNewLine = false) {
     await editJson(this.generatorCore, resource, async () => {
       const originJsonValue = await resource.value();
       try {
         const origin = import_comment_json2.default.parse(originJsonValue.content);
         const newObj = import_comment_json2.default.assign(origin, obj);
         const jsonIntent = 2;
-        return import_comment_json2.default.stringify(newObj, void 0, jsonIntent);
+        return import_comment_json2.default.stringify(newObj, void 0, jsonIntent) + (endWithNewLine ? "\n" : "");
       } catch (e) {
         this.generatorCore.logger.debug("[JSON API] parse json error:", e);
         throw new Error("resource content is not a legal json");
       }
     });
   }
-  async update(resource, operation) {
+  async update(resource, operation, endWithNewLine = false) {
     await editJson(this.generatorCore, resource, (text) => {
       try {
         const jsonContent = import_comment_json2.default.parse(text);
         declarationUpdate.query(jsonContent, operation.query, operation.update);
         const jsonIntent = 2;
-        return Promise.resolve(import_comment_json2.default.stringify(jsonContent, void 0, jsonIntent));
+        return Promise.resolve(import_comment_json2.default.stringify(jsonContent, void 0, jsonIntent) + (endWithNewLine ? "\n" : ""));
       } catch (e) {
         this.generatorCore.logger.debug("[JSON API] parse json error:", e);
         throw new Error("resource content is not a legal json");
@@ -63830,7 +63830,7 @@ async function getModernPluginVersion(solution, packageName, options = {
     const version = await getPackageVersion(`${packageName}@${tag || distTag || "latest"}`, registry2);
     return version;
   };
-  if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
+  if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck") || packageName.includes("eslint-config")) {
     return getLatetPluginVersion("latest");
   }
   let pkgPath = import_path6.default.join(require.resolve(SolutionToolsMap[solution], {
@@ -63928,7 +63928,8 @@ var handleTemplateFile = async (context, generator, appApi) => {
               include: [...tsconfigJSON.include || [], "server"]
             }
           }
-        }
+        },
+        true
       );
     }
   }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0",
+  "version": "3.6.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -24,21 +24,21 @@
     "/dist/index.js"
   ],
   "dependencies": {
-    "@modern-js/utils": "2.59.0"
+    "@modern-js/utils": "2.60.1"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.4.1",
-    "@modern-js/codesmith-api-app": "2.4.1",
-    "@modern-js/codesmith-api-json": "2.4.1",
+    "@modern-js/codesmith": "2.4.2",
+    "@modern-js/codesmith-api-app": "2.4.2",
+    "@modern-js/codesmith-api-json": "2.4.2",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-common": "3.5.0",
-    "@modern-js/generator-utils": "3.5.0",
-    "@modern-js/dependence-generator": "3.5.0",
-    "@scripts/build": "2.59.0",
-    "@scripts/jest-config": "2.59.0"
+    "@modern-js/dependence-generator": "3.6.1",
+    "@modern-js/generator-utils": "3.6.1",
+    "@scripts/build": "2.60.1",
+    "@modern-js/generator-common": "3.6.1",
+    "@scripts/jest-config": "2.60.1"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -95,6 +95,7 @@ const handleTemplateFile = async (
             },
           },
         },
+        true,
       );
     }
   }

package/templates/base-template/js/server/.eslintrc.js.handlebars

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-};

package/templates/base-template/ts/server/.eslintrc.js.handlebars

@@ -1,8 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: require.resolve('../tsconfig.json'),
-  },
-};