Skip to content

Commit

Permalink
Merge branch 'release-it:main' into feature/publicPath
Browse files Browse the repository at this point in the history
  • Loading branch information
xllily committed Jun 5, 2023
2 parents 56b9113 + 11709dc commit 0075813
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions .release-it.json
Expand Up @@ -3,6 +3,7 @@
"after:init": ["npm run lint", "npx knip", "npm test"]
},
"github": {
"tokenRef": "GITHUB_TOKEN_RELEASE_IT",
"release": true,
"comments": {
"submit": true
Expand Down
2 changes: 1 addition & 1 deletion lib/plugin/Plugin.js
Expand Up @@ -40,7 +40,7 @@ class Plugin {
afterRelease() {}

getContext(path) {
const context = Object.assign({}, this.options, this.context);
const context = _.merge({}, this.options, this.context);
return path ? _.get(context, path) : context;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/plugin/github/GitHub.js
Expand Up @@ -8,7 +8,7 @@ import mime from 'mime-types';
import _ from 'lodash';
import retry from 'async-retry';
import newGithubReleaseUrl from 'new-github-release-url';
import ProxyAgent from 'proxy-agent';
import { ProxyAgent } from 'proxy-agent';
import { format, parseVersion, readJSON, e } from '../../util.js';
import Release from '../GitRelease.js';
import prompts from './prompts.js';
Expand Down
22 changes: 11 additions & 11 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "release-it",
"version": "15.10.3",
"version": "15.10.5",
"description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
"keywords": [
"build",
Expand Down Expand Up @@ -61,27 +61,27 @@
"license": "MIT",
"dependencies": {
"@iarna/toml": "2.2.5",
"@octokit/rest": "19.0.7",
"@octokit/rest": "19.0.11",
"async-retry": "1.3.3",
"chalk": "5.2.0",
"cosmiconfig": "8.1.3",
"execa": "7.1.1",
"git-url-parse": "13.1.0",
"globby": "13.1.4",
"got": "12.6.0",
"inquirer": "9.2.0",
"got": "12.6.1",
"inquirer": "9.2.6",
"is-ci": "3.0.1",
"issue-parser": "6.0.0",
"lodash": "4.17.21",
"mime-types": "2.1.35",
"new-github-release-url": "2.0.0",
"node-fetch": "3.3.1",
"open": "9.1.0",
"ora": "6.3.0",
"ora": "6.3.1",
"os-name": "5.1.0",
"promise.allsettled": "1.0.6",
"proxy-agent": "5.0.0",
"semver": "7.5.0",
"proxy-agent": "6.2.1",
"semver": "7.5.1",
"shelljs": "0.8.5",
"update-notifier": "6.0.2",
"url-join": "5.0.0",
Expand All @@ -90,8 +90,8 @@
},
"devDependencies": {
"@octokit/request-error": "3.0.3",
"ava": "5.2.0",
"eslint": "8.39.0",
"ava": "5.3.0",
"eslint": "8.41.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-ava": "14.0.0",
"eslint-plugin-import": "2.27.5",
Expand All @@ -102,8 +102,8 @@
"prettier": "2.8.8",
"remark-cli": "11.0.0",
"remark-preset-webpro": "0.0.2",
"sinon": "15.0.4",
"strip-ansi": "7.0.1"
"sinon": "15.1.0",
"strip-ansi": "7.1.0"
},
"engines": {
"node": ">=14.9"
Expand Down

0 comments on commit 0075813

Please sign in to comment.