easy-soft-develop 2.0.82 → 2.0.119

package/src/tools/develop.file.js

@@ -23,10 +23,21 @@ const {
   contentFile: eslintContentFile,
   ignoreFile: eslintIgnoreFile,
   configFile: eslintConfigFile,
+  ruleCustomFile: eslintCustomRuleFile,
+  ruleEmbedFile: eslintEmbedRuleFile,
   ruleFile: eslintRuleFile,
+  extendEmbedFile: eslintExtendCustomFile,
+  extendCustomFile: eslintExtendEmbedFile,
   extendFile: eslintExtendFile,
+  parserCustomFile: eslintParserCustomFile,
+  parserEmbedFile: eslintParserEmbedFile,
   parserFile: eslintParserFile,
+  pluginEmbedFile: eslintPluginEmbedFile,
+  pluginCustomFile: eslintPluginCustomFile,
   pluginFile: eslintPluginFile,
+  settingCustomFile: eslintSettingCustomFile,
+  settingEmbedFile: eslintSettingEmbedFile,
+  settingFile: eslintSettingFile,
 } = require('../templates/eslint.template');
 const {
   attributeFile: gitAttributeFile,
@@ -123,11 +134,19 @@ const developDependencePackageCollection = [];
 
 const updateSpecialPackageCollection = [];
 
+const updatePackageFromPackageOptions = {
+  agent: '',
+  localFile: '',
+  packageUrl: '',
+  repo: '',
+};
+
 module.exports = {
   cleanCommand,
   cleanCollection,
   developDependencePackageCollection,
   updateSpecialPackageCollection,
+  updatePackageFromPackageOptions,
 };
 `;
 
@@ -151,6 +170,23 @@ clean(cleanCommand, cleanCollection);
   return createScriptFile('./develop/assists', 'clean.js', content, true);
 }
 
+function createUpdatePackageFromPackageScriptFile() {
+  const content = `${fileGlobalHeader}
+const { updatePackageFromPackage } = require('easy-soft-develop');
+
+const { updatePackageFromPackageOptions } = require('./config');
+
+updatePackageFromPackage(updatePackageFromPackageOptions);
+`;
+
+  return createScriptFile(
+    './develop/assists',
+    'update.package.from.package.js',
+    content,
+    true,
+  );
+}
+
 function createPackageCheckSpecialVersionScriptFile() {
   const content = `${fileGlobalHeader}
 const { updateSpecialPackageVersion } = require('easy-soft-develop');
@@ -172,13 +208,23 @@ updateSpecialPackageVersion(updateSpecialPackageCollection);
   }
 }
 
