easy-soft-develop 2.1.6 → 2.1.13

package/bin/cli.js

@@ -57,6 +57,7 @@ program
   .command('publish')
   .description('publish public packages to npm')
   .option('--packages <string>', 'the packages will publish')
+  .requiredOption('--opt <string>', 'use npm one-time password', false)
   .action((a, o) => {
     publishToNpm.run(a, o);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.6",
+  "version": "2.1.13",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {

package/src/cliCollection/publish-to-npm.js

@@ -13,13 +13,15 @@ const {
 
 exports.run = function (s, o) {
   const {
-    _optionValues: { packages },
+    _optionValues: { packages, opt },
   } = o;
 
   if (checkStringIsEmpty(packages)) {
     exit();
   }
 
+  const useOpt = !!opt;
+
   const packageList = packages.split(',');
 
   promptInfo('publish public packages to npm');
@@ -30,10 +32,16 @@ exports.run = function (s, o) {
 
       try {
         promptInfo(
-          `package ${name}: npm publish --registry https://registry.npmjs.org/`,
+          `package ${name}: npm publish --registry https://registry.npmjs.org/${
+            useOpt ? ' --opt' : ''
+          }`,
         );
 
-        exec(`npm publish --registry https://registry.npmjs.org/`);
+        exec(
+          `npm publish --registry https://registry.npmjs.org/${
+            useOpt ? ' --opt' : ''
+          }`,
+        );
 
         promptEmptyLine();
       } catch (error) {

package/src/config/develop.initial.environment.js

@@ -0,0 +1,47 @@
+const {
+  writeJsonFileSync,
+  readJsonFileSync,
+  existFileSync,
+  mkdirSync,
+} = require('../tools/meta');
+
+const developInitialEnvironment = {
+  publishWithOpt: false,
+};
+
+const developInitialEnvironmentConfigFilePath =
+  './develop/config/develop.initial.environment.json';
+
+function createDevelopInitialEnvironmentConfigFile() {
+  mkdirSync(`./develop`);
+
+  mkdirSync(`./develop/config`);
+
+  writeJsonFileSync(
+    developInitialEnvironmentConfigFilePath,
+    developInitialEnvironment,
+    {
+      coverFile: false,
+    },
+  );
+}
+
+function getDevelopInitialEnvironmentConfig() {
+  const developInitialEnvironmentConfigFileExist = existFileSync(
+    developInitialEnvironmentConfigFilePath,
+  );
+
+  if (!developInitialEnvironmentConfigFileExist) {
+    createDevelopInitialEnvironmentConfigFile();
+  }
+
+  return {
+    ...developInitialEnvironment,
+    ...readJsonFileSync(developInitialEnvironmentConfigFilePath),
+  };
+}
+
+module.exports = {
+  createDevelopInitialEnvironmentConfigFile,
+  getDevelopInitialEnvironmentConfig,
+};

package/src/project/initProject.js

@@ -25,6 +25,9 @@ const {
   getMainDevelopPackages,
   getProjectDevelopPackages,
 } = require('../tools/package.dependence');
+const {
+  createDevelopInitialEnvironmentConfigFile,
+} = require('../config/develop.initial.environment');
 
 function createLernaProjectFolder(name) {
   mkdirSync(`./${name}`);
@@ -79,7 +82,7 @@ function createPnpmWorkspaceFile() {
   }
 }
 
-function createLernaConfigFile(lernaName) {
+function createLernaConfigFile(packageName) {
   const content = `{
     "packages": ["packages/*"],
     "version": "independent",
@@ -92,12 +95,12 @@ function createLernaConfigFile(lernaName) {
       },
       "version": {
         "conventionalCommits": true,
-        "message": "chore(${lernaName}): version",
+        "message": "chore(${packageName}): version",
         "changelogPreset": "conventional-changelog-conventionalcommits"
       },
       "publish": {
         "conventionalCommits": true,
-        "message": "chore(${lernaName}): publish",
+        "message": "chore(${packageName}): publish",
         "changelogPreset": "conventional-changelog-conventionalcommits"
       }
     }
@@ -218,6 +221,10 @@ function createVscode() {
 function initialEnvironment() {
   mkdirSync(`./develop`);
 
+  mkdirSync(`./develop/config`);
+
+  createDevelopInitialEnvironmentConfigFile();
+
   promptSuccess(`step *: config environment`);
 
   promptEmptyLine();
@@ -278,7 +285,7 @@ function createLernaProject(name) {
   }
 
   createLernaPackageJsonFile(lernaName);
-  createLernaConfigFile(lernaName);
+  createLernaConfigFile(name);
   createPnpmWorkspaceFile();
 
   createProjectFolder(name);

package/src/templates/package.template.js

@@ -65,7 +65,8 @@ const globalChildPackageFile = {
   fileContent: globalChildPackageFileContent,
 };
 
-const globalMainPackageFileContent = `${fileGlobalHeader}
+function getGlobalMainPackageFileContent() {
+  return `${fileGlobalHeader}
 const lintScript = {
   'z:lint:staged': 'npx lint-staged',
   'z:lint:staged:quiet': 'npx lint-staged --quiet',
@@ -165,12 +166,13 @@ module.exports = {
   ...ncuScript,
 };
 `;
+}
 
 const globalMainPackageFile = {
   folderPath: `${folderPath}/template`,
   fileName: 'main.content.js',
   coverFile: true,
-  fileContent: globalMainPackageFileContent,
+  fileContent: getGlobalMainPackageFileContent(),
 };
 
 const customMainPackageFileContent = `${fileGlobalHeader}

package/src/tools/initial.environment.js

@@ -1,3 +1,6 @@
+const {
+  getDevelopInitialEnvironmentConfig,
+} = require('../config/develop.initial.environment');
 const { checkInCollection, checkStringIsEmpty, mkdirSync } = require('./meta');
 const {
   promptSuccess,
@@ -114,12 +117,17 @@ function adjustMainPackageJsonScript({ scripts }) {
     testAllProjects.push(`npm run test:${name}`);
   });
 
+  const developInitialEnvironmentConfig = getDevelopInitialEnvironmentConfig();
+
+  const publishWithOpt =
+    developInitialEnvironmentConfig.publishWithOpt || false;
+
   packageJson.scripts = assignObject(
     {
       'z:build:all': 'echo please supplement build all packages commend',
       'z:publish:npm-all': `easy-soft-develop publish --packages ${publishPackageNameList.join(
         ',',
-      )}`,
+      )}${publishWithOpt ? ' --opt' : ''}`,
     },
     globalScript,
     originalScript || {},

package/types/config/develop.initial.environment.d.ts

@@ -0,0 +1,2 @@
+export function createDevelopInitialEnvironmentConfigFile(): void;
+export function getDevelopInitialEnvironmentConfig(): any;

package/types/templates/package.template.d.ts

@@ -11,7 +11,7 @@ export namespace globalMainPackageFile {
     export { fileName_1 as fileName };
     const coverFile_1: boolean;
     export { coverFile_1 as coverFile };
-    export { globalMainPackageFileContent as fileContent };
+    export const fileContent: string;
 }
 export namespace customMainPackageFile {
     const folderPath_2: string;
@@ -32,7 +32,6 @@ export namespace customChildPackageFile {
     export { customChildPackageFileContent as fileContent };
 }
 declare const globalChildPackageFileContent: string;
-declare const globalMainPackageFileContent: string;
 declare const customMainPackageFileContent: string;
 declare const customChildPackageFileContent: string;
 export {};