@varlet/release 0.2.2 → 0.2.4

package/README.md

@@ -68,8 +68,10 @@ npx vr publish
 | Params                 | Instructions        |
 | ---------------------- | ------------------- |
 | -r --remote \<remote\> | Specify remote name |
-| -s --skip-npm-publish  | Skip npm publish           |
-| -sgt --skip-git-tag  | Skip git tag  |
+| -s --skip-npm-publish  | Skip npm publish    |
+| -sc --skip-changelog    | Skip generate changelog    |
+| -sgt --skip-git-tag    | Skip git tag        |
+| -nt --npm-tag \<npmTag\>   | npm tag        |
 
 #### changelog
 
@@ -89,9 +91,10 @@ npx vr publish
 
 #### publish
 
-```shell
-vr publish
-```
+| Params                      | Instructions                                                                                                                                             |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| -c --check-remote-version | Detects whether the remote version of the npm package is the same as the package version to be published locally, and if it is, skip the release |
+| -nt --npm-tag \<npmTag\>   | npm tag        |
 
 ### Custom Handle
 
@@ -120,12 +123,19 @@ release({ task })
 #### Types
 
 ```ts
-function publish(preRelease: boolean | undefined): Promise<void>
+interface PublishCommandOptions {
+  preRelease?: boolean
+  checkRemoteVersion?: boolean
+  npmTag?: string
+}
+function publish({ preRelease, checkRemoteVersion, npmTag }: PublishCommandOptions): Promise<void>
 function updateVersion(version: string): void
 interface ReleaseCommandOptions {
   remote?: string
   skipNpmPublish?: boolean
+  skipChangelog?: boolean
   skipGitTag?: boolean
+  npmTag?: string
   task?(): Promise<void>
 }
 function release(options: ReleaseCommandOptions): Promise<void>

package/README.zh-CN.md

@@ -68,8 +68,10 @@ npx vr publish
 | 参数                   | 说明             |
 | ---------------------- | ---------------- |
 | -r --remote \<remote\> | 指定远程仓库名称 |
-| -s --skip-npm-publish  | 跳过 npm 发布      |
-| -sgt --skip-git-tag  | 跳过 git tag      |
+| -s --skip-npm-publish  | 跳过 npm 发布    |
+| -sc --skip-changelog    | 跳过生成变更日志     |
+| -sgt --skip-git-tag    | 跳过 git tag     |
+| -nt --npm-tag \<npmTag\>   | npm tag        |
 
 #### changelog
 
@@ -89,9 +91,10 @@ npx vr publish
 
 #### publish
 
-```shell
-vr publish
-```
+| 参数                      | 说明                                                                  |
+| ------------------------- | --------------------------------------------------------------------- |
+| -c --check-remote-version | 检测npm包的远程版本是否与要在本地发布的包版本相同，如果是，则跳过发布 |
+| -nt --npm-tag \<npmTag\>   | npm tag        |
 
 ### 自定义处理
 
@@ -120,12 +123,19 @@ release({ task })
 #### 类型
 
 ```ts
-function publish(preRelease: boolean | undefined): Promise<void>
+interface PublishCommandOptions {
+  preRelease?: boolean
+  checkRemoteVersion?: boolean
+  npmTag?: string
+}
+function publish({ preRelease, checkRemoteVersion, npmTag }: PublishCommandOptions): Promise<void>
 function updateVersion(version: string): void
 interface ReleaseCommandOptions {
   remote?: string
   skipNpmPublish?: boolean
+  skipChangelog?: boolean
   skipGitTag?: boolean
+  npmTag?: string
   task?(): Promise<void>
 }
 function release(options: ReleaseCommandOptions): Promise<void>

package/bin/index.js

@@ -8,14 +8,18 @@ program
   .command('release')
   .option('-r --remote <remote>', 'Remote name')
   .option('-s --skip-npm-publish', 'Skip npm publish')
+  .option('-sc --skip-changelog', 'Skip generate changelog')
   .option('-sgt --skip-git-tag', 'Skip git tag')
+  .option('-nt --npm-tag <npmTag>', 'Npm tag')
   .description('Release all packages and generate changelogs')
   .action(async (options) => release(options))
 
 program
   .command('publish')
+  .option('-c --check-remote-version', 'Check remote version')
+  .option('-nt --npm-tag <npmTag>', 'Npm tag')
   .description('Publish to npm')
