fix conflicts

Author: meganrogge

build/azure-pipelines/alpine/cli-build-alpine.yml

@@ -30,7 +30,7 @@ steps:
       workingDirectory: build
       displayName: Install pipeline build
 
-    - script: node build/azure-pipelines/distro/apply-cli-patches
+    - script: node .build/distro/cli-patches/index.js
       displayName: Apply distro patches
 
   - task: Npm@1

build/azure-pipelines/cli/cli-apply-patches.yml

@@ -1,17 +1,5 @@
 steps:
   - template: ../distro/download-distro.yml
 
-  - task: Cache@2
-    inputs:
-      key: '"build_node_modules" | build/yarn.lock'
-      path: build/node_modules
-      cacheHitVar: BUILD_NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
-
-  - script: yarn --frozen-lockfile --ignore-optional --check-files
-    workingDirectory: build
-    condition: and(succeeded(), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
-    displayName: Install pipeline build
-
-  - script: node build/azure-pipelines/distro/apply-cli-patches
+  - script: node .build/distro/cli-patches/index.js
     displayName: Apply distro patches

build/azure-pipelines/distro/apply-cli-patches.js

@@ -7,7 +7,6 @@
     "@azure/identity": "^3.1.3",
     "@azure/storage-blob": "^12.13.0",
     "@electron/get": "^1.12.4",
-    "@iarna/toml": "^2.2.5",
     "@types/ansi-colors": "^3.2.0",
     "@types/byline": "^4.2.32",
     "@types/cssnano": "^4.0.0",
@@ -24,7 +23,6 @@
     "@types/gulp-postcss": "^8.0.0",
     "@types/gulp-rename": "^0.0.33",
     "@types/gulp-sourcemaps": "^0.0.32",
-    "@types/iarna__toml": "^2.0.2",
     "@types/mime": "0.0.29",
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",

build/azure-pipelines/distro/apply-cli-patches.ts

@@ -339,11 +339,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz#e81fb49de05fed91bf74251c9ca0343f4fc77d31"
   integrity sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==
 
-"@iarna/toml@^2.2.5":
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
-  integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
-
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -506,13 +501,6 @@
     "@types/undertaker" "*"
     "@types/vinyl-fs" "*"
 
-"@types/iarna__toml@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/iarna__toml/-/iarna__toml-2.0.2.tgz#2e61b079e50760b477bc70e4df1fe5b633ef6c63"
-  integrity sha512-Q3obxKhBLVVbEQ8zsAmsQVobAAZhi8dFFFjF0q5xKXiaHvH8IkSxcbM27e46M9feUMieR03SPpmp5CtaNzpdBg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/js-beautify@*":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.8.0.tgz#0369d3d0e1f35a6aec07cb4da2ee2bcda111367c"

build/package.json

@@ -8,6 +8,7 @@ import { Repository as GitHubRepository, RepositoryRuleset } from '@octokit/grap
 import { AuthenticationError, getOctokitGraphql } from './auth';
 import { API, BranchProtection, BranchProtectionProvider, BranchProtectionRule, Repository } from './typings/git';
 import { DisposableStore, getRepositoryFromUrl } from './util';
+import TelemetryReporter from '@vscode/extension-telemetry';
 
 const REPOSITORY_QUERY = `
 	query repositoryPermissions($owner: String!, $repo: String!) {
@@ -60,7 +61,7 @@ export class GithubBranchProtectionProviderManager {
 
 		if (enabled) {
 			for (const repository of this.gitAPI.repositories) {
-				this.providerDisposables.add(this.gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger)));
+				this.providerDisposables.add(this.gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger, this.telemetryReporter)));
 			}
 		} else {
 			this.providerDisposables.dispose();
@@ -72,10 +73,11 @@ export class GithubBranchProtectionProviderManager {
 	constructor(
 		private readonly gitAPI: API,
 		private readonly globalState: Memento,
-		private readonly logger: LogOutputChannel) {
+		private readonly logger: LogOutputChannel,
+		private readonly telemetryReporter: TelemetryReporter) {
 		this.disposables.add(this.gitAPI.onDidOpenRepository(repository => {
 			if (this._enabled) {
-				this.providerDisposables.add(gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger)));
+				this.providerDisposables.add(gitAPI.registerBranchProtectionProvider(repository.rootUri, new GithubBranchProtectionProvider(repository, this.globalState, this.logger, this.telemetryReporter)));
 			}
 		}));
 
@@ -110,7 +112,8 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 	constructor(
 		private readonly repository: Repository,
 		private readonly globalState: Memento,
-		private readonly logger: LogOutputChannel) {
+		private readonly logger: LogOutputChannel,
+		private readonly telemetryReporter: TelemetryReporter) {
 		// Restore branch protection from global state
 		this.branchProtection = this.globalState.get<BranchProtection[]>(this.globalStateKey, []);
 
@@ -199,6 +202,14 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 			// Save branch protection to global state
 			await this.globalState.update(this.globalStateKey, branchProtection);
 			this.logger.trace(`Branch protection for "${this.repository.rootUri.toString()}": ${JSON.stringify(branchProtection)}.`);
+
+			/* __GDPR__
+				"branchProtection" : {
+					"owner": "lszomoru",
+					"rulesetCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true, "comment": "Number of repository rulesets" }
+				}
+			*/
+			this.telemetryReporter.sendTelemetryEvent('branchProtection', undefined, { rulesetCount: this.branchProtection.length });
 		} catch (err) {
 			this.logger.warn(`Failed to update repository branch protection: ${err.message}`);
 

build/yarn.lock

@@ -97,7 +97,7 @@ function initializeGitExtension(context: ExtensionContext, telemetryReporter: Te
 
 						disposables.add(registerCommands(gitAPI));
 						disposables.add(new GithubCredentialProviderManager(gitAPI));
-						disposables.add(new GithubBranchProtectionProviderManager(gitAPI, context.globalState, logger));
+						disposables.add(new GithubBranchProtectionProviderManager(gitAPI, context.globalState, logger, telemetryReporter));
 						disposables.add(gitAPI.registerPushErrorHandler(new GithubPushErrorHandler(telemetryReporter)));
 						disposables.add(gitAPI.registerRemoteSourcePublisher(new GithubRemoteSourcePublisher(gitAPI)));
 						disposables.add(new GitHubCanonicalUriProvider(gitAPI));

extensions/github/src/branchProtection.ts

@@ -9,7 +9,6 @@ html, body {
 	padding: 0 26px;
 	line-height: var(--markdown-line-height, 22px);
 	word-wrap: break-word;
-	overscroll-behavior-x: none;
 }
 
 body {

extensions/github/src/extension.ts

@@ -723,7 +723,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "0.7.5",
     "dompurify": "^2.4.1",
-    "highlight.js": "^11.4.0",
+    "highlight.js": "^11.8.0",
     "markdown-it": "^12.3.2",
     "markdown-it-front-matter": "^0.2.1",
     "morphdom": "^2.6.1",