diff --git a/.gitignore b/.gitignore index c714710..e6a09d5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ node_modules/ .DS_Store /themes /icons +/src/icons/svgs/* +.tmp-output-remote-icons diff --git a/.gulp/index.ts b/.gulp/index.ts index 6e2342e..eea52e6 100644 --- a/.gulp/index.ts +++ b/.gulp/index.ts @@ -2,9 +2,11 @@ export * from './tasks/icons'; export * from './tasks/icons-accents'; export * from './tasks/icons-variants'; +export * from './tasks/icons-variants-json'; export * from './tasks/themes'; export * from './tasks/watcher'; export * from './tasks/changelog-title'; +export * from './tasks/get-remote-icons'; // export default script export default ['build:themes']; diff --git a/.gulp/tasks/get-remote-icons.ts b/.gulp/tasks/get-remote-icons.ts new file mode 100644 index 0000000..0a51976 --- /dev/null +++ b/.gulp/tasks/get-remote-icons.ts @@ -0,0 +1,33 @@ +import * as path from 'path'; +import * as gulp from 'gulp'; +import * as execa from 'execa'; +import * as rimraf from 'rimraf'; +import {ncp} from 'ncp'; + +const pCopy = (src: string, dest: string) => new Promise((resolve, reject) => + ncp(src, dest, err => err ? reject(err) : resolve()) +); + +const pRm = (dir: string) => new Promise((resolve, reject) => + rimraf(dir, (err: any) => err ? reject(err) : resolve()) +); + +/** + * Get remote Material Icons + */ +export default gulp.task('build:get-remote-icons', callback => { + const src = 'ssh://equinsuocha@vs-ssh.visualstudio.com:22/vsc-material-theme-icons/_ssh/vsc-material-theme-icons'; + const tmpDest = './_tmp-output-remote-icons'; + const dest = './src/icons/svgs'; + + execa('git', [ + 'clone', + '--depth=1', + src, + tmpDest + ]) + .then(() => pCopy(path.join(tmpDest, dest), dest)) + .then(() => pRm(tmpDest)) + .then(() => callback()) + .catch((err: any) => callback(err.message)); +}); diff --git a/.gulp/tasks/icons-variants-json.ts b/.gulp/tasks/icons-variants-json.ts new file mode 100644 index 0000000..2bf9717 --- /dev/null +++ b/.gulp/tasks/icons-variants-json.ts @@ -0,0 +1,37 @@ +import * as fs from 'fs'; +import * as gulp from 'gulp'; + +import {resolve} from 'path'; +import {IDefaultsThemeIconVariant} from './../../extensions/interfaces/idefaults'; +import {getDefaultValues, getVariantIcons} from './../../extensions/helpers/fs'; +import {PATHS} from '../../extensions/consts/paths'; +import {CHARSET} from '../../extensions/consts/files'; + +/** + * For each ThemeIconVariant create a Material-Theme-Icons-{variant}.json + * depends on default Material-Theme-Icons.json + */ +export default gulp.task('build:icons.variants-json', callback => { + try { + const variants: IDefaultsThemeIconVariant = getDefaultValues().themeIconVariants; + const defaults = fs.readFileSync(resolve(`${PATHS.THEMES}/Material-Theme-Icons.json`), 'utf8'); + Object.keys(variants).forEach(variantName => { + const jsonDefaults = JSON.parse(defaults); + + getVariantIcons().forEach(iconname => { + const newIconPath = jsonDefaults.iconDefinitions[iconname].iconPath.replace('.svg', `${variantName}.svg`); + jsonDefaults.iconDefinitions[iconname].iconPath = newIconPath; + + fs.writeFileSync( + `${PATHS.THEMES}/Material-Theme-Icons-${variantName}.json`, + JSON.stringify(jsonDefaults), + {encoding: CHARSET} + ); + }); + }); + } catch (error) { + return callback(error); + } + + callback(); +}); diff --git a/README.md b/README.md index 82d6e78..7add60c 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ The most epic theme meets Visual Studio Code. You can help by reporting issues [ - [Activate theme](#activate-theme) - [Fix File Icons](#fix-file-icons) - [Set the accent color](#set-the-accent-color) + - [Disabling/enabling file icons auto-applying](#disabling-enabling-file-icons-auto-applying) - [Override theme colors](#override-theme-colors) - [Color Scheme override](#color-scheme-override) - [UI Overrides](#ui-overrides) @@ -106,6 +107,18 @@ Launch *Quick Open*, Type `material theme` and choose `Material Theme: Set accent color` and pick one color from the list. +## Disabling/enabling file icons auto-applying + +By default material theme will apply the correct icons theme based on your active theme variant. To disable this behavior follow these steps: + +Launch *Quick Open*, + + - Linux `Ctrl + Shift + P` + - macOS `⌘ + Shift + P` + - Windows `Ctrl + Shift + P` + +Type `material theme` and choose `Material Theme: Enable or disable icons auto-applying` and choose to disable or enable this behavior. + ## Override theme colors You can override the material theme ui and schemes colors by adding these theme-specific settings to your configuration. For advanced customisation please check the [relative section on the vs code documentation](https://code.visualstudio.com/docs/getstarted/themes#_customizing-a-color-theme) diff --git a/extensions/commands/accents-setter/index.ts b/extensions/commands/accents-setter/index.ts index 63dd2ca..263367c 100644 --- a/extensions/commands/accents-setter/index.ts +++ b/extensions/commands/accents-setter/index.ts @@ -4,16 +4,8 @@ import {IAccentCustomProperty} from './../../interfaces/iaccent-custom-property' import {IGenericObject} from './../../interfaces/igeneric-object'; import { updateAccent, - isMaterialTheme, - isMaterialThemeIcons } from './../../helpers/settings'; -import { - getCurrentThemeID, - getCurrentThemeIconsID, - reloadWindow -} from './../../helpers/vscode'; import {getDefaultValues} from './../../helpers/fs'; -import {THEME_ICONS} from './../theme-icons/index'; const REGEXP_HEX: RegExp = /^#([0-9A-F]{6}|[0-9A-F]{8})$/i; @@ -62,11 +54,11 @@ const accentsProperties: IGenericObject = { alpha: 100, value: undefined }, - "editor.findWidgetResizeBorder": { + 'editor.findWidgetResizeBorder': { alpha: 100, value: undefined }, - "editorWidget.border": { + 'editorWidget.border': { alpha: 100, value: undefined } @@ -101,47 +93,37 @@ const isValidColour = (colour: string | null | undefined): boolean => /** * Sets workbench options */ -const setWorkbenchOptions = (accentSelected: string | undefined, config: any): void => { - vscode.workspace.getConfiguration().update('workbench.colorCustomizations', config, true).then(() => { - const themeID = getCurrentThemeID(); - const themeIconsID = getCurrentThemeIconsID(); - - updateAccent(accentSelected).then(() => { - if (isMaterialTheme(themeID) && isMaterialThemeIcons(themeIconsID)) { - THEME_ICONS().then(() => reloadWindow()); - } - }); - }, reason => { - vscode.window.showErrorMessage(reason); - }); -}; +const setWorkbenchOptions = (accentSelected: string | undefined, config: any): Thenable => + vscode.workspace.getConfiguration().update('workbench.colorCustomizations', config, true) + .then(() => updateAccent(accentSelected), + reason => vscode.window.showErrorMessage(reason)); /** * VSCode command */ -export const THEME_ACCENTS_SETTER = () => { +export default async (): Promise => { const themeConfigCommon = getDefaultValues(); - // shows the quick pick dropdown - const options: string[] = Object.keys(themeConfigCommon.accents); const purgeColourKey: string = 'Remove accents'; + const options: string[] = Object.keys(themeConfigCommon.accents).concat(purgeColourKey); - options.push(purgeColourKey); + // shows the quick pick dropdown and wait response + const accentSelected = await vscode.window.showQuickPick(options); - vscode.window.showQuickPick(options).then(accentSelected => { - if (accentSelected === null || accentSelected === undefined) { - return; - } + if (accentSelected === null || accentSelected === undefined) { + Promise.resolve(null); + } - const config: any = vscode.workspace.getConfiguration().get('workbench.colorCustomizations'); + const config: any = vscode.workspace.getConfiguration().get('workbench.colorCustomizations'); + + switch (accentSelected) { + case purgeColourKey: + assignColorCustomizations(undefined, config); + await setWorkbenchOptions(undefined, config); + return Promise.resolve(true); + default: + assignColorCustomizations(themeConfigCommon.accents[accentSelected], config); + await setWorkbenchOptions(accentSelected, config); + return Promise.resolve(true); + } - switch (accentSelected) { - case purgeColourKey: - assignColorCustomizations(undefined, config); - setWorkbenchOptions(undefined, config); - break; - default: - assignColorCustomizations(themeConfigCommon.accents[accentSelected], config); - setWorkbenchOptions(accentSelected, config); - } - }); }; diff --git a/extensions/commands/index.ts b/extensions/commands/index.ts new file mode 100644 index 0000000..cf23827 --- /dev/null +++ b/extensions/commands/index.ts @@ -0,0 +1,4 @@ +export {default as accentsSetter} from './accents-setter'; +export {default as fixIcons} from './theme-icons'; +export {default as toggleApplyIcons} from './toggle-apply-icons'; +export {default as showChangelog} from './show-changelog'; diff --git a/extensions/commands/show-changelog/index.ts b/extensions/commands/show-changelog/index.ts new file mode 100644 index 0000000..c7920ed --- /dev/null +++ b/extensions/commands/show-changelog/index.ts @@ -0,0 +1,28 @@ +import * as path from 'path'; +import * as vscode from 'vscode'; + +import {PATHS} from './../../consts/paths'; + +const previewFile = (): void => { + const uri = vscode.Uri.file(path.join(PATHS.VSIX_DIR, './CHANGELOG.md')); + vscode.commands.executeCommand('markdown.showPreview', uri); +}; + +export default (): void => { + const extname: string = 'vscode.markdown'; + const md = vscode.extensions.getExtension(extname); + + if (md === undefined) { + console.warn(`Ext not found ${ extname }`); + return; + } + + if (md.isActive) { + return previewFile(); + } + + md.activate() + .then(() => previewFile(), + reason => console.warn(reason) + ); +}; diff --git a/extensions/commands/theme-icons/index.ts b/extensions/commands/theme-icons/index.ts index 725a0a6..563fd7d 100644 --- a/extensions/commands/theme-icons/index.ts +++ b/extensions/commands/theme-icons/index.ts @@ -6,20 +6,21 @@ import { getDefaultValues, getThemeIconsByContributeID, getThemeIconsContribute, - getVariantIcons + getIconVariantFromTheme } from './../../helpers/fs'; import { isAccent, - isMaterialThemeIcons, - getCustomSettings + getCustomSettings, + isMaterialTheme, + setCustomSetting } from './../../helpers/settings'; -import {getCurrentThemeIconsID, getCurrentThemeID} from './../../helpers/vscode'; +import {getCurrentThemeID, setIconsID, getCurrentThemeIconsID, reloadWindow} from './../../helpers/vscode'; import {CHARSET} from './../../consts/files'; import {IPackageJSONThemeIcons} from './../../interfaces/ipackage.json'; import {IThemeIconsIconPath, IThemeIcons} from './../../interfaces/itheme-icons'; -const getIconDefinition = (definitions: any, iconname: string): IThemeIconsIconPath => { - return (definitions as any)[iconname]; +const getIconDefinition = (definitions: any, iconName: string): IThemeIconsIconPath => { + return (definitions as any)[iconName]; }; /** @@ -29,80 +30,73 @@ const replaceIconPathWithAccent = (iconPath: string, accentName: string): string return iconPath.replace('.svg', `.accent.${ accentName }.svg`); }; -const getVariantFromColor = (color: string): string => { - switch (true) { - case color === undefined || color === 'Material Theme': - return 'Default'; - case color === 'Material Theme High Contrast': - return 'Default High Contrast'; - case color.includes('Material Theme Lighter'): - return 'Light'; - default: - return color.replace(/Material Theme /gi, ''); - } -}; - -export const THEME_ICONS = () => { +/** + * Fix icons when flag auto-fix is active and current theme is Material + */ +export default async () => { const deferred: any = {}; const promise = new Promise((resolve, reject) => { deferred.resolve = resolve; deferred.reject = reject; }); - const themeIconsID: string = getCurrentThemeIconsID(); - if (isMaterialThemeIcons(themeIconsID)) { - const themeID = getCurrentThemeID(); - const customSettings = getCustomSettings(); - const defaults = getDefaultValues(); - const accentName = customSettings.accent; - const variantName: string = getVariantFromColor(themeID); + // Current theme id set on VSCode ("label" of the package.json) + const themeLabel = getCurrentThemeID(); - const themeContribute: IPackageJSONThemeIcons = getThemeIconsContribute(themeIconsID); - const theme: IThemeIcons = getThemeIconsByContributeID(themeIconsID); - const themepath: string = getAbsolutePath(themeContribute.path); - - if (isAccent(accentName, defaults)) { - const realAccentName = accentName.replace(/\s+/, '-'); - getAccentableIcons().forEach(iconname => { - const distIcon = getIconDefinition(theme.iconDefinitions, iconname); - const outIcon = getIconDefinition(defaults.icons.theme.iconDefinitions, iconname); - - if (typeof distIcon === 'object' && typeof outIcon === 'object') { - distIcon.iconPath = replaceIconPathWithAccent(outIcon.iconPath, realAccentName); - } - }); - - } else { - getAccentableIcons().forEach(iconname => { - const distIcon = getIconDefinition(theme.iconDefinitions, iconname); - const outIcon = getIconDefinition(defaults.icons.theme.iconDefinitions, iconname); - - distIcon.iconPath = outIcon.iconPath; - }); - } - - getVariantIcons().forEach(iconname => { - const distIcon = getIconDefinition(theme.iconDefinitions, iconname); - const outIcon = getIconDefinition(defaults.icons.theme.iconDefinitions, iconname); - - if (distIcon && outIcon) { - distIcon.iconPath = outIcon.iconPath.replace('.svg', `${ variantName }.svg`); - } - }); - - fs.writeFile(themepath, JSON.stringify(theme), { - encoding: CHARSET - }, err => { - if (err) { - deferred.reject(err); - return; - } - - deferred.resolve(); - }); - } else { - deferred.resolve(); + // If this method was called without Material Theme set, just return + if (!isMaterialTheme(themeLabel)) { + return deferred.resolve(); } - return promise; + await setCustomSetting('fixIconsRunning', true); + + const DEFAULTS = getDefaultValues(); + const CUSTOM_SETTINGS = getCustomSettings(); + + const materialIconVariantID: string | null = getIconVariantFromTheme(themeLabel); + const currentThemeIconsID: string = getCurrentThemeIconsID(); + const newThemeIconsID = materialIconVariantID ? + `eq-material-theme-icons-${materialIconVariantID}` : 'eq-material-theme-icons'; + + // Just set the correct Material Theme icons variant if wasn't + // Or also change the current icons set to the Material Theme icons variant + // (this is intended: this command was called directly or `autoFix` flag was already checked by other code) + if (currentThemeIconsID !== newThemeIconsID) { + await setIconsID(newThemeIconsID); + } + + // package.json iconThemes object for the current icons set + const themeIconsContribute: IPackageJSONThemeIcons = getThemeIconsContribute(newThemeIconsID); + // Actual json file of the icons theme (eg. Material-Theme-Icons-Darker.json) + const theme: IThemeIcons = getThemeIconsByContributeID(newThemeIconsID); + + const newIconPath = (outIcon: IThemeIconsIconPath) => isAccent(CUSTOM_SETTINGS.accent, DEFAULTS) ? + replaceIconPathWithAccent(outIcon.iconPath, CUSTOM_SETTINGS.accent.replace(/\s+/, '-')) : outIcon.iconPath; + + getAccentableIcons().forEach(iconName => { + const distIcon = getIconDefinition(theme.iconDefinitions, iconName); + const outIcon = getIconDefinition(DEFAULTS.icons.theme.iconDefinitions, iconName); + + if (typeof distIcon === 'object' && typeof outIcon === 'object') { + distIcon.iconPath = newIconPath(outIcon); + } + }); + + // Path of the icons theme .json + const themePath: string = getAbsolutePath(themeIconsContribute.path); + fs.writeFile(themePath, JSON.stringify(theme), { + encoding: CHARSET + }, async err => { + if (err) { + deferred.reject(err); + return; + } + + await setCustomSetting('fixIconsRunning', false); + deferred.resolve(); + }); + + return promise + .then(() => reloadWindow()) + .catch((error: NodeJS.ErrnoException) => console.trace(error)); }; diff --git a/extensions/commands/toggle-apply-icons/index.ts b/extensions/commands/toggle-apply-icons/index.ts new file mode 100644 index 0000000..adb0cc9 --- /dev/null +++ b/extensions/commands/toggle-apply-icons/index.ts @@ -0,0 +1,11 @@ +import * as vscode from 'vscode'; + +export default async (): Promise => { + // shows the quick pick dropdown and wait response + const optionSelected = await vscode.window.showQuickPick(['Enable', 'Disable']); + const isEnable = optionSelected === 'Enable'; + + return Promise.resolve(vscode.workspace + .getConfiguration().update('materialTheme.autoApplyIcons', isEnable, true) + ); +}; diff --git a/extensions/defaults.json b/extensions/defaults.json index c853863..2d5b58a 100644 --- a/extensions/defaults.json +++ b/extensions/defaults.json @@ -145,6 +145,12 @@ } } }, + "themeIconVariants": { + "Darker": "eq-material-theme-icons-darker", + "Light": "eq-material-theme-icons-light", + "Palenight": "eq-material-theme-icons-palenight", + "Ocean": "eq-material-theme-icons-ocean" + }, "themeVariants": { "Darker": "./themes/Material-Theme-Darker.json", "Darker High Contrast": "./themes/Material-Theme-Darker-High-Contrast.json", diff --git a/extensions/helpers/configuration-change.ts b/extensions/helpers/configuration-change.ts new file mode 100644 index 0000000..ef1e1aa --- /dev/null +++ b/extensions/helpers/configuration-change.ts @@ -0,0 +1,42 @@ +import { + ConfigurationChangeEvent +} from 'vscode'; +import {getCustomSettings, isMaterialThemeIcons, isAutoApplyEnable, isMaterialTheme} from './settings'; +import {getCurrentThemeIconsID, getCurrentThemeID} from './vscode'; + +import * as ThemeCommands from './../commands'; +import {infoMessage} from './messages'; + +const icons = () => isAutoApplyEnable() ? ThemeCommands.fixIcons() : infoMessage(); + +const onIconsChanged = () => { + const customSettings = getCustomSettings(); + if (customSettings.fixIconsRunning) { + return; + } + + const currentIconsTheme = getCurrentThemeIconsID(); + if (isMaterialThemeIcons(currentIconsTheme)) { + return icons(); + } +}; + +const onThemeChanged = () => { + const currentTheme = getCurrentThemeID(); + if (isMaterialTheme(currentTheme)) { + return icons(); + } +}; + +export const onChangeConfiguration = (event: ConfigurationChangeEvent) => { + const isColorTheme = event.affectsConfiguration('workbench.colorTheme'); + const isIconTheme = event.affectsConfiguration('workbench.iconTheme'); + + if (isIconTheme) { + return onIconsChanged(); + } + + if (isColorTheme) { + return onThemeChanged(); + } +}; diff --git a/extensions/helpers/fs.ts b/extensions/helpers/fs.ts index 986a847..688baea 100644 --- a/extensions/helpers/fs.ts +++ b/extensions/helpers/fs.ts @@ -52,6 +52,15 @@ export function getThemeIconsContribute(ID: string): IPackageJSONThemeIcons { return contributes[0] !== undefined ? contributes[0] : null; } +/** + * Icon variant name from theme name + */ +export function getIconVariantFromTheme(theme: string): string { + const {themeIconVariants} = getDefaultValues(); + const found = Object.keys(themeIconVariants).find(variant => theme.includes(variant)); + return found ? found.toLowerCase() : null; +} + /** * Gets package JSON */ diff --git a/extensions/helpers/messages.ts b/extensions/helpers/messages.ts new file mode 100644 index 0000000..a33a2af --- /dev/null +++ b/extensions/helpers/messages.ts @@ -0,0 +1,14 @@ +import { + window as Window +} from 'vscode'; + +import * as ThemeCommands from './../commands'; + +const INFO_MESSAGE = 'You should reload the window for full activate the Material Theme.'; +const OPTIONS = {ok: 'Reload now', cancel: 'Cancel'}; + +export const infoMessage = async () => { + if (await Window.showInformationMessage(INFO_MESSAGE, OPTIONS.ok, OPTIONS.cancel) === OPTIONS.ok) { + ThemeCommands.fixIcons(); + } +}; diff --git a/extensions/helpers/settings.ts b/extensions/helpers/settings.ts index e5b5f48..1c2073b 100644 --- a/extensions/helpers/settings.ts +++ b/extensions/helpers/settings.ts @@ -18,11 +18,18 @@ export function getCustomSettings(): IThemeCustomProperties { return vscode.workspace.getConfiguration().get('materialTheme', {}); } +/** + * Get autoApplyIcons + */ +export function isAutoApplyEnable(): boolean { + return vscode.workspace.getConfiguration().get('materialTheme.autoApplyIcons', true); +} + /** * Checks if a given string could be an accent */ export function isAccent(accentName: string, defaults: IDefaults): boolean { - return Object.keys(defaults.accents).filter(name => name === accentName).length > 0; + return Boolean(Object.keys(defaults.accents).find(name => name === accentName)); } /** @@ -30,7 +37,7 @@ export function isAccent(accentName: string, defaults: IDefaults): boolean { */ export function isMaterialTheme(themeName: string): boolean { const packageJSON = getPackageJSON(); - return packageJSON.contributes.themes.filter(contrib => contrib.label === themeName).length > 0; + return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName)); } /** @@ -38,20 +45,20 @@ export function isMaterialTheme(themeName: string): boolean { */ export function isMaterialThemeIcons(themeIconsName: string): boolean { const packageJSON = getPackageJSON(); - return packageJSON.contributes.iconThemes.filter(contribute => contribute.id === themeIconsName).length > 0; + return Boolean(packageJSON.contributes.iconThemes.find(contribute => contribute.id === themeIconsName)); } /** * Sets a custom property in custom settings */ -export function setCustomSetting(settingName: string, value: any): Thenable { - return vscode.workspace.getConfiguration().update(`materialTheme.${settingName}`, value, true); +export function setCustomSetting(settingName: string, value: any): Thenable { + return vscode.workspace.getConfiguration().update(`materialTheme.${settingName}`, value, true).then(() => settingName); } /** * Updates accent name */ -export function updateAccent(accentName: string): Thenable { +export function updateAccent(accentName: string): Thenable { const prevAccent = getAccent(); return setCustomSetting('accentPrevious', prevAccent) .then(() => setCustomSetting('accent', accentName)); diff --git a/extensions/helpers/changelog.ts b/extensions/helpers/should-show-changelog.ts similarity index 64% rename from extensions/helpers/changelog.ts rename to extensions/helpers/should-show-changelog.ts index cdd8fe6..f05b780 100644 --- a/extensions/helpers/changelog.ts +++ b/extensions/helpers/should-show-changelog.ts @@ -1,15 +1,8 @@ import * as path from 'path'; -import * as vscode from 'vscode'; import {IDefaults} from './../interfaces/idefaults'; import {getDefaultValues, getPackageJSON, writeFile} from './fs'; -import {PATHS} from './../consts/paths'; - -const previewFile = (): void => { - const uri = vscode.Uri.file(path.join(PATHS.VSIX_DIR, './CHANGELOG.md')); - vscode.commands.executeCommand('markdown.showPreview', uri); -}; const splitVersion = (input: string): {major: number; minor: number; patch: number} => { const [major, minor, patch] = input.split('.').map(i => parseInt(i, 10)); @@ -19,26 +12,7 @@ const splitVersion = (input: string): {major: number; minor: number; patch: numb const writeDefaults = (defaults: IDefaults) => writeFile(path.join('./extensions/defaults.json'), JSON.stringify(defaults, null, 2)); -export const showChangelog = (): void => { - const extname: string = 'vscode.markdown'; - const md = vscode.extensions.getExtension(extname); - - if (md === undefined) { - console.warn(`Ext not found ${ extname }`); - return; - } - - if (md.isActive) { - return previewFile(); - } - - md.activate() - .then(() => previewFile(), - reason => console.warn(reason) - ); -}; - -export const shouldShowChangelog = (): boolean => { +export default (): boolean => { const defaults = getDefaultValues(); const packageJSON = getPackageJSON(); diff --git a/extensions/interfaces/idefaults.ts b/extensions/interfaces/idefaults.ts index e989c20..799799e 100644 --- a/extensions/interfaces/idefaults.ts +++ b/extensions/interfaces/idefaults.ts @@ -4,6 +4,7 @@ export interface IDefaults { changelog: IChangelog; icons: IDefaultsThemeIcons; themeVariants: IDefaultsThemeVariant; + themeIconVariants: IDefaultsThemeIconVariant; themeVariantsColours: IDefaultsThemeVariant; themeVariantsUITheme: IDefaultsThemeVariant; variantsIcons: string[]; @@ -54,4 +55,14 @@ export interface IDefaultsThemeVariant { Light: string; LightHighContrast: string; PalenightHighContrast: string; + Ocean: string; + OceanHighContrast: string; +} + +export interface IDefaultsThemeIconVariant { + [index: string]: string; + Darker: string; + Light: string; + Palenight: string; + Ocean: string; } diff --git a/extensions/interfaces/itheme-custom-properties.ts b/extensions/interfaces/itheme-custom-properties.ts index 4d7a858..a836c2d 100644 --- a/extensions/interfaces/itheme-custom-properties.ts +++ b/extensions/interfaces/itheme-custom-properties.ts @@ -1,4 +1,6 @@ export interface IThemeCustomProperties { accent?: string; accentPrevious?: string; + autoApplyIcons?: boolean; + fixIconsRunning?: boolean; } diff --git a/extensions/material.theme.config.ts b/extensions/material.theme.config.ts index a1f5c40..8466755 100644 --- a/extensions/material.theme.config.ts +++ b/extensions/material.theme.config.ts @@ -3,28 +3,17 @@ import { commands as Commands } from 'vscode'; -import {THEME_ACCENTS_SETTER} from './commands/accents-setter/index'; -import {THEME_ICONS} from './commands/theme-icons/index'; -import {shouldShowChangelog, showChangelog} from './helpers/changelog'; -import {reloadWindow, getCurrentThemeID, setIconsID} from './helpers/vscode'; - -const isMaterialTheme = (currentTheme: string): boolean => - currentTheme.includes('Material Theme'); +import * as ThemeCommands from './commands'; +import {isAutoApplyEnable} from './helpers/settings'; +import {onChangeConfiguration} from './helpers/configuration-change'; +import {infoMessage} from './helpers/messages'; +import shouldShowChangelog from './helpers/should-show-changelog'; export function activate() { const config = Workspace.getConfiguration(); // Listen on set theme: when the theme is Material Theme, just adjust icon and accent. - Workspace.onDidChangeConfiguration(event => { - const isColorTheme = event.affectsConfiguration('workbench.colorTheme'); - const currentTheme = getCurrentThemeID(); - // tslint:disable-next-line:early-exit - if (isColorTheme && isMaterialTheme(currentTheme)) { - setIconsID('eq-material-theme-icons') - .then(() => THEME_ICONS().catch(error => console.trace(error))) - .then(() => reloadWindow()); - } - }); + Workspace.onDidChangeConfiguration(onChangeConfiguration); // Delete old configuration, must remove with next major release if (config.has('materialTheme.cache.workbench')) { @@ -32,15 +21,18 @@ export function activate() { } if (shouldShowChangelog()) { - showChangelog(); + ThemeCommands.showChangelog(); } // Registering commands - Commands.registerCommand('materialTheme.setAccent', () => THEME_ACCENTS_SETTER()); - Commands.registerCommand('materialTheme.fixIcons', () => - THEME_ICONS() - .then(() => reloadWindow()) - .catch(err => console.trace(err)) - ); - Commands.registerCommand('materialTheme.showChangelog', () => showChangelog()); + Commands.registerCommand('materialTheme.setAccent', async () => { + const wasSet = await ThemeCommands.accentsSetter(); + + if (wasSet) { + return isAutoApplyEnable() ? ThemeCommands.fixIcons() : infoMessage(); + } + }); + Commands.registerCommand('materialTheme.fixIcons', () => ThemeCommands.fixIcons()); + Commands.registerCommand('materialTheme.toggleApplyIcons', () => ThemeCommands.toggleApplyIcons()); + Commands.registerCommand('materialTheme.showChangelog', () => ThemeCommands.showChangelog()); } diff --git a/package.json b/package.json index a14a015..82894af 100644 --- a/package.json +++ b/package.json @@ -28,14 +28,16 @@ } }, "scripts": { - "build": "yarn build-icons && yarn build-themes && yarn build-icons-accents && yarn build-icons-variants", + "build": "yarn get-remote-icons && yarn build-icons && yarn build-themes && yarn build-icons-accents && yarn build-icons-variants && yarn build-icons-variants-json", "minimize-icons": "mkdir icons && svgo -f src/icons/svgs -o icons/", "minimize-json": "json-minify themes/.material-theme-icons.tmp > themes/Material-Theme-Icons.json && yarn remove-icons-tmp", "remove-icons": "rimraf icons && rimraf themes/Material-Theme-Icons.json", "remove-icons-tmp": "rimraf themes/.material-theme-icons.tmp", + "get-remote-icons": "yarn gulp build:get-remote-icons", "build-icons": "yarn remove-icons && yarn minimize-icons && yarn gulp build:icons && yarn minimize-json", "build-icons-accents": "yarn gulp build:icons.accents", "build-icons-variants": "yarn gulp build:icons.variants", + "build-icons-variants-json": "yarn gulp build:icons.variants-json", "build-themes": "yarn gulp build:themes", "build-ts": "tsc -p ./tsconfig.json", "test": "tslint **.ts", @@ -52,6 +54,11 @@ "main": "./extensions/material.theme.config.js", "contributes": { "commands": [ + { + "command": "materialTheme.toggleApplyIcons", + "title": "Enable or disable icons auto-applying", + "category": "🎨 Material Theme" + }, { "command": "materialTheme.setAccent", "title": "Set accent color", @@ -79,6 +86,16 @@ "materialTheme.accentPrevious": { "type": "string", "description": "Previous accent color selected" + }, + "materialTheme.autoApplyIcons": { + "type": "boolean", + "description": "Enable/disable auto-apply of Material Theme icons", + "default": true + }, + "materialTheme.fixIconsRunning": { + "type": "boolean", + "description": "For checking if the command is currently acting", + "default": false } } }, @@ -139,6 +156,26 @@ "id": "eq-material-theme-icons", "label": "Material Theme Icons", "path": "./themes/Material-Theme-Icons.json" + }, + { + "id": "eq-material-theme-icons-darker", + "label": "Material Theme Icons Darker", + "path": "./themes/Material-Theme-Icons-Darker.json" + }, + { + "id": "eq-material-theme-icons-palenight", + "label": "Material Theme Icons Palenight", + "path": "./themes/Material-Theme-Icons-Palenight.json" + }, + { + "id": "eq-material-theme-icons-ocean", + "label": "Material Theme Icons Ocean", + "path": "./themes/Material-Theme-Icons-Ocean.json" + }, + { + "id": "eq-material-theme-icons-light", + "label": "Material Theme Icons Light", + "path": "./themes/Material-Theme-Icons-Light.json" } ] }, @@ -151,10 +188,13 @@ ], "devDependencies": { "@types/chalk": "2.2.0", + "@types/execa": "0.9.0", "@types/gulp": "4.0.5", "@types/gulp-if": "0.0.33", "@types/gulp-util": "3.0.34", "@types/mustache": "0.8.30", + "@types/ncp": "2.0.1", + "@types/rimraf": "2.0.2", "@types/run-sequence": "0.0.30", "@types/through2": "2.0.33", "@types/yamljs": "0.2.30", @@ -163,6 +203,7 @@ "babel-preset-es2015": "6.24.1", "babel-root-import": "4.1.8", "cpx": "1.5.0", + "execa": "0.10.0", "gulp": "3.9.1", "gulp-bump": "3.1.0", "gulp-conventional-changelog": "1.1.11", @@ -172,6 +213,7 @@ "hoek": "5.0.3", "json-minify": "1.0.0", "mustache": "2.3.0", + "ncp": "2.0.0", "rimraf": "2.6.2", "run-sequence": "2.2.1", "standard-version": "4.3.0", diff --git a/src/icons/partials/fileExtensions.js b/src/icons/partials/fileExtensions.js index 4ac7d9f..d6b1c4d 100644 --- a/src/icons/partials/fileExtensions.js +++ b/src/icons/partials/fileExtensions.js @@ -1,14 +1,22 @@ "fileExtensions": { + "pm": "_file_perl", + "pl": "_file_perl", + "sql": "_file_sql", + "jl": "_file_julia", + "gv": "_file_graphviz", + "erl": "_file_erlang", "slim": "_file_slim", "hx": "_file_haxe", "zep": "_file_zephyr", "mjs": "_file_node", "mjml": "_file_mjml", "blade.php": "_file_blade", + "blade": "_file_blade", + "inky.php": "_file_blade", "scala": "_file_scala", - "asp": "_file_dotnet", - "aspx": "_file_dotnet", - "ascx": "_file_dotnet", + "asp": "_file_html", + "aspx": "_file_html", + "ascx": "_file_html", "cmd": "_file_cmd", "mustache": "_file_mustache", "rails": "_file_rails", @@ -83,7 +91,7 @@ "webp": "_file_image", "php": "_file_php", "js": "_file_js", - "ejs": "_file_js", + "ejs": "_file_html", "jsx": "_file_react", "ini": "_file_settings", "dlc": "_file_settings", @@ -141,9 +149,9 @@ "csh": "_file_console", "tcsh": "_file_console", "zsh": "_file_console", - "bash": "_file_console", - "bat": "_file_console", - "cmd": "_file_console", + "bash": "_file_cmd", + "bat": "_file_cmd", + "cmd": "_file_cmd", "awk": "_file_console", "ps1": "_file_console", "fish": "_file_console", @@ -191,6 +199,8 @@ "ino": "_file_arduino", "dockerignore": "_file_docker", "tex": "_file_tex", + "cls": "_file_tex", + "sty": "_file_tex", "bib": "_file_lib", "pptx": "_file_powerpoint", "ppt": "_file_powerpoint", @@ -229,11 +239,6 @@ "vbox": "_file_virtual", "vbox-prev": "_file_virtual", "ics": "_file_email", - "mp3": "_file_music", - "flac": "_file_music", - "m4a": "_file_music", - "wma": "_file_music", - "aiff": "_file_music", "coffee": "_file_coffee", "txt": "_file_document", "sqlite": "_file_database", @@ -282,7 +287,8 @@ "js.map": "_file_jsmap", "css.map": "_file_cssmap", "tmTheme": "_file_markup", - "pp": "_file_pp", + "tmcolor": "_file_markup", + "pp": "_file_puppet", "applescript": "_file_applescript", "mp3": "_file_audio", "flac": "_file_audio", @@ -292,6 +298,30 @@ "haml": "_file_haml", "ex": "_file_ex", "exs": "_file_ex", + "eex": "_file_ex", "re": "_file_reason", - "rei": "_file_reason" + "rei": "_file_reason", + "module.ts": "_file_angular", + "module.js": "_file_angular", + "ng-template": "_file_angular", + "component.ts": "_file_angular-component", + "component.js": "_file_angular-component", + "directive.ts": "_file_angular-directive", + "directive.js": "_file_angular-directive", + "guard.ts": "_file_angular-guard", + "guard.js": "_file_angular-guard", + "service.ts": "_file_angular-service", + "service.js": "_file_angular-service", + "pipe.ts": "_file_angular-pipe", + "pipe.js": "_file_angular-pipe", + "filter.js": "_file_angular-pipe", + "resolver.ts": "_file_angular-resolver", + "resolver.js": "_file_angular-resolver", + "routing.ts": "_file_angular-routing", + "routing.js": "_file_angular-routing", + "matlab": "_file_matlab", + "liquid": "_file_liquid", + "note": "_file_note", + "js.map": "_file_js_map", + "mjs.map": "_file_js_map" }, diff --git a/src/icons/partials/fileNames.js b/src/icons/partials/fileNames.js index 922ca44..8ec6f55 100644 --- a/src/icons/partials/fileNames.js +++ b/src/icons/partials/fileNames.js @@ -1,4 +1,11 @@ "fileNames": { + ".prettierrc": "_file_prettier", + "prettier.config.js": "_file_prettier", + ".prettierrc.js": "_file_prettier", + ".prettierrc.json": "_file_prettier", + ".prettierrc.yaml": "_file_prettier", + ".prettierrc.yml": "_file_prettier", + ".prettierignore": "_file_prettier", "code_of_conduct.md": "_file_conduct", "jest.config.js": "_file_jest", "jest.config.ts": "_file_jest", @@ -20,6 +27,19 @@ ".bowerrc": "_file_bower", "webpack.js": "_file_webpack", "rollup.config.js": "_file_rollup", + "rollup.config.ts": "file_rollup", + "rollup-config.js": "file_rollup", + "rollup-config.ts": "file_rollup", + "rollup.config.common.js": "file_rollup", + "rollup.config.common.ts": "file_rollup", + "rollup.config.base.js": "file_rollup", + "rollup.config.base.ts": "file_rollup", + "rollup.config.prod.js": "file_rollup", + "rollup.config.prod.ts": "file_rollup", + "rollup.config.dev.js": "file_rollup", + "rollup.config.dev.ts": "file_rollup", + "rollup.config.prod.vendor.js": "file_rollup", + "rollup.config.prod.vendor.ts": "file_rollup", "webpack.config.js": "_file_webpack", "webpack.dev.js": "_file_webpack", "webpack.prod.js": "_file_webpack", @@ -29,6 +49,7 @@ ".io-config.json": "_file_ionic", "gulpfile.js": "_file_gulp", "gulpfile.babel.js": "_file_gulp", + "gulpfile.babel.ts": "_file_gulp", "gulp-config.js": "_file_gulp", "package.json": "_file_npm", "gradle.properties": "_file_gradle", @@ -53,13 +74,18 @@ ".babelrc": "_file_babel", ".babelrc.json": "_file_babel", ".eslintrc": "_file_eslint", + ".eslintignore": "_file_eslint", ".eslintrc.js": "_file_eslint", ".eslintrc.json": "_file_eslint", ".eslintrc.yml": "_file_eslint", + ".eslintrc.yaml": "_file_eslint", ".stylelintrc": "_file_stylelint", - ".stylelint.js": "_file_stylelint", + ".stylelint.config.js": "_file_stylelint", + ".stylelintrc.js": "_file_stylelint", ".stylelintrc.json": "_file_stylelint", ".stylelintrc.yml": "_file_stylelint", + ".stylelintrc.yaml": "_file_stylelint", + ".stylelintignore": "_file_stylelint", ".buildignore": "_file_settings", ".htaccess": "_file_xml", "composer.lock": "_file_json", @@ -90,8 +116,8 @@ ".jsbeautifyrc": "_file_json", "git-history": "_file_git", "angular-cli.json": "_file_angular", - "component.ts": "_file_angular", - "component.js": "_file_angular", - "app.module.ts": "_file_angular", + ".angular-cli.json": "_file_angular", + "directive.ts": "_file_angular-directive", + "directive.js": "_file_angular-directive", "favicon.ico": "_file_favicon" -}, \ No newline at end of file +}, diff --git a/src/icons/partials/languageIds.js b/src/icons/partials/languageIds.js index a62b16c..a82cb1b 100644 --- a/src/icons/partials/languageIds.js +++ b/src/icons/partials/languageIds.js @@ -3,5 +3,7 @@ "ng-template": "_file_angular", "haxe": "_file_haxe", "hxml": "_file_haxe", - "polymer": "_file_polymer" -}, \ No newline at end of file + "polymer": "_file_polymer", + "matlab": "_file_matlab", + "makefile": "_file_settings" +}, diff --git a/src/icons/svgs/actionscript.svg b/src/icons/svgs/actionscript.svg deleted file mode 100755 index d1a6d21..0000000 --- a/src/icons/svgs/actionscript.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - { } - AS - diff --git a/src/icons/svgs/ai.svg b/src/icons/svgs/ai.svg deleted file mode 100644 index 860b0fc..0000000 --- a/src/icons/svgs/ai.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/icons/svgs/android.svg b/src/icons/svgs/android.svg deleted file mode 100755 index 9dc23cc..0000000 --- a/src/icons/svgs/android.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/angular.svg b/src/icons/svgs/angular.svg deleted file mode 100755 index c23e0bf..0000000 --- a/src/icons/svgs/angular.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/applescript.svg b/src/icons/svgs/applescript.svg deleted file mode 100644 index 33a08db..0000000 --- a/src/icons/svgs/applescript.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/arduino.svg b/src/icons/svgs/arduino.svg deleted file mode 100755 index 5d0136f..0000000 --- a/src/icons/svgs/arduino.svg +++ /dev/null @@ -1 +0,0 @@ -Layer 1 \ No newline at end of file diff --git a/src/icons/svgs/assembly.svg b/src/icons/svgs/assembly.svg deleted file mode 100755 index 13ffa1b..0000000 --- a/src/icons/svgs/assembly.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/audio.svg b/src/icons/svgs/audio.svg deleted file mode 100644 index e2ea335..0000000 --- a/src/icons/svgs/audio.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/autohotkey.svg b/src/icons/svgs/autohotkey.svg deleted file mode 100755 index 2d30b20..0000000 --- a/src/icons/svgs/autohotkey.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/babel.svg b/src/icons/svgs/babel.svg deleted file mode 100644 index 95cbb6e..0000000 --- a/src/icons/svgs/babel.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/blade.svg b/src/icons/svgs/blade.svg deleted file mode 100644 index f2e83f9..0000000 --- a/src/icons/svgs/blade.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/icons/svgs/bower.svg b/src/icons/svgs/bower.svg deleted file mode 100644 index 9fb2327..0000000 --- a/src/icons/svgs/bower.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/c.svg b/src/icons/svgs/c.svg deleted file mode 100644 index f088643..0000000 --- a/src/icons/svgs/c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/certificate.svg b/src/icons/svgs/certificate.svg deleted file mode 100755 index b755e35..0000000 --- a/src/icons/svgs/certificate.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/changelog.svg b/src/icons/svgs/changelog.svg deleted file mode 100755 index 18cbc87..0000000 --- a/src/icons/svgs/changelog.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/clojure.svg b/src/icons/svgs/clojure.svg deleted file mode 100755 index ebd6dda..0000000 --- a/src/icons/svgs/clojure.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/cmake.svg b/src/icons/svgs/cmake.svg deleted file mode 100755 index d03a99b..0000000 --- a/src/icons/svgs/cmake.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/src/icons/svgs/cmd.svg b/src/icons/svgs/cmd.svg deleted file mode 100644 index b4e9e24..0000000 --- a/src/icons/svgs/cmd.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/coffee.svg b/src/icons/svgs/coffee.svg deleted file mode 100755 index 9495cef..0000000 --- a/src/icons/svgs/coffee.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/conduct.svg b/src/icons/svgs/conduct.svg deleted file mode 100644 index c000154..0000000 --- a/src/icons/svgs/conduct.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/console.svg b/src/icons/svgs/console.svg deleted file mode 100755 index 05e0344..0000000 --- a/src/icons/svgs/console.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/contributing.svg b/src/icons/svgs/contributing.svg deleted file mode 100755 index 8674eef..0000000 --- a/src/icons/svgs/contributing.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/cpp.svg b/src/icons/svgs/cpp.svg deleted file mode 100755 index 1395b2e..0000000 --- a/src/icons/svgs/cpp.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/credits.svg b/src/icons/svgs/credits.svg deleted file mode 100755 index d648b6e..0000000 --- a/src/icons/svgs/credits.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/csharp.svg b/src/icons/svgs/csharp.svg deleted file mode 100755 index b9202af..0000000 --- a/src/icons/svgs/csharp.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/css-map.svg b/src/icons/svgs/css-map.svg deleted file mode 100755 index 05e3ecf..0000000 --- a/src/icons/svgs/css-map.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/css.svg b/src/icons/svgs/css.svg deleted file mode 100755 index ae3dfa5..0000000 --- a/src/icons/svgs/css.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/dart.svg b/src/icons/svgs/dart.svg deleted file mode 100755 index 92a3329..0000000 --- a/src/icons/svgs/dart.svg +++ /dev/null @@ -1,86 +0,0 @@ - - - Dart - - - - image/svg+xml - - Dart - - - - Philipp Kief - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/database.svg b/src/icons/svgs/database.svg deleted file mode 100755 index afaa27c..0000000 --- a/src/icons/svgs/database.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/dlang.svg b/src/icons/svgs/dlang.svg deleted file mode 100644 index 40b13c6..0000000 --- a/src/icons/svgs/dlang.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/docker.svg b/src/icons/svgs/docker.svg deleted file mode 100644 index 5fe5f0f..0000000 --- a/src/icons/svgs/docker.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/document.svg b/src/icons/svgs/document.svg deleted file mode 100755 index aa62b2b..0000000 --- a/src/icons/svgs/document.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/dotnet.svg b/src/icons/svgs/dotnet.svg deleted file mode 100644 index d31b3fc..0000000 --- a/src/icons/svgs/dotnet.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - dotnet - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/src/icons/svgs/email.svg b/src/icons/svgs/email.svg deleted file mode 100755 index 244fbe6..0000000 --- a/src/icons/svgs/email.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/eslint.svg b/src/icons/svgs/eslint.svg deleted file mode 100644 index 2696c8f..0000000 --- a/src/icons/svgs/eslint.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/ex.svg b/src/icons/svgs/ex.svg deleted file mode 100644 index ffe7bef..0000000 --- a/src/icons/svgs/ex.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/exe.svg b/src/icons/svgs/exe.svg deleted file mode 100755 index 870667c..0000000 --- a/src/icons/svgs/exe.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/favicon.svg b/src/icons/svgs/favicon.svg deleted file mode 100755 index c78b83d..0000000 --- a/src/icons/svgs/favicon.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/file_dark.svg b/src/icons/svgs/file_dark.svg deleted file mode 100755 index 2232f80..0000000 --- a/src/icons/svgs/file_dark.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/firebase.svg b/src/icons/svgs/firebase.svg deleted file mode 100644 index 7bdcb8d..0000000 --- a/src/icons/svgs/firebase.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/flash.svg b/src/icons/svgs/flash.svg deleted file mode 100755 index 1d192ae..0000000 --- a/src/icons/svgs/flash.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/flow.svg b/src/icons/svgs/flow.svg deleted file mode 100755 index 6ce1014..0000000 --- a/src/icons/svgs/flow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/folder_assets.svg b/src/icons/svgs/folder_assets.svg deleted file mode 100644 index d03adf3..0000000 --- a/src/icons/svgs/folder_assets.svg +++ /dev/null @@ -1 +0,0 @@ -folder_assets \ No newline at end of file diff --git a/src/icons/svgs/folder_assets_open.svg b/src/icons/svgs/folder_assets_open.svg deleted file mode 100644 index 63071b9..0000000 --- a/src/icons/svgs/folder_assets_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_assets_open \ No newline at end of file diff --git a/src/icons/svgs/folder_bower.svg b/src/icons/svgs/folder_bower.svg deleted file mode 100644 index fc3e493..0000000 --- a/src/icons/svgs/folder_bower.svg +++ /dev/null @@ -1 +0,0 @@ -folder_bower \ No newline at end of file diff --git a/src/icons/svgs/folder_bower_open.svg b/src/icons/svgs/folder_bower_open.svg deleted file mode 100644 index ecab30a..0000000 --- a/src/icons/svgs/folder_bower_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_bower_open \ No newline at end of file diff --git a/src/icons/svgs/folder_ci.svg b/src/icons/svgs/folder_ci.svg deleted file mode 100644 index 3f1a7d1..0000000 --- a/src/icons/svgs/folder_ci.svg +++ /dev/null @@ -1 +0,0 @@ -folder_ci \ No newline at end of file diff --git a/src/icons/svgs/folder_ci_open.svg b/src/icons/svgs/folder_ci_open.svg deleted file mode 100644 index 3903ad8..0000000 --- a/src/icons/svgs/folder_ci_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_ci_open \ No newline at end of file diff --git a/src/icons/svgs/folder_dark.svg b/src/icons/svgs/folder_dark.svg deleted file mode 100644 index 9aa8535..0000000 --- a/src/icons/svgs/folder_dark.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/folder_dark_build.svg b/src/icons/svgs/folder_dark_build.svg deleted file mode 100644 index e894e15..0000000 --- a/src/icons/svgs/folder_dark_build.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/src/icons/svgs/folder_dist.svg b/src/icons/svgs/folder_dist.svg deleted file mode 100644 index a0537bd..0000000 --- a/src/icons/svgs/folder_dist.svg +++ /dev/null @@ -1 +0,0 @@ -folder_dist \ No newline at end of file diff --git a/src/icons/svgs/folder_dist_open.svg b/src/icons/svgs/folder_dist_open.svg deleted file mode 100644 index 73a06ca..0000000 --- a/src/icons/svgs/folder_dist_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_dist_open \ No newline at end of file diff --git a/src/icons/svgs/folder_git.svg b/src/icons/svgs/folder_git.svg deleted file mode 100644 index 28b1656..0000000 --- a/src/icons/svgs/folder_git.svg +++ /dev/null @@ -1 +0,0 @@ -folder_git \ No newline at end of file diff --git a/src/icons/svgs/folder_git_open.svg b/src/icons/svgs/folder_git_open.svg deleted file mode 100644 index 891e7d1..0000000 --- a/src/icons/svgs/folder_git_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_git_open \ No newline at end of file diff --git a/src/icons/svgs/folder_github.svg b/src/icons/svgs/folder_github.svg deleted file mode 100644 index 54fa0e2..0000000 --- a/src/icons/svgs/folder_github.svg +++ /dev/null @@ -1 +0,0 @@ -folder_github \ No newline at end of file diff --git a/src/icons/svgs/folder_github_open.svg b/src/icons/svgs/folder_github_open.svg deleted file mode 100644 index cb0cfa7..0000000 --- a/src/icons/svgs/folder_github_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_github_open \ No newline at end of file diff --git a/src/icons/svgs/folder_gulp.svg b/src/icons/svgs/folder_gulp.svg deleted file mode 100644 index c8c1f9f..0000000 --- a/src/icons/svgs/folder_gulp.svg +++ /dev/null @@ -1 +0,0 @@ -folder_gulp \ No newline at end of file diff --git a/src/icons/svgs/folder_gulp_open.svg b/src/icons/svgs/folder_gulp_open.svg deleted file mode 100644 index 0d0b9cc..0000000 --- a/src/icons/svgs/folder_gulp_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_gulp_open \ No newline at end of file diff --git a/src/icons/svgs/folder_images.svg b/src/icons/svgs/folder_images.svg deleted file mode 100644 index e8bbe6e..0000000 --- a/src/icons/svgs/folder_images.svg +++ /dev/null @@ -1 +0,0 @@ -folder_images \ No newline at end of file diff --git a/src/icons/svgs/folder_images_open.svg b/src/icons/svgs/folder_images_open.svg deleted file mode 100644 index 750b88c..0000000 --- a/src/icons/svgs/folder_images_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_images_open \ No newline at end of file diff --git a/src/icons/svgs/folder_js.svg b/src/icons/svgs/folder_js.svg deleted file mode 100644 index 6c4c01d..0000000 --- a/src/icons/svgs/folder_js.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/svgs/folder_js_open.svg b/src/icons/svgs/folder_js_open.svg deleted file mode 100644 index a4d7ef4..0000000 --- a/src/icons/svgs/folder_js_open.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/svgs/folder_light.svg b/src/icons/svgs/folder_light.svg deleted file mode 100644 index 54846de..0000000 --- a/src/icons/svgs/folder_light.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/folder_light_build.svg b/src/icons/svgs/folder_light_build.svg deleted file mode 100644 index 3cd3446..0000000 --- a/src/icons/svgs/folder_light_build.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/folder_node.svg b/src/icons/svgs/folder_node.svg deleted file mode 100644 index 72e6791..0000000 --- a/src/icons/svgs/folder_node.svg +++ /dev/null @@ -1 +0,0 @@ -folder_node \ No newline at end of file diff --git a/src/icons/svgs/folder_node_open.svg b/src/icons/svgs/folder_node_open.svg deleted file mode 100644 index 4e72e2f..0000000 --- a/src/icons/svgs/folder_node_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_node_open \ No newline at end of file diff --git a/src/icons/svgs/folder_open.svg b/src/icons/svgs/folder_open.svg deleted file mode 100644 index a59c192..0000000 --- a/src/icons/svgs/folder_open.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/folder_open_build.svg b/src/icons/svgs/folder_open_build.svg deleted file mode 100644 index e7e86f4..0000000 --- a/src/icons/svgs/folder_open_build.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/src/icons/svgs/folder_src.svg b/src/icons/svgs/folder_src.svg deleted file mode 100644 index c9f63e1..0000000 --- a/src/icons/svgs/folder_src.svg +++ /dev/null @@ -1 +0,0 @@ -folder_src \ No newline at end of file diff --git a/src/icons/svgs/folder_src_open.svg b/src/icons/svgs/folder_src_open.svg deleted file mode 100644 index 0c8d18d..0000000 --- a/src/icons/svgs/folder_src_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_src_open \ No newline at end of file diff --git a/src/icons/svgs/folder_test.svg b/src/icons/svgs/folder_test.svg deleted file mode 100644 index 6eac173..0000000 --- a/src/icons/svgs/folder_test.svg +++ /dev/null @@ -1 +0,0 @@ -folder_test \ No newline at end of file diff --git a/src/icons/svgs/folder_test_open.svg b/src/icons/svgs/folder_test_open.svg deleted file mode 100644 index 33163af..0000000 --- a/src/icons/svgs/folder_test_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_test_open \ No newline at end of file diff --git a/src/icons/svgs/folder_vscode.svg b/src/icons/svgs/folder_vscode.svg deleted file mode 100644 index 99cca82..0000000 --- a/src/icons/svgs/folder_vscode.svg +++ /dev/null @@ -1 +0,0 @@ -folder_vscode \ No newline at end of file diff --git a/src/icons/svgs/folder_vscode_open.svg b/src/icons/svgs/folder_vscode_open.svg deleted file mode 100644 index 3beefea..0000000 --- a/src/icons/svgs/folder_vscode_open.svg +++ /dev/null @@ -1 +0,0 @@ -folder_vscode_open \ No newline at end of file diff --git a/src/icons/svgs/font.svg b/src/icons/svgs/font.svg deleted file mode 100755 index f7803b0..0000000 --- a/src/icons/svgs/font.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/fsharp.svg b/src/icons/svgs/fsharp.svg deleted file mode 100755 index 91ff767..0000000 --- a/src/icons/svgs/fsharp.svg +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/gatsby.svg b/src/icons/svgs/gatsby.svg deleted file mode 100644 index 0af9de4..0000000 --- a/src/icons/svgs/gatsby.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/git.svg b/src/icons/svgs/git.svg deleted file mode 100755 index 79ae754..0000000 --- a/src/icons/svgs/git.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/github.svg b/src/icons/svgs/github.svg deleted file mode 100644 index 6edfae5..0000000 --- a/src/icons/svgs/github.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/gitlab.svg b/src/icons/svgs/gitlab.svg deleted file mode 100644 index 97835c6..0000000 --- a/src/icons/svgs/gitlab.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/icons/svgs/go.svg b/src/icons/svgs/go.svg deleted file mode 100644 index 2e1a0d0..0000000 --- a/src/icons/svgs/go.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/gopher.svg b/src/icons/svgs/gopher.svg deleted file mode 100755 index fc0694c..0000000 --- a/src/icons/svgs/gopher.svg +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/gradle.svg b/src/icons/svgs/gradle.svg deleted file mode 100755 index d4bc84b..0000000 --- a/src/icons/svgs/gradle.svg +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/graphql.svg b/src/icons/svgs/graphql.svg deleted file mode 100644 index 8df1b04..0000000 --- a/src/icons/svgs/graphql.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/icons/svgs/groovy.svg b/src/icons/svgs/groovy.svg deleted file mode 100755 index 3e71e81..0000000 --- a/src/icons/svgs/groovy.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/grunt.svg b/src/icons/svgs/grunt.svg deleted file mode 100644 index 94a8442..0000000 --- a/src/icons/svgs/grunt.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/gulp.svg b/src/icons/svgs/gulp.svg deleted file mode 100755 index eb07242..0000000 --- a/src/icons/svgs/gulp.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/gulpfile.svg b/src/icons/svgs/gulpfile.svg deleted file mode 100644 index 4b42ee1..0000000 --- a/src/icons/svgs/gulpfile.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/haml.svg b/src/icons/svgs/haml.svg deleted file mode 100644 index 9f63e61..0000000 --- a/src/icons/svgs/haml.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/haskell.svg b/src/icons/svgs/haskell.svg deleted file mode 100755 index 33aef54..0000000 --- a/src/icons/svgs/haskell.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - y - - - diff --git a/src/icons/svgs/haxe.svg b/src/icons/svgs/haxe.svg deleted file mode 100644 index 067d17c..0000000 --- a/src/icons/svgs/haxe.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/html.svg b/src/icons/svgs/html.svg deleted file mode 100755 index a73de36..0000000 --- a/src/icons/svgs/html.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/image.svg b/src/icons/svgs/image.svg deleted file mode 100755 index c37763f..0000000 --- a/src/icons/svgs/image.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/ionic.svg b/src/icons/svgs/ionic.svg deleted file mode 100755 index d808a7e..0000000 --- a/src/icons/svgs/ionic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/java.svg b/src/icons/svgs/java.svg deleted file mode 100755 index c3187c6..0000000 --- a/src/icons/svgs/java.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/javascript-map.svg b/src/icons/svgs/javascript-map.svg deleted file mode 100755 index 4be7d30..0000000 --- a/src/icons/svgs/javascript-map.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/jenkins.svg b/src/icons/svgs/jenkins.svg deleted file mode 100644 index 21d52f9..0000000 --- a/src/icons/svgs/jenkins.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/jest.svg b/src/icons/svgs/jest.svg deleted file mode 100644 index 6315998..0000000 --- a/src/icons/svgs/jest.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/js.svg b/src/icons/svgs/js.svg deleted file mode 100644 index 5496e57..0000000 --- a/src/icons/svgs/js.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/json.svg b/src/icons/svgs/json.svg deleted file mode 100755 index 3390382..0000000 --- a/src/icons/svgs/json.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/key.svg b/src/icons/svgs/key.svg deleted file mode 100755 index b064be4..0000000 --- a/src/icons/svgs/key.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/kotlin.svg b/src/icons/svgs/kotlin.svg deleted file mode 100755 index 6555b58..0000000 --- a/src/icons/svgs/kotlin.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/less.svg b/src/icons/svgs/less.svg deleted file mode 100644 index de1a9b8..0000000 --- a/src/icons/svgs/less.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/lib.svg b/src/icons/svgs/lib.svg deleted file mode 100755 index 83f2b8d..0000000 --- a/src/icons/svgs/lib.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/license.svg b/src/icons/svgs/license.svg deleted file mode 100644 index 56f79ca..0000000 --- a/src/icons/svgs/license.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/lua.svg b/src/icons/svgs/lua.svg deleted file mode 100755 index f460949..0000000 --- a/src/icons/svgs/lua.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/icons/svgs/markdown.svg b/src/icons/svgs/markdown.svg deleted file mode 100755 index 18cdeaf..0000000 --- a/src/icons/svgs/markdown.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/markup.svg b/src/icons/svgs/markup.svg deleted file mode 100644 index 25ac918..0000000 --- a/src/icons/svgs/markup.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/icons/svgs/mjml.svg b/src/icons/svgs/mjml.svg deleted file mode 100644 index f7cb349..0000000 --- a/src/icons/svgs/mjml.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/icons/svgs/movie.svg b/src/icons/svgs/movie.svg deleted file mode 100755 index 8812c84..0000000 --- a/src/icons/svgs/movie.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/music.svg b/src/icons/svgs/music.svg deleted file mode 100755 index f01eb9a..0000000 --- a/src/icons/svgs/music.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/mustache.svg b/src/icons/svgs/mustache.svg deleted file mode 100644 index e4c9d3e..0000000 --- a/src/icons/svgs/mustache.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/mxml.svg b/src/icons/svgs/mxml.svg deleted file mode 100755 index 4c57bb0..0000000 --- a/src/icons/svgs/mxml.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/node.svg b/src/icons/svgs/node.svg deleted file mode 100644 index 7a3f96d..0000000 --- a/src/icons/svgs/node.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/nodejs.svg b/src/icons/svgs/nodejs.svg deleted file mode 100644 index c8cd6a0..0000000 --- a/src/icons/svgs/nodejs.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/npm.svg b/src/icons/svgs/npm.svg deleted file mode 100644 index dcedb81..0000000 --- a/src/icons/svgs/npm.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/ocaml.svg b/src/icons/svgs/ocaml.svg deleted file mode 100755 index 12c4dd4..0000000 --- a/src/icons/svgs/ocaml.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/package-lock.svg b/src/icons/svgs/package-lock.svg deleted file mode 100644 index bd442cb..0000000 --- a/src/icons/svgs/package-lock.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/pdf.svg b/src/icons/svgs/pdf.svg deleted file mode 100755 index 89a2e80..0000000 --- a/src/icons/svgs/pdf.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/php.svg b/src/icons/svgs/php.svg deleted file mode 100755 index 8af9132..0000000 --- a/src/icons/svgs/php.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/polymer.svg b/src/icons/svgs/polymer.svg deleted file mode 100644 index c48f085..0000000 --- a/src/icons/svgs/polymer.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/postcss.svg b/src/icons/svgs/postcss.svg deleted file mode 100644 index f9b3012..0000000 --- a/src/icons/svgs/postcss.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/powerpoint.svg b/src/icons/svgs/powerpoint.svg deleted file mode 100755 index 4de60cc..0000000 --- a/src/icons/svgs/powerpoint.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/pp.svg b/src/icons/svgs/pp.svg deleted file mode 100644 index 1e23d28..0000000 --- a/src/icons/svgs/pp.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/procfile.svg b/src/icons/svgs/procfile.svg deleted file mode 100644 index d0cc0fe..0000000 --- a/src/icons/svgs/procfile.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/psd.svg b/src/icons/svgs/psd.svg deleted file mode 100644 index d86c498..0000000 --- a/src/icons/svgs/psd.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/icons/svgs/pug.svg b/src/icons/svgs/pug.svg deleted file mode 100755 index 8dfa46a..0000000 --- a/src/icons/svgs/pug.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/icons/svgs/python.svg b/src/icons/svgs/python.svg deleted file mode 100755 index 422a0c3..0000000 --- a/src/icons/svgs/python.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/r.svg b/src/icons/svgs/r.svg deleted file mode 100755 index 796bf62..0000000 --- a/src/icons/svgs/r.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/rails.svg b/src/icons/svgs/rails.svg deleted file mode 100644 index 37f1b6f..0000000 --- a/src/icons/svgs/rails.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/raml.svg b/src/icons/svgs/raml.svg deleted file mode 100755 index 30d0b9b..0000000 --- a/src/icons/svgs/raml.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/react.svg b/src/icons/svgs/react.svg deleted file mode 100755 index 95fdef4..0000000 --- a/src/icons/svgs/react.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/readme.svg b/src/icons/svgs/readme.svg deleted file mode 100755 index 2836de7..0000000 --- a/src/icons/svgs/readme.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/reason.svg b/src/icons/svgs/reason.svg deleted file mode 100644 index 48239c6..0000000 --- a/src/icons/svgs/reason.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/rollup.svg b/src/icons/svgs/rollup.svg deleted file mode 100644 index 0fdb662..0000000 --- a/src/icons/svgs/rollup.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/ruby.svg b/src/icons/svgs/ruby.svg deleted file mode 100755 index e91a776..0000000 --- a/src/icons/svgs/ruby.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/rust.svg b/src/icons/svgs/rust.svg deleted file mode 100755 index 30b6267..0000000 --- a/src/icons/svgs/rust.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/sass.svg b/src/icons/svgs/sass.svg deleted file mode 100755 index 4e448be..0000000 --- a/src/icons/svgs/sass.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/scala.svg b/src/icons/svgs/scala.svg deleted file mode 100644 index 16377cc..0000000 --- a/src/icons/svgs/scala.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/settings.svg b/src/icons/svgs/settings.svg deleted file mode 100755 index 9cb4121..0000000 --- a/src/icons/svgs/settings.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/sketch.svg b/src/icons/svgs/sketch.svg deleted file mode 100644 index 61b3083..0000000 --- a/src/icons/svgs/sketch.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/icons/svgs/slim.svg b/src/icons/svgs/slim.svg deleted file mode 100644 index 3210b35..0000000 --- a/src/icons/svgs/slim.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/star.svg b/src/icons/svgs/star.svg deleted file mode 100755 index ab4fcad..0000000 --- a/src/icons/svgs/star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/svgs/stylelint.svg b/src/icons/svgs/stylelint.svg deleted file mode 100644 index 0900563..0000000 --- a/src/icons/svgs/stylelint.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/icons/svgs/stylus.svg b/src/icons/svgs/stylus.svg deleted file mode 100644 index 153ebb7..0000000 --- a/src/icons/svgs/stylus.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/sublime.svg b/src/icons/svgs/sublime.svg deleted file mode 100644 index 8a9d10f..0000000 --- a/src/icons/svgs/sublime.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/svg.svg b/src/icons/svgs/svg.svg deleted file mode 100644 index e6c7949..0000000 --- a/src/icons/svgs/svg.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/swc.svg b/src/icons/svgs/swc.svg deleted file mode 100755 index 1992020..0000000 --- a/src/icons/svgs/swc.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/swift.svg b/src/icons/svgs/swift.svg deleted file mode 100755 index ff72dcd..0000000 --- a/src/icons/svgs/swift.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/swig.svg b/src/icons/svgs/swig.svg deleted file mode 100644 index bbd8c0b..0000000 --- a/src/icons/svgs/swig.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/table.svg b/src/icons/svgs/table.svg deleted file mode 100755 index 180c0ed..0000000 --- a/src/icons/svgs/table.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/tex.svg b/src/icons/svgs/tex.svg deleted file mode 100755 index 4739d69..0000000 --- a/src/icons/svgs/tex.svg +++ /dev/null @@ -1,93 +0,0 @@ - -image/svg+xml - - - - T -E -X - - \ No newline at end of file diff --git a/src/icons/svgs/todo.svg b/src/icons/svgs/todo.svg deleted file mode 100644 index 0944f4f..0000000 --- a/src/icons/svgs/todo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/tune.svg b/src/icons/svgs/tune.svg deleted file mode 100755 index 27ca8a3..0000000 --- a/src/icons/svgs/tune.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/twig.svg b/src/icons/svgs/twig.svg deleted file mode 100644 index 175242c..0000000 --- a/src/icons/svgs/twig.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/typescript.svg b/src/icons/svgs/typescript.svg deleted file mode 100755 index ae647ca..0000000 --- a/src/icons/svgs/typescript.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/typescript_def.svg b/src/icons/svgs/typescript_def.svg deleted file mode 100755 index 1ab4ba9..0000000 --- a/src/icons/svgs/typescript_def.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/icons/svgs/url.svg b/src/icons/svgs/url.svg deleted file mode 100755 index df17496..0000000 --- a/src/icons/svgs/url.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/virtual.svg b/src/icons/svgs/virtual.svg deleted file mode 100755 index 6b958b0..0000000 --- a/src/icons/svgs/virtual.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/visualstudio.svg b/src/icons/svgs/visualstudio.svg deleted file mode 100755 index 58674de..0000000 --- a/src/icons/svgs/visualstudio.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/vue.svg b/src/icons/svgs/vue.svg deleted file mode 100755 index c0b54ee..0000000 --- a/src/icons/svgs/vue.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/icons/svgs/webpack.svg b/src/icons/svgs/webpack.svg deleted file mode 100755 index 5d5ac7b..0000000 --- a/src/icons/svgs/webpack.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/word.svg b/src/icons/svgs/word.svg deleted file mode 100755 index daa938b..0000000 --- a/src/icons/svgs/word.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/xaml.svg b/src/icons/svgs/xaml.svg deleted file mode 100755 index 77a1808..0000000 --- a/src/icons/svgs/xaml.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/xml.svg b/src/icons/svgs/xml.svg deleted file mode 100755 index bf2d3f2..0000000 --- a/src/icons/svgs/xml.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/src/icons/svgs/yaml.svg b/src/icons/svgs/yaml.svg deleted file mode 100755 index e19a2b5..0000000 --- a/src/icons/svgs/yaml.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/yarn-lock.svg b/src/icons/svgs/yarn-lock.svg deleted file mode 100644 index 8f27189..0000000 --- a/src/icons/svgs/yarn-lock.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/yarn.svg b/src/icons/svgs/yarn.svg deleted file mode 100755 index aee195b..0000000 --- a/src/icons/svgs/yarn.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/svgs/zephyr.svg b/src/icons/svgs/zephyr.svg deleted file mode 100644 index c113cdc..0000000 --- a/src/icons/svgs/zephyr.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/svgs/zip.svg b/src/icons/svgs/zip.svg deleted file mode 100755 index c1cf4bc..0000000 --- a/src/icons/svgs/zip.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/themes/settings/specific/darker-hc.json b/src/themes/settings/specific/darker-hc.json index 55e75ce..f8c3e08 100644 --- a/src/themes/settings/specific/darker-hc.json +++ b/src/themes/settings/specific/darker-hc.json @@ -13,7 +13,7 @@ "findHighlight": "#FFCC00", "foreground": "#EEFFFF", "focusBorder": "#FFFFFF", - "guides": "#42424270", + "guides": "#424242", "lineNumbers": "#424242", "invisibles": "#65737E", "lineHighlight": "#000000", diff --git a/src/themes/settings/specific/darker.json b/src/themes/settings/specific/darker.json index 9424a34..9bb7181 100644 --- a/src/themes/settings/specific/darker.json +++ b/src/themes/settings/specific/darker.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#EEFFFF", "focusBorder": "#FFFFFF", - "guides": "#42424270", + "guides": "#424242", "lineNumbers": "#424242", "invisibles": "#65737E", "lineHighlight": "#000000", diff --git a/src/themes/settings/specific/default-hc.json b/src/themes/settings/specific/default-hc.json index 33ea46e..d3035ea 100644 --- a/src/themes/settings/specific/default-hc.json +++ b/src/themes/settings/specific/default-hc.json @@ -13,7 +13,7 @@ "findHighlight": "#FFCC00", "foreground": "#EEFFFF", "focusBorder": "#FFFFFF", - "guides": "#37474F80", + "guides": "#37474F", "lineNumbers": "#37474F", "invisibles": "#65737E", "lineHighlight": "#000000", diff --git a/src/themes/settings/specific/default.json b/src/themes/settings/specific/default.json index b3059f1..9042608 100644 --- a/src/themes/settings/specific/default.json +++ b/src/themes/settings/specific/default.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#EEFFFF", "focusBorder": "#FFFFFF", - "guides": "#37474F80", + "guides": "#37474F", "lineNumbers": "#37474F", "invisibles": "#65737E", "lineHighlight": "#000000", diff --git a/src/themes/settings/specific/lighter-hc.json b/src/themes/settings/specific/lighter-hc.json index c96e4c5..9788c97 100644 --- a/src/themes/settings/specific/lighter-hc.json +++ b/src/themes/settings/specific/lighter-hc.json @@ -13,7 +13,7 @@ "findHighlight": "#FFCC00", "foreground": "#90A4AE", "focusBorder": "#FFFFFF", - "guides": "#B0BEC570", + "guides": "#B0BEC5", "lineNumbers": "#CFD8DC", "invisibles": "#E7EAEC", "lineHighlight": "#CCD7DA", @@ -44,4 +44,4 @@ "violet": "#945EB8" } } -} \ No newline at end of file +} diff --git a/src/themes/settings/specific/lighter.json b/src/themes/settings/specific/lighter.json index 207daf7..6ccfff2 100644 --- a/src/themes/settings/specific/lighter.json +++ b/src/themes/settings/specific/lighter.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#90A4AE", "focusBorder": "#FFFFFF", - "guides": "#B0BEC570", + "guides": "#B0BEC5", "lineNumbers": "#CFD8DC", "invisibles": "#E7EAEC", "lineHighlight": "#CCD7DA", @@ -44,4 +44,4 @@ "violet": "#945EB8" } } -} \ No newline at end of file +} diff --git a/src/themes/settings/specific/ocean-hc.json b/src/themes/settings/specific/ocean-hc.json index 7adecdf..068caf0 100644 --- a/src/themes/settings/specific/ocean-hc.json +++ b/src/themes/settings/specific/ocean-hc.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#8F93A2", "focusBorder": "#FFFFFF", - "guides": "#3B3F5150", + "guides": "#3B3F51", "lineNumbers": "#3B3F5180", "invisibles": "#80869E50", "lineHighlight": "#000000", @@ -44,4 +44,4 @@ "violet": "#bb80b3" } } -} \ No newline at end of file +} diff --git a/src/themes/settings/specific/ocean.json b/src/themes/settings/specific/ocean.json index a0b7cbe..afe91d3 100644 --- a/src/themes/settings/specific/ocean.json +++ b/src/themes/settings/specific/ocean.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#8F93A2", "focusBorder": "#FFFFFF", - "guides": "#3B3F5150", + "guides": "#3B3F51", "lineNumbers": "#3B3F5180", "invisibles": "#80869E50", "lineHighlight": "#000000", @@ -44,4 +44,4 @@ "violet": "#bb80b3" } } -} \ No newline at end of file +} diff --git a/src/themes/settings/specific/palenight-hc.json b/src/themes/settings/specific/palenight-hc.json index 324f912..72d3922 100644 --- a/src/themes/settings/specific/palenight-hc.json +++ b/src/themes/settings/specific/palenight-hc.json @@ -13,7 +13,7 @@ "findHighlight": "#FFCC00", "foreground": "#A6ACCD", "focusBorder": "#FFFFFF", - "guides": "#4E557980", + "guides": "#4E5579", "lineNumbers": "#3A3F58", "invisibles": "#4E5579", "lineHighlight": "#000000", @@ -44,4 +44,4 @@ "violet": "#bb80b3" } } -} \ No newline at end of file +} diff --git a/src/themes/settings/specific/palenight.json b/src/themes/settings/specific/palenight.json index 8d9f211..f60b56c 100644 --- a/src/themes/settings/specific/palenight.json +++ b/src/themes/settings/specific/palenight.json @@ -11,7 +11,7 @@ "findHighlight": "#FFCC00", "foreground": "#A6ACCD", "focusBorder": "#FFFFFF", - "guides": "#4E557980", + "guides": "#4E5579", "lineNumbers": "#3A3F58", "invisibles": "#4E5579", "lineHighlight": "#000000", @@ -44,4 +44,4 @@ "violet": "#bb80b3" } } -} \ No newline at end of file +} diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index bdb9a8b..337d6c2 100644 --- a/src/themes/theme-template-color-theme.json +++ b/src/themes/theme-template-color-theme.json @@ -706,7 +706,8 @@ "editorOverviewRuler.border": "{{variant.scheme.background}}", "editorHoverWidget.background": "{{variant.scheme.background}}", "editorHoverWidget.border": "{{variant.scheme.inputBorder}}", - "editorIndentGuide.background": "{{variant.scheme.guides}}", + "editorIndentGuide.background": "{{variant.scheme.guides}}70", + "editorIndentGuide.activeBackground": "{{variant.scheme.guides}}", "editorGroupHeader.tabsBackground": "{{variant.scheme.background}}", "editorGroup.border": "{{variant.scheme.shadow}}", "editorGutter.modifiedBackground": "{{variant.scheme.base.blue}}60", @@ -725,6 +726,7 @@ "statusBar.foreground": "{{variant.scheme.statusbarForeground}}", "statusBar.debuggingBackground": "{{variant.scheme.base.purple}}", "statusBar.debuggingForeground": "{{variant.scheme.base.white}}", + "statusBarItem.hoverBackground": "{{variant.scheme.comments}}20", "activityBar.background": "{{variant.scheme.backgroundAlt}}", "activityBar.border": "{{variant.scheme.contrastBorder}}60", "activityBar.foreground": "{{variant.scheme.foreground}}", @@ -759,7 +761,7 @@ "list.focusForeground": "{{variant.scheme.foreground}}", "list.highlightForeground": "{{commons.accents.Teal}}", "terminal.ansiWhite": "{{variant.scheme.base.white}}", - "terminal.ansiBlack": "{{variant.scheme.comments}}", + "terminal.ansiBlack": "{{variant.scheme.base.black}}", "terminal.ansiBlue": "{{variant.scheme.base.blue}}", "terminal.ansiCyan": "{{variant.scheme.base.cyan}}", "terminal.ansiGreen": "{{variant.scheme.base.green}}", @@ -819,4 +821,4 @@ "gitDecoration.ignoredResourceForeground": "{{variant.scheme.sidebarForeground}}90", "peekViewResult.selectionBackground": "{{variant.scheme.sidebarForeground}}70" } -} \ No newline at end of file +} diff --git a/test/COMMIT_EDITMSG b/test/component.ts similarity index 100% rename from test/COMMIT_EDITMSG rename to test/component.ts diff --git a/test/conf b/test/source.dart similarity index 100% rename from test/conf rename to test/source.dart diff --git a/test/default b/test/source.xaml similarity index 100% rename from test/default rename to test/source.xaml diff --git a/test/git-blame b/test/src.module.ts similarity index 100% rename from test/git-blame rename to test/src.module.ts diff --git a/test/git-rebase-todo b/test/src.pipe.ts similarity index 100% rename from test/git-rebase-todo rename to test/src.pipe.ts diff --git a/test/source.tcl b/test/src.resolver.ts similarity index 100% rename from test/source.tcl rename to test/src.resolver.ts diff --git a/test/source.textile b/test/src.service.ts similarity index 100% rename from test/source.textile rename to test/src.service.ts diff --git a/yarn.lock b/yarn.lock index 5078c18..fc91e7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,6 +35,12 @@ version "1.2.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86" +"@types/execa@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@types/execa/-/execa-0.9.0.tgz#9b025d2755f17e80beaf9368c3f4f319d8b0fb93" + dependencies: + "@types/node" "*" + "@types/glob-stream@*": version "6.1.0" resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-6.1.0.tgz#7ede8a33e59140534f8d8adfb8ac9edfb31897bc" @@ -82,10 +88,23 @@ version "0.8.30" resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.30.tgz#65e479073bc15e8ac834347f8f311b24220a277d" +"@types/ncp@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/ncp/-/ncp-2.0.1.tgz#749432511f6ad747d04e98837b18cca9045567fb" + dependencies: + "@types/node" "*" + "@types/node@*": version "9.6.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2" +"@types/rimraf@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" + dependencies: + "@types/glob" "*" + "@types/node" "*" + "@types/run-sequence@0.0.30": version "0.0.30" resolved "https://registry.yarnpkg.com/@types/run-sequence/-/run-sequence-0.0.30.tgz#b3a90c9fd29a5eede58135dd025eb3ac4bbb560e" @@ -1359,6 +1378,16 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -1689,6 +1718,18 @@ event-stream@^3.3.1, event-stream@~3.3.4: stream-combiner "~0.0.4" through "~2.3.1" +execa@0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" + dependencies: + cross-spawn "^6.0.0" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -3464,6 +3505,10 @@ natives@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.3.tgz#44a579be64507ea2d6ed1ca04a9415915cf75558" +ncp@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + needle@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.0.tgz#f14efc69cee1024b72c8b21c7bdf94a731dc12fa" @@ -3472,6 +3517,10 @@ needle@^2.2.0: iconv-lite "^0.4.4" sax "^1.2.4" +nice-try@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" + node-fetch@1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" @@ -3802,7 +3851,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" -path-key@^2.0.0: +path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"