@modern-js/repo-generator 0.0.0-canary-20221010130822 → 0.0.0-canary-20221011062930

package/dist/index.js

@@ -130418,23 +130418,17 @@ var require_compatRequire2 = __commonJSMin((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.cleanRequireCache = exports.requireExistModule = exports.compatRequire = void 0;
   var findExists_1 = require_findExists2();
-  var compatRequire = (filePath, interop = true) => {
+  var compatRequire = (filePath) => {
     const mod = __require(filePath);
-    const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
-    return rtnESMDefault ? mod.default : mod;
+    return (mod === null || mod === void 0 ? void 0 : mod.__esModule) ? mod.default : mod;
   };
   exports.compatRequire = compatRequire;
-  var requireExistModule = (filename, opt) => {
-    const final = {
-      extensions: [".ts", ".js"],
-      interop: true,
-      ...opt
-    };
-    const exist = (0, findExists_1.findExists)(final.extensions.map((ext) => `${filename}${ext}`));
+  var requireExistModule = (filename, extensions = [".ts", ".js"]) => {
+    const exist = (0, findExists_1.findExists)(extensions.map((ext) => `${filename}${ext}`));
     if (!exist) {
       return null;
     }
-    return (0, exports.compatRequire)(exist, final.interop);
+    return (0, exports.compatRequire)(exist);
   };
   exports.requireExistModule = requireExistModule;
   var cleanRequireCache = (filelist) => {
@@ -130467,7 +130461,6 @@ var require_constants6 = __commonJSMin((exports) => {
     "@modern-js/app-tools": { cli: "@modern-js/app-tools/cli" },
     "@modern-js/monorepo-tools": { cli: "@modern-js/monorepo-tools/cli" },
     "@modern-js/module-tools": { cli: "@modern-js/module-tools/cli" },
-    "@modern-js/module-tools-v2": { cli: "@modern-js/module-tools-v2" },
     "@modern-js/runtime": { cli: "@modern-js/runtime/cli" },
     "@modern-js/plugin-less": { cli: "@modern-js/plugin-less/cli" },
     "@modern-js/plugin-sass": { cli: "@modern-js/plugin-sass/cli" },
@@ -130772,10 +130765,13 @@ var require_getPort2 = __commonJSMin((exports) => {
   var net_1 = __importDefault(__require("net"));
   var compiled_1 = require_compiled2();
   var logger_1 = require_logger4();
-  var getPort = async (port, tryLimits = 20) => {
+  var getPort = async (port, { tryLimits = 20, strictPort = false } = {}) => {
     if (typeof port === "string") {
       port = parseInt(port, 10);
     }
+    if (strictPort) {
+      tryLimits = 1;
+    }
     const original = port;
     let found = false;
     let attempts = 0;
@@ -130802,7 +130798,11 @@ var require_getPort2 = __commonJSMin((exports) => {
       }
     }
     if (port !== original) {
-      logger_1.logger.info(compiled_1.chalk.red(`Something is already running on port ${original}. ${compiled_1.chalk.yellow(`Use port ${port} instead.`)}`));
+      if (strictPort) {
+        throw new Error(`Port "${original}" is occupied, please choose another one.`);
+      } else {
+        logger_1.logger.info(compiled_1.chalk.red(`Something is already running on port ${original}. ${compiled_1.chalk.yellow(`Use port ${port} instead.`)}`));
+      }
     }
     return port;
   };
@@ -134519,6 +134519,7 @@ var PluginInputContext = /* @__PURE__ */ function() {
   function PluginInputContext2(inputs) {
     _classCallCheck(this, PluginInputContext2);
     _defineProperty(this, "inputValue", {});
+    _defineProperty(this, "defaultConfig", {});
     _defineProperty(this, "inputs", []);
     _defineProperty(this, "extendInputMap", {});
     _defineProperty(this, "extendOptionMap", {});
@@ -134533,7 +134534,8 @@ var PluginInputContext = /* @__PURE__ */ function() {
         setInput: this.setInput.bind(this),
         addOptionBefore: this.addOptionBefore.bind(this),
         addOptionAfter: this.addOptionAfter.bind(this),
-        setInputValue: this.setInputValue.bind(this)
+        setInputValue: this.setInputValue.bind(this),
+        setDefaultConfig: this.setDefualtConfig.bind(this)
       };
     }
   }, {
@@ -134843,6 +134845,11 @@ var PluginInputContext = /* @__PURE__ */ function() {
     value: function setInputValue(value) {
       this.inputValue = value;
     }
+  }, {
+    key: "setDefualtConfig",
+    value: function setDefualtConfig(value) {
+      this.defaultConfig = value;
+    }
   }]);
   return PluginInputContext2;
 }();
@@ -135431,11 +135438,28 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
       }
       return result;
     }
+  }, {
+    key: "getDefaultConfig",
+    value: function getDefaultConfig() {
+      var result = {};
+      var _iterator3 = _createForOfIteratorHelper(this.plugins), _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done; ) {
+          var info = _step3.value;
+          result = (0, import_lodash7.merge)(result, info.context.inputContext.defaultConfig);
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      return result;
+    }
   }, {
     key: "installPlugins",
     value: function() {
       var _installPlugins2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee3(solution, inputData) {
-        var plugins, plugin, _iterator3, _step3, info;
+        var plugins, plugin, _iterator4, _step4, info;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -135457,17 +135481,17 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
                 return installPlugins(plugins, inputData.registry);
               case 6:
                 this.plugins = _context3.sent;
-                _iterator3 = _createForOfIteratorHelper(this.plugins);
+                _iterator4 = _createForOfIteratorHelper(this.plugins);
                 try {
-                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done; ) {
-                    info = _step3.value;
+                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done; ) {
+                    info = _step4.value;
                     info.context = new PluginContext(SolutionSchemas[solution], inputData.locale);
                     info.module(info.context.context);
                   }
                 } catch (err) {
-                  _iterator3.e(err);
+                  _iterator4.e(err);
                 } finally {
-                  _iterator3.f();
+                  _iterator4.f();
                 }
               case 9:
               case "end":
@@ -135485,20 +135509,20 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
     key: "getGitMessage",
     value: function getGitMessage() {
       var result = "";
-      var _iterator4 = _createForOfIteratorHelper(this.plugins), _step4;
+      var _iterator5 = _createForOfIteratorHelper(this.plugins), _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done; ) {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done; ) {
           var _info$context;
-          var info = _step4.value;
+          var info = _step5.value;
           if ((_info$context = info.context) !== null && _info$context !== void 0 && _info$context.gitAPI.gitMessage) {
             var _info$context2;
             result = ((_info$context2 = info.context) === null || _info$context2 === void 0 ? void 0 : _info$context2.gitAPI.gitMessage) || "";
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return result;
     }
@@ -135506,7 +135530,7 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
     key: "handleForged",
     value: function() {
       var _handleForged = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee4(solution, basePath, inputData, projectPath, generatorCore) {
-        var generatorPlugin, restData, _iterator5, _step5, _info$context3, _info$context4, info, onForgedFunc, _iterator6, _step6, _info$context5, _info, afterForged;
+        var generatorPlugin, restData, _iterator6, _step6, _info$context3, _info$context4, info, onForgedFunc, _iterator7, _step7, _info$context5, _info, afterForged;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -135522,15 +135546,15 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
                 }
                 return _context4.abrupt("return");
               case 5:
-                _iterator5 = _createForOfIteratorHelper(this.plugins);
+                _iterator6 = _createForOfIteratorHelper(this.plugins);
                 _context4.prev = 6;
-                _iterator5.s();
+                _iterator6.s();
               case 8:
-                if ((_step5 = _iterator5.n()).done) {
+                if ((_step6 = _iterator6.n()).done) {
                   _context4.next = 17;
                   break;
                 }
-                info = _step5.value;
+                info = _step6.value;
                 (_info$context3 = info.context) === null || _info$context3 === void 0 ? void 0 : _info$context3.handlePrepareContext(generatorCore, solution, import_path2.default.join(basePath, projectPath), import_path2.default.join(info.templatePath, "templates"), restData);
                 onForgedFunc = (_info$context4 = info.context) === null || _info$context4 === void 0 ? void 0 : _info$context4.lifeCycleFuncMap[LifeCycle.OnForged];
                 if (!(onForgedFunc && (0, import_lodash7.isFunction)(onForgedFunc))) {
@@ -135548,21 +135572,21 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
               case 19:
                 _context4.prev = 19;
                 _context4.t0 = _context4["catch"](6);
-                _iterator5.e(_context4.t0);
+                _iterator6.e(_context4.t0);
               case 22:
                 _context4.prev = 22;
-                _iterator5.f();
+                _iterator6.f();
                 return _context4.finish(22);
               case 25:
-                _iterator6 = _createForOfIteratorHelper(this.plugins);
+                _iterator7 = _createForOfIteratorHelper(this.plugins);
                 _context4.prev = 26;
-                _iterator6.s();
+                _iterator7.s();
               case 28:
-                if ((_step6 = _iterator6.n()).done) {
+                if ((_step7 = _iterator7.n()).done) {
                   _context4.next = 36;
                   break;
                 }
-                _info = _step6.value;
+                _info = _step7.value;
                 afterForged = (_info$context5 = _info.context) === null || _info$context5 === void 0 ? void 0 : _info$context5.lifeCycleFuncMap[LifeCycle.AfterForged];
                 if (!(afterForged && (0, import_lodash7.isFunction)(afterForged))) {
                   _context4.next = 34;
@@ -135579,10 +135603,10 @@ var GeneratorPlugin = /* @__PURE__ */ function() {
               case 38:
                 _context4.prev = 38;
                 _context4.t1 = _context4["catch"](26);
-                _iterator6.e(_context4.t1);
+                _iterator7.e(_context4.t1);
               case 41:
                 _context4.prev = 41;
-                _iterator6.f();
+                _iterator7.f();
                 return _context4.finish(41);
               case 44:
                 if (this.event) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-canary-20221010130822",
+  "version": "0.0.0-canary-20221011062930",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,18 +23,18 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/base-generator": "0.0.0-canary-20221010130822",
+    "@modern-js/base-generator": "0.0.0-canary-20221011062930",
     "@modern-js/codesmith": "^1.5.0",
     "@modern-js/codesmith-api-app": "^1.5.0",
-    "@modern-js/generator-common": "0.0.0-canary-20221010130822",
-    "@modern-js/generator-plugin": "0.0.0-canary-20221010130822",
-    "@modern-js/generator-utils": "0.0.0-canary-20221010130822",
-    "@modern-js/module-generator": "0.0.0-canary-20221010130822",
-    "@modern-js/monorepo-generator": "0.0.0-canary-20221010130822",
-    "@modern-js/mwa-generator": "0.0.0-canary-20221010130822",
-    "@modern-js/utils": "0.0.0-canary-20221010130822",
-    "@scripts/build": "0.0.0-canary-20221010130822",
-    "@scripts/jest-config": "0.0.0-canary-20221010130822",
+    "@modern-js/generator-common": "0.0.0-canary-20221011062930",
+    "@modern-js/generator-plugin": "0.0.0-canary-20221011062930",
+    "@modern-js/generator-utils": "0.0.0-canary-20221011062930",
+    "@modern-js/module-generator": "0.0.0-canary-20221011062930",
+    "@modern-js/monorepo-generator": "0.0.0-canary-20221011062930",
+    "@modern-js/mwa-generator": "0.0.0-canary-20221011062930",
+    "@modern-js/utils": "0.0.0-canary-20221011062930",
+    "@scripts/build": "0.0.0-canary-20221011062930",
+    "@scripts/jest-config": "0.0.0-canary-20221011062930",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",