@ones-open/cli 1.4.11-27607.928 → 2.1.1

package/bin/index.es.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
+import { ONESProjectTemplate, getCliVersionByMetaPath, Version, tryGitInit, renameHiddenTemplateFiles, getNpm, getPackageInNodeModulesDir } from '@ones-open/cli-utils';
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
-import { ONESProjectTemplate, getCliVersionByMetaPath, Version, EnhancedListr, tryGitInit, renameHiddenTemplateFiles, getNpm, getPackageInNodeModulesDir } from '@ones-open/cli-utils';
+import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
+import { checkIsLegalPluginType, getPluginProjectCreatingTasks } from '@ones-open/cli-plugin';
 import { execa } from 'execa';
 import { pathExists, copy } from 'fs-extra';
 import inquirer from 'inquirer';
-import path, { isAbsolute, join, basename, dirname } from 'path';
-import { cwd } from 'process';
+import Listr from 'listr';
+import { isAbsolute, join, basename, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import envinfo from 'envinfo';
+import { cwd } from 'process';
 
 /* eslint-disable no-console */
 const defaultConfig = {
@@ -33,7 +36,7 @@ function isLegalProjectType(projectType) {
   return LEGAL_PROJECT_TYPE_SET.has(projectType);
 }
 function isLegalPolicy(policy) {
-  return LEGAL_POLICY.includes(policy);
+  return _includesInstanceProperty(LEGAL_POLICY).call(LEGAL_POLICY, policy);
 }
 async function getRootPath(currentWorkingDirectory, specificPath) {
   const hasSpecificPath = specificPath && specificPath.length > 0;
@@ -107,13 +110,12 @@ async function installSubCli({
 /**
  *  TODO: support different project types
  */
-async function getExternalTaskByTemplateType(currentWorkingDirectory, projectCreatingParams, options) {
+function getExternalTaskByTemplateType(currentWorkingDirectory, projectCreatingParams, options) {
   const {
     template
   } = projectCreatingParams;
   if (template === ONESProjectTemplate.Plugin) {
-    const module = await import(path.join(cwd(), 'node_modules', '@ones-open/cli-plugin', 'dist', 'index.js'));
-    return module.getPluginProjectCreatingTasks({
+    return getPluginProjectCreatingTasks({
       currentWorkingDirectory,
       projectCreatingParams,
       options
@@ -129,6 +131,7 @@ async function createProject(rawProjectName, options) {
       useDefaultPreset,
       installLocalDependencies,
       distTag: rawDistTag,
+      pluginType,
       policy
     } = options;
     const cliVersion = await getCliVersionByMetaPath(import.meta.url);
@@ -139,6 +142,9 @@ async function createProject(rawProjectName, options) {
     if (!projectType || !isLegalProjectType(projectType)) {
       throw new Error(`Illegal project type: ${projectType}`);
     }
+    if (!checkIsLegalPluginType(pluginType)) {
+      throw new Error(`Illegal plugin type: ${pluginType}`);
+    }
     if (!isLegalPolicy(policy)) {
       throw new Error(`Illegal policy: ${policy}`);
     }
@@ -198,7 +204,6 @@ async function createProject(rawProjectName, options) {
         [key]: value
       };
     });
-    const createProject = new EnhancedListr();
     const projectCreatingTasks = [{
       title: 'Git init',
       task: async (ctx, task) => {
@@ -218,22 +223,22 @@ async function createProject(rawProjectName, options) {
       task: () => copyBasicTemplateFiles(projectCreatingParams.template, root)
     }, {
       title: 'Install sub CLI dependencies',
-      task: async () => {
+      task: () => {
         const subCliName = `@ones-open/cli-${projectCreatingParams.template}`;
-        await installSubCli({
+        return installSubCli({
           subCliName,
           root,
           installLocalDependencies,
           distTag
         });
-        const externalTask = await getExternalTaskByTemplateType(root, projectCreatingParams, {
-          ...options,
-          distTag
-        });
-        externalTask && createProject.add(externalTask);
       }
     }];
-    createProject.add(projectCreatingTasks);
+    const createProject = new Listr(projectCreatingTasks);
+    const externalTask = getExternalTaskByTemplateType(root, projectCreatingParams, {
+      ...options,
+      distTag
+    });
+    externalTask && createProject.add(externalTask);
     await createProject.run(projectCreatingParams);
     console.log(chalk.bold('\nProject has been created'), `\n${chalk.bold('Project path:')} ${chalk.green(root)}`, `\n${chalk.bold('Project name:')} ${chalk.green(projectCreatingParams.name)}`, `\n${chalk.bold('Project type:')} ${chalk.green(projectCreatingParams.template)}`, `\n${chalk.bold('Project description:')} ${chalk.green(projectCreatingParams.description)}`, `\n${chalk.bold('Project sub CLI:')} ${chalk.green(`@ones-open/cli-${projectCreatingParams.template}`)}`);
   } catch (error) {

package/bin/types/lib/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/lib/create.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,8BAA8B,EAE/B,MAAM,sBAAsB,CAAA;AAkI7B,iBAAe,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,8BAA8B,iBAkJ3F;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/lib/create.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,8BAA8B,EAE/B,MAAM,sBAAsB,CAAA;AAyI7B,iBAAe,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,8BAA8B,iBAyJ3F;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/bin/types/lib/env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/lib/env.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjD,QAAA,MAAM,aAAa,EAAE,SAKpB,CAAA;AAED,QAAA,MAAM,cAAc,EAAE,OAGrB,CAAA;AAED,iBAAe,oBAAoB,CACjC,MAAM,GAAE,SAAyB,EACjC,OAAO,GAAE,OAAwB,iBAIlC;AAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAA"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../../src/lib/env.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjD,QAAA,MAAM,aAAa,EAAE,SAKpB,CAAA;AAED,QAAA,MAAM,cAAc,EAAE,OAGrB,CAAA;AAED,iBAAe,oBAAoB,CACjC,MAAM,GAAE,SAAyB,EACjC,OAAO,GAAE,OAAwB,iBAIlC;AAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-open/cli",
-  "version": "1.4.11-27607.928+cb600015",
+  "version": "2.1.1",
   "description": "Command line interface for developers",
   "bin": {
     "ones": "./bin/index.es.js"
@@ -40,7 +40,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@ones-open/cli-utils": "1.12.4-27607.928+cb600015",
+    "@ones-open/cli-plugin": "^2.1.1",
+    "@ones-open/cli-utils": "^2.1.1",
     "chalk": "~5.0.1",
     "commander": "~9.4.0",
     "envinfo": "~7.8.1",
@@ -55,5 +56,5 @@
     "@types/listr": "^0.14.4"
   },
   "type": "module",
-  "gitHead": "cb6000157b4647ed4df97f24aedf38390684dd63"
+  "gitHead": "1e51d94a7a0362a4d26958a4f47b116914e12e5f"
 }

package/template/browserslist

@@ -1,4 +1,4 @@
-Chrome >= 63
+Chrome >= 69
 Edge >= 79
-Firefox >= 67
-Safari >= 12
+Firefox >= 87
+Safari >= 14

package/template/_npmrc

@@ -1,5 +0,0 @@
-save-exact = true
-registry = https://registry.npmmirror.com/
-@ones:registry = https://npm.partner.ones.cn/registry/
-@ones-design:registry = https://npm.partner.ones.cn/registry/
-@ones-open:registry = https://npm.partner.ones.cn/registry/