@modern-js/plugin-changeset 1.0.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/plugin-changeset
 
+## 1.1.1
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- Updated dependencies [6f7fe574]
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+  - @modern-js/core@1.1.2
+  - @modern-js/i18n-cli-language-detector@1.1.1
+  - @modern-js/plugin-i18n@1.1.1
+  - @modern-js/utils@1.1.2
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0### Patch Changes
+
+- Updated dependencies [96119db2]
+- Updated dependencies [eb00b569]
+  - @modern-js/core@1.1.0
+  - @modern-js/i18n-cli-language-detector@1.1.0
+  - @modern-js/plugin-i18n@1.1.0
+  - @modern-js/utils@1.1.0
+
+## 1.0.1
+
+### Patch Changes
+
+- fix: release command support --no-git-checks
+
 ## 1.0.0
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

package/dist/js/modern/commands/bump.js

@@ -10,6 +10,10 @@ export async function bump(options) {
 
   if (snapshot) {
     params.push('--snapshot');
+
+    if (typeof snapshot === 'string') {
+      params.push(snapshot);
+    }
   }
 
   if (ignore) {

package/dist/js/modern/commands/release.js

@@ -1,4 +1,5 @@
-import { path, getPackageManager, isModernjsMonorepo, fs } from '@modern-js/utils';
+import path from 'path';
+import { getPackageManager, isModernjsMonorepo, fs } from '@modern-js/utils';
 import { tag as gitTag } from '@changesets/git';
 import { CHANGESET_PATH, execaWithStreamLog } from "../utils";
 // eslint-disable-next-line max-statements
@@ -9,7 +10,8 @@ export async function release(options) {
   const params = ['publish'];
   const {
     tag,
-    ignoreScripts
+    ignoreScripts,
+    gitChecks
   } = options;
 
   if (tag) {
@@ -31,6 +33,10 @@ export async function release(options) {
     params.push('--ignore-scripts');
   }
 
+  if (!gitChecks) {
+    params.push('--no-git-checks');
+  }
+
   await execaWithStreamLog(packageManager, params);
   const pnpmPublishSummaryFile = path.join(appDir, 'pnpm-publish-summary.json');
   const publishInfo = await fs.readJSON(pnpmPublishSummaryFile, 'utf-8');

package/dist/js/modern/index.js

@@ -16,9 +16,9 @@ export default createPlugin(() => {
       program
     }) {
       program.command('change').description(i18n.t(localeKeys.command.change.describe)).option('--empty', i18n.t(localeKeys.command.change.empty), false).option('--open', i18n.t(localeKeys.command.change.open), false).action(options => change(options));
-      program.command('bump').description(i18n.t(localeKeys.command.bump.describe)).option('--canary', i18n.t(localeKeys.command.bump.canary), false).option('--preid <tag>', i18n.t(localeKeys.command.bump.preid), 'next').option('--snapshot', i18n.t(localeKeys.command.bump.snapshot), false).action(options => bump(options));
+      program.command('bump').description(i18n.t(localeKeys.command.bump.describe)).option('--canary', i18n.t(localeKeys.command.bump.canary), false).option('--preid <tag>', i18n.t(localeKeys.command.bump.preid), 'next').option('--snapshot [snapshot]', i18n.t(localeKeys.command.bump.snapshot), false).action(options => bump(options));
       program.command('pre <enter|exit> [tag]').description(i18n.t(localeKeys.command.pre.describe)).action((type, tag) => pre(type, tag));
-      program.command('release').description(i18n.t(localeKeys.command.release.describe)).option('--tag <tag>', i18n.t(localeKeys.command.release.tag), '').option('--ignore-scripts', i18n.t(localeKeys.command.release.ignore_scripts), '').action(options => release(options));
+      program.command('release').description(i18n.t(localeKeys.command.release.describe)).option('--tag <tag>', i18n.t(localeKeys.command.release.tag), '').option('--ignore-scripts', i18n.t(localeKeys.command.release.ignore_scripts), '').option('--no-git-checks', i18n.t(localeKeys.command.release.no_git_checks), '').action(options => release(options));
     }
 
   };

package/dist/js/modern/locale/en.js

@@ -19,7 +19,8 @@ export const EN_LOCALE = {
     release: {
       describe: 'publish changes to npm',
       tag: 'publish use special tag',
-      ignore_scripts: 'publish command ignore npm scripts, only can use in pnpm monorepo'
+      ignore_scripts: 'publish command ignore npm scripts, only can use in pnpm monorepo',
+      no_git_checks: 'publish command ignore checking if current branch is your publish branch, clean, and up-to-date, only can use in pnpm monorepo'
     }
   }
 };

package/dist/js/modern/locale/zh.js

@@ -19,7 +19,8 @@ export const ZH_LOCALE = {
     release: {
       describe: '发布 npm 包',
       tag: '发布 npm 包使用特定的 tag',
-      ignore_scripts: '发布时忽略 package.json 中的 scripts 命令，仅支持在 pnpm monorepo 中使用'
+      ignore_scripts: '发布时忽略 package.json 中的 scripts 命令，仅支持在 pnpm monorepo 中使用',
+      no_git_checks: '发布命令忽略检查当前分支是否是发布分支，干净且最新，仅支持在 pnpm monorepo 中使用'
     }
   }
 };

package/dist/js/modern/utils/changeset.js

@@ -1,6 +1,5 @@
 import execa from 'execa';
-import { upath } from '@modern-js/utils';
-export const CHANGESET_PATH = upath.normalizeSafe(require.resolve('@changesets/cli'));
+export const CHANGESET_PATH = require.resolve('@changesets/cli');
 export function execaWithStreamLog(command, args) {
   const promise = execa(command, args, {
     stdin: 'inherit',

package/dist/js/node/commands/bump.js

@@ -18,6 +18,10 @@ async function bump(options) {
 
   if (snapshot) {
     params.push('--snapshot');
+
+    if (typeof snapshot === 'string') {
+      params.push(snapshot);
+    }
   }
 
   if (ignore) {

package/dist/js/node/commands/release.js

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.release = release;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _git = require("@changesets/git");
 
 var _utils2 = require("../utils");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 // eslint-disable-next-line max-statements
 async function release(options) {
   const appDir = process.cwd();
@@ -19,7 +23,8 @@ async function release(options) {
   const params = ['publish'];
   const {
     tag,
-    ignoreScripts
+    ignoreScripts,
+    gitChecks
   } = options;
 
   if (tag) {
@@ -41,9 +46,13 @@ async function release(options) {
     params.push('--ignore-scripts');
   }
 
+  if (!gitChecks) {
+    params.push('--no-git-checks');
+  }
+
   await (0, _utils2.execaWithStreamLog)(packageManager, params);
 
-  const pnpmPublishSummaryFile = _utils.path.join(appDir, 'pnpm-publish-summary.json');
+  const pnpmPublishSummaryFile = _path.default.join(appDir, 'pnpm-publish-summary.json');
 
   const publishInfo = await _utils.fs.readJSON(pnpmPublishSummaryFile, 'utf-8');
   await Promise.all((publishInfo.publishedPackages || []).map(pkg => (0, _git.tag)(`${pkg.name}@${pkg.version}`, appDir)));

package/dist/js/node/index.js

@@ -28,9 +28,9 @@ var _default = (0, _core.createPlugin)(() => {
       program
     }) {
       program.command('change').description(_locale.i18n.t(_locale.localeKeys.command.change.describe)).option('--empty', _locale.i18n.t(_locale.localeKeys.command.change.empty), false).option('--open', _locale.i18n.t(_locale.localeKeys.command.change.open), false).action(options => (0, _commands.change)(options));
-      program.command('bump').description(_locale.i18n.t(_locale.localeKeys.command.bump.describe)).option('--canary', _locale.i18n.t(_locale.localeKeys.command.bump.canary), false).option('--preid <tag>', _locale.i18n.t(_locale.localeKeys.command.bump.preid), 'next').option('--snapshot', _locale.i18n.t(_locale.localeKeys.command.bump.snapshot), false).action(options => (0, _commands.bump)(options));
+      program.command('bump').description(_locale.i18n.t(_locale.localeKeys.command.bump.describe)).option('--canary', _locale.i18n.t(_locale.localeKeys.command.bump.canary), false).option('--preid <tag>', _locale.i18n.t(_locale.localeKeys.command.bump.preid), 'next').option('--snapshot [snapshot]', _locale.i18n.t(_locale.localeKeys.command.bump.snapshot), false).action(options => (0, _commands.bump)(options));
       program.command('pre <enter|exit> [tag]').description(_locale.i18n.t(_locale.localeKeys.command.pre.describe)).action((type, tag) => (0, _commands.pre)(type, tag));
-      program.command('release').description(_locale.i18n.t(_locale.localeKeys.command.release.describe)).option('--tag <tag>', _locale.i18n.t(_locale.localeKeys.command.release.tag), '').option('--ignore-scripts', _locale.i18n.t(_locale.localeKeys.command.release.ignore_scripts), '').action(options => (0, _commands.release)(options));
+      program.command('release').description(_locale.i18n.t(_locale.localeKeys.command.release.describe)).option('--tag <tag>', _locale.i18n.t(_locale.localeKeys.command.release.tag), '').option('--ignore-scripts', _locale.i18n.t(_locale.localeKeys.command.release.ignore_scripts), '').option('--no-git-checks', _locale.i18n.t(_locale.localeKeys.command.release.no_git_checks), '').action(options => (0, _commands.release)(options));
     }
 
   };

package/dist/js/node/locale/en.js

@@ -25,7 +25,8 @@ const EN_LOCALE = {
     release: {
       describe: 'publish changes to npm',
       tag: 'publish use special tag',
-      ignore_scripts: 'publish command ignore npm scripts, only can use in pnpm monorepo'
+      ignore_scripts: 'publish command ignore npm scripts, only can use in pnpm monorepo',
+      no_git_checks: 'publish command ignore checking if current branch is your publish branch, clean, and up-to-date, only can use in pnpm monorepo'
     }
   }
 };

package/dist/js/node/locale/zh.js

@@ -25,7 +25,8 @@ const ZH_LOCALE = {
     release: {
       describe: '发布 npm 包',
       tag: '发布 npm 包使用特定的 tag',
-      ignore_scripts: '发布时忽略 package.json 中的 scripts 命令，仅支持在 pnpm monorepo 中使用'
+      ignore_scripts: '发布时忽略 package.json 中的 scripts 命令，仅支持在 pnpm monorepo 中使用',
+      no_git_checks: '发布命令忽略检查当前分支是否是发布分支，干净且最新，仅支持在 pnpm monorepo 中使用'
     }
   }
 };

package/dist/js/node/utils/changeset.js

@@ -8,11 +8,9 @@ exports.execaWithStreamLog = execaWithStreamLog;
 
 var _execa = _interopRequireDefault(require("execa"));
 
-var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const CHANGESET_PATH = _utils.upath.normalizeSafe(require.resolve('@changesets/cli'));
+const CHANGESET_PATH = require.resolve('@changesets/cli');
 
 exports.CHANGESET_PATH = CHANGESET_PATH;
 

package/dist/types/commands/bump.d.ts

@@ -1,5 +1,5 @@
 interface BumpOptions {
-  snapshot: boolean;
+  snapshot: boolean | string;
   canary: boolean;
   preid: string;
   ignore: string[];

package/dist/types/commands/release.d.ts

@@ -1,6 +1,7 @@
 interface PublishOptions {
   tag: string;
   ignoreScripts: boolean;
+  gitChecks: boolean;
 }
 export declare function release(options: PublishOptions): Promise<void>;
 export {};

package/dist/types/locale/en.d.ts

@@ -20,6 +20,7 @@ export declare const EN_LOCALE: {
       describe: string;
       tag: string;
       ignore_scripts: string;
+      no_git_checks: string;
     };
   };
 };

package/dist/types/locale/index.d.ts

@@ -22,6 +22,7 @@ declare const localeKeys: {
       describe: string;
       tag: string;
       ignore_scripts: string;
+      no_git_checks: string;
     };
   };
 } | {
@@ -46,6 +47,7 @@ declare const localeKeys: {
       describe: string;
       tag: string;
       ignore_scripts: string;
+      no_git_checks: string;
     };
   };
 };

package/dist/types/locale/zh.d.ts

@@ -20,6 +20,7 @@ export declare const ZH_LOCALE: {
       describe: string;
       tag: string;
       ignore_scripts: string;
+      no_git_checks: string;
     };
   };
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -31,21 +31,21 @@
     "@babel/runtime": "^7",
     "@changesets/cli": "2.16.0",
     "@changesets/git": "^1.1.2",
-    "@modern-js/i18n-cli-language-detector": "^1.0.0",
-    "@modern-js/plugin-i18n": "^1.0.0",
-    "@modern-js/utils": "^1.0.0",
+    "@modern-js/i18n-cli-language-detector": "^1.1.1",
+    "@modern-js/plugin-i18n": "^1.1.1",
+    "@modern-js/utils": "^1.1.2",
     "execa": "^5.1.1"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0",
-    "@modern-js/plugin-testing": "^1.0.0",
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/module-tools": "^1.1.0",
+    "@modern-js/plugin-testing": "^1.1.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "typescript": "^4"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.0.0"
+    "@modern-js/core": "^1.1.2"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/commands/bump.ts

@@ -1,7 +1,7 @@
 import { CHANGESET_PATH, execaWithStreamLog } from '../utils';
 
 interface BumpOptions {
-  snapshot: boolean;
+  snapshot: boolean | string;
   canary: boolean;
   preid: string;
   ignore: string[];
@@ -13,6 +13,9 @@ export async function bump(options: BumpOptions) {
 
   if (snapshot) {
     params.push('--snapshot');
+    if (typeof snapshot === 'string') {
+      params.push(snapshot);
+    }
   }
 
   if (ignore) {

package/src/commands/release.ts

@@ -1,15 +1,12 @@
-import {
-  path,
-  getPackageManager,
-  isModernjsMonorepo,
-  fs,
-} from '@modern-js/utils';
+import path from 'path';
+import { getPackageManager, isModernjsMonorepo, fs } from '@modern-js/utils';
 import { tag as gitTag } from '@changesets/git';
 import { CHANGESET_PATH, execaWithStreamLog } from '../utils';
 
 interface PublishOptions {
   tag: string;
   ignoreScripts: boolean;
+  gitChecks: boolean;
 }
 // eslint-disable-next-line max-statements
 export async function release(options: PublishOptions) {
@@ -19,7 +16,7 @@ export async function release(options: PublishOptions) {
 
   const params = ['publish'];
 
-  const { tag, ignoreScripts } = options;
+  const { tag, ignoreScripts, gitChecks } = options;
 
   if (tag) {
     params.push('--tag');
@@ -40,6 +37,10 @@ export async function release(options: PublishOptions) {
     params.push('--ignore-scripts');
   }
 
+  if (!gitChecks) {
+    params.push('--no-git-checks');
+  }
+
   await execaWithStreamLog(packageManager, params);
 
   const pnpmPublishSummaryFile = path.join(appDir, 'pnpm-publish-summary.json');

package/src/index.ts

@@ -29,7 +29,11 @@ export default createPlugin(
             i18n.t(localeKeys.command.bump.preid),
             'next',
           )
-          .option('--snapshot', i18n.t(localeKeys.command.bump.snapshot), false)
+          .option(
+            '--snapshot [snapshot]',
+            i18n.t(localeKeys.command.bump.snapshot),
+            false,
+          )
           .action((options: any) => bump(options));
 
         program
@@ -46,6 +50,11 @@ export default createPlugin(
             i18n.t(localeKeys.command.release.ignore_scripts),
             '',
           )
+          .option(
+            '--no-git-checks',
+            i18n.t(localeKeys.command.release.no_git_checks),
+            '',
+          )
           .action((options: any) => release(options));
       },
     };

package/src/locale/en.ts

@@ -22,6 +22,8 @@ export const EN_LOCALE = {
       tag: 'publish use special tag',
       ignore_scripts:
         'publish command ignore npm scripts, only can use in pnpm monorepo',
+      no_git_checks:
+        'publish command ignore checking if current branch is your publish branch, clean, and up-to-date, only can use in pnpm monorepo',
     },
   },
 };

package/src/locale/zh.ts

@@ -22,6 +22,8 @@ export const ZH_LOCALE = {
       tag: '发布 npm 包使用特定的 tag',
       ignore_scripts:
         '发布时忽略 package.json 中的 scripts 命令，仅支持在 pnpm monorepo 中使用',
+      no_git_checks:
+        '发布命令忽略检查当前分支是否是发布分支，干净且最新，仅支持在 pnpm monorepo 中使用',
     },
   },
 };

package/src/utils/changeset.ts

@@ -1,7 +1,6 @@
 import execa from 'execa';
-import { upath } from '@modern-js/utils';
 
-export const CHANGESET_PATH = upath.normalizeSafe(require.resolve('@changesets/cli'));
+export const CHANGESET_PATH = require.resolve('@changesets/cli');
 
 export function execaWithStreamLog(command: string, args: string[]) {
   const promise = execa(command, args, {