easy-soft-develop 2.0.110 → 2.0.119

package/package.json

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

package/src/index.js

@@ -18,7 +18,7 @@ const {
   prettierChangeFile,
 } = require('./tools/prettier.file');
 const {
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
 } = require('./tools/package.install.global.develop.dependence');
 const { loopPackage } = require('./tools/package.tools');
 const {
@@ -34,7 +34,7 @@ module.exports = {
   clean,
   commitRefresh,
   initialEnvironment,
-  installGlobalDevelopDependencePackages,
+  installDevelopDependencePackages,
   loopPackage,
   checkAllPackageVersion,
   updateSpecialPackageVersion,

package/src/templates/eslint.template.js

@@ -10,6 +10,7 @@ const content = \`#
 **/.history
 **/.vs
 **/.swc
+**/docs
 
 *.d.ts
 *.log

package/src/templates/lint-staged.template.js

@@ -10,7 +10,7 @@ const content = \`{
     "npx prettier --cache --write"
   ],
   "*.{css,less,scss}": [
-    "stylelint",
+    "stylelint --allow-empty-input",
     "npx prettier --cache --write"
   ],
   "*.{ts,tsx}": [

package/src/templates/package.template.js

@@ -22,15 +22,15 @@ const lintScript = {
   'z:lint:script:all:fix': 'npx eslint --fix --ext .js,.jsx,.ts,.tsx ./src',
   'postz:lint:script:all:fix': 'npm run z:prettier:format:all',
   'z:lint:script:change': 'npx eslint --cache --ext .js,.jsx,.ts,.tsx ./src',
-  'z:lint:script:change:fix': 'npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ./src && npm run z:lint:style:fix',
-  'postz:lint:script:change:fix': 'npm run prettier:format:change',
+  'z:lint:script:change:fix': 'npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ./src',
+  'postz:lint:script:change:fix': 'npm run z:prettier:format:change',
   'z:lint:staged': 'npx lint-staged --quiet',
-  'z:lint:style:all': 'npx stylelint "./src/**/*.less"',
-  'z:lint:style:all:fix': 'npx stylelint --fix "./src/**/*.less"',
+  'z:lint:style:all': 'npx stylelint --allow-empty-input "./src/**/*.{css,scss,less}"',
+  'z:lint:style:all:fix': 'npx stylelint --allow-empty-input --fix "./src/**/*.{css,scss,less}"',
   'postz:lint:style:all:fix': 'npm run z:prettier:format:all',
-  'z:lint:style:change': 'npx stylelint --cache "./src/**/*.less"',
-  'z:lint:style:change:fix': 'npx stylelint --cache --fix "./src/**/*.less"',
-  'postz:lint:style:change:fix': 'npm run prettier:format:change',
+  'z:lint:style:change': 'npx stylelint --allow-empty-input --cache "./src/**/*.{css,scss,less}"',
+  'z:lint:style:change:fix': 'npx stylelint --allow-empty-input --cache --fix "./src/**/*.{css,scss,less}"',
+  'postz:lint:style:change:fix': 'npm run z:prettier:format:change',
 };
 
 const prettierScript = {
@@ -45,6 +45,7 @@ const tscScript = {
 
 module.exports = {
   ...commitScript,
+  ...documentationScript,
   ...lintScript,
   ...prettierScript,
   ...tscScript,

package/src/tools/develop.file.js

@@ -210,11 +210,21 @@ updateSpecialPackageVersion(updateSpecialPackageCollection);
 
 function createInstallGlobalDevelopDependenceScriptFile() {
   const content = `${fileGlobalHeader}
-const { installGlobalDevelopDependencePackages } = require('easy-soft-develop');
+const { installDevelopDependencePackages } = require('easy-soft-develop');
 
-const { developDependencePackageCollection } = require('./config');
-
-installGlobalDevelopDependencePackages(developDependencePackageCollection);
+const {
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+} = require('./config');
+
+installDevelopDependencePackages({
+  globalDevelopPackageList,
+  mainDevelopPackageList,
+  childrenDevelopPackageList,
+  childrenSpecialDevelopPackageList,
+});
 `;
 
   try {
@@ -238,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');
@@ -258,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;
@@ -278,11 +292,21 @@ const mainFileContentList = [
     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,
@@ -293,11 +317,6 @@ const mainFileContentList = [
     content: eslintIgnoreContent,
     coverFile: false,
   },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
-    coverFile: false,
-  },
   {
     name: '.gitattributes',
     content: gitAttributesContent,
@@ -326,11 +345,21 @@ const packageFileContentList = [
     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,
@@ -341,11 +370,6 @@ const packageFileContentList = [
     content: eslintIgnoreContent,
     coverFile: false,
   },
-  {
-    name: '.prettierignore',
-    content: prettierIgnoreContent,
-    coverFile: false,
-  },
   {
     name: '.gitattributes',
     content: gitAttributesContent,

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,
 };