@modern-js/generator-utils 1.1.3 → 1.2.2

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @modern-js/generator-utils
 
+## 1.2.2
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/plugin-i18n@1.2.4
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+  - @modern-js/plugin-i18n@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 2c049918: feat: polyfill function support enable using new command
+- Updated dependencies [2da09c69]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+  - @modern-js/plugin-i18n@1.2.0
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -1,13 +1,11 @@
 import path from 'path';
-import { fs, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
-import execa from 'execa';
+import { fs, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
 import ora from 'ora';
 import { stripAnsi } from "./utils/strip-ansi";
 import { i18n, localeKeys } from "./locale";
 export * from "./utils";
 export { fs, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
-export { i18n } from "./locale"; // eslint-disable-next-line max-statements
-
+export { i18n } from "./locale";
 export async function getPackageVersion(packageName, registry) {
   const spinner = ora('Loading...').start();
   spinner.color = 'yellow';

package/dist/js/node/index.js

@@ -77,8 +77,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _execa = _interopRequireDefault(require("execa"));
-
 var _ora = _interopRequireDefault(require("ora"));
 
 var _stripAnsi = require("./utils/strip-ansi");
@@ -101,7 +99,6 @@ Object.keys(_utils2).forEach(function (key) {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// eslint-disable-next-line max-statements
 async function getPackageVersion(packageName, registry) {
   const spinner = (0, _ora.default)('Loading...').start();
   spinner.color = 'yellow';
@@ -113,7 +110,7 @@ async function getPackageVersion(packageName, registry) {
       args.push(`--registry=${registry}`);
     }
 
-    const result = await (0, _execa.default)('pnpm', args);
+    const result = await (0, _utils.execa)('pnpm', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
@@ -125,7 +122,7 @@ async function getPackageVersion(packageName, registry) {
       args.push(`--registry=${registry}`);
     }
 
-    const result = await (0, _execa.default)('yarn', args);
+    const result = await (0, _utils.execa)('yarn', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }
@@ -137,7 +134,7 @@ async function getPackageVersion(packageName, registry) {
       args.push(`--registry=${registry}`);
     }
 
-    const result = await (0, _execa.default)('npm', args);
+    const result = await (0, _utils.execa)('npm', args);
     spinner.stop();
     return (0, _stripAnsi.stripAnsi)(result.stdout);
   }

package/jest.config.js

@@ -0,0 +1,11 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  ...sharedConfig,
+  rootDir: __dirname,
+  modulePathIgnorePatterns: [
+    // TODO: 很容易超时导致失败，暂时先绕过
+    'tests/index.test.ts',
+  ],
+};

package/modern.config.js

@@ -1,8 +1,2 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  testing: {
-    jest: {
-      testTimeout: 30000,
-    },
-  },
-};
+module.exports = {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3",
+  "version": "1.2.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,9 +29,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/plugin-i18n": "^1.1.2",
-    "@modern-js/utils": "^1.1.6",
-    "execa": "^5.1.1",
+    "@modern-js/plugin-i18n": "^1.2.4",
+    "@modern-js/utils": "^1.5.0",
     "ora": "^5.4.1"
   },
   "devDependencies": {
@@ -39,8 +38,9 @@
     "@types/jest": "^26",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/module-tools": "^1.1.5",
-    "@modern-js/plugin-testing": "^1.2.2"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -55,7 +55,7 @@
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --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,148 +0,0 @@
-import path from 'path';
-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 { stripAnsi } from './utils/strip-ansi';
-import { i18n, localeKeys } from './locale';
-
-export * from './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: string,
-  registry?: string,
-) {
-  const spinner = ora('Loading...').start();
-  spinner.color = 'yellow';
-  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');
-}
-
-export function getPackageManagerText(packageManager: 'pnpm' | 'yarn' | 'npm') {
-  return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
-}
-
-export function isTsProject(appDir: string) {
-  return fs.existsSync(path.join(appDir, 'tsconfig.json'));
-}
-
-export async function getPackageObj(context: GeneratorContext) {
-  const pkgStr = (await context.materials.default.get(`package.json`).value())
-    .content;
-
-  return JSON.parse(pkgStr as string);
-}
-
-export function getAllPackages(appDir: string) {
-  const packages = getMonorepoPackages(appDir);
-  return packages.map(pkg => pkg.name);
-}
-
-export function validatePackageName(
-  value: string,
-  packages: string[],
-  options: { isMonorepoSubProject: boolean },
-) {
-  const { isMonorepoSubProject } = options;
-  if (isMonorepoSubProject && packages.includes(value)) {
-    return {
-      success: false,
-      error: i18n.t(localeKeys.packageName.exit, { value }),
-    };
-  }
-  return { success: true };
-}
-
-export function validatePackagePath(
-  value: string,
-  projectDir: string,
-  options?: { isMwa?: boolean; isPublic?: boolean; isTest?: boolean },
-) {
-  const { isMwa, isPublic, 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,
-      error: i18n.t(localeKeys.pacakgePath.exit, { value }),
-    };
-  }
-  return { success: true };
-}
-
-export function getModuleProjectPath(
-  packagePath: string,
-  isMonorepoSubProject: boolean,
-  isPublic: boolean,
-  isLocalPackages: boolean,
-) {
-  if (isLocalPackages && packagePath) {
-    return `${packagePath}/`;
-  }
-  if (isMonorepoSubProject && packagePath) {
-    return `${isPublic ? 'packages' : 'features'}/${packagePath}/`;
-  }
-
-  return '';
-}
-
-export function getMWAProjectPath(
-  packagePath: string,
-  isMonorepoSubProject: boolean,
-  isTest = false,
-) {
-  if (isMonorepoSubProject && packagePath) {
-    return `${isTest ? 'examples' : 'apps'}/${packagePath}/`;
-  }
-  return '';
-}

package/src/locale/en.ts

@@ -1,4 +0,0 @@
-export const EN_LOCALE = {
-  packageName: { exit: 'package name `{value}` is already exists' },
-  pacakgePath: { exit: 'package path {value} is already exists' },
-};

package/src/locale/index.ts

@@ -1,9 +0,0 @@
-import { I18n } from '@modern-js/plugin-i18n';
-import { ZH_LOCALE } from './zh';
-import { EN_LOCALE } from './en';
-
-const i18n = new I18n();
-
-const localeKeys = i18n.init('zh', { zh: ZH_LOCALE, en: EN_LOCALE });
-
-export { i18n, localeKeys };

package/src/locale/zh.ts

@@ -1,4 +0,0 @@
-export const ZH_LOCALE = {
-  packageName: { exit: '项目名称 {value} 已存在' },
-  pacakgePath: { exit: '目录 {value} 已存在' },
-};

package/src/utils/index.ts

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

package/src/utils/strip-ansi.ts

@@ -1,16 +0,0 @@
-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');
-}
-
-export function stripAnsi(string: string) {
-  if (typeof string !== 'string') {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
-  }
-
-  return string.replace(ansiRegex(), '');
-}

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/index.test.ts

@@ -1,8 +0,0 @@
-import { getPackageVersion } from '../src';
-
-describe('test generator utils', () => {
-  test('test getPackageVersion', async () => {
-    const version = await getPackageVersion('lodash');
-    expect(typeof version === 'string').toBe(true);
-  });
-});

package/tests/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "paths": {}
-  }
-}