easy-soft-develop 2.0.161 → 2.0.163

package/package.json

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

package/src/project/initProject.js

@@ -17,11 +17,12 @@ const {
   createNcuConfigFile,
   createNpmConfigFile,
 } = require('../tools/develop.file');
+const { globalScript, packageScript } = require('../tools/package.script');
 const {
-  getGlobalPackages,
-  globalScript,
-  packageScript,
-} = require('../tools/package.script');
+  getGlobalDevelopPackages,
+  getMainDevelopPackages,
+  getProjectDevelopPackages,
+} = require('../tools/package.dependence');
 
 function createLernaProjectFolder(name) {
   mkdirSync(`./${name}`);
@@ -32,7 +33,11 @@ function createLernaProjectFolder(name) {
 function createLernaPackageJsonFile(lernaName) {
   const devDependencies = {};
 
-  getGlobalPackages().forEach((o) => {
+  let packages = getGlobalDevelopPackages();
+
+  packages = packages.concat(getMainDevelopPackages());
+
+  packages.forEach((o) => {
     if (checkStringIsEmpty(o)) {
       return;
     }
@@ -115,7 +120,11 @@ function createProjectFolder(name) {
 function createPackageJsonFile(name) {
   const devDependencies = {};
 
-  getGlobalPackages().forEach((o) => {
+  let packages = getGlobalDevelopPackages();
+
+  packages = packages.concat(getProjectDevelopPackages());
+
+  packages.forEach((o) => {
     if (checkStringIsEmpty(o)) {
       return;
     }

package/src/templates/eslint.template.js

@@ -65,7 +65,7 @@ const contentFile = {
 
 const configFileContent = `${fileGlobalHeader}
 const { rules } = require('./items/rules');
-const { parserOptions } = require('./items/parser');
+const { parserJsOptions, parserTsOptions } = require('./items/parser');
 const { pluginCollection } = require('./items/plugins');
 const { extendCollection } = require('./items/extends');
 const { settings } = require('./items/settings');
@@ -84,11 +84,16 @@ module.exports = {
       shelljs: true,
       node: true,
     },
-    plugins: [
-      ...pluginCollection,
+    plugins: [...pluginCollection],
+    parser: '@babel/eslint-parser',
+    parserOptions: parserJsOptions,
+    overrides: [
+      {
+        files: ['*.ts', '*.tsx'],
+        parser: '@typescript-eslint/parser',
+        parserOptions: parserTsOptions,
+      },
     ],
-    parser: '@typescript-eslint/parser',
-    parserOptions: parserOptions,
     rules: rules,
     settings: settings,
   },
@@ -437,10 +442,26 @@ const pluginFile = {
 };
 
 const parserEmbedFileContent = `${fileGlobalHeader}
-const parserOptions = {};
+const parserJsOptions = {
+  requireConfigFile: false,
+  babelOptions: {
+    presets: ['@babel/preset-react'],
+    plugins: [
+      ['@babel/plugin-proposal-decorators', { legacy: true }],
+      ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ],
+  },
+};
+
+const parserTsOptions = {
+  ecmaFeatures: {
+    jsx: true,
+  },
+};
 
 module.exports = {
-  parserOptions: { ...parserOptions },
+  parserJsOptions: { ...parserJsOptions },
+  parserTsOptions: { ...parserTsOptions },
 };
 `;
 
@@ -452,10 +473,13 @@ const parserEmbedFile = {
 };
 
 const parserCustomFileContent = `${fileGlobalHeader}
-const parserOptions = {};
+const parserJsOptions = {};
+
+const parserTsOptions = {};
 
 module.exports = {
-  parserOptions: { ...parserOptions },
+  parserJsOptions: { ...parserJsOptions },
+  parserTsOptions: { ...parserTsOptions },
 };
 `;
 
@@ -467,11 +491,18 @@ const parserCustomFile = {
 };
 
 const parserFileContent = `${fileGlobalHeader}
-const { parserOptions: embedParserOptions } = require('./embed');
-const { parserOptions: customParserOptions } = require('./custom');
+const {
+  parserJsOptions: embedParserJsOptions,
+  parserTsOptions: embedParserTsOptions,
+} = require('./embed');
+const {
+  parserJsOptions: customParserJsOptions,
+  parserTsOptions: customParserTsOptions,
+} = require('./custom');
 
 module.exports = {
-  parserOptions: { ...embedParserOptions, ...customParserOptions },
+  parserJsOptions: { ...embedParserJsOptions, ...customParserJsOptions },
+  parserTsOptions: { ...embedParserTsOptions, ...customParserTsOptions },
 };
 `;
 

package/src/templates/git.template.js

@@ -26,24 +26,31 @@ const attributeFile = {
 const ignoreFileContent = `${fileGlobalHeader}
 const content = \`# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-# dependencies
+# ignore dependencies dir
 **/node_modules
 
-# ignore dir
+# ignore distribute dir
 **/dist
 **/es
+
+# ignore temporary dir
 **/.umi
 **/.umi-production
+
+# ignore config dir
 **/.idea
 **/.history
 **/.vs
 
-# ignore file
+# ignore jest dir
+**/coverage
+
+# ignore general file
 *.log
 *.d.ts
 *.bak
 
-# ignore special
+# ignore special file
 rollup.config-*.cjs
 yarn.lock
 package-lock.json

package/src/templates/jest.template.js

@@ -0,0 +1,48 @@
+const { fileGlobalHeader } = require('./template.config');
+
+const folderPath = './develop/config/jest';
+
+const configFileContent = `${fileGlobalHeader}
+const content = \`${fileGlobalHeader}
+module.exports = {
+  collectCoverage: true,
+  verbose: true,
+};
+\`;
+
+module.exports = {
+  content,
+};
+`;
+
+const configFile = {
+  folderPath: `${folderPath}/template`,
+  fileName: 'content.js',
+  coverFile: true,
+  fileContent: configFileContent,
+};
+
+const simpleTestFileContent = `${fileGlobalHeader}
+const content = \`test('jest simple', () => {
+  expect(true).toBe(true);
+});
+\`;
+
+module.exports = {
+  content,
+};
+`;
+
+const simpleTestFile = {
+  folderPath: `${folderPath}/template`,
+  fileName: 'simple.test.content.js',
+  coverFile: true,
+  fileContent: configFileContent,
+};
+
+module.exports = {
+  configFileContent,
+  configFile,
+  simpleTestFileContent,
+  simpleTestFile,
+};

package/src/templates/package.template.js

@@ -44,12 +44,17 @@ const tscScript = {
   'z:tsc:build': 'echo show tsc version and create declaration file && tsc -v && tsc -p ./tsconfig.types.json && echo declaration file generate complete',
 };
 
+const jestScript = {
+  'z:test': 'cross-env NODE_ENV=test jest',
+};
+
 module.exports = {
   ...commitScript,
   ...documentationScript,
   ...lintScript,
   ...prettierScript,
   ...tscScript,
+  ...jestScript,
 };
 `;
 
@@ -123,7 +128,7 @@ const nrmScript = {
 
 const commitScript = {
   commitlint: 'npx commitlint --edit',
-  precz: 'npm run z:commit:refresh && git stage -A',
+  precz: 'npm run z:test && npm run z:commit:refresh && git stage -A',
   cz: 'cz',
   postcz: 'git push',
   precommit: 'npm run z:lint:staged:quiet',
@@ -145,6 +150,10 @@ const ncuScript = {
   'postz:update:special-package-version': 'npm run z:install',
 };
 
+const jestScript = {
+  'z:test': '',
+};
+
 module.exports = {
   ...lintScript,
   ...prettierScript,

package/src/tools/develop.file.js

@@ -62,6 +62,7 @@ const {
   contentFile: stylelintContentFile,
   configFile: stylelintConfigFile,
 } = require('../templates/stylelint.template');
+const { configFile: jestConfigFile } = require('../templates/jest.template');
 
 const childrenDevelopPackageConfigContent = `${fileGlobalHeader}
 const childrenDevelopPackageList = [];
@@ -370,6 +371,8 @@ const editorFile = require('../config/editor/template/content');
 const editorAttributesFile = require('../config/git/template/attributes.content');
 const editorIgnoreFile = require('../config/git/template/ignore.content');
 const lintStagedFile = require('../config/lint-staged/template/content');
+const jestFile = require('../config/jest/template/content');
+const jestSimpleTestFile = require('../config/jest/template/simple.test.content');
 const mainNecessaryPackageFile = require('../config/package/template/main.content');
 const childrenNecessaryPackageFile = require('../config/package/template/children.content');
 const mainCustomPackageFile = require('../config/package/custom/main.content');
@@ -397,6 +400,8 @@ const gitAttributesContent = editorAttributesFile.content;
 
 const gitIgnoreContent = editorIgnoreFile.content;
 const lintStagedRcContent = lintStagedFile.content;
+const jestContent = jestFile.content;
+const jestSimpleTestContent = jestSimpleTestFile.content;
 
 const mainFileContentList = [
   {
@@ -502,6 +507,16 @@ const packageFileContentList = [
     content: lintStagedRcContent,
     coverFile: false,
   },
+  {
+    name: 'jest.config.js',
+    content: jestContent,
+    coverFile: false,
+  },
+  {
+    name: 'simple.test.js',
+    content: jestSimpleTestContent,
+    coverFile: true,
+  },
 ];
 
 initialEnvironment({
@@ -627,6 +642,12 @@ function createDevelopFiles(waitMessage = '', successMessage = '') {
 
   //#endregion
 
+  //#region jest
+
+  writeFileWithOptionsSync(jestConfigFile);
+
+  //#endregion
+
   //#region assists
 
   createAssistConfigScriptFile();

package/src/tools/initial.environment.js

@@ -1,4 +1,4 @@
-const { checkInCollection } = require('./meta');
+const { checkInCollection, checkStringIsEmpty } = require('./meta');
 const {
   promptSuccess,
   writeFileSync,
@@ -44,9 +44,17 @@ function createPackageFile(fileWithContentCollection) {
     }
 
     fileWithContentCollection.forEach((o) => {
-      const { name, content, coverFile } = o;
-
-      writeFileSync(`${itemPath}/${name}`, content, { coverFile });
+      const { name, relativePath = '', content, coverFile } = o;
+
+      writeFileSync(
+        `${itemPath}${
+          checkStringIsEmpty(relativePath) ? '' : `/${relativePath}`
+        }/${name}`,
+        content,
+        {
+          coverFile,
+        },
+      );
     });
   });
 
@@ -83,9 +91,15 @@ function adjustMainPackageJsonScript({ scripts }) {
   });
 
   const publishPackageNameList = [];
+  const testScript = {};
+  const testAllProjects = [];
 
   loopPackage(({ name }) => {
     publishPackageNameList.push(name);
+
+    testScript[`test:${name}`] = `cd packages/${name} && npm run test`;
+
+    testAllProjects.push(`test:${name}`);
   });
 
   packageJson.scripts = assignObject(
@@ -98,6 +112,9 @@ function adjustMainPackageJsonScript({ scripts }) {
     globalScript,
     originalScript || {},
     scripts,
+    {
+      'z:test': testAllProjects.join(' && '),
+    },
   );
 
   writeJsonFileSync(mainProjectPath, packageJson, { coverFile: true });

package/src/tools/meta.js

@@ -193,25 +193,38 @@ function writeFileSync(path, content, options = { coverFile: false }) {
 
 function writeFileWithFolderAndNameSync(
   folderPath,
+  relativePath,
   fileName,
   fileContent,
   coverFile = false,
 ) {
   mkdirSync(folderPath);
 
-  return writeFileSync(`${folderPath}/${fileName}`, fileContent, {
-    coverFile: coverFile,
-  });
+  if (!checkStringIsEmpty(relativePath)) {
+    mkdirSync(`${folderPath}/${relativePath}`);
+  }
+
+  return writeFileSync(
+    `${folderPath}${
+      checkStringIsEmpty(relativePath) ? '' : `/${relativePath}`
+    }/${fileName}`,
+    fileContent,
+    {
+      coverFile: coverFile,
+    },
+  );
 }
 
 function writeFileWithOptionsSync({
   folderPath,
+  relativePath = '',
   fileName,
   fileContent,
   coverFile = false,
 }) {
   return writeFileWithFolderAndNameSync(
     folderPath,
+    relativePath,
     fileName,
     fileContent,
     coverFile,

package/src/tools/package.dependence.js

@@ -0,0 +1,90 @@
+function getGlobalDevelopPackages() {
+  let packages = [];
+
+  packages = packages.concat([
+    '@babel/core',
+    '@babel/eslint-parser',
+    '@babel/plugin-external-helpers',
+    '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-proposal-decorators',
+    '@babel/plugin-transform-runtime',
+    '@babel/preset-env',
+    '@babel/preset-react',
+    '@babel/runtime',
+  ]);
+
+  packages = packages.concat([
+    '@commitlint/cli',
+    '@commitlint/config-conventional',
+    '@commitlint/config-lerna-scopes',
+    '@commitlint/cz-commitlint',
+    '@pmmmwh/react-refresh-webpack-plugin',
+    'commitizen',
+    'conventional-changelog-conventionalcommits',
+  ]);
+
+  packages = packages.concat([
+    'eslint',
+    'eslint-config-airbnb',
+    'eslint-config-airbnb-typescript',
+    'eslint-config-prettier',
+    'eslint-formatter-pretty',
+    'eslint-import-resolver-typescript',
+    'eslint-plugin-eslint-comments',
+    'eslint-plugin-import',
+    'eslint-plugin-jest',
+    'eslint-plugin-jsx-a11y',
+    'eslint-plugin-prettier',
+    'eslint-plugin-promise',
+    'eslint-plugin-react',
+    'eslint-plugin-react-hooks',
+    'eslint-plugin-simple-import-sort',
+    'eslint-plugin-unicorn',
+  ]);
+
+  packages = packages.concat(['documentation']);
+
+  packages = packages.concat([
+    'prettier',
+    'prettier-plugin-organize-imports',
+    'prettier-plugin-packagejson',
+  ]);
+
+  packages = packages.concat([
+    'stylelint',
+    'stylelint-config-prettier',
+    'stylelint-config-standard',
+  ]);
+
+  packages = packages.concat(['@typescript-eslint/parser']);
+
+  packages = packages.concat(['@types/node']);
+
+  packages = packages.concat('rimraf', 'lint-staged', 'husky');
+
+  packages = packages.concat('easy-soft-develop');
+
+  return packages;
+}
+
+function getProjectDevelopPackages() {
+  let packages = [];
+
+  packages = packages.concat(['jest']);
+
+  return packages;
+}
+
+function getMainDevelopPackages() {
+  let packages = [];
+
+  packages = packages.concat(['@types/jest']);
+
+  return packages;
+}
+
+module.exports = {
+  getGlobalDevelopPackages,
+  getMainDevelopPackages,
+  getProjectDevelopPackages,
+};

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

@@ -8,7 +8,7 @@ const {
   writeJsonFileSync,
   exec,
 } = require('./meta');
-const { getGlobalPackages } = require('./package.script');
+const { getGlobalDevelopPackages } = require('./package.dependence');
 const { loopPackage } = require('./package.tools');
 const { updateSpecialPackageVersion } = require('./package.update');
 const { prettierAllPackageJson } = require('./prettier.package.json');
@@ -95,7 +95,7 @@ function installDevelopDependencePackages({
   childrenSpecialDevelopPackageList = [],
   execInstall = true,
 }) {
-  const packages = getGlobalPackages().concat(globalDevelopPackageList);
+  const packages = getGlobalDevelopPackages().concat(globalDevelopPackageList);
 
   promptInfo(`${packages.join()} will install`);
 

package/src/tools/package.script.js

@@ -4,73 +4,4 @@ const globalScript = {
 
 const packageScript = {};
 
-function getGlobalPackages() {
-  let packages = [];
-
-  packages = packages.concat([
-    '@babel/core',
-    '@babel/eslint-parser',
-    '@babel/plugin-external-helpers',
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-decorators',
-    '@babel/plugin-transform-runtime',
-    '@babel/preset-env',
-    '@babel/preset-react',
-    '@babel/runtime',
-  ]);
-
-  packages = packages.concat([
-    '@commitlint/cli',
-    '@commitlint/config-conventional',
-    '@commitlint/config-lerna-scopes',
-    '@commitlint/cz-commitlint',
-    '@pmmmwh/react-refresh-webpack-plugin',
-    'commitizen',
-    'conventional-changelog-conventionalcommits',
-  ]);
-
-  packages = packages.concat([
-    'eslint',
-    'eslint-config-airbnb',
-    'eslint-config-airbnb-typescript',
-    'eslint-config-prettier',
-    'eslint-formatter-pretty',
-    'eslint-import-resolver-typescript',
-    'eslint-plugin-eslint-comments',
-    'eslint-plugin-import',
-    'eslint-plugin-jest',
-    'eslint-plugin-jsx-a11y',
-    'eslint-plugin-prettier',
-    'eslint-plugin-promise',
-    'eslint-plugin-react',
-    'eslint-plugin-react-hooks',
-    'eslint-plugin-simple-import-sort',
-    'eslint-plugin-unicorn',
-  ]);
-
-  packages = packages.concat(['documentation']);
-
-  packages = packages.concat([
-    'prettier',
-    'prettier-plugin-organize-imports',
-    'prettier-plugin-packagejson',
-  ]);
-
-  packages = packages.concat([
-    'stylelint',
-    'stylelint-config-prettier',
-    'stylelint-config-standard',
-  ]);
-
-  packages = packages.concat(['@typescript-eslint/parser']);
-
-  packages = packages.concat(['@types/node']);
-
-  packages = packages.concat('rimraf', 'lint-staged', 'husky');
-
-  packages = packages.concat('easy-soft-develop');
-
-  return packages;
-}
-
-module.exports = { globalScript, packageScript, getGlobalPackages };
+module.exports = { globalScript, packageScript };

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

@@ -0,0 +1,17 @@
+export const configFileContent: string;
+export namespace configFile {
+    export const folderPath: string;
+    export const fileName: string;
+    export const coverFile: boolean;
+    export { configFileContent as fileContent };
+}
+export const simpleTestFileContent: string;
+export namespace simpleTestFile {
+    const folderPath_1: string;
+    export { folderPath_1 as folderPath };
+    const fileName_1: string;
+    export { fileName_1 as fileName };
+    const coverFile_1: boolean;
+    export { coverFile_1 as coverFile };
+    export { configFileContent as fileContent };
+}

package/types/tools/meta.d.ts

@@ -27,9 +27,10 @@ export function readJsonFileSync(path: any): any;
 export function writeJsonFileSync(path: any, json: any, options?: {
     coverFile: boolean;
 }): boolean;
-export function writeFileWithFolderAndNameSync(folderPath: any, fileName: any, fileContent: any, coverFile?: boolean): boolean;
-export function writeFileWithOptionsSync({ folderPath, fileName, fileContent, coverFile, }: {
+export function writeFileWithFolderAndNameSync(folderPath: any, relativePath: any, fileName: any, fileContent: any, coverFile?: boolean): boolean;
+export function writeFileWithOptionsSync({ folderPath, relativePath, fileName, fileContent, coverFile, }: {
     folderPath: any;
+    relativePath?: string | undefined;
     fileName: any;
     fileContent: any;
     coverFile?: boolean | undefined;

package/types/tools/package.dependence.d.ts

@@ -0,0 +1,3 @@
+export function getGlobalDevelopPackages(): any[];
+export function getMainDevelopPackages(): any[];
+export function getProjectDevelopPackages(): any[];

package/types/tools/package.script.d.ts

@@ -2,4 +2,3 @@ export const globalScript: {
     'z:initial:environment': string;
 };
 export const packageScript: {};
-export function getGlobalPackages(): any[];