Skip to content

Commit

Permalink
Merge branch 'main' into lk/prettier-formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoe committed May 14, 2022
2 parents 9c7ee0f + b42e0ca commit 8460125
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
pull_request:
types: [assigned, opened, synchronize, reopened, labeled]
name: ci
permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ on:
branches:
- main
name: release-please
permissions:
contents: read

jobs:
release-please:
permissions:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [17.5.0](https://github.com/yargs/yargs/compare/v17.4.1...v17.5.0) (2022-05-11)


### Features

* add browser.d.ts and check for existence of Error.captureStackTrace() ([#2144](https://github.com/yargs/yargs/issues/2144)) ([6192990](https://github.com/yargs/yargs/commit/6192990509cf793c4b10b88884d626893dee89df))


### Bug Fixes

* **completion:** support for default flags ([db35423](https://github.com/yargs/yargs/commit/db354232705623bbcd8fad362f6a4d6d59650be5))
* import yargs/yargs in esm projects ([#2151](https://github.com/yargs/yargs/issues/2151)) ([95aed1c](https://github.com/yargs/yargs/commit/95aed1c175ec82e585003883bda1b6b75d5493ce))

### [17.4.1](https://github.com/yargs/yargs/compare/v17.4.0...v17.4.1) (2022-04-09)

### Bug Fixes
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yargs",
"version": "17.4.1",
"version": "17.5.0",
"description": "yargs the modern, pirate-themed, successor to optimist.",
"main": "./index.cjs",
"exports": {
Expand All @@ -22,6 +22,7 @@
},
"./yargs": [
{
"import": "./yargs.mjs",
"require": "./yargs"
},
"./yargs"
Expand All @@ -37,11 +38,13 @@
],
"files": [
"browser.mjs",
"browser.d.ts",
"index.cjs",
"helpers/*.js",
"helpers/*",
"index.mjs",
"yargs",
"yargs.mjs",
"build",
"locales",
"LICENSE",
Expand Down
1 change: 0 additions & 1 deletion test/usage.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3969,7 +3969,6 @@ describe('usage tests', () => {
.strict()
.parse()
);
console.log(r);
r.errors[0]
.split('\n')
.should.deep.equal([
Expand Down
10 changes: 10 additions & 0 deletions yargs.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// TODO: consolidate on using a helpers file at some point in the future, which
// is the approach currently used to export Parser and applyExtends for ESM:
import pkg from './build/index.cjs';
const {applyExtends, cjsPlatformShim, Parser, processArgv, Yargs} = pkg;
Yargs.applyExtends = (config, cwd, mergeExtends) => {
return applyExtends(config, cwd, mergeExtends, cjsPlatformShim);
};
Yargs.hideBin = processArgv.hideBin;
Yargs.Parser = Parser;
export default Yargs;

0 comments on commit 8460125

Please sign in to comment.