@modern-js/generator-utils 2.3.0 → 2.3.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @modern-js/generator-utils
 
+## 2.3.1
+
+### Patch Changes
+
+- fb30bca: feat: add upgrade tools and command
+
+  feat: 增加升级工具和升级命令
+
+- f3fab28: feat: new command use solution version
+
+  feat: new 命令使用当前工程方案对应版本的插件
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [fb30bca]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/generator-common@2.3.1
+  - @modern-js/plugin-i18n@1.17.0
+
 ## 2.3.0
 
 ### Minor Changes

package/dist/js/modern/index.js

@@ -1,9 +1,11 @@
 import path from 'path';
-import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
+import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn, semver } from '@modern-js/utils';
+import { SolutionToolsMap } from '@modern-js/generator-common';
 import { stripAnsi } from "./utils/strip-ansi";
 import { i18n, localeKeys } from "./locale";
+import { getAvailableVersion } from "./utils/package";
 export * from "./utils";
-export { fs, execa, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from '@modern-js/utils';
+export { ora, fs, semver, execa, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from '@modern-js/utils';
 export { i18n } from "./locale";
 export async function getPackageVersion(packageName, registry) {
   const spinner = ora('Loading...').start();
@@ -48,16 +50,48 @@ export async function getPackageVersion(packageName, registry) {
   spinner.stop();
   throw new Error('not found npm, please install npm before');
 }
-const SolutionDep = {
-  mwa: '@modern-js/app-tools',
-  module: '@modern-js/module-tools',
-  monorepo: '@modern-js/monorepo-tools'
-};
-export async function getModernVersion(solution) {
-  const dep = SolutionDep[solution];
-  const modernVersion = await getPackageVersion(dep);
+export async function getModernVersion(solution, registry) {
+  const dep = SolutionToolsMap[solution];
+  const modernVersion = await getPackageVersion(dep, registry);
   return modernVersion;
 }
+export async function getModernPluginVersion(solution, packageName, options = {}) {
+  const {
+    cwd = process.cwd(),
+    registry
+  } = options;
+
+  const getLatetPluginVersion = async () => {
+    const version = await getPackageVersion(packageName, registry);
+    return version;
+  };
+
+  if (!packageName.startsWith('@modern-js')) {
+    return getLatetPluginVersion();
+  } // get project solution version
+
+
+  const pkgPath = path.join(require.resolve(SolutionToolsMap[solution], {
+    paths: [cwd]
+  }), '../../../../', 'package.json');
+
+  if (fs.existsSync(pkgPath)) {
+    const pkgInfo = fs.readJSONSync(pkgPath);
+    const modernVersion = pkgInfo.version;
+
+    if (typeof modernVersion !== 'string') {
+      return getLatetPluginVersion();
+    }
+
+    if (semver.lt(modernVersion, '1.15.0')) {
+      return getLatetPluginVersion();
+    }
+
+    return getAvailableVersion(packageName, modernVersion, registry);
+  }
+
+  return getLatetPluginVersion();
+}
 export function getPackageManagerText(packageManager) {
   return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
 }

package/dist/js/modern/utils/index.js

@@ -1 +1,2 @@
-export * from "./strip-ansi";
+export * from "./strip-ansi";
+export * from "./package";

package/dist/js/modern/utils/package.js

@@ -0,0 +1,88 @@
+import { canUseNpm, execa, logger, semver, stripAnsi } from '@modern-js/utils'; // 判断包是否存在
+
+export async function isPackageExist(packageName, registry) {
+  if (await canUseNpm()) {
+    const args = ['view', packageName, 'version'];
+
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+
+    const result = await execa('npm', args);
+    return stripAnsi(result.stdout);
+  }
+
+  throw new Error('not found npm, please install npm before');
+} // 判断包是否已经废弃
+
+export async function isPackageDeprecated(packageName, registry) {
+  if (await canUseNpm()) {
+    const args = ['view', packageName, 'deprecated'];
+
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+
+    const result = await execa('npm', args);
+    return stripAnsi(result.stdout);
+  }
+
+  throw new Error('not found npm, please install npm before');
+} // 降低包小版本号
+
+export function semverDecrease(version) {
+  const versionObj = semver.parse(version, {
+    loose: true
+  });
+
+  if (!versionObj) {
+    throw new Error(`Version ${version} is not valid semver`);
+  }
+
+  versionObj.build = [];
+  versionObj.prerelease = [];
+  versionObj.patch--;
+  const result = versionObj.format();
+
+  if (!semver.valid(result)) {
+    logger.debug(`Version ${result} is not valid semver`);
+    return version;
+  }
+
+  return result;
+}
+/**
+ * 插件存在 hotfix 版本，从 tools 版本号向上找当前插件版本号
+ * tools 存在 hotfix 版本，从 tools 版本号向下找当前插件版本号
+ * 限制只在当前小版本号范围内寻找
+ */
+
+export async function getAvailableVersion(packageName, currentVersion, registry) {
+  let times = 5;
+  let version = currentVersion;
+
+  while (times) {
+    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
+      version = semver.inc(version, 'patch');
+      times--;
+      continue;
+    }
+
+    return version;
+  }
+
+  times = 5;
+
+  while (times) {
+    version = semverDecrease(version);
+
+    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
+      times--;
+      continue;
+    }
+
+    return version;
+  }
+
+  return currentVersion;
+}

package/dist/js/node/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 var _exportNames = {
   getPackageVersion: true,
   getModernVersion: true,
+  getModernPluginVersion: true,
   getPackageManagerText: true,
   isTsProject: true,
   getPackageObj: true,
@@ -14,7 +15,9 @@ var _exportNames = {
   validatePackagePath: true,
   getModuleProjectPath: true,
   getMWAProjectPath: true,
+  ora: true,
   fs: true,
+  semver: true,
   execa: true,
   readTsConfigByFile: true,
   getPackageManager: true,
@@ -56,6 +59,7 @@ Object.defineProperty(exports, "fs", {
 });
 exports.getAllPackages = getAllPackages;
 exports.getMWAProjectPath = getMWAProjectPath;
+exports.getModernPluginVersion = getModernPluginVersion;
 exports.getModernVersion = getModernVersion;
 exports.getModuleProjectPath = getModuleProjectPath;
 Object.defineProperty(exports, "getPackageManager", {
@@ -80,12 +84,24 @@ Object.defineProperty(exports, "isReact18", {
   }
 });
 exports.isTsProject = isTsProject;
+Object.defineProperty(exports, "ora", {
+  enumerable: true,
+  get: function () {
+    return _utils.ora;
+  }
+});
 Object.defineProperty(exports, "readTsConfigByFile", {
   enumerable: true,
   get: function () {
     return _utils.readTsConfigByFile;
   }
 });
+Object.defineProperty(exports, "semver", {
+  enumerable: true,
+  get: function () {
+    return _utils.semver;
+  }
+});
 exports.validatePackageName = validatePackageName;
 exports.validatePackagePath = validatePackagePath;
 
@@ -93,10 +109,14 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
+var _generatorCommon = require("@modern-js/generator-common");
+
 var _stripAnsi = require("./utils/strip-ansi");
 
 var _locale = require("./locale");
 
+var _package = require("./utils/package");
+
 var _utils2 = require("./utils");
 
 Object.keys(_utils2).forEach(function (key) {
@@ -157,18 +177,51 @@ async function getPackageVersion(packageName, registry) {
   throw new Error('not found npm, please install npm before');
 }
 
-const SolutionDep = {
-  mwa: '@modern-js/app-tools',
-  module: '@modern-js/module-tools',
-  monorepo: '@modern-js/monorepo-tools'
-};
-
-async function getModernVersion(solution) {
-  const dep = SolutionDep[solution];
-  const modernVersion = await getPackageVersion(dep);
+async function getModernVersion(solution, registry) {
+  const dep = _generatorCommon.SolutionToolsMap[solution];
+  const modernVersion = await getPackageVersion(dep, registry);
   return modernVersion;
 }
 
+async function getModernPluginVersion(solution, packageName, options = {}) {
+  const {
+    cwd = process.cwd(),
+    registry
+  } = options;
+
+  const getLatetPluginVersion = async () => {
+    const version = await getPackageVersion(packageName, registry);
+    return version;
+  };
+
+  if (!packageName.startsWith('@modern-js')) {
+    return getLatetPluginVersion();
+  } // get project solution version
+
+
+  const pkgPath = _path.default.join(require.resolve(_generatorCommon.SolutionToolsMap[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`;
 }

package/dist/js/node/utils/index.js

@@ -15,4 +15,17 @@ Object.keys(_stripAnsi).forEach(function (key) {
       return _stripAnsi[key];
     }
   });
+});
+
+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];
+    }
+  });
 });

package/dist/js/node/utils/package.js

@@ -0,0 +1,103 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAvailableVersion = getAvailableVersion;
+exports.isPackageDeprecated = isPackageDeprecated;
+exports.isPackageExist = isPackageExist;
+exports.semverDecrease = semverDecrease;
+
+var _utils = require("@modern-js/utils");
+
+// 判断包是否存在
+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(version) {
+  const versionObj = _utils.semver.parse(version, {
+    loose: true
+  });
+
+  if (!versionObj) {
+    throw new Error(`Version ${version} 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 version;
+  }
+
+  return result;
+}
+/**
+ * 插件存在 hotfix 版本，从 tools 版本号向上找当前插件版本号
+ * tools 存在 hotfix 版本，从 tools 版本号向下找当前插件版本号
+ * 限制只在当前小版本号范围内寻找
+ */
+
+
+async function getAvailableVersion(packageName, currentVersion, registry) {
+  let times = 5;
+  let version = currentVersion;
+
+  while (times) {
+    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
+      version = _utils.semver.inc(version, 'patch');
+      times--;
+      continue;
+    }
+
+    return version;
+  }
+
+  times = 5;
+
+  while (times) {
+    version = semverDecrease(version);
+
+    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
+      times--;
+      continue;
+    }
+
+    return version;
+  }
+
+  return currentVersion;
+}

package/dist/types/index.d.ts

@@ -1,10 +1,14 @@
+import { Solution } from '@modern-js/generator-common';
 import { GeneratorContext } from '@modern-js/codesmith';
 export * from './utils';
-export { fs, execa, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from '@modern-js/utils';
+export { ora, fs, semver, execa, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from '@modern-js/utils';
 export { i18n } from './locale';
 export declare function getPackageVersion(packageName: string, registry?: string): Promise<string>;
-declare type Solution = 'mwa' | 'module' | 'monorepo';
-export declare function getModernVersion(solution: Solution): Promise<string>;
+export declare function getModernVersion(solution: Solution, registry?: string): Promise<string>;
+export declare function getModernPluginVersion(solution: Solution, packageName: string, options?: {
+  cwd?: string;
+  registry?: string;
+}): Promise<string>;
 export declare function getPackageManagerText(packageManager: 'pnpm' | 'yarn' | 'npm'): string;
 export declare function isTsProject(appDir: string): boolean;
 export declare function getPackageObj(context: GeneratorContext): Promise<any>;

package/dist/types/utils/index.d.ts

@@ -1 +1,2 @@
-export * from './strip-ansi';
+export * from './strip-ansi';
+export * from './package';

package/dist/types/utils/package.d.ts

@@ -0,0 +1,10 @@
+export declare function isPackageExist(packageName: string, registry?: string): Promise<string>;
+export declare function isPackageDeprecated(packageName: string, registry?: string): Promise<string>;
+export declare function semverDecrease(version: string): string;
+/**
+ * 插件存在 hotfix 版本，从 tools 版本号向上找当前插件版本号
+ * tools 存在 hotfix 版本，从 tools 版本号向下找当前插件版本号
+ * 限制只在当前小版本号范围内寻找
+ */
+
+export declare function getAvailableVersion(packageName: string, currentVersion: string, registry?: string): Promise<string>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.3.0",
+  "version": "2.3.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,13 +28,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/plugin-i18n": "1.16.0",
-    "@modern-js/utils": "1.16.0"
+    "@modern-js/plugin-i18n": "1.17.0",
+    "@modern-js/generator-common": "2.3.1",
+    "@modern-js/utils": "1.17.0"
   },
   "devDependencies": {
     "@modern-js/codesmith": "^1.5.0",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@scripts/build": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",