diff --git a/dist/index.js b/dist/index.js index d680fec..999e58c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -86224,7 +86224,10 @@ const errors_1 = __nccwpck_require__(93637); const sentence_case_1 = __nccwpck_require__(36662); const group_priority_1 = __nccwpck_require__(83172); const pluginFactories = { - 'linked-versions': options => new linked_versions_1.LinkedVersions(options.github, options.targetBranch, options.repositoryConfig, options.type.groupName, options.type.components), + 'linked-versions': options => new linked_versions_1.LinkedVersions(options.github, options.targetBranch, options.repositoryConfig, options.type.groupName, options.type.components, { + ...options, + ...options.type, + }), 'cargo-workspace': options => new cargo_workspace_1.CargoWorkspace(options.github, options.targetBranch, options.repositoryConfig, { ...options, ...options.type, @@ -86379,7 +86382,7 @@ const python_1 = __nccwpck_require__(32109); const ruby_1 = __nccwpck_require__(68142); const ruby_yoshi_1 = __nccwpck_require__(72294); const rust_1 = __nccwpck_require__(43066); -const salesforce_1 = __nccwpck_require__(42085); +const sfdx_1 = __nccwpck_require__(87648); const simple_1 = __nccwpck_require__(10591); const terraform_module_1 = __nccwpck_require__(80908); const helm_1 = __nccwpck_require__(97687); @@ -86432,7 +86435,8 @@ const releasers = { ruby: options => new ruby_1.Ruby(options), 'ruby-yoshi': options => new ruby_yoshi_1.RubyYoshi(options), rust: options => new rust_1.Rust(options), - salesforce: options => new salesforce_1.Salesforce(options), + salesforce: options => new sfdx_1.Sfdx(options), + sfdx: options => new sfdx_1.Sfdx(options), simple: options => new simple_1.Simple(options), 'terraform-module': options => new terraform_module_1.TerraformModule(options), helm: options => new helm_1.Helm(options), @@ -88877,6 +88881,7 @@ const pull_request_body_1 = __nccwpck_require__(70774); const branch_name_1 = __nccwpck_require__(16344); const versioning_strategy_1 = __nccwpck_require__(41941); const cargo_lock_1 = __nccwpck_require__(68875); +const errors_1 = __nccwpck_require__(93637); /** * The plugin analyzed a cargo workspace and will bump dependencies * of managed packages if those dependencies are being updated. @@ -88895,7 +88900,7 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin { } const allCrates = []; const candidatesByPackage = {}; - const members = cargoManifest.workspace.members; + const members = (await Promise.all(cargoManifest.workspace.members.map(member => this.github.findFilesByGlob(member)))).flat(); members.push(manifest_1.ROOT_PROJECT_PATH); for (const path of members) { const manifestPath = (0, workspace_1.addPath)(path, 'Cargo.toml'); @@ -88915,7 +88920,10 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin { } const version = (_d = manifest.package) === null || _d === void 0 ? void 0 : _d.version; if (!version) { - throw new Error(`package manifest at ${manifestPath} is missing [package.version]`); + throw new errors_1.ConfigurationError(`package manifest at ${manifestPath} is missing [package.version]`, 'cargo-workspace', `${this.github.repository.owner}/${this.github.repository.repo}`); + } + else if (typeof version !== 'string') { + throw new errors_1.ConfigurationError(`package manifest at ${manifestPath} has an invalid [package.version]`, 'cargo-workspace', `${this.github.repository.owner}/${this.github.repository.repo}`); } allCrates.push({ path, @@ -93523,7 +93531,7 @@ exports.Rust = Rust; /***/ }), -/***/ 42085: +/***/ 87648: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -93542,13 +93550,13 @@ exports.Rust = Rust; // See the License for the specific language governing permissions and // limitations under the License. Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.Salesforce = void 0; +exports.Sfdx = void 0; const base_1 = __nccwpck_require__(95081); const changelog_1 = __nccwpck_require__(3325); const errors_1 = __nccwpck_require__(93637); -const sfdx_project_json_1 = __nccwpck_require__(618); +const sfdx_project_json_1 = __nccwpck_require__(15688); const sfdxProjectJsonFileName = 'sfdx-project.json'; -class Salesforce extends base_1.BaseStrategy { +class Sfdx extends base_1.BaseStrategy { async buildUpdates(options) { const updates = []; const version = options.newVersion; @@ -93583,7 +93591,7 @@ class Salesforce extends base_1.BaseStrategy { } catch (e) { if (e instanceof errors_1.FileNotFoundError) { - throw new errors_1.MissingRequiredFileError(this.addPath(sfdxProjectJsonFileName), 'salesforce', `${this.repository.owner}/${this.repository.repo}`); + throw new errors_1.MissingRequiredFileError(this.addPath(sfdxProjectJsonFileName), 'sfdx', `${this.repository.owner}/${this.repository.repo}`); } throw e; } @@ -93591,8 +93599,8 @@ class Salesforce extends base_1.BaseStrategy { return this.sfdxProjectJsonContents; } } -exports.Salesforce = Salesforce; -//# sourceMappingURL=salesforce.js.map +exports.Sfdx = Sfdx; +//# sourceMappingURL=sfdx.js.map /***/ }), @@ -96233,7 +96241,7 @@ exports.parseCargoLockfile = parseCargoLockfile; /***/ }), -/***/ 618: +/***/ 15688: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "use strict"; @@ -96257,7 +96265,7 @@ const json_stringify_1 = __nccwpck_require__(69227); const logger_1 = __nccwpck_require__(68809); const default_1 = __nccwpck_require__(69995); /** - * This updates a Salesfore sfdx-project.json file's main version. + * This updates a sfdx sfdx-project.json file's main version. */ class SfdxProjectJson extends default_1.DefaultUpdater { /** @@ -97163,7 +97171,7 @@ function generateMatchPattern(pullRequestTitlePattern, logger = logger_1.logger) .replace('(', '\\(') .replace(')', '\\)') .replace('${scope}', '(\\((?[\\w-./]+)\\))?') - .replace('${component}', ' ?(?[\\w-./]*)?') + .replace('${component}', ' ?(?@?[\\w-./]*)?') .replace('${version}', 'v?(?[0-9].*)') .replace('${branch}', '(?[\\w-./]+)?')}$`); } @@ -119567,7 +119575,7 @@ module.exports = {}; /***/ ((module) => { "use strict"; -module.exports = {"i8":"15.8.1"}; +module.exports = {"i8":"15.9.1"}; /***/ }),