-function createInstallGlobalDevDependenceScriptFile() {
+function createInstallGlobalDevelopDependenceScriptFile() {
   const content = `${fileGlobalHeader}
-const { installGlobalDevDependencePackages } = require('easy-soft-develop');
-
-const { developDependencePackageCollection } = require('./config');
+const { installDevelopDependencePackages } = require('easy-soft-develop');
 
-installGlobalDevDependencePackages(developDependencePackageCollection);
+const {
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+} = require('./config');
+
+installDevelopDependencePackages({
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+});
 `;
 
   try {
@@ -202,6 +248,7 @@ const eslintIgnoreFile = require('../config/eslint/template/ignore.content');
 const prettierFile = require('../config/prettier/template/content');
 const prettierIgnoreFile = require('../config/prettier/template/ignore.content');
 const stylelintFile = require('../config/stylelint/template/content');
+const stylelintIgnoreFile = require('../config/stylelint/template/ignore.content');
 const editorFile = require('../config/editor/template/content');
 const editorAttributesFile = require('../config/git/template/attributes.content');
 const editorIgnoreFile = require('../config/git/template/ignore.content');
@@ -222,6 +269,9 @@ const packagePrettierContent = prettierFile.packageContent;
 const prettierIgnoreContent = prettierIgnoreFile.content;
 
 const mainStylelintContent = stylelintFile.mainContent;
+
+const stylelintIgnoreContent = stylelintIgnoreFile.content;
+
 const packageStylelintContent = stylelintFile.packageContent;
 
 const editorConfigContent = editorFile.content;
@@ -235,38 +285,52 @@ const mainFileContentList = [
   {
     name: '.eslintrc.js',
     content: mainEslintFileContent,
+    coverFile: true,
   },
   {
     name: '.prettierrc.js',
     content: mainPrettierContent,
+    coverFile: true,
+  },
+  {
+    name: '.prettierignore',
+    content: prettierIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.stylelintrc.js',
     content: mainStylelintContent,
+    coverFile: true,
+  },
+  {
+    name: '.stylelintignore',
+    content: stylelintIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.editorconfig',
     content: editorConfigContent,
+    coverFile: true,
   },
   {
     name: '.eslintignore',
     content: eslintIgnoreContent,
-  },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.gitattributes',
     content: gitAttributesContent,
+    coverFile: true,
   },
   {
     name: '.gitignore',
     content: gitIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.lintstagedrc',
     content: lintStagedRcContent,
+    coverFile: false,
   },
 ];
 
@@ -274,38 +338,52 @@ const packageFileContentList = [
   {
     name: '.eslintrc.js',
     content: packageEslintFileContent,
+    coverFile: true,
   },
   {
     name: '.prettierrc.js',
     content: packagePrettierContent,
+    coverFile: true,
+  },
+  {
+    name: '.prettierignore',
+    content: prettierIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.stylelintrc.js',
     content: packageStylelintContent,
+    coverFile: true,
+  },
+  {
+    name: '.stylelintignore',
+    content: stylelintIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.editorconfig',
     content: editorConfigContent,
+    coverFile: true,
   },
   {
     name: '.eslintignore',
     content: eslintIgnoreContent,
-  },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.gitattributes',
     content: gitAttributesContent,
+    coverFile: true,
   },
   {
     name: '.gitignore',
     content: gitIgnoreContent,
+    coverFile: false,
   },
   {
     name: '.lintstagedrc',
     content: lintStagedRcContent,
+    coverFile: false,
   },
 ];
 
@@ -354,12 +432,34 @@ function createDevelopFiles(waitMessage = '', successMessage = '') {
 
   writeFileWithOptionsSync(eslintConfigFile);
 
+  writeFileWithOptionsSync(eslintCustomRuleFile);
+
+  writeFileWithOptionsSync(eslintEmbedRuleFile);
+
   writeFileWithOptionsSync(eslintRuleFile);
 
+  writeFileWithOptionsSync(eslintSettingCustomFile);
+
+  writeFileWithOptionsSync(eslintSettingEmbedFile);
+
+  writeFileWithOptionsSync(eslintSettingFile);
+
+  writeFileWithOptionsSync(eslintExtendCustomFile);
+
+  writeFileWithOptionsSync(eslintExtendEmbedFile);
+
   writeFileWithOptionsSync(eslintExtendFile);
 
+  writeFileWithOptionsSync(eslintParserCustomFile);
+
+  writeFileWithOptionsSync(eslintParserEmbedFile);
+
   writeFileWithOptionsSync(eslintParserFile);
 
+  writeFileWithOptionsSync(eslintPluginCustomFile);
+
+  writeFileWithOptionsSync(eslintPluginEmbedFile);
+
   writeFileWithOptionsSync(eslintPluginFile);
 
   //#endregion
@@ -416,9 +516,11 @@ function createDevelopFiles(waitMessage = '', successMessage = '') {
 
   createCleanScriptFile();
 
+  createUpdatePackageFromPackageScriptFile();
+
   createPackageCheckSpecialVersionScriptFile();
 
-  createInstallGlobalDevDependenceScriptFile();
+  createInstallGlobalDevelopDependenceScriptFile();
 
   createInitialEnvironmentScriptFiles();
 
@@ -437,7 +539,8 @@ module.exports = {
   createNpmConfigFile,
   createCleanScriptFile,
   createPackageCheckSpecialVersionScriptFile,
-  createInstallGlobalDevDependenceScriptFile,
+  createInstallGlobalDevelopDependenceScriptFile,
   createInitialEnvironmentScriptFiles,
   createDevelopFiles,
+  createUpdatePackageFromPackageScriptFile,
 };

package/src/tools/initial.environment.js

@@ -18,9 +18,9 @@ function createMainFile(fileWithContentCollection) {
   }
 
   fileWithContentCollection.forEach((o) => {
-    const { name, content } = o;
+    const { name, content, coverFile } = o;
 
-    writeFileSync(name, content);
+    writeFileSync(name, content, { coverFile });
   });
 
   const log = `main files [${fileWithContentCollection
@@ -43,9 +43,9 @@ function createPackageFile(fileWithContentCollection) {
     }
 
     fileWithContentCollection.forEach((o) => {
-      const { name, content } = o;
+      const { name, content, coverFile } = o;
 
-      writeFileSync(`${itemPath}/${name}`, content);
+      writeFileSync(`${itemPath}/${name}`, content, { coverFile });
     });
   });
 
@@ -82,7 +82,7 @@ function adjustMainPackageJson({ scripts }) {
 }
 
 function adjustChildrenPackageJson({ scripts }) {
-  loopPackage(({ absolutePath }) => {
+  loopPackage(({ name, absolutePath }) => {
     const itemPath = absolutePath;
 
     const childPackageJsonPath = `${itemPath}/package.json`;
@@ -93,7 +93,7 @@ function adjustChildrenPackageJson({ scripts }) {
 
     writeJsonFileSync(childPackageJsonPath, packageJson, { coverFile: true });
 
-    promptSuccess('adjust child package.json success');
+    promptSuccess(`adjust ${name} package.json success`);
     promptEmptyLine();
   });
 }

package/src/tools/package.install.global.develop.dependence.js

@@ -48,18 +48,32 @@ function adjustMainPackageJson(packageList) {
   writeJsonFileSync('./package.json', packageJson, { coverFile: true });
 }
 
-function adjustChildrenPackageJson(packageList) {
-  if (!isArray(packageList) || packageList.length <= 0) {
+function adjustChildrenPackageJson(packageList, specialPackageList) {
+  if (
+    !(
+      (isArray(packageList) && packageList.length > 0) ||
+      (isArray(specialPackageList) && specialPackageList.length > 0)
+    )
+  ) {
     return;
   }
 
   const o = buildPackageObject(packageList);
 
-  loopPackage(({ relativePath }) => {
+  loopPackage(({ name, relativePath }) => {
     const packageJson = readJsonFileSync(`${relativePath}/package.json`);
 
+    let specials = {};
+
+    if (specialPackageList[name]) {
+      if (isArray(specialPackageList[name])) {
+        specials = buildPackageObject(specialPackageList[name]);
+      }
+    }
+
     packageJson.devDependencies = assignObject(
       o,
+      specials,
       packageJson.devDependencies || {},
     );
 
@@ -69,14 +83,30 @@ function adjustChildrenPackageJson(packageList) {
   });
 }
 
-function installGlobalDevelopDependencePackages(packageList) {
-  const packages = getGlobalPackages().concat(packageList);
+function installDevelopDependencePackages({
+  globalDevelopPackageList,
+  mainDevelopPackageList = [],
+  childrenDevelopPackageList = [],
+  childrenSpecialDevelopPackageList = [],
+}) {
+  const packages = getGlobalPackages().concat(globalDevelopPackageList);
 
   promptInfo(`${packages.join()} will install`);
 
-  adjustChildrenPackageJson(packages);
+  adjustChildrenPackageJson(
+    packages.concat(
+      isArray(childrenDevelopPackageList) ? childrenDevelopPackageList : [],
+    ),
+    isArray(childrenSpecialDevelopPackageList)
+      ? childrenSpecialDevelopPackageList
+      : [],
+  );
 
-  adjustMainPackageJson(packages);
+  adjustMainPackageJson(
+    packages.concat(
+      isArray(mainDevelopPackageList) ? mainDevelopPackageList : [],
+    ),
+  );
 
   prettierAllPackageJson();
 
@@ -88,5 +118,5 @@ function installGlobalDevelopDependencePackages(packageList) {
 }
 
 module.exports = {
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
 };

package/src/tools/package.script.js

@@ -16,6 +16,7 @@ function getGlobalPackages() {
     '@babel/plugin-transform-runtime',
     '@babel/preset-env',
     '@babel/preset-react',
+    '@babel/runtime',
   ]);
 
   packages = packages.concat([
@@ -47,6 +48,8 @@ function getGlobalPackages() {
     'eslint-plugin-unicorn',
   ]);
 
+  packages = packages.concat(['documentation']);
+
   packages = packages.concat([
     'prettier',
     'prettier-plugin-organize-imports',
@@ -59,13 +62,7 @@ function getGlobalPackages() {
     'stylelint-config-standard',
   ]);
 
-  packages = packages.concat(
-    'rimraf',
-    'lint-staged',
-    'husky',
-    'shelljs',
-    'terminal-kit',
-  );
+  packages = packages.concat('rimraf', 'lint-staged', 'husky');
 
   packages = packages.concat('easy-soft-develop');
 

package/src/tools/update.package.from.package.js

@@ -0,0 +1,153 @@
+const download = require('download');
+const agent = require('hpagent');
+
+const {
+  promptSuccess,
+  promptLine,
+  promptError,
+  promptWarn,
+  exit,
+  readJsonFileSync,
+  resolvePath,
+  writeJsonFileSync,
+  checkStringIsEmpty,
+} = require('../tools/meta');
+
+const { HttpsProxyAgent } = agent;
+
+function handlePackage({ packageFilePath, packageTempPath }) {
+  promptSuccess(`referential package.json :${packageTempPath}`);
+
+  const packageProjectPath = resolvePath(packageFilePath);
+
+  const packageJsonTemp = readJsonFileSync(packageTempPath);
+
+  const packageJsonTarget = readJsonFileSync(packageProjectPath);
+
+  const dependencies = packageJsonTemp.dependencies;
+  const devDependencies = packageJsonTemp.devDependencies;
+
+  packageJsonTarget.dependencies = dependencies;
+  packageJsonTarget.devDependencies = devDependencies;
+
+  writeJsonFileSync(packageProjectPath, packageJsonTarget, { coverFile: true });
+
+  promptSuccess(`update package.json success!`);
+
+  promptLine();
+
+  exit();
+}
+
+async function handleTempPackagePath({ agent, localFile, packageUrl, repo }) {
+  let packageTempPath = '';
+
+  if (localFile) {
+    promptSuccess(`use local referential package.json`);
+
+    promptSuccess(`file path: ${localFile}`);
+
+    promptLine();
+
+    packageTempPath = resolvePath(localFile);
+  } else {
+    promptSuccess(`try ${repo} repo`);
+
+    if (agent) {
+      promptSuccess(`agent: ${agent}`);
+    }
+
+    promptSuccess(`${repo} repo: ${packageUrl}`);
+
+    await download(packageUrl, resolvePath(`./temp`), {
+      ...(agent
+        ? {
+            agent: {
+              https: new HttpsProxyAgent({
+                keepAlive: true,
+                keepAliveMsecs: 1000,
+                maxSockets: 256,
+                maxFreeSockets: 256,
+                scheduling: 'lifo',
+                proxy: agent,
+              }),
+            },
+          }
+        : {}),
+    });
+
+    promptSuccess(`use ${repo} repo success!`);
+
+    packageTempPath = resolvePath(`./temp/package.json`);
+
+    promptSuccess(`packageTempPath: ${packageTempPath}`);
+  }
+
+  return packageTempPath;
+}
+
+async function updatePackageFromPackage({
+  path,
+  primaryRemoteUrl,
+  spareRemoteUrl,
+  agent,
+  localFile,
+}) {
+  if (checkStringIsEmpty(primaryRemoteUrl)) {
+    promptError('please input primary remote package.json url');
+
+    exit();
+  }
+
+  let packageTempPath = '';
+
+  promptSuccess(`prepare to update package.json: `);
+
+  promptLine();
+
+  try {
+    packageTempPath = await handleTempPackagePath({
+      agent,
+      localFile,
+      packageUrl: primaryRemoteUrl,
+      repo: 'github',
+    });
+  } catch (error) {
+    if (checkStringIsEmpty(primaryRemoteUrl)) {
+      promptError('please input spare remote package.json url');
+
+      exit();
+    }
+
+    promptLine();
+
+    promptWarn(
+      `use github repo failure! switch to gitee, gitee repo possible update delay.`,
+    );
+
+    promptLine();
+
+    try {
+      packageTempPath = await handleTempPackagePath({
+        agent: '',
+        localFile,
+        packageUrl: spareRemoteUrl,
+        repo: 'gitee',
+      });
+    } catch (error) {
+      promptLine();
+
+      promptError(error);
+
+      promptLine();
+
+      promptWarn('download error, please check network');
+
+      exit();
+    }
+  }
+
+  handlePackage(path, packageTempPath);
+}
+
+module.exports = { updatePackageFromPackage };