Moves gk sub files under gk

src/commands/quickCommand.steps.ts

@@ -37,6 +37,7 @@ import type { GitTag, TagSortOptions } from '../git/models/tag';
 import { sortTags } from '../git/models/tag';
 import type { GitWorktree } from '../git/models/worktree';
 import { remoteUrlRegex } from '../git/parsers/remoteParser';
+import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../plus/gk/subscription/subscription';
 import {
 	CommitApplyFileChangesCommandQuickPickItem,
 	CommitBrowseRepositoryFromHereCommandQuickPickItem,
@@ -93,7 +94,6 @@ import {
 	CopyRemoteResourceCommandQuickPickItem,
 	OpenRemoteResourceCommandQuickPickItem,
 } from '../quickpicks/remoteProviderPicker';
-import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../subscription';
 import { filterMap, intersection, isStringArray } from '../system/array';
 import { configuration } from '../system/configuration';
 import { formatPath } from '../system/formatPath';

src/constants.ts

@@ -1,7 +1,7 @@
 import type { ViewShowBranchComparison } from './config';
 import type { Environment } from './container';
 import type { StoredSearchQuery } from './git/search';
-import type { Subscription } from './subscription';
+import type { Subscription } from './plus/gk/subscription/subscription';
 import type { TrackedUsage, TrackedUsageKeys } from './telemetry/usageTracker';
 
 export const extensionPrefix = 'gitlens';

src/container.ts

@@ -24,8 +24,8 @@ import type { RepositoryPathMappingProvider } from './pathMapping/repositoryPath
 import { FocusService } from './plus/focus/focusService';
 import { AccountAuthenticationProvider } from './plus/gk/authenticationProvider';
 import { ServerConnection } from './plus/gk/serverConnection';
+import { SubscriptionService } from './plus/gk/subscription/subscriptionService';
 import { IntegrationAuthenticationService } from './plus/integrationAuthentication';
-import { SubscriptionService } from './plus/subscription/subscriptionService';
 import { registerAccountWebviewView } from './plus/webviews/account/registration';
 import { registerFocusWebviewCommands, registerFocusWebviewPanel } from './plus/webviews/focus/registration';
 import {

src/errors.ts

@@ -1,8 +1,8 @@
 import type { Uri } from 'vscode';
 import { CancellationError as _CancellationError } from 'vscode';
 import type { Response } from '@env/fetch';
-import type { RequiredSubscriptionPlans, Subscription } from './subscription';
-import { isSubscriptionPaidPlan } from './subscription';
+import type { RequiredSubscriptionPlans, Subscription } from './plus/gk/subscription/subscription';
+import { isSubscriptionPaidPlan } from './plus/gk/subscription/subscription';
 
 export class AccessDeniedError extends Error {
 	public readonly subscription: Subscription;

src/features.ts

@@ -1,5 +1,5 @@
 import type { RepositoryVisibility } from './git/gitProvider';
-import type { RequiredSubscriptionPlans, Subscription } from './subscription';
+import type { RequiredSubscriptionPlans, Subscription } from './plus/gk/subscription/subscription';
 
 export const enum Features {
 	Stashes = 'stashes',

src/git/formatters/commitFormatter.ts

@@ -19,7 +19,7 @@ import type { DateStyle } from '../../config';
 import { Commands, GlyphChars } from '../../constants';
 import { Container } from '../../container';
 import { emojify } from '../../emojis';
-import { arePlusFeaturesEnabled } from '../../plus/subscription/utils';
+import { arePlusFeaturesEnabled } from '../../plus/gk/utils';
 import type { ShowInCommitGraphCommandArgs } from '../../plus/webviews/graph/protocol';
 import { configuration } from '../../system/configuration';
 import { join, map } from '../../system/iterable';

src/git/gitProviderService.ts

@@ -17,11 +17,11 @@ import { GlyphChars, Schemes } from '../constants';
 import type { Container } from '../container';
 import { AccessDeniedError, CancellationError, ProviderNotFoundError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
-import type { SubscriptionChangeEvent } from '../plus/subscription/subscriptionService';
+import type { Subscription } from '../plus/gk/subscription/subscription';
+import { isSubscriptionPaidPlan, SubscriptionPlanId } from '../plus/gk/subscription/subscription';
+import type { SubscriptionChangeEvent } from '../plus/gk/subscription/subscriptionService';
 import type { RepoComparisonKey } from '../repositories';
 import { asRepoComparisonKey, Repositories } from '../repositories';
-import type { Subscription } from '../subscription';
-import { isSubscriptionPaidPlan, SubscriptionPlanId } from '../subscription';
 import { groupByFilterMap, groupByMap, joinUnique } from '../system/array';
 import { registerCommand } from '../system/command';
 import { configuration } from '../system/configuration';

src/git/remotes/richRemoteProvider.ts

@@ -12,8 +12,8 @@ import { isWeb } from '@env/platform';
 import type { Container } from '../../container';
 import { AuthenticationError, ProviderRequestClientError } from '../../errors';
 import { showIntegrationDisconnectedTooManyFailedRequestsWarningMessage } from '../../messages';
+import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../../plus/gk/subscription/subscription';
 import type { IntegrationAuthenticationSessionDescriptor } from '../../plus/integrationAuthentication';
-import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../../subscription';
 import { configuration } from '../../system/configuration';
 import { gate } from '../../system/decorators/gate';
 import { debug, log } from '../../system/decorators/log';

src/plus/focus/focusService.ts

@@ -3,7 +3,7 @@ import { window } from 'vscode';
 import type { Container } from '../../container';
 import type { GitRemote } from '../../git/models/remote';
 import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider';
-import { isSubscriptionPaidPlan } from '../../subscription';
+import { isSubscriptionPaidPlan } from '../gk/subscription/subscription';
 import { log } from '../../system/decorators/log';
 import { Logger } from '../../system/logger';
 import { getLogScope } from '../../system/logger.scope';

src/subscription.ts → src/plus/gk/subscription/subscription.ts

@@ -1,5 +1,5 @@
 // NOTE@eamodio This file is referenced in the webviews to we can't use anything vscode or other imports that aren't available in the webviews
-import { getDateDifference } from './system/date';
+import { getDateDifference } from '../../../system/date';
 
 export const enum SubscriptionPlanId {
 	Free = 'free',

src/plus/subscription/subscriptionService.ts → src/plus/gk/subscription/subscriptionService.ts

@@ -20,12 +20,29 @@ import {
 	window,
 } from 'vscode';
 import { getPlatform } from '@env/platform';
-import type { CoreColors } from '../../constants';
-import { Commands } from '../../constants';
-import type { Container } from '../../container';
-import { AccountValidationError } from '../../errors';
-import type { RepositoriesChangeEvent } from '../../git/gitProviderService';
-import type { Subscription } from '../../subscription';
+import type { CoreColors } from '../../../constants';
+import { Commands } from '../../../constants';
+import type { Container } from '../../../container';
+import { AccountValidationError } from '../../../errors';
+import type { RepositoriesChangeEvent } from '../../../git/gitProviderService';
+import { executeCommand, registerCommand } from '../../../system/command';
+import { configuration } from '../../../system/configuration';
+import { setContext } from '../../../system/context';
+import { createFromDateDelta } from '../../../system/date';
+import { gate } from '../../../system/decorators/gate';
+import { debug, log } from '../../../system/decorators/log';
+import type { Deferrable } from '../../../system/function';
+import { debounce, once } from '../../../system/function';
+import { Logger } from '../../../system/logger';
+import { getLogScope } from '../../../system/logger.scope';
+import { flatten } from '../../../system/object';
+import { pluralize } from '../../../system/string';
+import { openWalkthrough } from '../../../system/utils';
+import { satisfies } from '../../../system/version';
+import { authenticationProviderId, authenticationProviderScopes } from '../authenticationProvider';
+import type { ServerConnection } from '../serverConnection';
+import { ensurePlusFeaturesEnabled } from '../utils';
+import type { Subscription } from './subscription';
 import {
 	computeSubscriptionState,
 	getSubscriptionPlan,
@@ -39,24 +56,7 @@ import {
 	isSubscriptionTrial,
 	SubscriptionPlanId,
 	SubscriptionState,
-} from '../../subscription';
-import { executeCommand, registerCommand } from '../../system/command';
-import { configuration } from '../../system/configuration';
-import { setContext } from '../../system/context';
-import { createFromDateDelta } from '../../system/date';
-import { gate } from '../../system/decorators/gate';
-import { debug, log } from '../../system/decorators/log';
-import type { Deferrable } from '../../system/function';
-import { debounce, once } from '../../system/function';
-import { Logger } from '../../system/logger';
-import { getLogScope } from '../../system/logger.scope';
-import { flatten } from '../../system/object';
-import { pluralize } from '../../system/string';
-import { openWalkthrough } from '../../system/utils';
-import { satisfies } from '../../system/version';
-import { authenticationProviderId, authenticationProviderScopes } from '../gk/authenticationProvider';
-import type { ServerConnection } from '../gk/serverConnection';
-import { ensurePlusFeaturesEnabled } from './utils';
+} from './subscription';
 
 export interface SubscriptionChangeEvent {
 	readonly current: Subscription;

src/plus/webviews/account/accountWebview.ts

@@ -1,12 +1,12 @@
 import { Disposable, window } from 'vscode';
 import { getAvatarUriFromGravatarEmail } from '../../../avatars';
 import type { Container } from '../../../container';
-import type { Subscription } from '../../../subscription';
+import type { Subscription } from '../../gk/subscription/subscription';
 import { registerCommand } from '../../../system/command';
 import type { Deferrable } from '../../../system/function';
 import { debounce } from '../../../system/function';
 import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController';
-import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../../gk/subscription/subscriptionService';
 import type { State } from './protocol';
 import { DidChangeSubscriptionNotificationType } from './protocol';
 

src/plus/webviews/account/protocol.ts

@@ -1,6 +1,6 @@
-import type { Subscription } from '../../../subscription';
 import type { WebviewState } from '../../../webviews/protocol';
 import { IpcNotificationType } from '../../../webviews/protocol';
+import type { Subscription } from '../../gk/subscription/subscription';
 
 export interface State extends WebviewState {
 	webroot?: string;

src/plus/webviews/focus/focusWebview.ts

@@ -34,7 +34,7 @@ import type { IpcMessage } from '../../../webviews/protocol';
 import { onIpc } from '../../../webviews/protocol';
 import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController';
 import type { EnrichedItem, FocusItem } from '../../focus/focusService';
-import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../../gk/subscription/subscriptionService';
 import type { ShowInCommitGraphCommandArgs } from '../graph/protocol';
 import type {
 	OpenBranchParams,

src/plus/webviews/graph/graphWebview.ts

@@ -86,7 +86,7 @@ import { onIpc } from '../../../webviews/protocol';
 import type { WebviewController, WebviewProvider } from '../../../webviews/webviewController';
 import type { WebviewPanelShowCommandArgs } from '../../../webviews/webviewsController';
 import { isSerializedState } from '../../../webviews/webviewsController';
-import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../../gk/subscription/subscriptionService';
 import type {
 	BranchState,
 	DimMergeCommitsParams,

src/plus/webviews/graph/protocol.ts

@@ -34,11 +34,11 @@ import type {
 	GitTagReference,
 } from '../../../git/models/reference';
 import type { GitSearchResultData, SearchQuery } from '../../../git/search';
-import type { Subscription } from '../../../subscription';
 import type { DateTimeFormat } from '../../../system/date';
 import type { WebviewItemContext, WebviewItemGroupContext } from '../../../system/webview';
 import type { WebviewState } from '../../../webviews/protocol';
 import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol';
+import type { Subscription } from '../../gk/subscription/subscription';
 
 export type { GraphRefType } from '@gitkraken/gitkraken-components';
 

src/plus/webviews/graph/statusbar.ts

@@ -5,8 +5,8 @@ import type { Container } from '../../../container';
 import { configuration } from '../../../system/configuration';
 import { getContext, onDidChangeContext } from '../../../system/context';
 import { once } from '../../../system/function';
-import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
-import { arePlusFeaturesEnabled } from '../../subscription/utils';
+import type { SubscriptionChangeEvent } from '../../gk/subscription/subscriptionService';
+import { arePlusFeaturesEnabled } from '../../gk/utils';
 
 export class GraphStatusBarController implements Disposable {
 	private readonly _disposable: Disposable;

src/plus/webviews/timeline/timelineWebview.ts

@@ -25,7 +25,7 @@ import type { WebviewController, WebviewProvider } from '../../../webviews/webvi
 import { updatePendingContext } from '../../../webviews/webviewController';
 import type { WebviewShowOptions } from '../../../webviews/webviewsController';
 import { isSerializedState } from '../../../webviews/webviewsController';
-import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../../gk/subscription/subscriptionService';
 import type { Commit, Period, State } from './protocol';
 import { DidChangeNotificationType, OpenDataPointCommandType, UpdatePeriodCommandType } from './protocol';
 

src/plus/workspaces/workspacesService.ts

@@ -6,13 +6,13 @@ import type { GitRemote } from '../../git/models/remote';
 import { RemoteResourceType } from '../../git/models/remoteResource';
 import { Repository } from '../../git/models/repository';
 import { showRepositoriesPicker } from '../../quickpicks/repositoryPicker';
-import { SubscriptionState } from '../../subscription';
+import { SubscriptionState } from '../gk/subscription/subscription';
 import { log } from '../../system/decorators/log';
 import { normalizePath } from '../../system/path';
 import type { OpenWorkspaceLocation } from '../../system/utils';
 import { openWorkspace } from '../../system/utils';
 import type { ServerConnection } from '../gk/serverConnection';
-import type { SubscriptionChangeEvent } from '../subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../gk/subscription/subscriptionService';
 import type {
 	AddWorkspaceRepoDescriptor,
 	CloudWorkspaceData,

src/quickpicks/items/directive.ts

@@ -1,5 +1,5 @@
 import type { QuickPickItem } from 'vscode';
-import type { Subscription } from '../../subscription';
+import type { Subscription } from '../../plus/gk/subscription/subscription';
 
 export enum Directive {
 	Back,

src/views/nodes/abstract/repositoriesSubscribeableNode.ts

@@ -1,7 +1,7 @@
 import { Disposable } from 'vscode';
 import type { RepositoriesChangeEvent } from '../../../git/gitProviderService';
 import { unknownGitUri } from '../../../git/gitUri';
-import type { SubscriptionChangeEvent } from '../../../plus/subscription/subscriptionService';
+import type { SubscriptionChangeEvent } from '../../../plus/gk/subscription/subscriptionService';
 import { debug } from '../../../system/decorators/log';
 import { weakEvent } from '../../../system/event';
 import { szudzikPairing } from '../../../system/function';

src/views/workspacesView.ts

@@ -5,7 +5,7 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { unknownGitUri } from '../git/gitUri';
 import type { Repository } from '../git/models/repository';
-import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
+import { ensurePlusFeaturesEnabled } from '../plus/gk/utils';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
 import { debug } from '../system/decorators/log';

src/views/worktreesView.ts

@@ -9,7 +9,7 @@ import { GitUri } from '../git/gitUri';
 import type { RepositoryChangeEvent } from '../git/models/repository';
 import { RepositoryChange, RepositoryChangeComparisonMode } from '../git/models/repository';
 import type { GitWorktree } from '../git/models/worktree';
-import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
+import { ensurePlusFeaturesEnabled } from '../plus/gk/utils';
 import { executeCommand } from '../system/command';
 import { configuration } from '../system/configuration';
 import { gate } from '../system/decorators/gate';

src/webviews/apps/plus/account/account.ts

@@ -1,9 +1,9 @@
 /*global*/
 import './account.scss';
 import type { Disposable } from 'vscode';
+import { getSubscriptionTimeRemaining, SubscriptionState } from '../../../../plus/gk/subscription/subscription';
 import type { State } from '../../../../plus/webviews/account/protocol';
 import { DidChangeSubscriptionNotificationType } from '../../../../plus/webviews/account/protocol';
-import { getSubscriptionTimeRemaining, SubscriptionState } from '../../../../subscription';
 import type { IpcMessage } from '../../../protocol';
 import { ExecuteCommandType, onIpc } from '../../../protocol';
 import { App } from '../../shared/appBase';

src/webviews/apps/plus/account/components/account-content.ts

@@ -1,6 +1,6 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { hasAccountFromSubscriptionState, SubscriptionState } from '../../../../../subscription';
+import { hasAccountFromSubscriptionState, SubscriptionState } from '../../../../../plus/gk/subscription/subscription';
 import { pluralize } from '../../../../../system/string';
 import { elementBase, linkBase } from '../../../shared/components/styles/lit/base.css';
 import '../../../shared/components/button';

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -18,6 +18,7 @@ import React, { createElement, useEffect, useMemo, useRef, useState } from 'reac
 import { getPlatform } from '@env/platform';
 import type { DateStyle } from '../../../../config';
 import type { SearchQuery } from '../../../../git/search';
+import type { Subscription } from '../../../../plus/gk/subscription/subscription';
 import type {
 	DidEnsureRowParams,
 	DidSearchParams,
@@ -53,7 +54,6 @@ import {
 	DidFetchNotificationType,
 	DidSearchNotificationType,
 } from '../../../../plus/webviews/graph/protocol';
-import type { Subscription } from '../../../../subscription';
 import { pluralize } from '../../../../system/string';
 import { createWebviewCommandLink } from '../../../../system/webview';
 import type { IpcNotificationType } from '../../../protocol';

src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts

@@ -1,6 +1,6 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { SubscriptionState } from '../../../../../subscription';
+import { SubscriptionState } from '../../../../../plus/gk/subscription/subscription';
 import '../../../shared/components/button';
 import { linkStyles } from './vscode.css';
 

src/webviews/apps/shared/components/feature-gate-badge.ts

@@ -1,13 +1,13 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import type { Subscription } from '../../../../subscription';
+import type { Subscription } from '../../../../plus/gk/subscription/subscription';
 import {
 	getSubscriptionStatePlanName,
 	getSubscriptionTimeRemaining,
 	isSubscriptionStatePaidOrTrial,
 	isSubscriptionStateTrial,
 	SubscriptionState,
-} from '../../../../subscription';
+} from '../../../../plus/gk/subscription/subscription';
 import '../../plus/shared/components/feature-gate-plus-state';
 import { pluralize } from '../../../../system/string';
 import { focusOutline } from './styles/lit/a11y.css';

src/webviews/apps/shared/components/feature-gate.ts

@@ -1,6 +1,6 @@
 import { css, html, LitElement, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../subscription';
+import { isSubscriptionStatePaidOrTrial, SubscriptionState } from '../../../../plus/gk/subscription/subscription';
 import '../../plus/shared/components/feature-gate-plus-state';
 
 @customElement('gk-feature-gate')

src/webviews/apps/tsconfig.json

@@ -11,6 +11,7 @@
 	},
 	"include": [
 		"**/*",
+		"../../plus/gk/subscription/**/*",
 		"../../plus/webviews/**/*",
 		"../../@types/**/*",
 		"../protocol.ts",

src/webviews/webviewsController.ts

@@ -10,7 +10,7 @@ import { Disposable, Uri, ViewColumn, window } from 'vscode';
 import { uuid } from '@env/crypto';
 import type { Commands, WebviewIds, WebviewTypes, WebviewViewIds, WebviewViewTypes } from '../constants';
 import type { Container } from '../container';
-import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
+import { ensurePlusFeaturesEnabled } from '../plus/gk/utils';
 import { executeCoreCommand, registerCommand } from '../system/command';
 import { debug } from '../system/decorators/log';
 import { find, first, map } from '../system/iterable';

src/webviews/welcome/welcomeWebview.ts

@@ -1,9 +1,9 @@
 import type { ConfigurationChangeEvent } from 'vscode';
 import { Disposable, workspace } from 'vscode';
 import type { Container } from '../../container';
-import type { SubscriptionChangeEvent } from '../../plus/subscription/subscriptionService';
-import type { Subscription } from '../../subscription';
-import { SubscriptionState } from '../../subscription';
+import type { SubscriptionChangeEvent } from '../../plus/gk/subscription/subscriptionService';
+import type { Subscription } from '../../plus/gk/subscription/subscription';
+import { SubscriptionState } from '../../plus/gk/subscription/subscription';
 import { configuration } from '../../system/configuration';
 import type { IpcMessage } from '../protocol';
 import { onIpc } from '../protocol';