diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cfcdd50..786a5d3 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/LICENSE b/LICENSE index b75a3a1..774edb7 100644 --- a/LICENSE +++ b/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. =============================================================================== diff --git a/LICENSE.premium b/LICENSE.premium index b6045e3..2e551e8 100644 --- a/LICENSE.premium +++ b/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 diff --git a/README.md b/README.md index 01b80ae..0d46936 100644 --- a/README.md +++ b/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. diff --git a/src/container.ts b/src/container.ts index 91497f1..5a459bd 100644 --- a/src/container.ts +++ b/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 | undefined; + private _github: Promise | 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; diff --git a/src/env/browser/providers.ts b/src/env/browser/providers.ts index 8e0ae36..e85bc0a 100644 --- a/src/env/browser/providers.ts +++ b/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 { diff --git a/src/env/node/providers.ts b/src/env/node/providers.ts index 6bf3ad3..94c0916 100644 --- a/src/env/node/providers.ts +++ b/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 = Object.freeze({ values: [] }); const emptyPromise: Promise = Promise.resolve(undefined); diff --git a/src/premium/remotehub.ts b/src/plus/remotehub.ts similarity index 100% rename from src/premium/remotehub.ts rename to src/plus/remotehub.ts diff --git a/src/premium/subscription/authenticationProvider.ts b/src/plus/subscription/authenticationProvider.ts similarity index 100% rename from src/premium/subscription/authenticationProvider.ts rename to src/plus/subscription/authenticationProvider.ts diff --git a/src/premium/subscription/serverConnection.ts b/src/plus/subscription/serverConnection.ts similarity index 100% rename from src/premium/subscription/serverConnection.ts rename to src/plus/subscription/serverConnection.ts diff --git a/src/premium/subscription/subscriptionService.ts b/src/plus/subscription/subscriptionService.ts similarity index 100% rename from src/premium/subscription/subscriptionService.ts rename to src/plus/subscription/subscriptionService.ts diff --git a/src/premium/subscription/utils.ts b/src/plus/subscription/utils.ts similarity index 100% rename from src/premium/subscription/utils.ts rename to src/plus/subscription/utils.ts diff --git a/src/premium/webviews/timeline/protocol.ts b/src/plus/webviews/timeline/protocol.ts similarity index 100% rename from src/premium/webviews/timeline/protocol.ts rename to src/plus/webviews/timeline/protocol.ts diff --git a/src/premium/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts similarity index 100% rename from src/premium/webviews/timeline/timelineWebview.ts rename to src/plus/webviews/timeline/timelineWebview.ts diff --git a/src/premium/webviews/timeline/timelineWebviewView.ts b/src/plus/webviews/timeline/timelineWebviewView.ts similarity index 100% rename from src/premium/webviews/timeline/timelineWebviewView.ts rename to src/plus/webviews/timeline/timelineWebviewView.ts diff --git a/src/views/nodes/viewNode.ts b/src/views/nodes/viewNode.ts index 48ed2ca..9af467e 100644 --- a/src/views/nodes/viewNode.ts +++ b/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'; diff --git a/src/views/worktreesView.ts b/src/views/worktreesView.ts index 7b1c47e..c2f6499 100644 --- a/src/views/worktreesView.ts +++ b/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'; diff --git a/src/webviews/apps/premium/LICENSE.premium b/src/webviews/apps/plus/LICENSE.plus similarity index 99% rename from src/webviews/apps/premium/LICENSE.premium rename to src/webviews/apps/plus/LICENSE.plus index b6045e3..2e551e8 100644 --- a/src/webviews/apps/premium/LICENSE.premium +++ b/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 diff --git a/src/webviews/apps/premium/timeline/chart.scss b/src/webviews/apps/plus/timeline/chart.scss similarity index 100% rename from src/webviews/apps/premium/timeline/chart.scss rename to src/webviews/apps/plus/timeline/chart.scss diff --git a/src/webviews/apps/premium/timeline/chart.ts b/src/webviews/apps/plus/timeline/chart.ts similarity index 99% rename from src/webviews/apps/premium/timeline/chart.ts rename to src/webviews/apps/plus/timeline/chart.ts index 0c7316d..1449778 100644 --- a/src/webviews/apps/premium/timeline/chart.ts +++ b/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'; diff --git a/src/webviews/apps/premium/timeline/partials/state.free-preview-expired.html b/src/webviews/apps/plus/timeline/partials/state.free-preview-expired.html similarity index 100% rename from src/webviews/apps/premium/timeline/partials/state.free-preview-expired.html rename to src/webviews/apps/plus/timeline/partials/state.free-preview-expired.html diff --git a/src/webviews/apps/premium/timeline/partials/state.free.html b/src/webviews/apps/plus/timeline/partials/state.free.html similarity index 100% rename from src/webviews/apps/premium/timeline/partials/state.free.html rename to src/webviews/apps/plus/timeline/partials/state.free.html diff --git a/src/webviews/apps/premium/timeline/partials/state.plus-trial-expired.html b/src/webviews/apps/plus/timeline/partials/state.plus-trial-expired.html similarity index 100% rename from src/webviews/apps/premium/timeline/partials/state.plus-trial-expired.html rename to src/webviews/apps/plus/timeline/partials/state.plus-trial-expired.html diff --git a/src/webviews/apps/premium/timeline/partials/state.verify-email.html b/src/webviews/apps/plus/timeline/partials/state.verify-email.html similarity index 100% rename from src/webviews/apps/premium/timeline/partials/state.verify-email.html rename to src/webviews/apps/plus/timeline/partials/state.verify-email.html diff --git a/src/webviews/apps/premium/timeline/plugins.d.ts b/src/webviews/apps/plus/timeline/plugins.d.ts similarity index 100% rename from src/webviews/apps/premium/timeline/plugins.d.ts rename to src/webviews/apps/plus/timeline/plugins.d.ts diff --git a/src/webviews/apps/premium/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html similarity index 100% rename from src/webviews/apps/premium/timeline/timeline.html rename to src/webviews/apps/plus/timeline/timeline.html diff --git a/src/webviews/apps/premium/timeline/timeline.scss b/src/webviews/apps/plus/timeline/timeline.scss similarity index 100% rename from src/webviews/apps/premium/timeline/timeline.scss rename to src/webviews/apps/plus/timeline/timeline.scss diff --git a/src/webviews/apps/premium/timeline/timeline.ts b/src/webviews/apps/plus/timeline/timeline.ts similarity index 98% rename from src/webviews/apps/premium/timeline/timeline.ts rename to src/webviews/apps/plus/timeline/timeline.ts index 400a4ea..d0bdb0d 100644 --- a/src/webviews/apps/premium/timeline/timeline.ts +++ b/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'; diff --git a/src/webviews/home/homeWebviewView.ts b/src/webviews/home/homeWebviewView.ts index e143f4e..85b8270 100644 --- a/src/webviews/home/homeWebviewView.ts +++ b/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'; diff --git a/webpack.config.js b/webpack.config.js index c8e56a0..f92865c 100644 --- a/webpack.config.js +++ b/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,