@modern-js/monorepo-tools 1.21.5 → 2.0.0-beta.1

package/dist/js/node/projects/get-projects-by-workspace-file.js

@@ -4,105 +4,69 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.syncGetProjectsByWorkspaceFile = exports.getProjectsByWorkspaceFile = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _nodeCoreLibrary = require("@rushstack/node-core-library");
-
 var _utils = require("@modern-js/utils");
-
 var _monorepo = require("../parse-config/monorepo");
-
 var _constants = require("../constants");
-
 var _getProjectsByPackagesConfig = require("./get-projects-by-packages-config");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const getProjectsByWorkspaceFile = async (rootPath, config, ignoreConfigs) => {
   var _config$workspaceFile;
-
   let {
     workspaceFile
   } = config;
-
   if (!config.enableAutoFinder && (!('workspaceFile' in config) || ((_config$workspaceFile = config.workspaceFile) === null || _config$workspaceFile === void 0 ? void 0 : _config$workspaceFile.length) === 0)) {
     throw new Error('Missing workspaceFile Key or workspaceFile is empty string');
   }
-
   if (config.enableAutoFinder) {
     workspaceFile = (0, _monorepo.getWorkspaceFile)(rootPath);
   }
-
   let packagesConfig = [];
-
   if (workspaceFile === _constants.WORKSPACE_FILE.PNPM) {
     const yamlString = await _nodeCoreLibrary.FileSystem.readFileAsync(path.resolve('/', rootPath, workspaceFile)).then(data => data.toString());
-
     const pnpmWorkspace = _utils.yaml.load(yamlString);
-
     packagesConfig = pnpmWorkspace.packages || [];
   } else if (workspaceFile === _constants.WORKSPACE_FILE.YARN) {
     var _pkgJson$workspaces;
-
     const pkgJson = _nodeCoreLibrary.JsonFile.load(path.resolve(rootPath, workspaceFile));
-
     packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson$workspaces = pkgJson.workspaces) === null || _pkgJson$workspaces === void 0 ? void 0 : _pkgJson$workspaces.packages) || [];
   } else if (workspaceFile === _constants.WORKSPACE_FILE.LERNA) {
     var _lernaJson$packages;
-
     const lernaJson = _nodeCoreLibrary.JsonFile.load(path.resolve(rootPath, workspaceFile));
-
     packagesConfig = (_lernaJson$packages = lernaJson.packages) !== null && _lernaJson$packages !== void 0 ? _lernaJson$packages : [];
   }
-
   const projects = await (0, _getProjectsByPackagesConfig.getProjectsByPackageConfig)(rootPath, packagesConfig, ignoreConfigs);
   return projects;
 };
-
 exports.getProjectsByWorkspaceFile = getProjectsByWorkspaceFile;
-
 const syncGetProjectsByWorkspaceFile = (rootPath, config, ignoreConfigs) => {
   var _config$workspaceFile2;
-
   let {
     workspaceFile
   } = config;
-
   if (!config.enableAutoFinder && (!('workspaceFile' in config) || ((_config$workspaceFile2 = config.workspaceFile) === null || _config$workspaceFile2 === void 0 ? void 0 : _config$workspaceFile2.length) === 0)) {
     throw new Error('Missing workspaceFile Key or workspaceFile is empty string');
   }
-
   if (config.enableAutoFinder) {
     workspaceFile = (0, _monorepo.getWorkspaceFile)(rootPath);
   }
-
   let packagesConfig = [];
-
   if (workspaceFile === _constants.WORKSPACE_FILE.PNPM) {
     const yamlString = _utils.fs.readFileSync(path.resolve('/', rootPath, workspaceFile), 'utf-8');
-
     const pnpmWorkspace = _utils.yaml.load(yamlString);
-
     packagesConfig = pnpmWorkspace.packages || [];
   } else if (workspaceFile === _constants.WORKSPACE_FILE.YARN) {
     var _pkgJson$workspaces2;
-
     const pkgJson = _nodeCoreLibrary.JsonFile.load(path.resolve(rootPath, workspaceFile));
-
     packagesConfig = (pkgJson === null || pkgJson === void 0 ? void 0 : (_pkgJson$workspaces2 = pkgJson.workspaces) === null || _pkgJson$workspaces2 === void 0 ? void 0 : _pkgJson$workspaces2.packages) || [];
   } else if (workspaceFile === _constants.WORKSPACE_FILE.LERNA) {
     var _lernaJson$packages2;
-
     const lernaJson = _nodeCoreLibrary.JsonFile.load(path.resolve(rootPath, workspaceFile));
-
     packagesConfig = (_lernaJson$packages2 = lernaJson.packages) !== null && _lernaJson$packages2 !== void 0 ? _lernaJson$packages2 : [];
   }
-
   const projects = (0, _getProjectsByPackagesConfig.syncGetProjectsByPackageConfig)(rootPath, packagesConfig, ignoreConfigs);
   return projects;
 };
-
 exports.syncGetProjectsByWorkspaceFile = syncGetProjectsByWorkspaceFile;

