@modern-js/generator-utils 3.0.0-beta.0 → 3.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @modern-js/generator-utils
 
+## 3.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin-i18n@2.0.0-beta.2
+  - @modern-js/generator-common@3.0.0-beta.2
+
+## 3.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/plugin-i18n@2.0.0-beta.1
+  - @modern-js/generator-common@3.0.0-beta.1
+
 ## 3.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn, semver } from '@modern-js/utils';
+import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
 import { SolutionToolsMap } from '@modern-js/generator-common';
 import { stripAnsi } from "./utils/strip-ansi";
 import { i18n, localeKeys } from "./locale";
@@ -8,45 +8,37 @@ export * from "./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();
-  spinner.color = 'yellow';
-
+  const spinner = ora({
+    text: 'Load Generator...',
+    spinner: 'runner'
+  }).start();
   if (await canUsePnpm()) {
     const args = ['info', packageName, 'version'];
-
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await execa('pnpm', args);
     spinner.stop();
     return stripAnsi(result.stdout);
   }
-
   if (await canUseYarn()) {
     const args = ['info', packageName, 'version', '--silent'];
-
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await execa('yarn', args);
     spinner.stop();
     return stripAnsi(result.stdout);
   }
-
   if (await canUseNpm()) {
     const args = ['view', packageName, 'version'];
-
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await execa('npm', args);
     spinner.stop();
     return stripAnsi(result.stdout);
   }
-
   spinner.stop();
   throw new Error('not found npm, please install npm before');
 }
@@ -63,36 +55,25 @@ export async function getModernPluginVersion(solution, packageName, options = {
     registry,
     distTag
   } = options;
-
-  const getLatetPluginVersion = async () => {
-    const version = await getPackageVersion(`${packageName}@${distTag}`, registry);
+  const getLatetPluginVersion = async tag => {
+    const version = await getPackageVersion(`${packageName}@${tag || distTag || 'latest'}`, registry);
     return version;
   };
-
   if (!packageName.startsWith('@modern-js') || packageName.includes('electron') || packageName.includes('codesmith') || packageName.includes('easy-form') || packageName.startsWith('@modern-js-reduck')) {
-    return getLatetPluginVersion();
-  } // get project solution version
-
-
+    return getLatetPluginVersion('latest');
+  }
+  // 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) {
@@ -113,7 +94,6 @@ export function validatePackageName(value, packages, options) {
   const {
     isMonorepoSubProject
   } = options;
-
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
       success: false,
@@ -122,7 +102,6 @@ export function validatePackageName(value, packages, options) {
       })
     };
   }
-
   return {
     success: true
   };
@@ -134,15 +113,12 @@ export function validatePackagePath(value, projectDir, options) {
     isTest
   } = options || {};
   let dir = 'apps';
-
   if (isMwa && isTest) {
     dir = 'examples';
   } else {
     dir = isPublic ? 'packages' : 'features';
   }
-
   const packageDir = path.resolve(projectDir || '', dir, value);
-
   if (fs.existsSync(packageDir)) {
     return {
       success: false,
@@ -151,7 +127,6 @@ export function validatePackagePath(value, projectDir, options) {
       })
     };
   }
-
   return {
     success: true
   };
@@ -160,17 +135,14 @@ export function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic
   if (isLocalPackages && packagePath) {
     return `${packagePath}/`;
   }
-
   if (isMonorepoSubProject && packagePath) {
     return `${isPublic ? 'packages' : 'features'}/${packagePath}/`;
   }
-
   return '';
 }
 export function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   if (isMonorepoSubProject && packagePath) {
     return `${isTest ? 'examples' : 'apps'}/${packagePath}/`;
   }
-
   return '';
 }

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

@@ -1,88 +1,74 @@
-import { canUseNpm, execa, logger, semver, stripAnsi } from '@modern-js/utils'; // 判断包是否存在
+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/modern/utils/strip-ansi.js