-  .action(async () => publish())
+  .action(async (options) => publish(options))
 
 program
   .command('changelog')

package/dist/index.cjs

@@ -100,12 +100,29 @@ async function isWorktreeEmpty() {
   const ret = await (0, import_execa.execa)("git", ["status", "--porcelain"]);
   return !ret.stdout;
 }
-async function publish(preRelease) {
+async function publish({ preRelease, checkRemoteVersion, npmTag }) {
   const s = (0, import_nanospinner2.createSpinner)("Publishing all packages").start();
   const args = ["-r", "publish", "--no-git-checks", "--access", "public"];
+  if (checkRemoteVersion) {
+    const packageJson = getPackageJsons().find((packageJson2) => !packageJson2.config.private);
+    if (packageJson) {
+      const { config } = packageJson;
+      try {
+        await (0, import_execa.execa)("npm", ["view", `${config.name}@${config.version}`, "version"]);
+        s.warn({
+          text: `The npm package has a same remote version ${config.version}, publishing automatically skipped.`
+        });
+        return;
+      } catch {
+      }
+    }
+  }
   if (preRelease) {
     args.push("--tag", "alpha");
   }
+  if (npmTag) {
+    args.push("--tag", npmTag);
+  }
   const ret = await (0, import_execa.execa)("pnpm", args);
   if (ret.stderr && ret.stderr.includes("npm ERR!")) {
     throw new Error("\n" + ret.stderr);
@@ -126,14 +143,21 @@ async function pushGit(version, remote = "origin", skipGitTag = false) {
   s.success({ text: "Push remote repository successfully" });
   ret.stdout && logger_default.info(ret.stdout);
 }
+function getPackageJsons() {
+  const packageJsons = ["package.json", ...import_glob.glob.sync("packages/*/package.json")];
+  return packageJsons.map((path) => {
+    const filePath = (0, import_path2.resolve)(cwd, path);
+    return {
+      config: readJSONSync(filePath),
+      filePath
+    };
+  });
+}
 function updateVersion(version) {
-  const packageJsons = import_glob.glob.sync("packages/*/package.json");
-  packageJsons.push("package.json");
-  packageJsons.forEach((path) => {
-    const file = (0, import_path2.resolve)(cwd, path);
-    const config = readJSONSync(file);
+  const packageJsons = getPackageJsons();
+  packageJsons.forEach(({ config, filePath }) => {
     config.version = version;
-    writeFileSync(file, JSON.stringify(config, null, 2));
+    writeFileSync(filePath, JSON.stringify(config, null, 2));
   });
 }
 async function confirmRegistry() {
@@ -214,10 +238,12 @@ async function release(options) {
       await options.task();
     }
     if (!options.skipNpmPublish) {
-      await publish(isPreRelease);
+      await publish({ preRelease: isPreRelease, npmTag: options.npmTag });
     }
     if (!isPreRelease) {
-      await changelog();
+      if (!options.skipChangelog) {
+        await changelog();
+      }
       await pushGit(expectVersion, options.remote, options.skipGitTag);
     }
     logger_default.success(`Release version ${expectVersion} successfully!`);

package/dist/index.d.cts

@@ -1,8 +1,15 @@
-declare function publish(preRelease: boolean | undefined): Promise<void>;
+interface PublishCommandOptions {
+    preRelease?: boolean;
+    checkRemoteVersion?: boolean;
+    npmTag?: string;
+}
+declare function publish({ preRelease, checkRemoteVersion, npmTag }: PublishCommandOptions): Promise<void>;
 declare function updateVersion(version: string): void;
 interface ReleaseCommandOptions {
     remote?: string;
+    npmTag?: string;
     skipNpmPublish?: boolean;
+    skipChangelog?: boolean;
     skipGitTag?: boolean;
     task?(): Promise<void>;
 }
@@ -25,4 +32,4 @@ interface CommitLintCommandOptions {
 }
 declare function commitLint(options: CommitLintCommandOptions): void;
 
-export { COMMIT_MESSAGE_RE, type ChangelogCommandOptions, type CommitLintCommandOptions, type ReleaseCommandOptions, changelog, commitLint, getCommitMessage, isVersionCommitMessage, publish, release, updateVersion };
+export { COMMIT_MESSAGE_RE, type ChangelogCommandOptions, type CommitLintCommandOptions, type PublishCommandOptions, type ReleaseCommandOptions, changelog, commitLint, getCommitMessage, isVersionCommitMessage, publish, release, updateVersion };

package/dist/index.d.ts

@@ -1,8 +1,15 @@
-declare function publish(preRelease: boolean | undefined): Promise<void>;
+interface PublishCommandOptions {
+    preRelease?: boolean;
+    checkRemoteVersion?: boolean;
+    npmTag?: string;
+}
+declare function publish({ preRelease, checkRemoteVersion, npmTag }: PublishCommandOptions): Promise<void>;
 declare function updateVersion(version: string): void;
 interface ReleaseCommandOptions {
     remote?: string;
+    npmTag?: string;
     skipNpmPublish?: boolean;
+    skipChangelog?: boolean;
     skipGitTag?: boolean;
     task?(): Promise<void>;
 }
@@ -25,4 +32,4 @@ interface CommitLintCommandOptions {
 }
 declare function commitLint(options: CommitLintCommandOptions): void;
 
-export { COMMIT_MESSAGE_RE, type ChangelogCommandOptions, type CommitLintCommandOptions, type ReleaseCommandOptions, changelog, commitLint, getCommitMessage, isVersionCommitMessage, publish, release, updateVersion };
+export { COMMIT_MESSAGE_RE, type ChangelogCommandOptions, type CommitLintCommandOptions, type PublishCommandOptions, type ReleaseCommandOptions, changelog, commitLint, getCommitMessage, isVersionCommitMessage, publish, release, updateVersion };

package/dist/index.js

@@ -57,12 +57,29 @@ async function isWorktreeEmpty() {
   const ret = await execa("git", ["status", "--porcelain"]);
   return !ret.stdout;
 }
-async function publish(preRelease) {
+async function publish({ preRelease, checkRemoteVersion, npmTag }) {
   const s = createSpinner2("Publishing all packages").start();
   const args = ["-r", "publish", "--no-git-checks", "--access", "public"];
+  if (checkRemoteVersion) {
+    const packageJson = getPackageJsons().find((packageJson2) => !packageJson2.config.private);
+    if (packageJson) {
+      const { config } = packageJson;
+      try {
+        await execa("npm", ["view", `${config.name}@${config.version}`, "version"]);
+        s.warn({
+          text: `The npm package has a same remote version ${config.version}, publishing automatically skipped.`
+        });
+        return;
+      } catch {
+      }
+    }
+  }
   if (preRelease) {
     args.push("--tag", "alpha");
   }
+  if (npmTag) {
+    args.push("--tag", npmTag);
+  }
   const ret = await execa("pnpm", args);
   if (ret.stderr && ret.stderr.includes("npm ERR!")) {
     throw new Error("\n" + ret.stderr);
@@ -83,14 +100,21 @@ async function pushGit(version, remote = "origin", skipGitTag = false) {
   s.success({ text: "Push remote repository successfully" });
   ret.stdout && logger_default.info(ret.stdout);
 }
+function getPackageJsons() {
+  const packageJsons = ["package.json", ...glob.sync("packages/*/package.json")];
+  return packageJsons.map((path) => {
+    const filePath = resolve(cwd, path);
+    return {
+      config: readJSONSync(filePath),
+      filePath
+    };
+  });
+}
 function updateVersion(version) {
-  const packageJsons = glob.sync("packages/*/package.json");
-  packageJsons.push("package.json");
-  packageJsons.forEach((path) => {
-    const file = resolve(cwd, path);
-    const config = readJSONSync(file);
+  const packageJsons = getPackageJsons();
+  packageJsons.forEach(({ config, filePath }) => {
     config.version = version;
-    writeFileSync(file, JSON.stringify(config, null, 2));
+    writeFileSync(filePath, JSON.stringify(config, null, 2));
   });
 }
 async function confirmRegistry() {
@@ -171,10 +195,12 @@ async function release(options) {
       await options.task();
     }
     if (!options.skipNpmPublish) {
-      await publish(isPreRelease);
+      await publish({ preRelease: isPreRelease, npmTag: options.npmTag });
     }
     if (!isPreRelease) {
-      await changelog();
+      if (!options.skipChangelog) {
+        await changelog();
+      }
       await pushGit(expectVersion, options.remote, options.skipGitTag);
     }
     logger_default.success(`Release version ${expectVersion} successfully!`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@varlet/release",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "release all packages and generate changelogs",
   "keywords": [
     "varlet",