@modern-js/repo-generator 0.0.0-canary-20220824070800 → 0.0.0-canary-20220830054020

package/dist/index.js

@@ -140400,18 +140400,14 @@ var require_runtimeExports2 = __commonJSMin((exports) => {
       return res;
     };
   };
-  exports.createRuntimeExportsUtils = memo((pwd = "", namespace, ts = false) => {
-    const entryExportFile = path_1.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : "index.js"}`);
-    const entryExportTsFile = path_1.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : "index.d.ts"}`);
+  exports.createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
+    const entryExportFile = path_1.default.join(pwd, `.runtime-exports/${namespace}.js`);
     const addExport = (statement) => {
       statement = (0, path_2.normalizeOutputPath)(statement);
       try {
         compiled_1.fs.ensureFileSync(entryExportFile);
-        compiled_1.fs.ensureFileSync(entryExportTsFile);
         if (!compiled_1.fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
           compiled_1.fs.appendFileSync(entryExportFile, `${statement}
-`);
-          ts && compiled_1.fs.appendFileSync(entryExportTsFile, `${statement.replace(".js", ".d")}
 `);
         }
       } catch {
@@ -140900,8 +140896,8 @@ var require_analyzeProject2 = __commonJSMin((exports) => {
   exports.isApiOnly = void 0;
   var path6 = __importStar(__require("path"));
   var compiled_1 = require_compiled2();
-  var isApiOnly = async (appDirectory) => {
-    const srcDir = path6.join(appDirectory, "src");
+  var isApiOnly = async (appDirectory, entryDir) => {
+    const srcDir = path6.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src");
     const existSrc = await compiled_1.fs.pathExists(srcDir);
     const options3 = (0, compiled_1.minimist)(process.argv.slice(2));
     return !existSrc || Boolean(options3["api-only"]);
@@ -140925,8 +140921,9 @@ var require_chainId2 = __commonJSMin((exports) => {
       LESS: "less",
       SASS: "sass",
       SVG: "svg",
-      SVG_INLINE: "svg-inline",
-      SVG_URL: "svg-url"
+      PUG: "pug",
+      TOML: "toml",
+      YAML: "yaml"
     },
     ONE_OF: {
       JS: "js",
@@ -140944,6 +140941,7 @@ var require_chainId2 = __commonJSMin((exports) => {
       SASS_MODULES: "sass-modules",
       SVG: "svg",
       SVG_URL: "svg-url",
+      SVG_ASSET: "svg-asset",
       SVG_INLINE: "svg-inline",
       ASSETS: "assets",
       ASSETS_URL: "assets-url",
@@ -140955,6 +140953,7 @@ var require_chainId2 = __commonJSMin((exports) => {
       SASS: "sass",
       LESS: "less",
       URL: "url",
+      PUG: "pug",
       FILE: "file",
       SVGR: "svgr",
       YAML: "yaml",
@@ -140985,7 +140984,8 @@ var require_chainId2 = __commonJSMin((exports) => {
       HTML_CROSS_ORIGIN: "html-cross-origin",
       MINI_CSS_EXTRACT: "mini-css-extract",
       REACT_FAST_REFRESH: "react-fast-refresh",
-      NODE_POLYFILL_PROVIDE: "node-polyfill-provide"
+      NODE_POLYFILL_PROVIDE: "node-polyfill-provide",
+      MODULE_DEPENDENCY_ERROR: "module-dependency-error"
     },
     MINIMIZER: {
       JS: "js",
@@ -141153,6 +141153,78 @@ var require_locale2 = __commonJSMin((exports) => {
   });
   exports.localeKeys = localeKeys3;
 });
+var require_package = __commonJSMin((exports) => {
+  "use strict";
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.getAvailableVersion = getAvailableVersion;
+  exports.isPackageDeprecated = isPackageDeprecated;
+  exports.isPackageExist = isPackageExist;
+  exports.semverDecrease = semverDecrease;
+  var _utils = require_dist2();
+  async function isPackageExist(packageName, registry) {
+    if (await (0, _utils.canUseNpm)()) {
+      const args = ["view", packageName, "version"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = await (0, _utils.execa)("npm", args);
+      return (0, _utils.stripAnsi)(result.stdout);
+    }
+    throw new Error("not found npm, please install npm before");
+  }
+  async function isPackageDeprecated(packageName, registry) {
+    if (await (0, _utils.canUseNpm)()) {
+      const args = ["view", packageName, "deprecated"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = await (0, _utils.execa)("npm", args);
+      return (0, _utils.stripAnsi)(result.stdout);
+    }
+    throw new Error("not found npm, please install npm before");
+  }
+  function semverDecrease(version4) {
+    const versionObj = _utils.semver.parse(version4, {
+      loose: true
+    });
+    if (!versionObj) {
+      throw new Error(`Version ${version4} is not valid semver`);
+    }
+    versionObj.build = [];
+    versionObj.prerelease = [];
+    versionObj.patch--;
+    const result = versionObj.format();
+    if (!_utils.semver.valid(result)) {
+      _utils.logger.debug(`Version ${result} is not valid semver`);
+      return version4;
+    }
+    return result;
+  }
+  async function getAvailableVersion(packageName, currentVersion, registry) {
+    let times = 5;
+    let version4 = currentVersion;
+    while (times) {
+      if (!await isPackageExist(`${packageName}@${version4}`, registry) || await isPackageDeprecated(`${packageName}@${version4}`, registry)) {
+        version4 = _utils.semver.inc(version4, "patch");
+        times--;
+        continue;
+      }
+      return version4;
+    }
+    times = 5;
+    while (times) {
+      version4 = semverDecrease(version4);
+      if (!await isPackageExist(`${packageName}@${version4}`, registry) || await isPackageDeprecated(`${packageName}@${version4}`, registry)) {
+        times--;
+        continue;
+      }
+      return version4;
+    }
+    return currentVersion;
+  }
+});
 var require_utils10 = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", {
@@ -141171,6 +141243,19 @@ var require_utils10 = __commonJSMin((exports) => {
       }
     });
   });
+  var _package = require_package();
+  Object.keys(_package).forEach(function(key) {
+    if (key === "default" || key === "__esModule")
+      return;
+    if (key in exports && exports[key] === _package[key])
+      return;
+    Object.defineProperty(exports, key, {
+      enumerable: true,
+      get: function() {
+        return _package[key];
+      }
+    });
+  });
 });
 var require_node8 = __commonJSMin((exports) => {
   "use strict";
@@ -141180,6 +141265,7 @@ var require_node8 = __commonJSMin((exports) => {
   var _exportNames = {
     getPackageVersion: true,
     getModernVersion: true,
+    getModernPluginVersion: true,
     getPackageManagerText: true,
     isTsProject: true,
     getPackageObj: true,
@@ -141189,6 +141275,7 @@ var require_node8 = __commonJSMin((exports) => {
     getModuleProjectPath: true,
     getMWAProjectPath: true,
     fs: true,
+    semver: true,
     execa: true,
     readTsConfigByFile: true,
     getPackageManager: true,
@@ -141230,6 +141317,7 @@ var require_node8 = __commonJSMin((exports) => {
   });
   exports.getAllPackages = getAllPackages;
   exports.getMWAProjectPath = getMWAProjectPath;
+  exports.getModernPluginVersion = getModernPluginVersion;
   exports.getModernVersion = getModernVersion;
   exports.getModuleProjectPath = getModuleProjectPath;
   Object.defineProperty(exports, "getPackageManager", {
@@ -141260,12 +141348,19 @@ var require_node8 = __commonJSMin((exports) => {
       return _utils.readTsConfigByFile;
     }
   });
+  Object.defineProperty(exports, "semver", {
+    enumerable: true,
+    get: function() {
+      return _utils.semver;
+    }
+  });
   exports.validatePackageName = validatePackageName;
   exports.validatePackagePath = validatePackagePath;
   var _path = _interopRequireDefault(__require("path"));
   var _utils = require_dist2();
   var _stripAnsi = require_strip_ansi4();
   var _locale = require_locale2();
+  var _package = require_package();
   var _utils2 = require_utils10();
   Object.keys(_utils2).forEach(function(key) {
     if (key === "default" || key === "__esModule")
@@ -141322,11 +141417,39 @@ var require_node8 = __commonJSMin((exports) => {
     module: "@modern-js/module-tools",
     monorepo: "@modern-js/monorepo-tools"
   };
-  async function getModernVersion(solution) {
+  async function getModernVersion(solution, registry) {
     const dep = SolutionDep[solution];
-    const modernVersion = await getPackageVersion(dep);
+    const modernVersion = await getPackageVersion(dep, registry);
     return modernVersion;
   }
+  async function getModernPluginVersion(solution, packageName, options3 = {}) {
+    const {
+      cwd = process.cwd(),
+      registry
+    } = options3;
+    const getLatetPluginVersion = async () => {
+      const version4 = await getPackageVersion(packageName, registry);
+      return version4;
+    };
+    if (!packageName.startsWith("@modern-js")) {
+      return getLatetPluginVersion();
+    }
+    const pkgPath = _path.default.join(__require.resolve(SolutionDep[solution], {
+      paths: [cwd]
+    }), "../../../../", "package.json");
+    if (_utils.fs.existsSync(pkgPath)) {
+      const pkgInfo = _utils.fs.readJSONSync(pkgPath);
+      const modernVersion = pkgInfo.version;
+      if (typeof modernVersion !== "string") {
+        return getLatetPluginVersion();
+      }
+      if (_utils.semver.lt(modernVersion, "1.15.0")) {
+        return getLatetPluginVersion();
+      }
+      return (0, _package.getAvailableVersion)(packageName, modernVersion, registry);
+    }
+    return getLatetPluginVersion();
+  }
   function getPackageManagerText(packageManager) {
     return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
   }
@@ -142347,6 +142470,7 @@ var require_utils12 = __commonJSMin((exports) => {
     value: true
   });
   exports.alreadyRepo = alreadyRepo;
+  exports.getGeneratorPath = getGeneratorPath2;
   exports.hasEnabledFunction = hasEnabledFunction;
   exports.readJson = void 0;
   var _path = _interopRequireDefault(__require("path"));
@@ -142396,6 +142520,14 @@ var require_utils12 = __commonJSMin((exports) => {
     }
     return false;
   }
+  function getGeneratorPath2(generator, distTag) {
+    if (process.env.CODESMITH_ENV === "development") {
+      return _path.default.dirname(__require.resolve(generator));
+    } else if (distTag) {
+      return `${generator}@${distTag}`;
+    }
+    return generator;
+  }
 });
 var require_mwa = __commonJSMin((exports) => {
   "use strict";
@@ -142457,13 +142589,15 @@ var require_mwa = __commonJSMin((exports) => {
     const ans = await appAPI.getInputBySchema(schema, UserConfig);
     const actionType = ans.actionType;
     const action2 = ans[actionType];
-    let generator = _generatorCommon.MWANewActionGenerators[actionType][action2];
+    const generator = (0, _utils.getGeneratorPath)(_generatorCommon.MWANewActionGenerators[actionType][action2], distTag);
     if (!generator) {
       throw new Error(`no valid option`);
     }
-    if (distTag) {
-      generator = `${generator}@${distTag}`;
-    }
+    const getMwaPluginVersion = (packageName) => {
+      return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.MWA, packageName, {
+        registry
+      });
+    };
     const devDependency = _generatorCommon.MWAActionFunctionsDevDependencies[action2];
     const dependency = _generatorCommon.MWAActionFunctionsDependencies[action2];
     const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
@@ -142471,10 +142605,10 @@ var require_mwa = __commonJSMin((exports) => {
       packageManager: UserConfig.packageManager || await (0, _generatorUtils.getPackageManager)(cwd)
     }, {
       devDependencies: devDependency ? {
-        [devDependency]: `^${await (0, _generatorUtils.getPackageVersion)(devDependency)}`
+        [devDependency]: `${await getMwaPluginVersion(devDependency)}`
       } : {},
       dependencies: dependency ? {
-        [dependency]: `^${await (0, _generatorUtils.getPackageVersion)(dependency)}`
+        [dependency]: `${await getMwaPluginVersion(dependency)}`
       } : {},
       appendTypeContent: _generatorCommon.MWAActionFunctionsAppendTypeContent[action2]
     });
@@ -142560,28 +142694,30 @@ var require_module = __commonJSMin((exports) => {
     const ans = await appAPI.getInputBySchema(schema, UserConfig);
     const actionType = ans.actionType;
     const action2 = ans[actionType];
-    let generator = _generatorCommon.ModuleNewActionGenerators[actionType] && _generatorCommon.ModuleNewActionGenerators[actionType][action2];
+    const generator = (0, _utils.getGeneratorPath)(_generatorCommon.ModuleNewActionGenerators[actionType][action2], distTag);
     if (!generator) {
       throw new Error(`no valid option`);
     }
-    if (distTag) {
-      generator = `${generator}@${distTag}`;
-    }
     const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action2];
     const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action2];
     const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action2];
+    const getModulePluginVersion = (packageName) => {
+      return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.Module, packageName, {
+        registry
+      });
+    };
     const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
       locale: UserConfig.locale || locale,
       packageManager: UserConfig.packageManager || await (0, _generatorUtils.getPackageManager)(cwd)
     }, {
       devDependencies: devDependency ? {
-        [devDependency]: `^${await (0, _generatorUtils.getPackageVersion)(devDependency)}`
+        [devDependency]: `${await getModulePluginVersion(devDependency)}`
       } : {},
       dependencies: dependency ? {
-        [dependency]: `^${await (0, _generatorUtils.getPackageVersion)(dependency)}`
+        [dependency]: `${await getModulePluginVersion(dependency)}`
       } : {},
       peerDependencies: peerDependency ? {
-        [peerDependency]: `^${await (0, _generatorUtils.getPackageVersion)(peerDependency)}`
+        [peerDependency]: `${await getModulePluginVersion(peerDependency)}`
       } : {}
     });
     const task = [{

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-canary-20220824070800",
+  "version": "0.0.0-canary-20220830054020",
   "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-20220824070800",
+    "@modern-js/base-generator": "0.0.0-canary-20220830054020",
     "@modern-js/codesmith": "^1.5.0",
     "@modern-js/codesmith-api-app": "^1.5.0",
-    "@modern-js/generator-common": "0.0.0-canary-20220824070800",
-    "@modern-js/generator-plugin": "0.0.0-canary-20220824070800",
-    "@modern-js/generator-utils": "0.0.0-canary-20220824070800",
-    "@modern-js/module-generator": "0.0.0-canary-20220824070800",
-    "@modern-js/monorepo-generator": "0.0.0-canary-20220824070800",
-    "@modern-js/mwa-generator": "0.0.0-canary-20220824070800",
-    "@modern-js/utils": "0.0.0-canary-20220824070800",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@modern-js/generator-common": "0.0.0-canary-20220830054020",
+    "@modern-js/generator-plugin": "0.0.0-canary-20220830054020",
+    "@modern-js/generator-utils": "0.0.0-canary-20220830054020",
+    "@modern-js/module-generator": "0.0.0-canary-20220830054020",
+    "@modern-js/monorepo-generator": "0.0.0-canary-20220830054020",
+    "@modern-js/mwa-generator": "0.0.0-canary-20220830054020",
+    "@modern-js/utils": "0.0.0-canary-20220830054020",
+    "@scripts/build": "0.0.0-canary-20220830054020",
+    "@scripts/jest-config": "0.0.0-canary-20220830054020",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",