package/dist/js/node/projects/get-projects.js

@@ -4,31 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.syncGetProjects = exports.getProjects = void 0;
-
 var _error = require("../log/error");
-
 var _monorepo = require("../parse-config/monorepo");
-
 var _getProjectsByPackagesConfig = require("./get-projects-by-packages-config");
-
 var _getProjectsByWorkspaceFile = require("./get-projects-by-workspace-file");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 var FindProjectsMode;
-
 (function (FindProjectsMode) {
   FindProjectsMode[FindProjectsMode["Rough"] = 0] = "Rough";
   FindProjectsMode[FindProjectsMode["Precise"] = 1] = "Precise";
 })(FindProjectsMode || (FindProjectsMode = {}));
-
 const getProjectsByProjectsConfig = (rootPath, configs = []) => {
   const subProjects = [];
-
   for (const config of configs) {
     subProjects.push({
       name: config.name,
@@ -42,13 +31,10 @@ const getProjectsByProjectsConfig = (rootPath, configs = []) => {
       circlePath: []
     });
   }
-
   return subProjects;
 };
-
 const getProjectsByPackagesMatch = async (rootPath, match, ignore) => {
   let projects = [];
-
   if (Array.isArray(match)) {
     // like lerna`s packages config
     projects = await (0, _getProjectsByPackagesConfig.getProjectsByPackageConfig)(rootPath, match, ignore);
@@ -56,9 +42,7 @@ const getProjectsByPackagesMatch = async (rootPath, match, ignore) => {
     // use workspace file
     projects = await (0, _getProjectsByWorkspaceFile.getProjectsByWorkspaceFile)(rootPath, match, ignore);
   }
-
   const subProjects = [];
-
   for (const project of projects) {
     subProjects.push({
       name: project.name,
@@ -72,13 +56,11 @@ const getProjectsByPackagesMatch = async (rootPath, match, ignore) => {
       circlePath: []
     });
   }
-
   return subProjects;
 };
-
 const syncGetProjectsByPackagesMatch = (rootPath, match, ignore) => {
-  let projects = []; // TODO: code start
-
+  let projects = [];
+  // TODO: code start
   if (Array.isArray(match)) {
     // like lerna`s packages config
     projects = (0, _getProjectsByPackagesConfig.syncGetProjectsByPackageConfig)(rootPath, match, ignore);
@@ -86,9 +68,7 @@ const syncGetProjectsByPackagesMatch = (rootPath, match, ignore) => {
     // use workspace file
     projects = (0, _getProjectsByWorkspaceFile.syncGetProjectsByWorkspaceFile)(rootPath, match, ignore);
   }
-
   const subProjects = [];
-
   for (const project of projects) {
     subProjects.push({
       name: project.name,
@@ -102,63 +82,50 @@ const syncGetProjectsByPackagesMatch = (rootPath, match, ignore) => {
       circlePath: []
     });
   }
-
   return subProjects;
 };
-
-const checkFindProjectsMode = (config // eslint-disable-next-line consistent-return
+const checkFindProjectsMode = (config
+// eslint-disable-next-line consistent-return
 ) => {
   if (config.packagesMatchs && Array.isArray(config.packagesMatchs)) {
     return FindProjectsMode.Rough;
   }
-
   if (config.packagesMatchs && typeof config.packagesMatchs === 'object' && (config.packagesMatchs.workspaceFile || config.packagesMatchs.enableAutoFinder)) {
     return FindProjectsMode.Rough;
   }
-
   if (config.projectsConfig && Array.isArray(config.projectsConfig)) {
     return FindProjectsMode.Precise;
   }
-
   if (config.projectsConfig && config.packagesMatchs) {
     (0, _error.errorLog)('There can not be both `packagesMatchs` and `projectsConfig`');
   }
-
   (0, _error.errorLog)('No `packagesMatchs` and `projectsConfig` configurations found');
 };
-
 const getProjects = async (config, currentDir = process.cwd()) => {
   const {
     rootPath
   } = (0, _monorepo.getMonorepoBaseData)(currentDir);
   const mode = checkFindProjectsMode(config);
   let projects = [];
-
   if (mode === FindProjectsMode.Rough) {
     projects = await getProjectsByPackagesMatch(rootPath, config.packagesMatchs, config.packagesIgnoreMatchs || []);
   } else if (mode === FindProjectsMode.Precise) {
     projects = getProjectsByProjectsConfig(rootPath, config.projectsConfig);
   }
-
   return projects;
 };
-
 exports.getProjects = getProjects;
-
 const syncGetProjects = (config, currentDir = process.cwd()) => {
   const {
     rootPath
   } = (0, _monorepo.getMonorepoBaseData)(currentDir);
   const mode = checkFindProjectsMode(config);
   let projects = [];
-
   if (mode === FindProjectsMode.Rough) {
     projects = syncGetProjectsByPackagesMatch(rootPath, config.packagesMatchs, config.packagesIgnoreMatchs || []);
   } else if (mode === FindProjectsMode.Precise) {
     projects = getProjectsByProjectsConfig(rootPath, config.projectsConfig);
   }
-
   return projects;
 };
-
 exports.syncGetProjects = syncGetProjects;

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

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removeLockFile = exports.installByPackageManager = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("../constants");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const removeLockFile = (rootPath, packageManager) => {
   if (packageManager === 'pnpm') {
     _utils.fs.removeSync(path.join(rootPath, _constants.LOCK_FILE.PNPM));
@@ -24,9 +18,7 @@ const removeLockFile = (rootPath, packageManager) => {
     _utils.fs.removeSync(path.join(rootPath, _constants.LOCK_FILE.NPM));
   }
 };
-
 exports.removeLockFile = removeLockFile;
-
 const installByPackageManager = async (packageManager, {
   rootPath,
   removeLock
@@ -34,18 +26,15 @@ const installByPackageManager = async (packageManager, {
   if (removeLock) {
     removeLockFile(rootPath, packageManager);
   }
-
   if (packageManager === 'pnpm') {
     await (0, _utils.execa)('pnpm', ['install'], {
       stdio: 'inherit'
     });
   }
-
   if (packageManager === 'yarn') {
     await (0, _utils.execa)('yarn', ['install'], {
       stdio: 'inherit'
     });
   }
 };
-
 exports.installByPackageManager = installByPackageManager;

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

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLocaleLanguage = getLocaleLanguage;
-
 var _languageDetector = require("@modern-js/plugin-i18n/language-detector");
-
 function getLocaleLanguage() {
   const detector = new _languageDetector.I18CLILanguageDetector();
   return detector.detect();

package/dist/types/dag/operator.d.ts

@@ -31,7 +31,6 @@ export declare class DagOperator {
    * 3. 检查是否存在 dependencyEdge === 0 的节点，加入叶子节点集合 A中。
    * 4. 根据情况（是否存在空闲的进程）选择是否执行新加入的节点对应的任务。
    */
-
   traverseProjectToDependent(name: string, task: Task, {
     withSelf,
     runTaskConcurrency
@@ -43,7 +42,6 @@ export declare class DagOperator {
    * 4. 检查 B 集合中是否存在入度为0的节点，则此节点为叶子节点，并加入叶子节点集合 A
    * 5. 根据情况（是否存在空闲的进程）选择是否执行新加入的节点对应的任务。
    */
-
   traverseDependenciesToProject(name: string, task: Task, {
     withSelf,
     runTaskConcurrency
@@ -58,7 +56,6 @@ export declare class DagOperator {
   /**
    * Checks for projects that indirectly depend on themselves.
    */
-
   private _checkForCyclicDependencies;
   private _getDependencyLeafNodes;
   private readonly _createTask;

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

@@ -3,7 +3,6 @@ import { IProjectNode } from '../projects/get-projects';
  * Calculate the number of packages which must be built before we reach
  * the furthest away "root" node
  */
-
 export declare const calculateCriticalPaths: (project: IProjectNode) => number;
 export declare const recursiveGetDependency: (project: IProjectNode, skipCircleProjects?: boolean) => IProjectNode[];
 export declare const sortProjects: (projects: IProjectNode[]) => IProjectNode[][];

package/dist/types/features/dev/index.d.ts

@@ -17,7 +17,6 @@ export interface IProjectChangeResult {
   /**
    * Contains the git hashes for all tracked files in the repo
    */
-
   state: any;
 }
 export declare const runBuildWatchTask: (projectName: string, operator: DagOperator, config: IBuildWatchConfig, taskCmds?: BuildWatchCmdsType) => Promise<void>;

package/dist/types/index.d.ts

@@ -1,5 +1,3 @@
 import type { CliPlugin } from '@modern-js/core';
-
 declare const _default: () => CliPlugin;
-
 export default _default;

package/dist/types/projects/get-projects.d.ts

@@ -10,7 +10,6 @@ export interface IFindSubProjectConfig {
   /**
    * https://github.com/mrmlnc/fast-glob#ignore
    */
-
   packagesIgnoreMatchs?: string[];
 }
 export interface IProjectNode {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -41,14 +41,14 @@
     "anymatch": "^3.1.2",
     "md5": "^2.3.0",
     "p-map": "^4.0.0",
-    "@modern-js/core": "1.21.5",
-    "@modern-js/new-action": "1.21.5",
-    "@modern-js/upgrade": "1.21.5",
-    "@modern-js/plugin": "1.21.5",
-    "@modern-js/plugin-changeset": "1.21.5",
-    "@modern-js/plugin-i18n": "1.21.5",
-    "@modern-js/plugin-jarvis": "1.21.5",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/new-action": "2.0.0-beta.1",
+    "@modern-js/upgrade": "2.0.0-beta.1",
+    "@modern-js/plugin": "2.0.0-beta.1",
+    "@modern-js/plugin-changeset": "2.0.0-beta.1",
+    "@modern-js/plugin-i18n": "2.0.0-beta.1",
+    "@modern-js/plugin-lint": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/jest": "^27",
@@ -56,8 +56,8 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -69,32 +69,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }