@modern-js/server-generator 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/index.js

@@ -34990,7 +34990,7 @@ var require_is = __commonJSMin((exports) => {
 var require_compatRequire = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.cleanRequireCache = exports.requireExistModule = exports.compatRequire = void 0;
+  exports.cleanRequireCache = exports.requireExistModule = exports.dynamicImport = exports.compatRequire = void 0;
   var findExists_1 = require_findExists();
   var compatRequire = (filePath, interop = true) => {
     const mod = __require(filePath);
@@ -34998,6 +34998,7 @@ var require_compatRequire = __commonJSMin((exports) => {
     return rtnESMDefault ? mod.default : mod;
   };
   exports.compatRequire = compatRequire;
+  exports.dynamicImport = new Function("modulePath", "return import(modulePath)");
   var requireExistModule = (filename, opt) => {
     const final = {
       extensions: [".ts", ".js"],
@@ -35044,6 +35045,7 @@ var require_constants = __commonJSMin((exports) => {
     "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
     "@modern-js/module-tools": "@modern-js/module-tools/cli",
     "@modern-js/module-tools-v2": "@modern-js/module-tools-v2",
+    "@modern-js/doc-tools": "@modern-js/doc-tools",
     "@modern-js/runtime": "@modern-js/runtime/cli",
     "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
     "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
@@ -36554,7 +36556,7 @@ var init_zh = __esmMin(() => {
       element: {
         self: "\u521B\u5EFA\u5DE5\u7A0B\u5143\u7D20",
         entry: "\u65B0\u5EFA\u300C\u5E94\u7528\u5165\u53E3\u300D",
-        server: "\u65B0\u5EFA\u300CServer \u81EA\u5B9A\u4E49\u300D\u6E90\u7801\u76EE\u5F55"
+        server: "\u65B0\u5EFA\u300C\u81EA\u5B9A\u4E49 Web Server\u300D\u6E90\u7801\u76EE\u5F55"
       },
       refactor: {
         self: "\u81EA\u52A8\u91CD\u6784",
@@ -36645,7 +36647,7 @@ var init_en = __esmMin(() => {
       element: {
         self: "Create project element",
         entry: 'New "entry"',
-        server: 'New "Server Custom" source code directory'
+        server: 'New "Custom Web Server" source code directory'
       },
       refactor: {
         self: "Automatic refactor",
@@ -37938,8 +37940,10 @@ var require_node = __commonJSMin((exports) => {
     return obj && obj.__esModule ? obj : { default: obj };
   }
   async function getPackageVersion2(packageName, registry2) {
-    const spinner = (0, _utils.ora)("Loading...").start();
-    spinner.color = "yellow";
+    const spinner = (0, _utils.ora)({
+      text: "Load Generator...",
+      spinner: "runner"
+    }).start();
     if (await (0, _utils.canUsePnpm)()) {
       const args = ["info", packageName, "version"];
       if (registry2) {
@@ -37984,7 +37988,7 @@ var require_node = __commonJSMin((exports) => {
       distTag
     } = options3;
     const getLatetPluginVersion = async (tag) => {
-      const version5 = await getPackageVersion2(`${packageName}@${tag || distTag}`, registry2);
+      const version5 = await getPackageVersion2(`${packageName}@${tag || distTag || "latest"}`, registry2);
       return version5;
     };
     if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
@@ -37999,9 +38003,6 @@ var require_node = __commonJSMin((exports) => {
       if (typeof modernVersion !== "string") {
         return getLatetPluginVersion();
       }
-      if (_utils.semver.lt(modernVersion, "1.15.0")) {
-        return getLatetPluginVersion();
-      }
       return (0, _package.getAvailableVersion)(packageName, modernVersion, registry2);
     }
     return getLatetPluginVersion();
@@ -77278,8 +77279,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       };
     }
     async runGenerator(generator, config = {}) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -77298,8 +77301,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       this.setCurrent(null);
     }
     async runSubGenerator(subGenerator, relativePwdPath = "", config) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -140287,9 +140292,6 @@ var require_inquirer2 = __commonJSMin((exports, module2) => {
     inquirer2.prompt.restoreDefaultPrompts();
   };
 });
-var require_lodash4 = __commonJSMin((exports, module2) => {
-  module2.exports = require_lodash();
-});
 function getObjKeyMap2(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
   var result = {};
@@ -140304,7 +140306,7 @@ function getObjKeyMap2(obj) {
 }
 var import_lodash5;
 var init_utils2 = __esmMin(() => {
-  import_lodash5 = __toESM2(require_lodash4());
+  import_lodash5 = __toESM2(require_lodash3());
 });
 var treeshaking_exports4 = {};
 __export2(treeshaking_exports4, {
@@ -140315,7 +140317,7 @@ var init_treeshaking4 = __esmMin(() => {
   init_classCallCheck();
   init_createClass();
   init_defineProperty();
-  import_lodash6 = __toESM2(require_lodash4());
+  import_lodash6 = __toESM2(require_lodash3());
   init_utils2();
   I18n2 = /* @__PURE__ */ function() {
     function I18n3() {
@@ -141722,7 +141724,8 @@ var handleTemplateFile = async (context, generator, appApi) => {
   const getServerPluginVersion = (packageName) => {
     return (0, import_generator_utils.getModernPluginVersion)(Solution.MWA, packageName, {
       registry: context.config.registry,
-      distTag: context.config.distTag
+      distTag: context.config.distTag,
+      cwd: context.materials.default.basePath
     });
   };
   await jsonAPI.update(context.materials.default.get(import_path.default.join(appDir, "package.json")), {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -21,17 +21,17 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "2.0.0",
-    "@modern-js/codesmith-api-app": "2.0.0",
-    "@modern-js/codesmith-api-json": "2.0.0",
+    "@modern-js/codesmith": "2.0.1",
+    "@modern-js/codesmith-api-app": "2.0.1",
+    "@modern-js/codesmith-api-json": "2.0.1",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.0.0-beta.1",
-    "@modern-js/generator-utils": "3.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@modern-js/generator-common": "3.0.0-beta.2",
+    "@modern-js/generator-utils": "3.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }