From ed63525f12649dde3a118f790c873f2ed92db428 Mon Sep 17 00:00:00 2001 From: Alessio Date: Thu, 30 Aug 2018 08:52:34 +0200 Subject: [PATCH] fix: Switched webviews to correct folder --- .gulp/tasks/copy-ui.ts | 8 ++------ extensions/material.theme.config.ts | 2 +- {src => extensions}/webviews/ReleaseNotes.ts | 0 {src => extensions}/webviews/Settings.ts | 0 {src => extensions}/webviews/Webview.ts | 0 {src => extensions}/webviews/interfaces.ts | 0 {src => extensions}/webviews/ui/release-notes/index.ts | 0 .../webviews/ui/release-notes/release-notes.html | 0 {src => extensions}/webviews/ui/release-notes/style.css | 0 {src => extensions}/webviews/ui/settings/index.ts | 0 .../webviews/ui/settings/lib/accents-selector.ts | 0 {src => extensions}/webviews/ui/settings/settings.html | 0 {src => extensions}/webviews/ui/settings/style.css | 0 package.json | 2 +- 14 files changed, 4 insertions(+), 8 deletions(-) rename {src => extensions}/webviews/ReleaseNotes.ts (100%) rename {src => extensions}/webviews/Settings.ts (100%) rename {src => extensions}/webviews/Webview.ts (100%) rename {src => extensions}/webviews/interfaces.ts (100%) rename {src => extensions}/webviews/ui/release-notes/index.ts (100%) rename {src => extensions}/webviews/ui/release-notes/release-notes.html (100%) rename {src => extensions}/webviews/ui/release-notes/style.css (100%) rename {src => extensions}/webviews/ui/settings/index.ts (100%) rename {src => extensions}/webviews/ui/settings/lib/accents-selector.ts (100%) rename {src => extensions}/webviews/ui/settings/settings.html (100%) rename {src => extensions}/webviews/ui/settings/style.css (100%) diff --git a/.gulp/tasks/copy-ui.ts b/.gulp/tasks/copy-ui.ts index fa45ac6..027fba9 100644 --- a/.gulp/tasks/copy-ui.ts +++ b/.gulp/tasks/copy-ui.ts @@ -5,19 +5,15 @@ import * as gulp from 'gulp'; import {PATHS} from '../../extensions/consts/paths'; import {ensureDir} from '../../extensions/helpers/fs'; -/** - * For each ThemeIconVariant create a Material-Theme-Icons-{variant}.json - * depends on default Material-Theme-Icons.json - */ export default gulp.task('build:copy-ui', callback => { try { ensureDir(path.resolve(PATHS.UI)); fs.copyFileSync( - path.join(PATHS.SRC, 'webviews', 'ui', 'release-notes', 'release-notes.html'), + path.join(PATHS.VSIX_DIR, 'webviews', 'ui', 'release-notes', 'release-notes.html'), path.join(PATHS.UI, 'release-notes.html') ); fs.copyFileSync( - path.join(PATHS.SRC, 'webviews', 'ui', 'release-notes', 'style.css'), + path.join(PATHS.VSIX_DIR, 'webviews', 'ui', 'release-notes', 'style.css'), path.join(PATHS.UI, 'release-notes.css') ); } catch (error) { diff --git a/extensions/material.theme.config.ts b/extensions/material.theme.config.ts index 9975ed3..24ccd4f 100644 --- a/extensions/material.theme.config.ts +++ b/extensions/material.theme.config.ts @@ -10,7 +10,7 @@ import {onChangeConfiguration} from './helpers/configuration-change'; import {changelogMessage, installationMessage} from './helpers/messages'; import checkInstallation from './helpers/check-installation'; import writeChangelog from './helpers/write-changelog'; -import {ReleaseNotesWebview} from '../src/webviews/ReleaseNotes'; +import {ReleaseNotesWebview} from './webviews/ReleaseNotes'; import handleAutoapply from './helpers/handle-autoapply'; export async function activate(context: ExtensionContext) { diff --git a/src/webviews/ReleaseNotes.ts b/extensions/webviews/ReleaseNotes.ts similarity index 100% rename from src/webviews/ReleaseNotes.ts rename to extensions/webviews/ReleaseNotes.ts diff --git a/src/webviews/Settings.ts b/extensions/webviews/Settings.ts similarity index 100% rename from src/webviews/Settings.ts rename to extensions/webviews/Settings.ts diff --git a/src/webviews/Webview.ts b/extensions/webviews/Webview.ts similarity index 100% rename from src/webviews/Webview.ts rename to extensions/webviews/Webview.ts diff --git a/src/webviews/interfaces.ts b/extensions/webviews/interfaces.ts similarity index 100% rename from src/webviews/interfaces.ts rename to extensions/webviews/interfaces.ts diff --git a/src/webviews/ui/release-notes/index.ts b/extensions/webviews/ui/release-notes/index.ts similarity index 100% rename from src/webviews/ui/release-notes/index.ts rename to extensions/webviews/ui/release-notes/index.ts diff --git a/src/webviews/ui/release-notes/release-notes.html b/extensions/webviews/ui/release-notes/release-notes.html similarity index 100% rename from src/webviews/ui/release-notes/release-notes.html rename to extensions/webviews/ui/release-notes/release-notes.html diff --git a/src/webviews/ui/release-notes/style.css b/extensions/webviews/ui/release-notes/style.css similarity index 100% rename from src/webviews/ui/release-notes/style.css rename to extensions/webviews/ui/release-notes/style.css diff --git a/src/webviews/ui/settings/index.ts b/extensions/webviews/ui/settings/index.ts similarity index 100% rename from src/webviews/ui/settings/index.ts rename to extensions/webviews/ui/settings/index.ts diff --git a/src/webviews/ui/settings/lib/accents-selector.ts b/extensions/webviews/ui/settings/lib/accents-selector.ts similarity index 100% rename from src/webviews/ui/settings/lib/accents-selector.ts rename to extensions/webviews/ui/settings/lib/accents-selector.ts diff --git a/src/webviews/ui/settings/settings.html b/extensions/webviews/ui/settings/settings.html similarity index 100% rename from src/webviews/ui/settings/settings.html rename to extensions/webviews/ui/settings/settings.html diff --git a/src/webviews/ui/settings/style.css b/extensions/webviews/ui/settings/style.css similarity index 100% rename from src/webviews/ui/settings/style.css rename to extensions/webviews/ui/settings/style.css diff --git a/package.json b/package.json index f041fc2..91a2041 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "build-themes": "gulp build:themes", "build-ui": "yarn copy-ui && yarn build-ui-release-notes", "copy-ui": "gulp build:copy-ui", - "build-ui-release-notes": "browserify src/webviews/ui/release-notes/index.js > ui/release-notes.js", + "build-ui-release-notes": "browserify extensions/webviews/ui/release-notes/index.js > ui/release-notes.js", "build-ui-only": "yarn cleanup && yarn build-ts && yarn build-ui", "build-ts": "tsc -p ./tsconfig.json", "test": "tslint **.ts",