easy-soft-develop 2.1.35 → 2.1.37

package/bin/cli.js

@@ -9,7 +9,7 @@ const updateAllPackageVersion = require('../src/cliCollection/update-all-package
 const sleep = require('../src/cliCollection/sleep');
 const publishToNpm = require('../src/cliCollection/publish-to-npm');
 const commitRefresh = require('../src/cliCollection/commit-refresh');
-const createLernaProject = require('../src/cliCollection/create-lerna-project');
+const createRepositoryProject = require('../src/cliCollection/create-repository-project');
 const clearAllDependence = require('../src/cliCollection/clear-all-dependence');
 const updatePackageFromPackage = require('../src/cliCollection/update-package-from-package');
 const createProjectWithTemplate = require('../src/cliCollection/create-project-with-template');
@@ -75,11 +75,11 @@ program
   });
 
 program
-  .command('create-lerna-project')
-  .description('create a lerna project')
+  .command('create-project')
+  .description('create a repository project')
   .option('--name <string>', 'project name')
   .action((a, o) => {
-    createLernaProject.run(a, o);
+    createRepositoryProject.run(a, o);
   });
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.1.35",
+  "version": "2.1.37",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {
@@ -30,7 +30,7 @@
     "test:bin:check-all-package-version": "node ./bin/cli.js check-all-package-version",
     "test:bin:code": "node ./bin/cli.js code --dataPath ./develop/generatorCodeSource/code.json",
     "test:bin:create-assist-scripts": "node ./bin/cli.js create-assist-scripts",
-    "test:bin:create-lerna-project": "node ./bin/cli.js create-lerna-project",
+    "test:bin:create-repository-project": "node ./bin/cli.js create-repository-project",
     "test:bin:publish": "node ./bin/cli.js publish --packages ss --otp true",
     "test:bin:sleep": "node ./bin/cli.js sleep --second 2 --showInfo true",
     "test:bin:update-all-package-version": "node ./bin/cli.js update-all-package-version",
@@ -73,7 +73,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.6",
     "@commitlint/config-conventional": "^17.6.6",
-    "@commitlint/config-lerna-scopes": "^17.6.6",
+    "@commitlint/config-pnpm-scopes": "^17.6.6",
     "@commitlint/cz-commitlint": "^17.5.0",
     "commitizen": "^4.3.0",
     "conventional-changelog-conventionalcommits": "^6.1.0",

package/src/cliCollection/create-repository-project.js

@@ -0,0 +1,9 @@
+const { createRepositoryProject } = require('../project/initProject');
+
+exports.run = function (s, o) {
+  const {
+    _optionValues: { name },
+  } = o;
+
+  createRepositoryProject(name);
+};

package/src/project/initProject.js

@@ -29,13 +29,13 @@ const {
   createDevelopInitialEnvironmentConfigFile,
 } = require('../config/develop.initial.environment');
 
-function createLernaProjectFolder(name) {
+function createRepositoryProjectFolder(name) {
   mkdirSync(`./${name}`);
 
   promptSuccess(`step *: create folder ${name} success`);
 }
 
-function createLernaPackageJsonFile(lernaName) {
+function createRepositoryPackageJsonFile(repositoryName) {
   const devDependencies = {};
 
   let packages = getGlobalDevelopPackages();
@@ -51,7 +51,7 @@ function createLernaPackageJsonFile(lernaName) {
   });
 
   const packageJson = {
-    name: lernaName,
+    name: repositoryName,
     version: '1.0.0',
     author: '',
     workspaces: ['packages/*'],
@@ -82,36 +82,8 @@ function createPnpmWorkspaceFile() {
   }
 }
 
-function createLernaConfigFile(packageName) {
-  const content = `{
-    "packages": ["packages/*"],
-    "version": "independent",
-    "npmClient": "pnpm",
-    "command": {
-      "updated": {
-        "conventionalCommits": true,
-        "changelogPreset": "conventional-changelog-conventionalcommits"
-      },
-      "version": {
-        "conventionalCommits": true,
-        "message": "chore(${packageName}): version",
-        "changelogPreset": "conventional-changelog-conventionalcommits"
-      },
-      "publish": {
-        "conventionalCommits": true,
-        "message": "chore(${packageName}): publish",
-        "changelogPreset": "conventional-changelog-conventionalcommits"
-      }
-    }
-  }
-  `;
-
-  let result = writeFileSync(`./lerna.json`, content, { coverFile: true });
-
-  if (result) {
-    promptSuccess(`step *: create lerna.json success`);
-  }
-}
+// eslint-disable-next-line no-unused-vars
+function createRepositoryConfigFile(packageName) {}
 
 function createProjectFolder(name) {
   mkdirSync(`./packages/`);
@@ -163,6 +135,9 @@ function createHusky() {
   const commitMsg = `#!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
+echo ---------------------
+echo exec husky commit-msg
+
 npx commitlint -e $HUSKY_GIT_PARAMS -V
 `;
 
@@ -171,7 +146,8 @@ npx commitlint -e $HUSKY_GIT_PARAMS -V
   const precommit = `#!/bin/sh
   . "$(dirname "$0")/_/husky.sh"
 
-  npx lerna run --concurrency 1 --stream precommit --since HEAD --exclude-dependents
+echo ---------------------
+echo exec husky pre-commit
   `;
 
   writeFileSync(`./.husky/pre-commit`, precommit, { coverFile: true });
@@ -249,19 +225,19 @@ function initialEnvironment() {
   exec('npx husky install');
 }
 
-function createLernaProject(name) {
+function createRepositoryProject(name) {
   if (checkStringIsEmpty(name)) {
     promptError(
-      'project name disallow empty, please use create-lerna-project --name name or get info with create-lerna-project --help',
+      'project name disallow empty, please use create-repository-project --name name or get info with create-repository-project --help',
     );
 
     return;
   }
-  const lernaName = `lerna-${name}`;
+  const repositoryName = `mono-${name}`;
 
-  createLernaProjectFolder(lernaName);
+  createRepositoryProjectFolder(repositoryName);
 
-  cd(`./${lernaName}`);
+  cd(`./${repositoryName}`);
 
   if (!existDirectorySync(`./.git`)) {
     promptSuccess(`step *: init git(branch main) success`);
@@ -283,8 +259,8 @@ function createLernaProject(name) {
     promptEmptyLine();
   }
 
-  createLernaPackageJsonFile(lernaName);
-  createLernaConfigFile(name);
+  createRepositoryPackageJsonFile(repositoryName);
+  createRepositoryConfigFile(name);
   createPnpmWorkspaceFile();
 
   createProjectFolder(name);
@@ -302,4 +278,4 @@ function createLernaProject(name) {
   initialEnvironment();
 }
 
-module.exports = { createLernaProject };
+module.exports = { createRepositoryProject };

package/src/templates/commitlint.config.template.js

@@ -6,7 +6,7 @@ const contentFileContent = `${fileGlobalHeader}
 module.exports = {
   extends: [
     '@commitlint/config-conventional',
-    '@commitlint/config-lerna-scopes',
+    '@commitlint/config-pnpm-scopes',
   ],
   parserPreset: 'conventional-changelog-conventionalcommits',
   prompt: {

package/src/templates/package.template.js

@@ -73,28 +73,25 @@ const lintScript = {
 };
 
 const prepareScript = {
-  prepare: 'npm run z:husky:install && echo do other prepare work with here',
+  prepare: 'pnpm changeset init && npm run z:husky:install && echo do other prepare work with here',
   'z:husky:install':'npx husky install'
 };
 
 const toolsScript = {
   postinstall: 'npm run z:initial:environment && echo do other postinstall work with here',
   'z:show:info':
-    'echo node version && node --version && echo npm version && npm --version && echo ------------ && npx lerna ls -a -l',
-  "z:show:package": "npx lerna ls -a -l",
+    'echo node version && node --version && echo npm version && npm --version',
   "z:sleep": "npx easy-soft-develop sleep --second 2 --showInfo false",
   "z:create:assist-scripts": "npx easy-soft-develop create-assist-scripts",
   "z:update:package-from-package": "node ./develop/assists/update-package-from-package.js",
 };
 
 const publishScript = {
-  changelog:
-    'lerna version --conventional-commits --no-push --no-git-tag-version',
-  'prez:publish:lerna': 'npm run z:change:npm:registry:npm',
-  'z:publish:lerna': 'lerna updated && npm run z:lerna:publish',
-  'postz:publish:lerna': 'npm run z:change:npm:registry:local && npm run z:publish:npm-all',
-  'prez:publish:build': 'npm run z:install && npm run z:cz && npm run z:build:all',
-  'z:publish:build': 'npm run z:publish:lerna',
+  'prez:publish:repository': 'npm run z:change:npm:registry:local',
+  'z:publish:repository': 'npm run z:repository:publish',
+  'postz:publish:repository': 'npm run z:publish:npm-all',
+  'prez:publish:build': 'npm run z:install && pnpm changeset && pnpm changeset version && npm run z:cz && npm run z:build:all',
+  'z:publish:build': 'npm run z:publish:repository',
 };
 
 const cleanScript = {
@@ -106,14 +103,14 @@ const environmentScript = {
   "z:initial:environment": "node ./develop/assists/initial.environment.js",
 };
 
-const lernaScript = {
-  'z:lerna:publish': 'lerna publish --yes',
-  'z:lerna:bootstrap':
+const repositoryScript = {
+  'z:repository:publish': 'pnpm -r publish',
+  'z:bootstrap':
     'npm run z:clean && npm run z:husky:install && git pull && npm run z:install',
 };
 
 const installScript = {
-  "z:reinstall": 'npm run z:lerna:bootstrap',
+  "z:reinstall": 'npm run z:bootstrap',
   "postinstall": "npm run z:initial:environment",
   "prez:install.global.develop.dependence": "npm run z:change:npm:registry:local",
   "z:install.global.develop.dependence": "node ./develop/assists/install.global.develop.dependence",
@@ -159,7 +156,7 @@ module.exports = {
   ...publishScript,
   ...cleanScript,
   ...environmentScript,
-  ...lernaScript,
+  ...repositoryScript,
   ...installScript,
   ...nrmScript,
   ...commitScript,

package/src/tools/develop.file.js

@@ -87,7 +87,7 @@ module.exports = {
 `;
 
 const cleanConfigContent = `${fileGlobalHeader}
-const cleanCommand = 'lerna clean -y';
+const cleanCommand = '';
 
 const cleanCollection = [];
 

package/src/tools/package.dependence.js

@@ -16,7 +16,7 @@ function getGlobalDevelopPackages() {
   packages = packages.concat([
     '@commitlint/cli',
     '@commitlint/config-conventional',
-    '@commitlint/config-lerna-scopes',
+    '@commitlint/config-pnpm-scopes',
     '@commitlint/cz-commitlint',
     '@pmmmwh/react-refresh-webpack-plugin',
     'commitizen',

package/types/cliCollection/create-lerna-project.d.ts

@@ -1 +1 @@
-export function run(s: any, o: any): void;
+export function run(s: any, o: any): void;

package/types/cliCollection/create-repository-project.d.ts

@@ -0,0 +1 @@
+export function run(s: any, o: any): void;

package/types/project/initProject.d.ts

@@ -1 +1 @@
-export function createLernaProject(name: any): void;
+export function createRepositoryProject(name: any): void;

package/src/cliCollection/create-lerna-project.js

@@ -1,9 +0,0 @@
-const { createLernaProject } = require('../project/initProject');
-
-exports.run = function (s, o) {
-  const {
-    _optionValues: { name },
-  } = o;
-
-  createLernaProject(name);
-};