diff --git a/src/container.ts b/src/container.ts index 9e4c773..2069411 100644 --- a/src/container.ts +++ b/src/container.ts @@ -52,7 +52,7 @@ import { ViewCommands } from './views/viewCommands'; import { ViewFileDecorationProvider } from './views/viewDecorationProvider'; import { WorktreesView } from './views/worktreesView'; import { VslsController } from './vsls/vsls'; -import { HomeWebviewView } from './webviews/premium/home/homeWebviewView'; +import { HomeWebviewView } from './webviews/home/homeWebviewView'; import { RebaseEditorProvider } from './webviews/rebase/rebaseEditor'; import { SettingsWebview } from './webviews/settings/settingsWebview'; import { WelcomeWebview } from './webviews/welcome/welcomeWebview'; diff --git a/src/webviews/apps/premium/home/home.html b/src/webviews/apps/home/home.html similarity index 100% rename from src/webviews/apps/premium/home/home.html rename to src/webviews/apps/home/home.html diff --git a/src/webviews/apps/premium/home/home.scss b/src/webviews/apps/home/home.scss similarity index 98% rename from src/webviews/apps/premium/home/home.scss rename to src/webviews/apps/home/home.scss index 7936fbb..f81ea93 100644 --- a/src/webviews/apps/premium/home/home.scss +++ b/src/webviews/apps/home/home.scss @@ -119,4 +119,4 @@ vscode-divider { margin-top: 2rem; } -@import '../../shared/codicons'; +@import '../shared/codicons'; diff --git a/src/webviews/apps/premium/home/home.ts b/src/webviews/apps/home/home.ts similarity index 94% rename from src/webviews/apps/premium/home/home.ts rename to src/webviews/apps/home/home.ts index 8051122..912f8a6 100644 --- a/src/webviews/apps/premium/home/home.ts +++ b/src/webviews/apps/home/home.ts @@ -1,11 +1,11 @@ /*global window*/ import './home.scss'; import { Disposable } from 'vscode'; -import { getSubscriptionTimeRemaining, SubscriptionState } from '../../../../subscription'; -import { DidChangeSubscriptionNotificationType, State } from '../../../premium/home/protocol'; -import { ExecuteCommandType, IpcMessage, onIpc } from '../../../protocol'; -import { App } from '../../shared/appBase'; -import { DOM } from '../../shared/dom'; +import { getSubscriptionTimeRemaining, SubscriptionState } from '../../../subscription'; +import { DidChangeSubscriptionNotificationType, State } from '../../home/protocol'; +import { ExecuteCommandType, IpcMessage, onIpc } from '../../protocol'; +import { App } from '../shared/appBase'; +import { DOM } from '../shared/dom'; export class HomeApp extends App { private $slot1!: HTMLDivElement; diff --git a/src/webviews/premium/home/homeWebviewView.ts b/src/webviews/home/homeWebviewView.ts similarity index 87% rename from src/webviews/premium/home/homeWebviewView.ts rename to src/webviews/home/homeWebviewView.ts index 2ce692c..1b8da78 100644 --- a/src/webviews/premium/home/homeWebviewView.ts +++ b/src/webviews/home/homeWebviewView.ts @@ -1,9 +1,9 @@ import { commands, Disposable, window } from 'vscode'; -import type { Container } from '../../../container'; -import type { SubscriptionChangeEvent } from '../../../premium/subscription/subscriptionService'; -import { SyncedStorageKeys } from '../../../storage'; -import type { Subscription } from '../../../subscription'; -import { WebviewViewBase } from '../../webviewViewBase'; +import type { Container } from '../../container'; +import type { SubscriptionChangeEvent } from '../../premium/subscription/subscriptionService'; +import { SyncedStorageKeys } from '../../storage'; +import type { Subscription } from '../../subscription'; +import { WebviewViewBase } from '../webviewViewBase'; import { DidChangeSubscriptionNotificationType, State } from './protocol'; export class HomeWebviewView extends WebviewViewBase { diff --git a/src/webviews/premium/home/protocol.ts b/src/webviews/home/protocol.ts similarity index 74% rename from src/webviews/premium/home/protocol.ts rename to src/webviews/home/protocol.ts index 64d0e12..5833fb3 100644 --- a/src/webviews/premium/home/protocol.ts +++ b/src/webviews/home/protocol.ts @@ -1,5 +1,5 @@ -import type { Subscription } from '../../../subscription'; -import { IpcNotificationType } from '../../protocol'; +import type { Subscription } from '../../subscription'; +import { IpcNotificationType } from '../protocol'; export interface State { subscription: Subscription; diff --git a/webpack.config.js b/webpack.config.js index 77b8065..55758cb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -257,7 +257,7 @@ function getWebviewsConfig(mode, env) { }, }), new MiniCssExtractPlugin({ filename: '[name].css' }), - getHtmlPlugin('home', true, mode, env), + getHtmlPlugin('home', false, mode, env), getHtmlPlugin('rebase', false, mode, env), getHtmlPlugin('settings', false, mode, env), getHtmlPlugin('welcome', false, mode, env), @@ -310,7 +310,7 @@ function getWebviewsConfig(mode, env) { name: 'webviews', context: basePath, entry: { - home: './premium/home/home.ts', + home: './home/home.ts', rebase: './rebase/rebase.ts', settings: './settings/settings.ts', welcome: './welcome/welcome.ts',