Moves code into plus folders instead of premium

CONTRIBUTING.md

@@ -112,6 +112,6 @@ Please follow all the instructions in the [PR template](.github/PULL_REQUEST_TEM
 
 ### Contributions to GitLens+ Licensed Files
 
-This repository contains both OSS-licensed and non-OSS-licensed files. All files in or under any directory named "premium" fall under LICENSE.premium. The remaining files fall under LICENSE, the MIT license.
+This repository contains both OSS-licensed and non-OSS-licensed files. All files in or under any directory named "plus" fall under LICENSE.plus. The remaining files fall under LICENSE, the MIT license.
 
-If a pull request is submitted which contains changes to files in or under any directory named "premium", then you agree that GitKraken and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches.
+If a pull request is submitted which contains changes to files in or under any directory named "plus", then you agree that GitKraken and/or its licensors (as applicable) retain all right, title and interest in and to all such modifications and/or patches.

LICENSE

@@ -1,8 +1,8 @@
 ===============================================================================
 
 The following license applies to all files in this repository,
-except for those in or under any directory named "premium",
-which are covered by LICENSE.premium.
+except for those in or under any directory named "plus",
+which are covered by LICENSE.plus.
 
 ===============================================================================
 

LICENSE.premium

@@ -2,7 +2,7 @@ GitLens+ License
 
 Copyright (c) 2021-2022 Axosoft, LLC dba GitKraken ("GitKraken")
 
-With regard to the software set forth in or under any directory named "premium".
+With regard to the software set forth in or under any directory named "plus".
 
 This software and associated documentation files (the "Software") may be
 compiled as part of the gitkraken/vscode-gitlens open source project (the

README.md

@@ -1183,6 +1183,6 @@ And of course the awesome [vscode](https://github.com/Microsoft/vscode/graphs/co
 
 This repository contains both OSS-licensed and non-OSS-licensed files.
 
-All files in or under any directory named "premium" fall under LICENSE.premium.
+All files in or under any directory named "plus" fall under LICENSE.plus.
 
 The remaining files fall under the MIT license.

src/container.ts

@@ -29,11 +29,11 @@ import { GitProviderService } from './git/gitProviderService';
 import { LineHoverController } from './hovers/lineHoverController';
 import { Keyboard } from './keyboard';
 import { Logger } from './logger';
-import { SubscriptionAuthenticationProvider } from './premium/subscription/authenticationProvider';
-import { ServerConnection } from './premium/subscription/serverConnection';
-import { SubscriptionService } from './premium/subscription/subscriptionService';
-import { TimelineWebview } from './premium/webviews/timeline/timelineWebview';
-import { TimelineWebviewView } from './premium/webviews/timeline/timelineWebviewView';
+import { SubscriptionAuthenticationProvider } from './plus/subscription/authenticationProvider';
+import { ServerConnection } from './plus/subscription/serverConnection';
+import { SubscriptionService } from './plus/subscription/subscriptionService';
+import { TimelineWebview } from './plus/webviews/timeline/timelineWebview';
+import { TimelineWebviewView } from './plus/webviews/timeline/timelineWebviewView';
 import { StatusBarController } from './statusbar/statusBarController';
 import { Storage } from './storage';
 import { executeCommand } from './system/command';
@@ -353,7 +353,7 @@ export class Container {
 		return this._git;
 	}
 
-	private _github: Promise<import('./premium/github/github').GitHubApi | undefined> | undefined;
+	private _github: Promise<import('./plus/github/github').GitHubApi | undefined> | undefined;
 	get github() {
 		if (this._github == null) {
 			this._github = this._loadGitHubApi();
@@ -364,7 +364,7 @@ export class Container {
 
 	private async _loadGitHubApi() {
 		try {
-			return new (await import(/* webpackChunkName: "github" */ './premium/github/github')).GitHubApi();
+			return new (await import(/* webpackChunkName: "github" */ './plus/github/github')).GitHubApi();
 		} catch (ex) {
 			Logger.error(ex);
 			return undefined;

src/env/browser/providers.ts

@@ -1,7 +1,7 @@
 import { Container } from '../../container';
 import { GitCommandOptions } from '../../git/commandOptions';
 // Force import of GitHub since dynamic imports are not supported in the WebWorker ExtensionHost
-import { GitHubGitProvider } from '../../premium/github/githubGitProvider';
+import { GitHubGitProvider } from '../../plus/github/githubGitProvider';
 import { GitProvider } from '../../git/gitProvider';
 
 export function git(_options: GitCommandOptions, ..._args: any[]): Promise<string | Buffer> {

src/env/node/providers.ts

@@ -1,7 +1,7 @@
 import { Container } from '../../container';
 import { GitCommandOptions } from '../../git/commandOptions';
 import { GitProvider } from '../../git/gitProvider';
-// import { GitHubGitProvider } from '../../premium/github/githubGitProvider';
+// import { GitHubGitProvider } from '../../plus/github/githubGitProvider';
 import { Git } from './git/git';
 import { LocalGitProvider } from './git/localGitProvider';
 import { VslsGit, VslsGitProvider } from './git/vslsGitProvider';
@@ -27,9 +27,8 @@ export async function getSupportedGitProviders(container: Container): Promise
 	];
 
 	if (container.config.virtualRepositories.enabled) {
-		const GitHubGitProvider = (
-			await import(/* webpackChunkName: "github" */ '../../premium/github/githubGitProvider')
-		).GitHubGitProvider;
+		const GitHubGitProvider = (await import(/* webpackChunkName: "github" */ '../../plus/github/githubGitProvider'))
+			.GitHubGitProvider;
 		providers.push(new GitHubGitProvider(container));
 	}
 

src/git/gitProviderService.ts

@@ -23,7 +23,7 @@ import { setContext } from '../context';
 import { AccessDeniedError, ProviderNotFoundError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures } from '../features';
 import { Logger } from '../logger';
-import type { SubscriptionChangeEvent } from '../premium/subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../plus/subscription/subscriptionService';
 import { asRepoComparisonKey, RepoComparisionKey, Repositories } from '../repositories';
 import { WorkspaceStorageKeys } from '../storage';
 import {

src/git/gitUri.ts

@@ -4,7 +4,7 @@ import { UriComparer } from '../comparers';
 import { Schemes } from '../constants';
 import { Container } from '../container';
 import { Logger } from '../logger';
-import type { GitHubAuthorityMetadata } from '../premium/remotehub';
+import type { GitHubAuthorityMetadata } from '../plus/remotehub';
 import { debug } from '../system/decorators/log';
 import { memoize } from '../system/decorators/memoize';
 import { formatPath } from '../system/formatPath';

src/git/remotes/github.ts

@@ -238,7 +238,7 @@ export class GitHubRemote extends RichRemoteProvider {
 		const [owner, repo] = this.splitPath();
 		const { include, ...opts } = options ?? {};
 
-		const GitHubPullRequest = (await import(/* webpackChunkName: "github" */ '../../premium/github/github'))
+		const GitHubPullRequest = (await import(/* webpackChunkName: "github" */ '../../plus/github/github'))
 			.GitHubPullRequest;
 		return (await Container.instance.github)?.getPullRequestForBranch(this, accessToken, owner, repo, branch, {
 			...opts,

src/premium/LICENSE.premium → src/plus/LICENSE.plus

@@ -2,7 +2,7 @@ GitLens+ License
 
 Copyright (c) 2021-2022 Axosoft, LLC dba GitKraken ("GitKraken")
 
-With regard to the software set forth in or under any directory named "premium".
+With regard to the software set forth in or under any directory named "plus".
 
 This software and associated documentation files (the "Software") may be
 compiled as part of the gitkraken/vscode-gitlens open source project (the

src/premium/github/githubGitProvider.ts → src/plus/github/githubGitProvider.ts

@@ -89,8 +89,8 @@ import { filterMap, some } from '../../system/iterable';
 import { isAbsolute, isFolderGlob, maybeUri, normalizePath, relative } from '../../system/path';
 import { CachedBlame, CachedLog, GitDocumentState } from '../../trackers/gitDocumentTracker';
 import { TrackedDocument } from '../../trackers/trackedDocument';
-import { fromCommitFileStatus, GitHubApi } from '../github/github';
 import { getRemoteHubApi, GitHubAuthorityMetadata, Metadata, RemoteHubApi } from '../remotehub';
+import { fromCommitFileStatus, GitHubApi } from './github';
 
 const emptyPagedResult: PagedResult<any> = Object.freeze({ values: [] });
 const emptyPromise: Promise<GitBlame | GitDiff | GitLog | undefined> = Promise.resolve(undefined);

src/views/nodes/viewNode.ts

@@ -21,7 +21,7 @@ import {
 	RepositoryChangeEvent,
 } from '../../git/models';
 import { Logger } from '../../logger';
-import { SubscriptionChangeEvent } from '../../premium/subscription/subscriptionService';
+import { SubscriptionChangeEvent } from '../../plus/subscription/subscriptionService';
 import { gate } from '../../system/decorators/gate';
 import { debug, log, logName } from '../../system/decorators/log';
 import { is as isA, szudzikPairing } from '../../system/function';

src/views/worktreesView.ts

@@ -15,7 +15,7 @@ import { Container } from '../container';
 import { PlusFeatures } from '../features';
 import { GitUri } from '../git/gitUri';
 import { GitWorktree, RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent } from '../git/models';
-import { ensurePlusFeaturesEnabled } from '../premium/subscription/utils';
+import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
 import { getSubscriptionTimeRemaining, SubscriptionState } from '../subscription';
 import { gate } from '../system/decorators/gate';
 import { pluralize } from '../system/string';

src/webviews/apps/premium/LICENSE.premium → src/webviews/apps/plus/LICENSE.plus

@@ -2,7 +2,7 @@ GitLens+ License
 
 Copyright (c) 2021-2022 Axosoft, LLC dba GitKraken ("GitKraken")
 
-With regard to the software set forth in or under any directory named "premium".
+With regard to the software set forth in or under any directory named "plus".
 
 This software and associated documentation files (the "Software") may be
 compiled as part of the gitkraken/vscode-gitlens open source project (the

src/webviews/apps/premium/timeline/chart.ts → src/webviews/apps/plus/timeline/chart.ts

@@ -3,7 +3,7 @@
 import { bar, bb, bubble, Chart, ChartOptions, ChartTypes, DataItem, zoom } from 'billboard.js';
 // import BubbleCompare from 'billboard.js/dist/plugin/billboardjs-plugin-bubblecompare';
 // import { scaleSqrt } from 'd3-scale';
-import { Commit, State } from '../../../../premium/webviews/timeline/protocol';
+import { Commit, State } from '../../../../plus/webviews/timeline/protocol';
 import { formatDate, fromNow } from '../../shared/date';
 import { Emitter, Event } from '../../shared/events';
 import { throttle } from '../../shared/utils';

src/webviews/apps/premium/timeline/timeline.ts → src/webviews/apps/plus/timeline/timeline.ts

@@ -7,7 +7,7 @@ import {
 	OpenDataPointCommandType,
 	State,
 	UpdatePeriodCommandType,
-} from '../../../../premium/webviews/timeline/protocol';
+} from '../../../../plus/webviews/timeline/protocol';
 import { SubscriptionPlanId, SubscriptionState } from '../../../../subscription';
 import { ExecuteCommandType, IpcMessage, onIpc } from '../../../protocol';
 import { App } from '../../shared/appBase';

src/webviews/home/homeWebviewView.ts

@@ -1,7 +1,7 @@
 import { commands, Disposable, window } from 'vscode';
 import type { Container } from '../../container';
-import type { SubscriptionChangeEvent } from '../../premium/subscription/subscriptionService';
-import { ensurePlusFeaturesEnabled } from '../../premium/subscription/utils';
+import type { SubscriptionChangeEvent } from '../../plus/subscription/subscriptionService';
+import { ensurePlusFeaturesEnabled } from '../../plus/subscription/utils';
 import { SyncedStorageKeys } from '../../storage';
 import type { Subscription } from '../../subscription';
 import { WebviewViewBase } from '../webviewViewBase';

webpack.config.js

@@ -303,7 +303,7 @@ function getWebviewsConfig(mode, env) {
 			home: './home/home.ts',
 			rebase: './rebase/rebase.ts',
 			settings: './settings/settings.ts',
-			timeline: './premium/timeline/timeline.ts',
+			timeline: './plus/timeline/timeline.ts',
 			welcome: './welcome/welcome.ts',
 		},
 		mode: mode,
@@ -502,14 +502,14 @@ function getImageMinimizerConfig(mode, env) {
 
 /**
  * @param { string } name
- * @param { boolean } premium
+ * @param { boolean } plus
  * @param { 'production' | 'development' | 'none' } mode
  * @param {{ analyzeBundle?: boolean; analyzeDeps?: boolean; esbuild?: boolean; squoosh?: boolean } | undefined } env
  * @returns { HtmlPlugin }
  */
-function getHtmlPlugin(name, premium, mode, env) {
+function getHtmlPlugin(name, plus, mode, env) {
 	return new HtmlPlugin({
-		template: premium ? path.join('premium', name, `${name}.html`) : path.join(name, `${name}.html`),
+		template: plus ? path.join('plus', name, `${name}.html`) : path.join(name, `${name}.html`),
 		chunks: [name],
 		filename: path.join(__dirname, 'dist', 'webviews', `${name}.html`),
 		inject: true,