Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/main' into live
Browse files Browse the repository at this point in the history
  • Loading branch information
octogonz committed Jul 17, 2024
2 parents f1faa01 + 4f10112 commit 7c57a0e
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 7 deletions.
5 changes: 4 additions & 1 deletion rush/v5/common-versions.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Rush common-versions.json config file",
"description": "For use with the Rush tool, this file manages dependency versions that affect all projects in the repo. See http://rushjs.io for details.",

"type": "object",
"properties": {
"$schema": {
Expand All @@ -20,6 +19,10 @@
"description": "When set to true, for all projects in the repo, all dependencies will be automatically added as preferredVersions, except in cases where different projects specify different version ranges for a given dependency. For older package managers, this tended to reduce duplication of indirect dependencies. However, it can sometimes cause trouble for indirect dependencies with incompatible peerDependencies ranges.",
"type": "boolean"
},
"ensureConsistentVersions": {
"description": "If true, consistent version specifiers for dependencies will be enforced (i.e. \"rush check\" is run before some commands).",
"type": "boolean"
},
"allowedAlternativeVersions": {
"description": "The \"rush check\" command can be used to enforce that every project in the repo must specify the same SemVer range for a given dependency. However, sometimes exceptions are needed. The allowedAlternativeVersions table allows you to list other SemVer ranges that will be accepted by \"rush check\" for a given dependency. Note that the normal version range (as inferred by looking at all projects in the repo) should NOT be included in this list.",
"type": "object",
Expand Down
6 changes: 3 additions & 3 deletions rush/v5/deploy-scenario.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"description": "The \"rush deploy\" command prepares a deployment folder, starting from the main project and collecting all of its dependencies (both NPM packages and other Rush projects). The main project is specified using the \"--project\" parameter. The \"deploymentProjectNames\" setting lists the allowable choices for the \"--project\" parameter; this documents the intended deployments for your monorepo and helps validate that \"rush deploy\" is invoked correctly. If there is only one item in the \"deploymentProjectNames\" array, then \"--project\" can be omitted. The names should be complete package names as declared in rush.json.\n\nIf the main project should include other unrelated Rush projects, add it to the \"projectSettings\" section, and then specify those projects in the \"additionalProjectsToInclude\" list.",
"type": "array",
"items": {
"type": "string",
"minItems": 1
}
"type": "string"
},
"minItems": 1
},

"includeDevDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion rush/v5/experiments.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"type": "boolean"
},
"phasedCommands": {
"description": "If true, the phased commands feature is enabled. To use this feature, create a \"phased\" command in common/config/rush/command-line.json.",
"description": "THIS EXPERIMENT HAS BEEN GRADUATED TO A STANDARD FEATURE. THIS PROPERTY SHOULD BE REMOVED.",
"type": "boolean"
},
"cleanInstallAfterNpmrcChanges": {
Expand Down
4 changes: 4 additions & 0 deletions rush/v5/repo-state.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"preferredVersionsHash": {
"description": "A hash of \"preferred versions\" for the repository. This hash is used to determine whether or not preferred versions have been modified prior to install.",
"type": "string"
},
"packageJsonInjectedDependenciesHash": {
"description": "A hash of the injected dependencies in related package.json. This hash is used to determine whether or not the shrinkwrap needs to updated prior to install.",
"type": "string"
}
},
"additionalProperties": false
Expand Down
67 changes: 67 additions & 0 deletions rush/v5/rush-alerts.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Rush rush-alerts.json file",
"description": "This configuration file provides settings to rush alerts feature.",
"type": "object",
"additionalProperties": false,
"properties": {
"$schema": {
"description": "Part of the JSON Schema standard, this optional keyword declares the URL of the schema that the file conforms to. Editors may download the schema and use it to perform syntax highlighting.",
"type": "string"
},

"timezone": {
"description": "Settings such as `startTime` and `endTime` will use this timezone.\n\nIf omitted, the default timezone is UTC (`+00:00`).",
"type": "string"
},
"alerts": {
"description": "An array of alert messages and conditions for triggering them.",
"items": {
"$ref": "#/definitions/IAlert"
},
"type": "array"
}
},
"definitions": {
"IAlert": {
"type": "object",
"properties": {
"title": {
"description": "When the alert is displayed, this title will appear at the top of the message box. It should be a single line of text, as concise as possible.",
"type": "string"
},
"message": {
"description": "When the alert is displayed, this text appears in the message box.\n\nTo make the JSON file more readable, if the text is longer than one line, you can instead provide an array of strings that will be concatenated.\n\nYour text may contain newline characters, but generally this is unnecessary because word-wrapping is automatically applied.",
"oneOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"detailsUrl": {
"description": "(OPTIONAL) To avoid spamming users, the `title` and `message` settings should be kept as concise as possible.\n\nIf you need to provide more detail, use this setting to print a hyperlink to a web page with further guidance.",
"type": "string"
},
"startTime": {
"description": "(OPTIONAL) If `startTime` is specified, then this alert will not be shown prior to that time.\n\nKeep in mind that the alert is not guaranteed to be shown at this time, or at all. Alerts are only displayed after a Rush command has triggered fetching of the latest rush-alerts.json configuration.\n\nAlso, display of alerts is throttled to avoid spamming the user with too many messages.\n\nIf you need to test your alert, set the environment variable `RUSH_ALERTS_DEBUG=1` to disable throttling.\n\nThe `startTime` should be specified as `YYYY-MM-DD HH:MM` using 24 hour time format, or else `YYYY-MM-DD` in which case the time part will be `00:00` (start of that day). The time zone is obtained from the `timezone` setting above.",
"type": "string"
},
"endTime": {
"description": "(OPTIONAL) This alert will not be shown if the current time is later than `endTime`.\n\nThe format is the same as `startTime`.",
"type": "string"
},
"conditionScript": {
"description": "(OPTIONAL) The filename of a script that determines whether this alert can be shown, found in the 'common/config/rush/alert-scripts' folder.\n\nThe script must define a CommonJS export named `canShowAlert` that returns a boolean value, for example:\n\n`module.exports.canShowAlert = function () { // (your logic goes here) return true; }`.\n\nRush will invoke this script with the working directory set to the monorepo root folder, with no guarantee that `rush install` has been run.\n\nTo ensure up-to-date alerts, Rush may fetch and checkout the 'common/config/rush-alerts' folder in an unpredictable temporary path. Therefore, your script should avoid importing dependencies from outside its folder, generally be kept as simple and reliable and quick as possible.\n\nFor more complex conditions, we suggest to design some other process that prepares a data file or environment variable that can be cheaply checked by your condition script.",
"type": "string"
}
},
"required": ["title", "message"]
}
}
}
4 changes: 2 additions & 2 deletions rush/v5/rush.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"type": "number"
},
"ensureConsistentVersions": {
"description": "If true, consistent version specifiers for dependencies will be enforced (i.e. \"rush check\" is run before some commands).",
"description": "If true, consistent version specifiers for dependencies will be enforced (i.e. \"rush check\" is run before some commands). Used when property is not defined in common-versions.json.",
"type": "boolean"
},
"hotfixChangeEnabled": {
Expand Down Expand Up @@ -186,7 +186,7 @@
"type": "string"
},
"changefilesCommitMessage": {
"description": "The commit message to use when commiting change files made by \"rush change\". Defaults to \"Rush change\"",
"description": "The commit message to use when committing change files made by \"rush change\". Defaults to \"Rush change\"",
"type": "string"
},
"tagSeparator": {
Expand Down

0 comments on commit 7c57a0e

Please sign in to comment.