@modern-js/generator-utils 1.1.1 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/generator-utils
 
+## 1.1.3
+
+### Patch Changes
+
+- f73fee4b: feat: upgrade codesmith version to add get npm package timeout's time
+
+## 1.1.2
+
+### Patch Changes
+
+- 4819a3c7: feat: update generator version
+- b7fb82ec: fix: get package manager function
+- Updated dependencies [5e3de7d8]
+- Updated dependencies [b7fb82ec]
+  - @modern-js/plugin-i18n@1.1.2
+  - @modern-js/utils@1.1.6
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -1,13 +1,11 @@
-import os from 'os';
 import path from 'path';
-import { fs, getMonorepoPackages } from '@modern-js/utils';
+import { fs, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
 import execa from 'execa';
 import ora from 'ora';
-import { canUseNpm, canUsePnpm, canUseYarn } from "./utils/env";
 import { stripAnsi } from "./utils/strip-ansi";
 import { i18n, localeKeys } from "./locale";
 export * from "./utils";
-export { fs, readTsConfigByFile } from '@modern-js/utils';
+export { fs, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
 export { i18n } from "./locale"; // eslint-disable-next-line max-statements
 
 export async function getPackageVersion(packageName, registry) {
@@ -53,27 +51,6 @@ export async function getPackageVersion(packageName, registry) {
   spinner.stop();
   throw new Error('not found npm, please install npm before');
 }
-export function getPackageManager(cwd = process.cwd()) {
-  let appDirectory = cwd;
-
-  while (os.homedir() !== appDirectory) {
-    if (fs.existsSync(path.resolve(appDirectory, 'pnpm-lock.yaml'))) {
-      return 'pnpm';
-    }
-
-    if (fs.existsSync(path.resolve(appDirectory, 'yarn.lock'))) {
-      return 'yarn';
-    }
-
-    if (fs.existsSync(path.resolve(appDirectory, 'package-lock.json'))) {
-      return 'npm';
-    }
-
-    appDirectory = path.join(appDirectory, '..');
-  }
-
-  return 'npm';
-}
 export function getPackageManagerText(packageManager) {
   return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
 }

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

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

package/dist/js/node/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   getPackageVersion: true,
-  getPackageManager: true,
   getPackageManagerText: true,
   isTsProject: true,
   getPackageObj: true,
@@ -16,8 +15,30 @@ var _exportNames = {
   getMWAProjectPath: true,
   fs: true,
   readTsConfigByFile: true,
+  getPackageManager: true,
+  canUseNpm: true,
+  canUsePnpm: true,
+  canUseYarn: true,
   i18n: true
 };
+Object.defineProperty(exports, "canUseNpm", {
+  enumerable: true,
+  get: function () {
+    return _utils.canUseNpm;
+  }
+});
+Object.defineProperty(exports, "canUsePnpm", {
+  enumerable: true,
+  get: function () {
+    return _utils.canUsePnpm;
+  }
+});
+Object.defineProperty(exports, "canUseYarn", {
+  enumerable: true,
+  get: function () {
+    return _utils.canUseYarn;
+  }
+});
 Object.defineProperty(exports, "fs", {
   enumerable: true,
   get: function () {
@@ -27,7 +48,12 @@ Object.defineProperty(exports, "fs", {
 exports.getAllPackages = getAllPackages;
 exports.getMWAProjectPath = getMWAProjectPath;
 exports.getModuleProjectPath = getModuleProjectPath;
-exports.getPackageManager = getPackageManager;
+Object.defineProperty(exports, "getPackageManager", {
+  enumerable: true,
+  get: function () {
+    return _utils.getPackageManager;
+  }
+});
 exports.getPackageManagerText = getPackageManagerText;
 exports.getPackageObj = getPackageObj;
 exports.getPackageVersion = getPackageVersion;
@@ -47,8 +73,6 @@ Object.defineProperty(exports, "readTsConfigByFile", {
 exports.validatePackageName = validatePackageName;
 exports.validatePackagePath = validatePackagePath;
 
-var _os = _interopRequireDefault(require("os"));
-
 var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
@@ -57,8 +81,6 @@ var _execa = _interopRequireDefault(require("execa"));
 
 var _ora = _interopRequireDefault(require("ora"));
 
-var _env = require("./utils/env");
-
 var _stripAnsi = require("./utils/strip-ansi");
 
 var _locale = require("./locale");
@@ -84,7 +106,7 @@ async function getPackageVersion(packageName, registry) {
   const spinner = (0, _ora.default)('Loading...').start();
   spinner.color = 'yellow';
 
-  if (await (0, _env.canUsePnpm)()) {
+  if (await (0, _utils.canUsePnpm)()) {
     const args = ['info', packageName, 'version'];
 
     if (registry) {
@@ -96,7 +118,7 @@ async function getPackageVersion(packageName, registry) {
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
 
-  if (await (0, _env.canUseYarn)()) {
+  if (await (0, _utils.canUseYarn)()) {
     const args = ['info', packageName, 'version', '--silent'];
 
     if (registry) {
@@ -108,7 +130,7 @@ async function getPackageVersion(packageName, registry) {
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
 
-  if (await (0, _env.canUseNpm)()) {
+  if (await (0, _utils.canUseNpm)()) {
     const args = ['view', packageName, 'version'];
 
     if (registry) {
@@ -124,28 +146,6 @@ async function getPackageVersion(packageName, registry) {
   throw new Error('not found npm, please install npm before');
 }
 
-function getPackageManager(cwd = process.cwd()) {
-  let appDirectory = cwd;
-
-  while (_os.default.homedir() !== appDirectory) {
-    if (_utils.fs.existsSync(_path.default.resolve(appDirectory, 'pnpm-lock.yaml'))) {
-      return 'pnpm';
-    }
-
-    if (_utils.fs.existsSync(_path.default.resolve(appDirectory, 'yarn.lock'))) {
-      return 'yarn';
-    }
-
-    if (_utils.fs.existsSync(_path.default.resolve(appDirectory, 'package-lock.json'))) {
-      return 'npm';
-    }
-
-    appDirectory = _path.default.join(appDirectory, '..');
-  }
-
-  return 'npm';
-}
-
 function getPackageManagerText(packageManager) {
   return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
 }

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

@@ -4,19 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _env = require("./env");
-
-Object.keys(_env).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _env[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _env[key];
-    }
-  });
-});
-
 var _stripAnsi = require("./strip-ansi");
 
 Object.keys(_stripAnsi).forEach(function (key) {

package/dist/types/index.d.ts

@@ -1,9 +1,8 @@
 import { GeneratorContext } from '@modern-js/codesmith';
 export * from './utils';
-export { fs, readTsConfigByFile } from '@modern-js/utils';
+export { fs, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
 export { i18n } from './locale';
 export declare function getPackageVersion(packageName: string, registry?: string): Promise<string>;
-export declare function getPackageManager(cwd?: string): "npm" | "yarn" | "pnpm";
 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,2 +1 @@
-export * from './env';
 export * from './strip-ansi';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,6 +20,7 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
@@ -28,18 +29,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/plugin-i18n": "^1.1.1",
-    "@modern-js/utils": "^1.1.2",
+    "@modern-js/plugin-i18n": "^1.1.2",
+    "@modern-js/utils": "^1.1.6",
     "execa": "^5.1.1",
     "ora": "^5.4.1"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "^1.0.0",
+    "@modern-js/codesmith": "^1.0.8",
     "@types/jest": "^26",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/module-tools": "^1.1.0",
-    "@modern-js/plugin-testing": "^1.1.0"
+    "@modern-js/module-tools": "^1.1.5",
+    "@modern-js/plugin-testing": "^1.2.2"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -55,5 +56,6 @@
     "new": "modern new",
     "build": "modern build",
     "test": "modern test --passWithNoTests"
-  }
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/src/index.ts

@@ -1,16 +1,27 @@
-import os from 'os';
 import path from 'path';
-import { fs, getMonorepoPackages } from '@modern-js/utils';
+import {
+  fs,
+  getMonorepoPackages,
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+} from '@modern-js/utils';
 import execa from 'execa';
 import ora from 'ora';
 import { GeneratorContext } from '@modern-js/codesmith';
-import { canUseNpm, canUsePnpm, canUseYarn } from './utils/env';
 import { stripAnsi } from './utils/strip-ansi';
 import { i18n, localeKeys } from './locale';
 
 export * from './utils';
 
-export { fs, readTsConfigByFile } from '@modern-js/utils';
+export {
+  fs,
+  readTsConfigByFile,
+  getPackageManager,
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+} from '@modern-js/utils';
 
 export { i18n } from './locale';
 
@@ -52,23 +63,6 @@ export async function getPackageVersion(
   throw new Error('not found npm, please install npm before');
 }
 
-export function getPackageManager(cwd: string = process.cwd()) {
-  let appDirectory = cwd;
-  while (os.homedir() !== appDirectory) {
-    if (fs.existsSync(path.resolve(appDirectory, 'pnpm-lock.yaml'))) {
-      return 'pnpm';
-    }
-    if (fs.existsSync(path.resolve(appDirectory, 'yarn.lock'))) {
-      return 'yarn';
-    }
-    if (fs.existsSync(path.resolve(appDirectory, 'package-lock.json'))) {
-      return 'npm';
-    }
-    appDirectory = path.join(appDirectory, '..');
-  }
-  return 'npm';
-}
-
 export function getPackageManagerText(packageManager: 'pnpm' | 'yarn' | 'npm') {
   return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
 }

package/src/utils/index.ts

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

package/tests/index.test.ts

@@ -1,20 +1,8 @@
-import { getPackageVersion, canUseNpm, canUsePnpm, canUseYarn } from '@/index';
+import { getPackageVersion } from '../src';
 
 describe('test generator utils', () => {
   test('test getPackageVersion', async () => {
     const version = await getPackageVersion('lodash');
     expect(typeof version === 'string').toBe(true);
   });
-  test('test canUseNpm', async () => {
-    const npmAbility = await canUseNpm();
-    expect(typeof npmAbility === 'boolean').toBe(true);
-  });
-  test('test canUsePnpm', async () => {
-    const pnpmAbility = await canUsePnpm();
-    expect(typeof pnpmAbility === 'boolean').toBe(true);
-  });
-  test('test canUseYarn', async () => {
-    const yarnAbility = await canUseYarn();
-    expect(typeof yarnAbility === 'boolean').toBe(true);
-  });
 });

package/tests/tsconfig.json

@@ -4,8 +4,6 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["../src/*"]
-    }
+    "paths": {}
   }
 }

package/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }

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

@@ -1,31 +0,0 @@
-import execa from 'execa';
-export async function canUseNpm() {
-  try {
-    await execa('npm', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-export async function canUseYarn() {
-  try {
-    await execa('yarn', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-export async function canUsePnpm() {
-  try {
-    await execa('pnpm', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}

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

@@ -1,45 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.canUseNpm = canUseNpm;
-exports.canUsePnpm = canUsePnpm;
-exports.canUseYarn = canUseYarn;
-
-var _execa = _interopRequireDefault(require("execa"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-async function canUseNpm() {
-  try {
-    await (0, _execa.default)('npm', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-async function canUseYarn() {
-  try {
-    await (0, _execa.default)('yarn', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-async function canUsePnpm() {
-  try {
-    await (0, _execa.default)('pnpm', ['--version'], {
-      env: process.env
-    });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}

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

@@ -1,3 +0,0 @@
-export declare function canUseNpm(): Promise<boolean>;
-export declare function canUseYarn(): Promise<boolean>;
-export declare function canUsePnpm(): Promise<boolean>;

package/src/utils/env.ts

@@ -1,28 +0,0 @@
-import execa from 'execa';
-
-export async function canUseNpm() {
-  try {
-    await execa('npm', ['--version'], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-export async function canUseYarn() {
-  try {
-    await execa('yarn', ['--version'], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-export async function canUsePnpm() {
-  try {
-    await execa('pnpm', ['--version'], { env: process.env });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}