@@ -4,11 +4,9 @@ function ansiRegex({
   const pattern = ['[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)', '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'].join('|');
   return new RegExp(pattern, onlyFirst ? undefined : 'g');
 }
-
 export function stripAnsi(string) {
   if (typeof string !== 'string') {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
-
   return string.replace(ansiRegex(), '');
 }

package/dist/js/node/index.js

@@ -104,21 +104,13 @@ Object.defineProperty(exports, "semver", {
 });
 exports.validatePackageName = validatePackageName;
 exports.validatePackagePath = validatePackagePath;
-
 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) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -130,59 +122,47 @@ Object.keys(_utils2).forEach(function (key) {
     }
   });
 });
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function getPackageVersion(packageName, registry) {
-  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 (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await (0, _utils.execa)('pnpm', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
-
   if (await (0, _utils.canUseYarn)()) {
     const args = ['info', packageName, 'version', '--silent'];
-
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await (0, _utils.execa)('yarn', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
-
   if (await (0, _utils.canUseNpm)()) {
     const args = ['view', packageName, 'version'];
-
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-
     const result = await (0, _utils.execa)('npm', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
-
   spinner.stop();
   throw new Error('not found npm, please install npm before');
 }
-
 async function getModernVersion(solution, registry, distTag = 'latest') {
   const dep = _generatorCommon.SolutionToolsMap[solution];
   const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
   return modernVersion;
 }
-
 async function getModernPluginVersion(solution, packageName, options = {
   distTag: 'latest'
 }) {
@@ -191,63 +171,45 @@ async function getModernPluginVersion(solution, packageName, options = {
     registry,
     distTag
   } = options;
-
-  const getLatetPluginVersion = async () => {
-    const version = await getPackageVersion(`${packageName}@${distTag}`, registry);
+  const getLatetPluginVersion = async tag => {
+    const version = await getPackageVersion(`${packageName}@${tag || distTag || 'latest'}`, registry);
     return version;
   };
-
   if (!packageName.startsWith('@modern-js') || packageName.includes('electron') || packageName.includes('codesmith') || packageName.includes('easy-form') || packageName.startsWith('@modern-js-reduck')) {
-    return getLatetPluginVersion();
-  } // get project solution version
-
-
+    return getLatetPluginVersion('latest');
+  }
+  // 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`;
 }
-
 function isTsProject(appDir) {
   return _utils.fs.existsSync(_path.default.join(appDir, 'tsconfig.json'));
 }
-
 async function getPackageObj(context) {
   const pkgStr = (await context.materials.default.get(`package.json`).value()).content;
   return JSON.parse(pkgStr);
 }
-
 function getAllPackages(appDir) {
   const packages = (0, _utils.getMonorepoPackages)(appDir);
   return packages.map(pkg => pkg.name);
 }
-
 function validatePackageName(value, packages, options) {
   const {
     isMonorepoSubProject
   } = options;
-
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
       success: false,
@@ -256,12 +218,10 @@ function validatePackageName(value, packages, options) {
       })
     };
   }
-
   return {
     success: true
   };
 }
-
 function validatePackagePath(value, projectDir, options) {
   const {
     isMwa,
@@ -269,15 +229,12 @@ function validatePackagePath(value, projectDir, options) {
     isTest
   } = options || {};
   let dir = 'apps';
-
   if (isMwa && isTest) {
     dir = 'examples';
   } else {
     dir = isPublic ? 'packages' : 'features';
   }
-
   const packageDir = _path.default.resolve(projectDir || '', dir, value);
-
   if (_utils.fs.existsSync(packageDir)) {
     return {
       success: false,
@@ -286,28 +243,22 @@ function validatePackagePath(value, projectDir, options) {
       })
     };
   }
-
   return {
     success: true
   };
 }
-
 function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
   if (isLocalPackages && packagePath) {
     return `${packagePath}/`;
   }
-
   if (isMonorepoSubProject && packagePath) {
     return `${isPublic ? 'packages' : 'features'}/${packagePath}/`;
   }
-
   return '';
 }
-
 function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   if (isMonorepoSubProject && packagePath) {
     return `${isTest ? 'examples' : 'apps'}/${packagePath}/`;
   }
-
   return '';
 }

package/dist/js/node/locale/index.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.localeKeys = exports.i18n = void 0;
-
 var _pluginI18n = require("@modern-js/plugin-i18n");
-
 var _zh = require("./zh");
-
 var _en = require("./en");
-
 const i18n = new _pluginI18n.I18n();
 exports.i18n = i18n;
 const localeKeys = i18n.init('zh', {

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

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _stripAnsi = require("./strip-ansi");
-
 Object.keys(_stripAnsi).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _stripAnsi[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_stripAnsi).forEach(function (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;

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

@@ -7,97 +7,76 @@ 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/js/node/utils/strip-ansi.js

@@ -4,18 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.stripAnsi = stripAnsi;
-
 function ansiRegex({
   onlyFirst = false
 } = {}) {
   const pattern = ['[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)', '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'].join('|');
   return new RegExp(pattern, onlyFirst ? undefined : 'g');
 }
-
 function stripAnsi(string) {
   if (typeof string !== 'string') {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
-
   return string.replace(ansiRegex(), '');
 }

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

@@ -6,5 +6,4 @@ export declare function semverDecrease(version: string): string;
  * 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": "3.0.0-beta.0",
+  "version": "3.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,18 +28,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/plugin-i18n": "2.0.0-beta.0",
-    "@modern-js/generator-common": "3.0.0-beta.0",
-    "@modern-js/utils": "2.0.0-beta.0"
+    "@modern-js/plugin-i18n": "2.0.0-beta.2",
+    "@modern-js/generator-common": "3.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.0.0",
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
+    "@modern-js/codesmith": "2.0.1",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -52,8 +52,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }