From 50c057184cb5eb2b6a6b4544741c422bf3350adb Mon Sep 17 00:00:00 2001 From: Alessio Occhipinti Date: Thu, 31 Jan 2019 21:35:51 +0100 Subject: [PATCH] Feat/remove icons (#310) * feat(Icons removal): Removed all related icons commands and files * chore: fix (remove) all gulp related imports and task for icons * chore: removed extensions folder and switch all imports (+ small fixes) * chore: re-added defaults.json on root * feat(Icons removal): Added vsc-material-theme-icons dependency --- .gitignore | 9 +- .gulp/consts/log.ts | 2 - .gulp/index.ts | 5 - .gulp/interfaces/iicon.ts | 20 - .gulp/interfaces/itheme-icons-accents.ts | 8 - .gulp/interfaces/itheme-icons-item.ts | 3 - .gulp/interfaces/itheme-icons-variants.ts | 17 - .gulp/tasks/changelog-title.ts | 2 +- .gulp/tasks/copy-ui.ts | 8 +- .gulp/tasks/get-remote-icons.ts | 33 - .gulp/tasks/icons-accents.ts | 111 --- .gulp/tasks/icons-variants-json.ts | 37 - .gulp/tasks/icons-variants.ts | 63 -- .gulp/tasks/icons.ts | 82 --- .gulp/tasks/themes.ts | 6 +- .gulp/tasks/watcher.ts | 2 +- .vscode/launch.json | 20 +- .vscode/settings.json | 5 +- CONTRIBUTING.md | 15 - README.md | 26 - defaults.json | 137 ++++ extensions/commands/theme-icons/index.ts | 97 --- .../commands/toggle-apply-icons/index.ts | 11 - extensions/defaults.json | 307 -------- extensions/helpers/configuration-change.ts | 39 - extensions/helpers/fs.ts | 81 --- extensions/helpers/handle-autoapply.ts | 27 - extensions/helpers/messages.ts | 47 -- extensions/helpers/vscode.ts | 44 -- extensions/interfaces/itheme-icons.ts | 516 ------------- gulpfile.babel.js | 9 + gulpfile.babel.ts | 9 - iconlist.json | 113 --- package.json | 111 +-- .../commands/accents-setter/consts.ts | 0 .../commands/accents-setter/index.ts | 0 .../commands/accents-setter/quick-pick.ts | 0 {extensions => src}/commands/index.ts | 2 - {extensions => src}/consts/files.ts | 0 {extensions => src}/consts/paths.ts | 9 +- .../helpers/check-installation.ts | 0 src/helpers/fs.ts | 47 ++ src/helpers/messages.ts | 25 + {extensions => src}/helpers/settings.ts | 15 - src/helpers/vscode.ts | 15 + .../helpers/write-changelog.ts | 4 +- src/icons/icons-theme.json | 10 - src/icons/partials/fileExtensions.js | 353 --------- src/icons/partials/fileFolders.js | 5 - src/icons/partials/fileNames.js | 149 ---- src/icons/partials/folderNames.js | 51 -- src/icons/partials/iconDefinitions.js | 7 - src/icons/partials/languageIds.js | 60 -- src/icons/partials/light.js | 36 - src/icons/svgs/.gitkeep | 0 .../interfaces/iaccent-custom-property.ts | 0 {extensions => src}/interfaces/idefaults.ts | 37 - .../interfaces/igeneric-object.ts | 0 .../interfaces/iinstallation-type.ts | 0 .../interfaces/ipackage.json.ts | 9 +- {extensions => src}/interfaces/ipaths.ts | 9 +- .../interfaces/itheme-custom-properties.ts | 1 - {extensions => src}/material.theme.config.ts | 20 +- {extensions => src}/webviews/ReleaseNotes.ts | 0 {extensions => src}/webviews/Settings.ts | 4 +- {extensions => src}/webviews/Webview.ts | 6 +- {extensions => src}/webviews/interfaces.ts | 4 +- .../webviews/ui/release-notes/index.ts | 0 .../ui/release-notes/release-notes.html | 0 .../webviews/ui/release-notes/style.css | 0 .../webviews/ui/settings/index.ts | 0 .../ui/settings/lib/accents-selector.ts | 2 +- .../webviews/ui/settings/settings.html | 0 .../webviews/ui/settings/style.css | 0 tsconfig.json | 19 +- typings/sanity/{sanity.ts => sanity.d.ts} | 0 yarn.lock | 679 ++---------------- 77 files changed, 347 insertions(+), 3253 deletions(-) delete mode 100644 .gulp/interfaces/iicon.ts delete mode 100644 .gulp/interfaces/itheme-icons-accents.ts delete mode 100644 .gulp/interfaces/itheme-icons-item.ts delete mode 100644 .gulp/interfaces/itheme-icons-variants.ts delete mode 100644 .gulp/tasks/get-remote-icons.ts delete mode 100644 .gulp/tasks/icons-accents.ts delete mode 100644 .gulp/tasks/icons-variants-json.ts delete mode 100644 .gulp/tasks/icons-variants.ts delete mode 100644 .gulp/tasks/icons.ts create mode 100644 defaults.json delete mode 100644 extensions/commands/theme-icons/index.ts delete mode 100644 extensions/commands/toggle-apply-icons/index.ts delete mode 100644 extensions/defaults.json delete mode 100644 extensions/helpers/configuration-change.ts delete mode 100644 extensions/helpers/fs.ts delete mode 100644 extensions/helpers/handle-autoapply.ts delete mode 100644 extensions/helpers/messages.ts delete mode 100644 extensions/helpers/vscode.ts delete mode 100644 extensions/interfaces/itheme-icons.ts create mode 100644 gulpfile.babel.js delete mode 100644 gulpfile.babel.ts delete mode 100644 iconlist.json rename {extensions => src}/commands/accents-setter/consts.ts (100%) rename {extensions => src}/commands/accents-setter/index.ts (100%) rename {extensions => src}/commands/accents-setter/quick-pick.ts (100%) rename {extensions => src}/commands/index.ts (53%) rename {extensions => src}/consts/files.ts (100%) rename {extensions => src}/consts/paths.ts (52%) rename {extensions => src}/helpers/check-installation.ts (100%) create mode 100644 src/helpers/fs.ts create mode 100644 src/helpers/messages.ts rename {extensions => src}/helpers/settings.ts (77%) create mode 100644 src/helpers/vscode.ts rename {extensions => src}/helpers/write-changelog.ts (75%) delete mode 100644 src/icons/icons-theme.json delete mode 100644 src/icons/partials/fileExtensions.js delete mode 100644 src/icons/partials/fileFolders.js delete mode 100644 src/icons/partials/fileNames.js delete mode 100644 src/icons/partials/folderNames.js delete mode 100644 src/icons/partials/iconDefinitions.js delete mode 100644 src/icons/partials/languageIds.js delete mode 100644 src/icons/partials/light.js delete mode 100644 src/icons/svgs/.gitkeep rename {extensions => src}/interfaces/iaccent-custom-property.ts (100%) rename {extensions => src}/interfaces/idefaults.ts (55%) rename {extensions => src}/interfaces/igeneric-object.ts (100%) rename {extensions => src}/interfaces/iinstallation-type.ts (100%) rename {extensions => src}/interfaces/ipackage.json.ts (83%) rename {extensions => src}/interfaces/ipaths.ts (76%) rename {extensions => src}/interfaces/itheme-custom-properties.ts (68%) rename {extensions => src}/material.theme.config.ts (53%) rename {extensions => src}/webviews/ReleaseNotes.ts (100%) rename {extensions => src}/webviews/Settings.ts (89%) rename {extensions => src}/webviews/Webview.ts (95%) rename {extensions => src}/webviews/interfaces.ts (87%) rename {extensions => src}/webviews/ui/release-notes/index.ts (100%) rename {extensions => src}/webviews/ui/release-notes/release-notes.html (100%) rename {extensions => src}/webviews/ui/release-notes/style.css (100%) rename {extensions => src}/webviews/ui/settings/index.ts (100%) rename {extensions => src}/webviews/ui/settings/lib/accents-selector.ts (92%) rename {extensions => src}/webviews/ui/settings/settings.html (100%) rename {extensions => src}/webviews/ui/settings/style.css (100%) rename typings/sanity/{sanity.ts => sanity.d.ts} (100%) diff --git a/.gitignore b/.gitignore index 119e33e..ae0193c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,8 @@ *.log *.~lock -*.js -!src/icons/partials/*.js **/*.map -*.gulp/**.js -dist/ +out/ node_modules/ .DS_Store /themes -/icons -/src/icons/svgs/*.svg -.tmp-output-remote-icons -_tmp-output-remote-icons /ui/ diff --git a/.gulp/consts/log.ts b/.gulp/consts/log.ts index 94dba4d..657eb73 100644 --- a/.gulp/consts/log.ts +++ b/.gulp/consts/log.ts @@ -1,7 +1,5 @@ export const HR: string = '\n———————————————————————————————————————————————————————————————\n'; export const MESSAGE_BUMP_ERROR: string = ' There was an issue bumping version:\n'; export const MESSAGE_BUMP_SUCCESS: string = ' Finished successfully\n'; -export const MESSAGE_ICON_ERROR: string = 'There is an error with JSON generated for icons'; -export const MESSAGE_ICON_ACCENTS_ERROR: string = 'Failed to create accents icon themes, please read the log file.'; export const MESSAGE_GENERATED: string = 'Generated'; export const MESSAGE_THEME_VARIANT_PARSE_ERROR: string = 'Error when parsing json for theme variants'; diff --git a/.gulp/index.ts b/.gulp/index.ts index bfc316f..b57f54c 100644 --- a/.gulp/index.ts +++ b/.gulp/index.ts @@ -1,12 +1,7 @@ // export the tasks -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 * from './tasks/copy-ui'; // export default script diff --git a/.gulp/interfaces/iicon.ts b/.gulp/interfaces/iicon.ts deleted file mode 100644 index 9c63e4e..0000000 --- a/.gulp/interfaces/iicon.ts +++ /dev/null @@ -1,20 +0,0 @@ -export interface IIcon { - /** - * Icon filename - * @type {string} - * @memberof IIcon - */ - filename: string; - /** - * If set to true, the icon is marked as last - * @type {boolean} - * @memberof IIcon - */ - last: boolean; - /** - * Icon's name - * @type {string} - * @memberof IIcon - */ - name: string; -} \ No newline at end of file diff --git a/.gulp/interfaces/itheme-icons-accents.ts b/.gulp/interfaces/itheme-icons-accents.ts deleted file mode 100644 index 8f60ca1..0000000 --- a/.gulp/interfaces/itheme-icons-accents.ts +++ /dev/null @@ -1,8 +0,0 @@ -import {IThemeIconsItem} from './itheme-icons-item'; - -export interface IThemeIconsAccents { - iconDefinitions: { - _folder_open: IThemeIconsItem; - _folder_open_build: IThemeIconsItem; - }; -} diff --git a/.gulp/interfaces/itheme-icons-item.ts b/.gulp/interfaces/itheme-icons-item.ts deleted file mode 100644 index 964462c..0000000 --- a/.gulp/interfaces/itheme-icons-item.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IThemeIconsItem { - iconPath: string; -} diff --git a/.gulp/interfaces/itheme-icons-variants.ts b/.gulp/interfaces/itheme-icons-variants.ts deleted file mode 100644 index 93c2bfb..0000000 --- a/.gulp/interfaces/itheme-icons-variants.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {IThemeIconsItem} from './itheme-icons-item'; - -export interface IThemeIconsVariants { - iconDefinitions: { - _folder_dark: IThemeIconsItem; - _folder_dark_build: IThemeIconsItem; - _folder_light: IThemeIconsItem; - _folder_light_build: IThemeIconsItem; - _folder_vscode: IThemeIconsItem; - _folder_gulp: IThemeIconsItem; - _folder_node: IThemeIconsItem; - _folder_images: IThemeIconsItem; - _folder_js: IThemeIconsItem; - _folder_src: IThemeIconsItem; - _folder_assets: IThemeIconsItem; - }; -} diff --git a/.gulp/tasks/changelog-title.ts b/.gulp/tasks/changelog-title.ts index e8da38a..ef82fd2 100644 --- a/.gulp/tasks/changelog-title.ts +++ b/.gulp/tasks/changelog-title.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as gulp from 'gulp'; -import {CHARSET} from './../../extensions/consts/files'; +import {CHARSET} from '../../src/consts/files'; export default gulp.task('changelog-title', () => { fs.writeFileSync( diff --git a/.gulp/tasks/copy-ui.ts b/.gulp/tasks/copy-ui.ts index b5d9ed3..7887e91 100644 --- a/.gulp/tasks/copy-ui.ts +++ b/.gulp/tasks/copy-ui.ts @@ -2,18 +2,18 @@ import * as fs from 'fs'; import * as path from 'path'; import * as gulp from 'gulp'; -import {PATHS} from '../../extensions/consts/paths'; -import {ensureDir} from '../../extensions/helpers/fs'; +import {PATHS} from '../../src/consts/paths'; +import {ensureDir} from '../../src/helpers/fs'; export default gulp.task('build:copy-ui', callback => { try { ensureDir(path.resolve(PATHS.UI)); fs.copyFileSync( - path.join(PATHS.EXT_DIR, 'webviews', 'ui', 'release-notes', 'release-notes.html'), + path.join(PATHS.SRC, 'webviews', 'ui', 'release-notes', 'release-notes.html'), path.join(PATHS.UI, 'release-notes.html') ); fs.copyFileSync( - path.join(PATHS.EXT_DIR, 'webviews', 'ui', 'release-notes', 'style.css'), + path.join(PATHS.SRC, 'webviews', 'ui', 'release-notes', 'style.css'), path.join(PATHS.UI, 'release-notes.css') ); } catch (error) { diff --git a/.gulp/tasks/get-remote-icons.ts b/.gulp/tasks/get-remote-icons.ts deleted file mode 100644 index 0a51976..0000000 --- a/.gulp/tasks/get-remote-icons.ts +++ /dev/null @@ -1,33 +0,0 @@ -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-accents.ts b/.gulp/tasks/icons-accents.ts deleted file mode 100644 index f0b6466..0000000 --- a/.gulp/tasks/icons-accents.ts +++ /dev/null @@ -1,111 +0,0 @@ -import * as fs from 'fs'; -import * as gulp from 'gulp'; -import * as gutil from 'gulp-util'; -import * as path from 'path'; - -import {MESSAGE_GENERATED, MESSAGE_ICON_ACCENTS_ERROR} from './../consts/log'; - -import {CHARSET} from './../../extensions/consts/files'; -import {IThemeIconsAccents} from './../interfaces/itheme-icons-accents'; -import PATHS from './../../extensions/consts/paths'; -import {IThemeIconsItem} from './../interfaces/itheme-icons-item'; -import {getAccentableIcons, getDefaultValues} from './../../extensions/helpers/fs'; - -const BASE_ICON_THEME_PATH: string = path.join(process.cwd(), PATHS.THEMES, './Material-Theme-Icons.json'); -const DEFAULTS = getDefaultValues(); - -/** - * Normalizes icon path - */ -function normalizeIconPath(iconPath: string): string { - return path.join(process.cwd(), PATHS.ICONS, iconPath); -} - -/** - * Replaces a file name with the accented filename - */ -function replaceNameWithAccent(name: string, accentName: string): string { - return name.replace('.svg', `.accent.${ accentName }.svg`); -} - -/** - * Replaces a SVG colour - */ -export function replaceSVGColour(filecontent: string, colour: string): string { - return filecontent.replace(new RegExp('#(80CBC4)', 'i'), ($0, $1) => { - const newColour = colour.replace('#', ''); - console.log(`Replacing colour ${ $1 } with ${ newColour }`); - return $0.replace($1, newColour); - }); -} - -/** - * Replaces white spaces in accents' names - */ -function replaceWhiteSpaces(input: string): string { - return input.replace(/\s+/g, '-'); -} - -/** - * Writes a new svg file - */ -function writeSVGIcon(fromFile: string, toFile: string, accent: string): void { - const fileContent: string = fs.readFileSync(normalizeIconPath(fromFile), CHARSET); - const content: string = replaceSVGColour(fileContent, DEFAULTS.accents[accent]); - const pathToFile = normalizeIconPath(toFile); - - gutil.log(gutil.colors.gray(`Accented icon ${pathToFile} created with colour ${ accent } (${ DEFAULTS.accents[accent] })`)); - - fs.writeFileSync(pathToFile, content); -} - -// Exports task to index.ts -export default gulp.task('build:icons.accents', cb => { - let basetheme: IThemeIconsAccents; - - try { - basetheme = require(BASE_ICON_THEME_PATH); - - Object.keys(DEFAULTS.accents).forEach(key => { - const iconName = replaceWhiteSpaces(key); - const themecopy: IThemeIconsAccents = JSON.parse(JSON.stringify(basetheme)); - const themePath: string = path.join(PATHS.THEMES, `./Material-Theme-Icons-${ key }.json`); - - getAccentableIcons().forEach(accentableIconName => { - gutil.log(gutil.colors.gray(`Preparing ${ accentableIconName } accented icon`)); - - const iconOriginDefinition: IThemeIconsItem = (basetheme.iconDefinitions as any)[accentableIconName]; - const iconCopyDefinition: IThemeIconsItem = (themecopy.iconDefinitions as any)[accentableIconName]; - - if (iconOriginDefinition !== undefined && typeof iconOriginDefinition.iconPath === 'string' && iconCopyDefinition !== undefined && typeof iconCopyDefinition.iconPath === 'string') { - iconCopyDefinition.iconPath = replaceNameWithAccent(iconOriginDefinition.iconPath, iconName); - writeSVGIcon(iconOriginDefinition.iconPath, iconCopyDefinition.iconPath, key); - } else { - gutil.log(gutil.colors.yellow(`Icon ${ accentableIconName } not found`)); - } - }); - - // themecopy.iconDefinitions._folder_open.iconPath = replaceNameWithAccent(basetheme.iconDefinitions._folder_open.iconPath, iconName); - // themecopy.iconDefinitions._folder_open_build.iconPath = replaceNameWithAccent(basetheme.iconDefinitions._folder_open_build.iconPath, iconName); - - // writeSVGIcon(basetheme.iconDefinitions._folder_open.iconPath, themecopy.iconDefinitions._folder_open.iconPath, key); - // writeSVGIcon(basetheme.iconDefinitions._folder_open_build.iconPath, themecopy.iconDefinitions._folder_open_build.iconPath, key); - - // fs.writeFileSync(themePath, JSON.stringify(themecopy)); - - // addContributeIconTheme(id, label, themepathJSON, PACKAGE_JSON); - - gutil.log(gutil.colors.green(MESSAGE_GENERATED, themePath)); - }); - - // writePackageJSON(PACKAGE_JSON); - - } catch (error) { - // http://ragefaces.memesoftware.com/faces/large/misc-le-fu-l.png - gutil.log(gutil.colors.red(MESSAGE_ICON_ACCENTS_ERROR)); - cb(error); - return; - } - - cb(); -}); diff --git a/.gulp/tasks/icons-variants-json.ts b/.gulp/tasks/icons-variants-json.ts deleted file mode 100644 index 2bf9717..0000000 --- a/.gulp/tasks/icons-variants-json.ts +++ /dev/null @@ -1,37 +0,0 @@ -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/.gulp/tasks/icons-variants.ts b/.gulp/tasks/icons-variants.ts deleted file mode 100644 index 6c0232c..0000000 --- a/.gulp/tasks/icons-variants.ts +++ /dev/null @@ -1,63 +0,0 @@ -import * as gulp from 'gulp'; -import * as path from 'path'; -import * as fs from 'fs'; - -import {IThemeIconsVariants} from '../interfaces/itheme-icons-variants'; -import {CHARSET} from './../../extensions/consts/files'; -import PATHS from './../../extensions/consts/paths'; -import {getDefaultValues, getVariantIcons, getPackageJSON} from './../../extensions/helpers/fs'; -import {IDefaultsThemeVariant} from './../../extensions/interfaces/idefaults'; -import {IThemeIconsItem} from './../interfaces/itheme-icons-item'; - -const PACKAGE_JSON = getPackageJSON(); - -const variants: IDefaultsThemeVariant = getDefaultValues().themeVariantsColours; - -const writeIconVariant = (filepath: string, destpath: string, colour: string): void => { - const regexp = new RegExp('(#4a616c)', 'i'); - const finalFilePath = path.join(process.cwd(), PATHS.ICONS, filepath); - const finalDestpath = path.join(process.cwd(), PATHS.ICONS, destpath); - fs.writeFileSync( - finalDestpath, - fs.readFileSync(finalFilePath, CHARSET) - .replace(regexp, ($0, $1) => $0.replace($1, colour)), {encoding: CHARSET} - ); -}; - -export default gulp.task('build:icons.variants', callback => { - try { - Object.keys(variants).forEach(variantName => { - PACKAGE_JSON.contributes.iconThemes.forEach(contribute => { - const regexpCheck: RegExp = new RegExp(Object.keys(variants).join('|'), 'i'); - - if (regexpCheck.test(contribute.path) || regexpCheck.test(contribute.id)) { - return; - } - - const basepath: string = path.join(process.cwd(), contribute.path); - const basetheme: IThemeIconsVariants = require(basepath); - const theme: IThemeIconsVariants = JSON.parse(JSON.stringify(basetheme)); - const variant = variants[variantName]; - - getVariantIcons().forEach(iconName => { - const basethemeIcon: IThemeIconsItem = (basetheme.iconDefinitions as any)[iconName]; - const themeIcon: IThemeIconsItem = (theme.iconDefinitions as any)[iconName]; - - if (themeIcon !== undefined) { - themeIcon.iconPath = themeIcon.iconPath.replace('.svg', `${ variantName }.svg`); - } - - if (basethemeIcon !== undefined && themeIcon !== undefined) { - writeIconVariant(basethemeIcon.iconPath, themeIcon.iconPath, variant); - } - }); - }); - }); - - } catch (error) { - callback(error); - return; - } - - callback(); -}); diff --git a/.gulp/tasks/icons.ts b/.gulp/tasks/icons.ts deleted file mode 100644 index ae3d6e7..0000000 --- a/.gulp/tasks/icons.ts +++ /dev/null @@ -1,82 +0,0 @@ -import * as fs from 'fs'; -import * as gulp from 'gulp'; -import * as gutil from 'gulp-util'; -import * as mustache from 'mustache'; -import * as path from 'path'; - -import {HR, MESSAGE_GENERATED, MESSAGE_ICON_ERROR} from './../consts/log'; - -import {CHARSET} from './../../extensions/consts/files'; -import {IGenericObject} from './../../extensions/interfaces/igeneric-object'; -import {IIcon} from './../interfaces/iicon'; -import paths from './../../extensions/consts/paths'; -import {ensureDir} from './../../extensions/helpers/fs'; - -/** - * Returns an object implementing the IIcon interface - */ -const iconFactory = (fileName: string): IIcon => { - gutil.log(gutil.colors.gray(`Processing icon ${ fileName }`)); - let name: string = path.basename(fileName, path.extname(fileName)); - const filename: string = name; - const last: boolean = false; - - // renaming icon for vscode - // if the icon filename starts with a folder prefix, - // the resulting name will be prefixed only by an underscore, - // otherwise the icon will be prefixed by a _file_ prefix - if (name.indexOf('folder')) { - name = name.indexOf('file') ? `_file_${ name }` : `_${ name }`; - } else { - name = `_${ name }`; - } - - gutil.log(gutil.colors.gray(`VSCode icon name ${ name } with filename ${ filename }`)); - - return {filename, name, last} as IIcon; -}; - -/** - * > Build Icons - * @returns {gulp.Gulp} - */ -export default gulp.task('build:icons', cb => { - let contents: string; - const fileNames: string[] = fs.readdirSync(path.join(paths.SRC, './icons/svgs')); - const icons: IIcon[] = fileNames.map(fileName => iconFactory(fileName)); - const partials: string[] = fs.readdirSync(path.join(paths.SRC, './icons/partials')); - const partialsData: IGenericObject = {}; - const pathTemp: string = './themes/.material-theme-icons.tmp'; - - ensureDir(path.join(paths.THEMES)); - - icons[icons.length - 1].last = true; - - partials.forEach(partial => { - partialsData[path.basename(partial, path.extname(partial))] = fs.readFileSync( - path.join(paths.SRC, './icons/partials', `./${partial}` - ), CHARSET); - }); - - contents = mustache.render( - fs.readFileSync(path.join(paths.SRC, './icons/icons-theme.json'), CHARSET), - {icons}, - partialsData - ); - - try { - contents = JSON.stringify(JSON.parse(contents), null, 2); - } catch (error) { - gutil.log(gutil.colors.red(MESSAGE_ICON_ERROR), error); - cb(error); - return; - } - - fs.writeFileSync(pathTemp, contents, {encoding: CHARSET}); - - gutil.log(gutil.colors.gray(HR)); - gutil.log(MESSAGE_GENERATED, gutil.colors.green(pathTemp)); - gutil.log(gutil.colors.gray(HR)); - - cb(); -}); diff --git a/.gulp/tasks/themes.ts b/.gulp/tasks/themes.ts index 693ef7c..6c6d570 100644 --- a/.gulp/tasks/themes.ts +++ b/.gulp/tasks/themes.ts @@ -6,10 +6,10 @@ import * as path from 'path'; import {HR, MESSAGE_GENERATED, MESSAGE_THEME_VARIANT_PARSE_ERROR} from './../consts/log'; -import {CHARSET} from './../../extensions/consts/files'; +import {CHARSET} from './../../src/consts/files'; import {IThemeVariant} from './../interfaces/itheme-variant'; -import paths from './../../extensions/consts/paths'; -import {ensureDir, getDefaultValues} from './../../extensions/helpers/fs'; +import paths from './../../src/consts/paths'; +import {ensureDir, getDefaultValues} from './../../src/helpers/fs'; const commons = getDefaultValues(); diff --git a/.gulp/tasks/watcher.ts b/.gulp/tasks/watcher.ts index cc2dddd..f4e950d 100644 --- a/.gulp/tasks/watcher.ts +++ b/.gulp/tasks/watcher.ts @@ -1,7 +1,7 @@ import * as gulp from 'gulp'; import * as path from 'path'; -import Paths from './../../extensions/consts/paths'; +import Paths from './../../src/consts/paths'; /* * > Watcher diff --git a/.vscode/launch.json b/.vscode/launch.json index acc9440..f3bc209 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,24 +4,6 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Gulp build-icons-variants", - "program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js", - "args": [ - "build:icons.variants" - ] - }, - { - "type": "node", - "request": "launch", - "name": "Gulp build-icons", - "program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js", - "args": [ - "build:icons.accents" - ] - }, { "name": "Launch Extension", "type": "extensionHost", @@ -53,4 +35,4 @@ "preLaunchTask": "npm" } ] -} \ No newline at end of file +} diff --git a/.vscode/settings.json b/.vscode/settings.json index c8a043f..8c2b23b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,9 +9,6 @@ "**/.hg": true, "**/CVS": true, "**/.DS_Store": true, - "**/*.js": { - "when": "$(basename).ts" - }, "**/*.js.map": true }, "files.associations": { @@ -27,4 +24,4 @@ }, "gulp.autoDetect": "off", "npm.autoDetect": "off" -} \ No newline at end of file +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3d9fc68..859d89c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,6 @@ - [Installing and compiling source](#installing-and-compiling-source) - [Testing the theme](#testing-the-theme) - [Adding new Material Theme commands](#adding-new-material-theme-commands) - - [Adding new icons](#adding-new-icons) - [Financial contributions](#financial-contributions) - [Credits](#credits) - [Contributors](#contributors) @@ -118,20 +117,6 @@ A test suite is currently in developing. Update soon. Soon(ish)® -### Adding new icons - -* Add your icon to the `~/src/icons/svgs` directory. - -* Add the reference to that icon to the `~/src/icons/partials/fileNames.js` or if your icon is referred to a directory adds the reference to the `~/src/icons/partials/folderNames.js` file, otherwise to `~/src/icons/partials/fileExtensions.js` if is referred to a file extension. - -* If you want to make the icon sensitive to be accented, modify the `~/extensions/defaults.json` file, adding the icon definition to the `accentableIcons` array (e.g. ["_folder_open", "_folder_open_build"]) and the path to the `icons.theme.iconDefinitions` object. **The same applies to variants (the variant icons array is called "variantsIcons")** - -* Execute the build command. - -* Start the debug - -* Enjoy your new icons in Material Theme, and don't forget to pull request! - ## Financial contributions diff --git a/README.md b/README.md index 2e1e84c..f0c313b 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,7 @@ The most epic theme meets Visual Studio Code. You can help by reporting issues [ - [Packaged VSIX Extension](#packaged-vsix-extension) - [GitHub Repository Clone](#github-repository-clone) - [Activate theme](#activate-theme) - - [Fix File Icons](#fix-file-icons) - [Set the accent color](#set-the-accent-color) - - [Disabling/enabling file icons auto-applying](#disablingenabling-file-icons-auto-applying) - [Override theme colors](#override-theme-colors) - [Color Scheme override](#color-scheme-override) - [Recommended settings for a better experience](#recommended-settings-for-a-better-experience) @@ -80,18 +78,6 @@ Launch *Quick Open*, Type `theme` and choose `Preferences: Color Theme`, then select one of the Material Theme variant from the list. After the activation the theme will set the correct icons theme for you, based on your picked theme variant. -## Fix File Icons - -If you notice that the folder icons does not match the material theme active variant you can fix it with just a command. - -Launch *Quick Open*, - - - Linux `Ctrl + Shift + P` - - macOS `⌘ + Shift + P` - - Windows `Ctrl + Shift + P` - -type `material theme` and select `Material Theme: Fix file icons` from the drop-down menu, this command will set the correct icon theme based on your active material theme variant. - ## Set the accent color Launch *Quick Open*, @@ -102,18 +88,6 @@ 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/defaults.json b/defaults.json new file mode 100644 index 0000000..9c5fb25 --- /dev/null +++ b/defaults.json @@ -0,0 +1,137 @@ +{ + "accents": { + "Acid Lime": "#C6FF00", + "Blue": "#2979FF", + "Breaking Bad": "#388E3C", + "Bright Teal": "#64FFDA", + "Cyan": "#00BCD4", + "Graphite": "#616161", + "Indigo": "#5C6BC0", + "Lime": "#7CB342", + "Orange": "#FF7042", + "Pink": "#FF4081", + "Purple": "#AB47BC", + "Red": "#E57373", + "Sky": "#84FFFF", + "Tomato": "#F44336", + "Teal": "#80CBC4", + "Yellow": "#FFA000" + }, + "accentsProperties": { + "activityBarBadge.background": { + "alpha": 100, + "value": null + }, + "list.activeSelectionForeground": { + "alpha": 100, + "value": null + }, + "list.inactiveSelectionForeground": { + "alpha": 100, + "value": null + }, + "list.highlightForeground": { + "alpha": 100, + "value": null + }, + "scrollbarSlider.activeBackground": { + "alpha": 50, + "value": null + }, + "editorSuggestWidget.highlightForeground": { + "alpha": 100, + "value": null + }, + "textLink.foreground": { + "alpha": 100, + "value": null + }, + "progressBar.background": { + "alpha": 100, + "value": null + }, + "pickerGroup.foreground": { + "alpha": 100, + "value": null + }, + "tab.activeBorder": { + "alpha": 100, + "value": null + }, + "notificationLink.foreground": { + "alpha": 100, + "value": null + }, + "editorWidget.resizeBorder": { + "alpha": 100, + "value": null + }, + "editorWidget.border": { + "alpha": 100, + "value": null + }, + "settings.modifiedItemIndicator": { + "alpha": 100, + "value": null + }, + "settings.headerForeground": { + "alpha": 100, + "value": null + }, + "panelTitle.activeBorder": { + "alpha": 100, + "value": null + }, + "breadcrumb.activeSelectionForeground": { + "alpha": 100, + "value": null + }, + "menu.selectionForeground": { + "alpha": 100, + "value": null + }, + "menubar.selectionForeground": { + "alpha": 100, + "value": null + } + }, + "changelog": { + "lastversion": "2.6.3" + }, + "themeVariants": { + "Darker": "./themes/Material-Theme-Darker.json", + "Darker High Contrast": "./themes/Material-Theme-Darker-High-Contrast.json", + "Default": "./themes/Material-Theme-Default.json", + "Default High Contrast": "./themes/Material-Theme-Default-High-Contrast.json", + "Light": "./themes/Material-Theme-Lighter.json", + "Light High Contrast": "./themes/Material-Theme-Lighter-High-Contrast.json", + "Palenight": "./themes/Material-Theme-Palenight.json", + "Palenight High Contrast": "./themes/Material-Theme-Palenight-High-Contrast.json", + "Ocean": "./themes/Material-Theme-Ocean.json", + "Ocean High Contrast": "./themes/Material-Theme-Ocean-High-Contrast.json" + }, + "themeVariantsColours": { + "Darker": "#424242", + "Darker High Contrast": "#424242", + "Default": "#4A616C", + "Default High Contrast": "#4A616C", + "Light": "#90A4AE", + "Light High Contrast": "#90A4AE", + "Palenight": "#4E5579", + "Palenight High Contrast": "#4E5579", + "Ocean": "#474C60", + "Ocean High Contrast": "#474C60" + }, + "themeVariantsUITheme": { + "Darker": "vs-dark", + "Darker High Contrast": "vs-dark", + "Default": "vs-dark", + "Default High Contrast": "vs-dark", + "Light": "vs", + "Light High Contrast": "vs", + "Palenight": "vs-dark", + "Palenight High Contrast": "vs-dark", + "Ocean": "vs-dark", + "Ocean High Contrast": "vs-dark" + } +} diff --git a/extensions/commands/theme-icons/index.ts b/extensions/commands/theme-icons/index.ts deleted file mode 100644 index 503f360..0000000 --- a/extensions/commands/theme-icons/index.ts +++ /dev/null @@ -1,97 +0,0 @@ -import * as fs from 'fs'; - -import { - getAccentableIcons, - getAbsolutePath, - getDefaultValues, - getThemeIconsByContributeID, - getThemeIconsContribute, - getIconVariantFromTheme -} from './../../helpers/fs'; -import { - isAccent, - getCustomSettings, - isMaterialTheme -} from './../../helpers/settings'; -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]; -}; - -/** - * Replaces icon path with the accented one. - */ -const replaceIconPathWithAccent = (iconPath: string, accentName: string): string => { - return iconPath.replace('.svg', `.accent.${ accentName }.svg`); -}; - -/** - * 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; - }); - - // Current theme id set on VSCode ("label" of the package.json) - const themeLabel = getCurrentThemeID(); - - // If this method was called without Material Theme set, just return - if (!isMaterialTheme(themeLabel)) { - return deferred.resolve(); - } - - 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; - } - 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 deleted file mode 100644 index adb0cc9..0000000 --- a/extensions/commands/toggle-apply-icons/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index d0ed0f1..0000000 --- a/extensions/defaults.json +++ /dev/null @@ -1,307 +0,0 @@ -{ - "accents": { - "Acid Lime": "#C6FF00", - "Blue": "#2979FF", - "Breaking Bad": "#388E3C", - "Bright Teal": "#64FFDA", - "Cyan": "#00BCD4", - "Graphite": "#616161", - "Indigo": "#5C6BC0", - "Lime": "#7CB342", - "Orange": "#FF7042", - "Pink": "#FF4081", - "Purple": "#AB47BC", - "Red": "#E57373", - "Sky": "#84FFFF", - "Tomato": "#F44336", - "Teal": "#80CBC4", - "Yellow": "#FFA000" - }, - "accentableIcons": [ - "_folder_open", - "_folder_root_open", - "_folder_open_build", - "_folder_vscode_open", - "_folder_gulp_open", - "_folder_node_open", - "_folder_images_open", - "_folder_js_open", - "_folder_css_open", - "_folder_sass_open", - "_folder_src_open", - "_folder_assets_open", - "_folder_bower_open", - "_folder_git_open", - "_folder_github_open", - "_folder_test_open", - "_folder_dist_open", - "_folder_ci_open" - ], - "accentsProperties": { - "activityBarBadge.background": { - "alpha": 100, - "value": null - }, - "list.activeSelectionForeground": { - "alpha": 100, - "value": null - }, - "list.inactiveSelectionForeground": { - "alpha": 100, - "value": null - }, - "list.highlightForeground": { - "alpha": 100, - "value": null - }, - "scrollbarSlider.activeBackground": { - "alpha": 50, - "value": null - }, - "editorSuggestWidget.highlightForeground": { - "alpha": 100, - "value": null - }, - "textLink.foreground": { - "alpha": 100, - "value": null - }, - "progressBar.background": { - "alpha": 100, - "value": null - }, - "pickerGroup.foreground": { - "alpha": 100, - "value": null - }, - "tab.activeBorder": { - "alpha": 100, - "value": null - }, - "notificationLink.foreground": { - "alpha": 100, - "value": null - }, - "editorWidget.resizeBorder": { - "alpha": 100, - "value": null - }, - "editorWidget.border": { - "alpha": 100, - "value": null - }, - "settings.modifiedItemIndicator": { - "alpha": 100, - "value": null - }, - "settings.headerForeground": { - "alpha": 100, - "value": null - }, - "panelTitle.activeBorder": { - "alpha": 100, - "value": null - }, - "breadcrumb.activeSelectionForeground": { - "alpha": 100, - "value": null - }, - "menu.selectionForeground": { - "alpha": 100, - "value": null - }, - "menubar.selectionForeground": { - "alpha": 100, - "value": null - } - }, - "changelog": { - "lastversion": "2.6.3" - }, - "icons": { - "theme": { - "iconDefinitions": { - "_folder_sass": { - "iconPath": "../icons/folder_sass.svg" - }, - "_folder_sass_open": { - "iconPath": "../icons/folder_sass_open.svg" - }, - "_folder_css": { - "iconPath": "../icons/folder_css.svg" - }, - "_folder_css_open": { - "iconPath": "../icons/folder_css_open.svg" - }, - "_folder_ci": { - "iconPath": "../icons/folder_ci.svg" - }, - "_folder_ci_open": { - "iconPath": "../icons/folder_ci_open.svg" - }, - "_folder_dist": { - "iconPath": "../icons/folder_dist.svg" - }, - "_folder_dist_open": { - "iconPath": "../icons/folder_dist_open.svg" - }, - "_folder_test": { - "iconPath": "../icons/folder_test.svg" - }, - "_folder_test_open": { - "iconPath": "../icons/folder_test_open.svg" - }, - "_folder_github": { - "iconPath": "../icons/folder_github.svg" - }, - "_folder_github_open": { - "iconPath": "../icons/folder_github_open.svg" - }, - "_folder_git": { - "iconPath": "../icons/folder_git.svg" - }, - "_folder_git_open": { - "iconPath": "../icons/folder_git_open.svg" - }, - "_folder_bower": { - "iconPath": "../icons/folder_bower.svg" - }, - "_folder_bower_open": { - "iconPath": "../icons/folder_bower_open.svg" - }, - "_folder_assets": { - "iconPath": "../icons/folder_assets.svg" - }, - "_folder_assets_open": { - "iconPath": "../icons/folder_assets_open.svg" - }, - "_folder_src": { - "iconPath": "../icons/folder_src.svg" - }, - "_folder_src_open": { - "iconPath": "../icons/folder_src_open.svg" - }, - "_folder_js": { - "iconPath": "../icons/folder_js.svg" - }, - "_folder_js_open": { - "iconPath": "../icons/folder_js_open.svg" - }, - "_folder_images": { - "iconPath": "../icons/folder_images.svg" - }, - "_folder_images_open": { - "iconPath": "../icons/folder_images_open.svg" - }, - "_folder_gulp": { - "iconPath": "../icons/folder_gulp.svg" - }, - "_folder_gulp_open": { - "iconPath": "../icons/folder_gulp_open.svg" - }, - "_folder_node": { - "iconPath": "../icons/folder_node.svg" - }, - "_folder_node_open": { - "iconPath": "../icons/folder_node_open.svg" - }, - "_folder_vscode": { - "iconPath": "../icons/folder_vscode.svg" - }, - "_folder_vscode_open": { - "iconPath": "../icons/folder_vscode_open.svg" - }, - "_folder_dark": { - "iconPath": "../icons/folder_dark.svg" - }, - "_folder_light": { - "iconPath": "../icons/folder_light.svg" - }, - "_folder_root_dark": { - "iconPath": "../icons/folder_root_dark.svg" - }, - "_folder_root_light": { - "iconPath": "../icons/folder_root_light.svg" - }, - "_file_folder": { - "iconPath": "../icons/file_folder.svg" - }, - "_file_folder_build": { - "iconPath": "../icons/file_folder_build.svg" - }, - "_folder_open": { - "iconPath": "../icons/folder_open.svg" - }, - "_folder_root_open": { - "iconPath": "../icons/folder_root_open.svg" - }, - "_folder_open_build": { - "iconPath": "../icons/folder_open_build.svg" - } - } - } - }, - "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", - "Default": "./themes/Material-Theme-Default.json", - "Default High Contrast": "./themes/Material-Theme-Default-High-Contrast.json", - "Light": "./themes/Material-Theme-Lighter.json", - "Light High Contrast": "./themes/Material-Theme-Lighter-High-Contrast.json", - "Palenight": "./themes/Material-Theme-Palenight.json", - "Palenight High Contrast": "./themes/Material-Theme-Palenight-High-Contrast.json", - "Ocean": "./themes/Material-Theme-Ocean.json", - "Ocean High Contrast": "./themes/Material-Theme-Ocean-High-Contrast.json" - }, - "themeVariantsColours": { - "Darker": "#424242", - "Darker High Contrast": "#424242", - "Default": "#4A616C", - "Default High Contrast": "#4A616C", - "Light": "#90A4AE", - "Light High Contrast": "#90A4AE", - "Palenight": "#4E5579", - "Palenight High Contrast": "#4E5579", - "Ocean": "#474C60", - "Ocean High Contrast": "#474C60" - }, - "themeVariantsUITheme": { - "Darker": "vs-dark", - "Darker High Contrast": "vs-dark", - "Default": "vs-dark", - "Default High Contrast": "vs-dark", - "Light": "vs", - "Light High Contrast": "vs", - "Palenight": "vs-dark", - "Palenight High Contrast": "vs-dark", - "Ocean": "vs-dark", - "Ocean High Contrast": "vs-dark" - }, - "variantsIcons": [ - "_folder_sass", - "_folder_css", - "_folder_ci", - "_folder_dist", - "_folder_test", - "_folder_github", - "_folder_git", - "_folder_bower", - "_folder_assets", - "_folder_src", - "_folder_js", - "_folder_images", - "_folder_gulp", - "_folder_node", - "_folder_vscode", - "_folder_dark", - "_folder_light", - "_folder_root_dark", - "_folder_root_light" - ] -} \ No newline at end of file diff --git a/extensions/helpers/configuration-change.ts b/extensions/helpers/configuration-change.ts deleted file mode 100644 index d323238..0000000 --- a/extensions/helpers/configuration-change.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { - ConfigurationChangeEvent -} from 'vscode'; -import {isMaterialThemeIcons, isMaterialTheme, getAccent} from './settings'; -import {getCurrentThemeIconsID, getCurrentThemeID} from './vscode'; -import handleAutoapply from './handle-autoapply'; -import {accentsSetter} from '../commands'; - -const onIconsChanged = () => { - const currentIconsTheme = getCurrentThemeIconsID(); - return handleAutoapply(isMaterialThemeIcons(currentIconsTheme)); -}; - -const onThemeChanged = () => { - const currentTheme = getCurrentThemeID(); - return handleAutoapply(isMaterialTheme(currentTheme)); -}; - -const onAccentChanged = () => { - const currentTheme = getCurrentThemeID(); - const currentIconsTheme = getCurrentThemeIconsID(); - const currentAccent = getAccent(); - return accentsSetter(currentAccent) - .then(() => - handleAutoapply( - isMaterialTheme(currentTheme) && isMaterialThemeIcons(currentIconsTheme) - ) - ); -}; - -export const onChangeConfiguration = (event: ConfigurationChangeEvent) => { - const isColorTheme = event.affectsConfiguration('workbench.colorTheme'); - const isIconTheme = event.affectsConfiguration('workbench.iconTheme'); - const isAccent = event.affectsConfiguration('materialTheme.accent'); - - return isIconTheme ? onIconsChanged() : - isColorTheme ? onThemeChanged() : - isAccent ? onAccentChanged() : null; -}; diff --git a/extensions/helpers/fs.ts b/extensions/helpers/fs.ts deleted file mode 100644 index 9dca63b..0000000 --- a/extensions/helpers/fs.ts +++ /dev/null @@ -1,81 +0,0 @@ -import * as fs from 'fs'; -import * as path from 'path'; - -import {IPackageJSON, IPackageJSONThemeIcons} from './../interfaces/ipackage.json'; - -import {CHARSET} from './../consts/files'; -import {IDefaults} from '../interfaces/idefaults'; -import {IThemeIcons} from '../interfaces/itheme-icons'; -import {PATHS} from '../consts/paths'; - -export function ensureDir(dirname: string): void { - if (!fs.existsSync(dirname)) { - fs.mkdirSync(dirname); - } -} - -export function getDefaultValues(): IDefaults { - const defaults: IDefaults = require(path.join(PATHS.VSIX_DIR, './extensions/defaults.json')); - - if (defaults === undefined || defaults === null) { - throw new Error('Cannot find defaults params'); - } - - return defaults; -} - -export function getAbsolutePath(input: string): string { - return path.join(PATHS.VSIX_DIR, input); -} - -export function getAccentableIcons(): string[] { - return getDefaultValues().accentableIcons; -} - -export function getVariantIcons(): string[] { - return getDefaultValues().variantsIcons; -} - -export function getAccentsProperties() { - return getDefaultValues().accentsProperties; -} - -/** - * Gets a theme content by a given contribute ID - */ -export function getThemeIconsByContributeID(ID: string): IThemeIcons | null { - const contribute: IPackageJSONThemeIcons = getThemeIconsContribute(ID); - return contribute !== null ? require(path.join(PATHS.VSIX_DIR, contribute.path)) : null; -} - -/** - * Gets a theme by name - */ -export function getThemeIconsContribute(ID: string): IPackageJSONThemeIcons { - const contributes = getPackageJSON().contributes.iconThemes.filter(contribute => contribute.id === ID); - 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 - */ -export function getPackageJSON(): IPackageJSON { - return require(path.join(PATHS.VSIX_DIR, './package.json')); -} - -/** - * Writes a file inside the vsix directory - */ -export function writeFile(filename: string, filecontent: string): void { - const filePath = path.join(PATHS.VSIX_DIR, filename); - fs.writeFileSync(filePath, filecontent, {encoding: CHARSET}); -} diff --git a/extensions/helpers/handle-autoapply.ts b/extensions/helpers/handle-autoapply.ts deleted file mode 100644 index c7188cc..0000000 --- a/extensions/helpers/handle-autoapply.ts +++ /dev/null @@ -1,27 +0,0 @@ -import {isAutoApplyEnable, isReloadNotificationEnable} from './settings'; -import {infoMessage} from './messages'; -import {fixIcons} from '../commands'; - -let fixIconsRunning: boolean = false; - -export default async (doubleCheck: boolean) => { - if (!doubleCheck || fixIconsRunning) { - return; - } - - if (isAutoApplyEnable()) { - fixIconsRunning = true; - return fixIcons().then(() => fixIconsRunning = false); - } - - if (!isReloadNotificationEnable()) { - return; - } - - const result = await infoMessage(); - - if (result.reload) { - fixIconsRunning = true; - return fixIcons().then(() => fixIconsRunning = false); - } -}; diff --git a/extensions/helpers/messages.ts b/extensions/helpers/messages.ts deleted file mode 100644 index c4371b3..0000000 --- a/extensions/helpers/messages.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { - window as Window -} from 'vscode'; - -const MESSAGES = { - INFO: { - message: 'Do you want to reload to apply Material Theme Icons to enjoy the full experience?', - options: {ok: 'Yeah, reload', cancel: 'No, thank you'} - }, - CHANGELOG: { - message: 'Material Theme was updated. Check the release notes for more details.', - options: {ok: 'Show me', cancel: 'Maybe later'} - }, - INSTALLATION: { - message: 'Thank you for installing Material Theme! Would you like to enable the auto-application (with window reload when needed) of the Material Theme icons?', - options: {ok: 'Sure!', cancel: 'Nope :('} - } -}; - -export const infoMessage = async () => { - const result = await Window.showInformationMessage( - MESSAGES.INFO.message, - MESSAGES.INFO.options.ok, - MESSAGES.INFO.options.cancel - ); - - switch (result) { - case MESSAGES.INFO.options.ok: - return {reload: true}; - default: - return {}; - } -}; - -export const changelogMessage = async () => - await Window.showInformationMessage( - MESSAGES.CHANGELOG.message, - MESSAGES.CHANGELOG.options.ok, - MESSAGES.CHANGELOG.options.cancel - ) === MESSAGES.CHANGELOG.options.ok; - -export const installationMessage = async () => - await Window.showInformationMessage( - MESSAGES.INSTALLATION.message, - MESSAGES.INSTALLATION.options.ok, - MESSAGES.INSTALLATION.options.cancel, - ) === MESSAGES.INSTALLATION.options.ok; diff --git a/extensions/helpers/vscode.ts b/extensions/helpers/vscode.ts deleted file mode 100644 index 911024d..0000000 --- a/extensions/helpers/vscode.ts +++ /dev/null @@ -1,44 +0,0 @@ -import * as vscode from 'vscode'; - -export function askForWindowReload(): Thenable { - const PROMPT_MESSAGE: string = 'Material Theme requires VS Code reload in order to display icons correctly.'; - const PROMPT_MESSAGE_CONFIRM: string = 'Ok, reload'; - const PROMPT_MESSAGE_CANCEL: string = 'I will do it later'; - - return vscode.window.showInformationMessage(PROMPT_MESSAGE, PROMPT_MESSAGE_CONFIRM, PROMPT_MESSAGE_CANCEL) - .then(response => { - if (response === PROMPT_MESSAGE_CONFIRM) { - reloadWindow(); - } - }, err => { - console.log(err); - }); -} - -/** - * Gets your current theme ID - */ -export function getCurrentThemeID(): string { - return vscode.workspace.getConfiguration().get('workbench.colorTheme'); -} - -/** - * Gets your current icons theme ID - */ -export function getCurrentThemeIconsID(): string { - return vscode.workspace.getConfiguration().get('workbench.iconTheme'); -} - -/** - * Set a specific id for icons - */ -export function setIconsID(id: string): Thenable { - return vscode.workspace.getConfiguration().update('workbench.iconTheme', id, true); -} - -/** - * Reloads current vscode window. - */ -export function reloadWindow(): void { - vscode.commands.executeCommand('workbench.action.reloadWindow'); -} diff --git a/extensions/interfaces/itheme-icons.ts b/extensions/interfaces/itheme-icons.ts deleted file mode 100644 index 4d6cd8b..0000000 --- a/extensions/interfaces/itheme-icons.ts +++ /dev/null @@ -1,516 +0,0 @@ -export interface IThemeIconsIconPath { - iconPath: string; -} - -export interface IThemeIcons { - iconDefinitions: { - _folder_dark: IThemeIconsIconPath; - _file_folder: IThemeIconsIconPath; - _folder_dark_build: IThemeIconsIconPath; - _folder_light: IThemeIconsIconPath; - _folder_light_build: IThemeIconsIconPath; - _folder_open: IThemeIconsIconPath; - _folder_open_build: IThemeIconsIconPath; - _file_dark: IThemeIconsIconPath; - _file_actionscript: IThemeIconsIconPath; - _file_ai: IThemeIconsIconPath; - _file_android: IThemeIconsIconPath; - _file_angular: IThemeIconsIconPath; - _file_applescript: IThemeIconsIconPath; - _file_arduino: IThemeIconsIconPath; - _file_assembly: IThemeIconsIconPath; - _file_autohotkey: IThemeIconsIconPath; - _file_bower: IThemeIconsIconPath; - _file_c: IThemeIconsIconPath; - _file_certificate: IThemeIconsIconPath; - _file_changelog: IThemeIconsIconPath; - _file_clojure: IThemeIconsIconPath; - _file_cmake: IThemeIconsIconPath; - _file_cmd: IThemeIconsIconPath; - _file_coffee: IThemeIconsIconPath; - _file_console: IThemeIconsIconPath; - _file_contributing: IThemeIconsIconPath; - _file_cpp: IThemeIconsIconPath; - _file_credits: IThemeIconsIconPath; - _file_csharp: IThemeIconsIconPath; - '_file_css-map': IThemeIconsIconPath; - _file_css: IThemeIconsIconPath; - _file_dart: IThemeIconsIconPath; - _file_database: IThemeIconsIconPath; - _file_dlang: IThemeIconsIconPath; - _file_docker: IThemeIconsIconPath; - _file_document: IThemeIconsIconPath; - _file_email: IThemeIconsIconPath; - _file_exe: IThemeIconsIconPath; - _file_favicon: IThemeIconsIconPath; - _file_file: IThemeIconsIconPath; - _file_flash: IThemeIconsIconPath; - _file_flow: IThemeIconsIconPath; - '_file_folder-build': IThemeIconsIconPath; - '_file_folder-light-build': IThemeIconsIconPath; - '_file_folder-light': IThemeIconsIconPath; - '_file_folder-outline-build': IThemeIconsIconPath; - '_file_folder-outline': IThemeIconsIconPath; - _file_font: IThemeIconsIconPath; - _file_fsharp: IThemeIconsIconPath; - _file_git: IThemeIconsIconPath; - _file_github: IThemeIconsIconPath; - _file_go: IThemeIconsIconPath; - _file_gopher: IThemeIconsIconPath; - _file_gradle: IThemeIconsIconPath; - _file_graphql: IThemeIconsIconPath; - _file_groovy: IThemeIconsIconPath; - _file_grunt: IThemeIconsIconPath; - _file_gulp: IThemeIconsIconPath; - _file_haml: IThemeIconsIconPath; - _file_haskell: IThemeIconsIconPath; - _file_html: IThemeIconsIconPath; - _file_image: IThemeIconsIconPath; - _file_ionic: IThemeIconsIconPath; - _file_java: IThemeIconsIconPath; - '_file_javascript-map': IThemeIconsIconPath; - _file_js: IThemeIconsIconPath; - _file_json: IThemeIconsIconPath; - _file_key: IThemeIconsIconPath; - _file_kotlin: IThemeIconsIconPath; - _file_less: IThemeIconsIconPath; - _file_lib: IThemeIconsIconPath; - _file_license: IThemeIconsIconPath; - _file_lua: IThemeIconsIconPath; - _file_markdown: IThemeIconsIconPath; - _file_markup: IThemeIconsIconPath; - _file_movie: IThemeIconsIconPath; - _file_music: IThemeIconsIconPath; - _file_mustache: IThemeIconsIconPath; - _file_mxml: IThemeIconsIconPath; - _file_nodejs: IThemeIconsIconPath; - _file_npm: IThemeIconsIconPath; - _file_ocaml: IThemeIconsIconPath; - _file_pdf: IThemeIconsIconPath; - _file_php: IThemeIconsIconPath; - _file_polymer: IThemeIconsIconPath; - _file_postcss: IThemeIconsIconPath; - _file_powerpoint: IThemeIconsIconPath; - _file_pp: IThemeIconsIconPath; - _file_procfile: IThemeIconsIconPath; - _file_pug: IThemeIconsIconPath; - _file_python: IThemeIconsIconPath; - _file_r: IThemeIconsIconPath; - _file_rails: IThemeIconsIconPath; - _file_raml: IThemeIconsIconPath; - _file_react: IThemeIconsIconPath; - _file_readme: IThemeIconsIconPath; - _file_ruby: IThemeIconsIconPath; - _file_rust: IThemeIconsIconPath; - _file_sass: IThemeIconsIconPath; - _file_settings: IThemeIconsIconPath; - _file_sketch: IThemeIconsIconPath; - _file_star: IThemeIconsIconPath; - _file_stylus: IThemeIconsIconPath; - _file_sublime: IThemeIconsIconPath; - _file_svg: IThemeIconsIconPath; - _file_swc: IThemeIconsIconPath; - _file_swift: IThemeIconsIconPath; - _file_swig: IThemeIconsIconPath; - _file_table: IThemeIconsIconPath; - _file_tex: IThemeIconsIconPath; - _file_todo: IThemeIconsIconPath; - _file_tune: IThemeIconsIconPath; - _file_twig: IThemeIconsIconPath; - _file_typescript: IThemeIconsIconPath; - _file_typescript_def: IThemeIconsIconPath; - _file_url: IThemeIconsIconPath; - _file_virtual: IThemeIconsIconPath; - _file_visualstudio: IThemeIconsIconPath; - _file_vue: IThemeIconsIconPath; - _file_webpack: IThemeIconsIconPath; - _file_word: IThemeIconsIconPath; - _file_xaml: IThemeIconsIconPath; - _file_xml: IThemeIconsIconPath; - _file_yaml: IThemeIconsIconPath; - _file_yarn: IThemeIconsIconPath; - _file_zip: IThemeIconsIconPath; - }; - fileExtensions: { - cmd: string; - mustache: string; - rails: string; - styl: string; - twig: string; - swig: string; - sketch: string; - do: string; - 'sublime-settings': string; - 'sublime-theme': string; - 'sublime-commands': string; - 'sublime-menu': string; - html: string; - jade: string; - pug: string; - md: string; - 'md.rendered': string; - markdown: string; - 'markdown.rendered': string; - css: string; - postcss: string; - scss: string; - sass: string; - less: string; - json: string; - yaml: string; - 'YAML-tmLanguage': string; - yml: string; - xml: string; - plist: string; - xsd: string; - dtd: string; - xsl: string; - xslt: string; - resx: string; - iml: string; - xquery: string; - tmLanguage: string; - png: string; - jpeg: string; - jpg: string; - gif: string; - svg: string; - eps: string; - ai: string; - ico: string; - tif: string; - tiff: string; - psd: string; - psb: string; - ami: string; - apx: string; - bmp: string; - bpg: string; - brk: string; - cur: string; - dds: string; - dng: string; - exr: string; - fpx: string; - gbr: string; - img: string; - jbig2: string; - jb2: string; - jng: string; - jxr: string; - pbm: string; - pgf: string; - pic: string; - raw: string; - webp: string; - php: string; - js: string; - ejs: string; - jsx: string; - ini: string; - dlc: string; - dll: string; - config: string; - conf: string; - esx: string; - ts: string; - tsx: string; - 'd.ts': string; - pdf: string; - xlsx: string; - xls: string; - csv: string; - vscodeignore: string; - vsixmanifest: string; - suo: string; - sln: string; - pdb: string; - cs: string; - csx: string; - csproj: string; - zip: string; - tar: string; - gz: string; - xz: string; - bzip2: string; - gzip: string; - '7z': string; - '7zip': string; - pzip: string; - wim: string; - rar: string; - tgz: string; - exe: string; - msi: string; - java: string; - jar: string; - jsp: string; - c: string; - h: string; - m: string; - cc: string; - cpp: string; - 'c++': string; - hpp: string; - mm: string; - cxx: string; - go: string; - py: string; - url: string; - sh: string; - bat: string; - ps1: string; - fish: string; - bash: string; - gradle: string; - doc: string; - docx: string; - rtf: string; - properties: string; - prop: string; - settings: string; - sql: string; - accdb: string; - mdb: string; - cer: string; - cert: string; - crt: string; - pub: string; - key: string; - pem: string; - asc: string; - woff: string; - woff2: string; - ttf: string; - eot: string; - suit: string; - otf: string; - bmap: string; - fnt: string; - odttf: string; - ttc: string; - font: string; - fonts: string; - sui: string; - ntf: string; - mrf: string; - lib: string; - rb: string; - erb: string; - fs: string; - fsx: string; - fsi: string; - fsproj: string; - manifest: string; - swift: string; - ino: string; - dockerignore: string; - tex: string; - bib: string; - pptx: string; - ppt: string; - pptm: string; - potx: string; - pot: string; - potm: string; - ppsx: string; - ppsm: string; - pps: string; - ppam: string; - ppa: string; - webm: string; - mkv: string; - flv: string; - vob: string; - ogv: string; - ogg: string; - gifv: string; - avi: string; - mov: string; - qt: string; - wmv: string; - yuv: string; - rm: string; - rmvb: string; - mp4: string; - m4v: string; - mpg: string; - mp2: string; - mpeg: string; - mpe: string; - mpv: string; - m2v: string; - vdi: string; - vbox: string; - 'vbox-prev': string; - ics: string; - mp3: string; - flac: string; - m4a: string; - wma: string; - aiff: string; - coffee: string; - txt: string; - sqlite: string; - graphql: string; - gql: string; - props: string; - toml: string; - rs: string; - raml: string; - xaml: string; - prefs: string; - hs: string; - kt: string; - project: string; - patch: string; - dockerfile: string; - vb: string; - lua: string; - clj: string; - groovy: string; - r: string; - rst: string; - dart: string; - as: string; - mxml: string; - ahk: string; - swf: string; - swc: string; - cmake: string; - asm: string; - a51: string; - inc: string; - nasm: string; - s: string; - ms: string; - agc: string; - ags: string; - aea: string; - argus: string; - mitigus: string; - binsource: string; - vue: string; - ml: string; - mli: string; - cmx: string; - 'js.map': string; - 'css.map': string; - tmTheme: string; - pp: string; - applescript: string; - haml: string; - }; - fileNames: { - 'gruntfile.js': string; - 'bower.json': string; - '.bowerrc': string; - 'webpack.js': string; - 'webpack.config.js': string; - 'webpack.dev.js': string; - 'webpack.prod.js': string; - 'webpack.common.js': string; - 'webpackfile.js': string; - 'ionic.config.json': string; - '.io-config.json': string; - 'gulpfile.js': string; - 'gulpfile.babel.js': string; - 'package.json': string; - 'gradle.properties': string; - gradlew: string; - '.jscsrc': string; - '.jshintrc': string; - '.jshintignore': string; - '.npmignore': string; - 'tsconfig.json': string; - 'tslint.json': string; - 'androidmanifest.xml': string; - 'gradle-wrapper.properties': string; - '.editorconfig': string; - procfile: string; - '.env': string; - dockerfile: string; - license: string; - 'license.md': string; - 'license.md.rendered': string; - 'license.txt': string; - '.babelrc': string; - '.eslintrc': string; - '.buildignore': string; - '.htaccess': string; - 'composer.lock': string; - '.gitignore': string; - '.gitconfig': string; - '.gitattributes': string; - '.gitmodules': string; - '.gitkeep': string; - 'yarn.lock': string; - '.yarnclean': string; - '.yarn-integrity': string; - 'yarn-error.log': string; - 'contributing.md': string; - 'contributing.md.rendered': string; - 'readme.md': string; - 'readme.md.rendered': string; - '.mailmap': string; - makefile: string; - changelog: string; - 'changelog.md': string; - 'changelog.md.rendered': string; - CREDITS: string; - 'credits.txt': string; - 'credits.md': string; - 'credits.md.rendered': string; - '.flowconfig': string; - '.jsbeautifyrc': string; - 'git-history': string; - 'angular-cli.json': string; - 'app.module.ts': string; - 'favicon.ico': string; - }; - file: string; - folder: string; - folderExpanded: string; - languageIds: - { git: string }; - light: { - folderExpanded: string; - folder: string; - folderNames: { - node_modules: string; - '.git': string; - '.github': string; - '.gulp': string; - bower_components: string; - build: string; - dist: string; - }; - folderNamesExpanded: { - node_modules: string; - '.git': string; - '.github': string; - '.gulp': string; - bower_components: string; - build: string; - dist: string; - }; - }; - folderNames: { - node_modules: string; - '.git': string; - '.github': string; - '.gulp': string; - bower_components: string; - build: string; - dist: string; - }; - folderNamesExpanded: { - node_modules: string; - '.git': string; - '.github': string; - '.gulp': string; - bower_components: string; - build: string; - dist: string; - }; -} diff --git a/gulpfile.babel.js b/gulpfile.babel.js new file mode 100644 index 0000000..9015071 --- /dev/null +++ b/gulpfile.babel.js @@ -0,0 +1,9 @@ +import Gulp from 'gulp'; +import GulpStats from 'gulp-stats'; +import tasks from './out/.gulp'; + +// Use gulp-stats +GulpStats(Gulp); + +// set default task +Gulp.task('default', tasks); diff --git a/gulpfile.babel.ts b/gulpfile.babel.ts deleted file mode 100644 index 9cde7bd..0000000 --- a/gulpfile.babel.ts +++ /dev/null @@ -1,9 +0,0 @@ -import * as Gulp from 'gulp'; -import * as GulpStats from 'gulp-stats'; -import * as tasks from './.gulp'; - -// Use gulp-stats -GulpStats(Gulp); - -// set default task -Gulp.task('default', tasks.default as any); diff --git a/iconlist.json b/iconlist.json deleted file mode 100644 index 83ccbc5..0000000 --- a/iconlist.json +++ /dev/null @@ -1,113 +0,0 @@ -[ - "actionscript", - "ai", - "android", - "angular", - "arduino", - "assembly", - "autohotkey", - "bower", - "c-lang", - "certificate", - "changelog", - "clojure", - "cmake", - "cmd", - "coffee", - "console", - "contributing", - "cpp", - "credits", - "csharp", - "css-map", - "css", - "dart", - "database", - "dlang", - "docker", - "document", - "email", - "exe", - "favicon", - "file", - "flash", - "flow", - "folder-light", - "folder-outline", - "folder", - "font", - "fsharp", - "git", - "github", - "gopher", - "gradle", - "groovy", - "grunt", - "gulp", - "haskell", - "html", - "image", - "ionic", - "java", - "javascript-map", - "js", - "json", - "key", - "kotlin", - "less", - "lib", - "license", - "lua", - "markdown", - "markup", - "movie", - "music", - "mustache", - "mxml", - "nodejs", - "npm", - "ocaml", - "pdf", - "php", - "polymer", - "postcss", - "powerpoint", - "procfile", - "pug", - "python", - "r", - "rails", - "raml", - "react", - "readme", - "ruby", - "rust", - "sass", - "settings", - "sketch", - "star", - "stylus", - "sublime", - "svg", - "swc", - "swift", - "swig", - "table", - "tex", - "todo", - "tune", - "twig", - "typescript", - "typescript_def", - "url", - "virtual", - "visualstudio", - "vue", - "webpack", - "word", - "xaml", - "xml", - "yaml", - "yarn", - "zip" -] \ No newline at end of file diff --git a/package.json b/package.json index 7a43d3e..ce21998 100644 --- a/package.json +++ b/package.json @@ -23,21 +23,11 @@ "vscode": "^1.28.0" }, "scripts": { - "build": "yarn cleanup && yarn get-remote-icons && yarn build-icons && yarn build-themes && yarn build-icons-accents && yarn build-icons-variants && yarn build-icons-variants-json && yarn build-ui", - "build-icons": "yarn remove-icons && yarn minimize-icons && gulp build:icons && yarn minimize-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": "gulp build:get-remote-icons", - "cleanup": "rimraf _tmp-output-remote-icons/ && rimraf ui", - "build-icons-accents": "gulp build:icons.accents", - "build-icons-variants": "gulp build:icons.variants", - "build-icons-variants-json": "gulp build:icons.variants-json", + "build": "yarn cleanup && yarn build-ts && yarn build-themes && yarn build-ui", + "cleanup": "rimraf out", "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 extensions/webviews/ui/release-notes/index.js > ui/release-notes.js", + "build-ui": "gulp build:copy-ui && yarn build-ui-release-notes", + "build-ui-release-notes": "browserify out/src/webviews/ui/release-notes/index.js > out/ui/release-notes.js", "build-ui-only": "yarn cleanup && yarn build-ts && yarn build-ui", "build-ts": "tsc -p ./tsconfig.json", "test": "tslint **.ts", @@ -54,24 +44,14 @@ "activationEvents": [ "*" ], - "main": "./extensions/material.theme.config.js", + "main": "./out/src/material.theme.config", "contributes": { "commands": [ - { - "command": "materialTheme.toggleApplyIcons", - "title": "Enable or disable icons auto-applying", - "category": "💅 Material Theme" - }, { "command": "materialTheme.setAccent", "title": "Set accent color", "category": "🎨 Material Theme" }, - { - "command": "materialTheme.fixIcons", - "title": "Fix file icons", - "category": "🛠 Material Theme" - }, { "command": "materialTheme.showReleaseNotes", "title": "Release Notes", @@ -105,101 +85,63 @@ ], "description": "Current accent color selected", "scope": "window" - }, - "materialTheme.autoApplyIcons": { - "type": "boolean", - "description": "Enable/disable auto-apply of Material Theme icons with window reload when needed", - "default": false, - "scope": "window" - }, - "materialTheme.showReloadNotification": { - "type": "boolean", - "description": "Useful when autoApplyIcons is false and you want to be asked to reload the window when needed", - "default": true, - "scope": "window" } } }, "themes": [ { "label": "Material Theme", - "path": "./themes/Material-Theme-Default.json", + "path": "./out/themes/Material-Theme-Default.json", "uiTheme": "vs-dark" }, { "label": "Material Theme High Contrast", - "path": "./themes/Material-Theme-Default-High-Contrast.json", + "path": "./out/themes/Material-Theme-Default-High-Contrast.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Darker", - "path": "./themes/Material-Theme-Darker.json", + "path": "./out/themes/Material-Theme-Darker.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Darker High Contrast", - "path": "./themes/Material-Theme-Darker-High-Contrast.json", + "path": "./out/themes/Material-Theme-Darker-High-Contrast.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Palenight", - "path": "./themes/Material-Theme-Palenight.json", + "path": "./out/themes/Material-Theme-Palenight.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Palenight High Contrast", - "path": "./themes/Material-Theme-Palenight-High-Contrast.json", + "path": "./out/themes/Material-Theme-Palenight-High-Contrast.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Ocean", - "path": "./themes/Material-Theme-Ocean.json", + "path": "./out/themes/Material-Theme-Ocean.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Ocean High Contrast", - "path": "./themes/Material-Theme-Ocean-High-Contrast.json", + "path": "./out/themes/Material-Theme-Ocean-High-Contrast.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Lighter", - "path": "./themes/Material-Theme-Lighter.json", + "path": "./out/themes/Material-Theme-Lighter.json", "uiTheme": "vs" }, { "label": "Material Theme Lighter High Contrast", - "path": "./themes/Material-Theme-Lighter-High-Contrast.json", + "path": "./out/themes/Material-Theme-Lighter-High-Contrast.json", "uiTheme": "vs" } - ], - "iconThemes": [ - { - "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" - } ] }, + "extensionDependency": ["Equinusocio.vsc-material-theme-icons"], "badges": [ { "url": "https://camo.githubusercontent.com/d3c6e53aa66426dead24cdedab0e83082103bea6/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f6973737565732f657175696e75736f63696f2f7673632d6d6174657269616c2d7468656d652e7376673f7374796c653d666c61742d737175617265", @@ -213,42 +155,25 @@ } ], "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.31", - "@types/ncp": "2.0.1", + "@types/mustache": "0.8.32", "@types/rimraf": "2.0.2", - "@types/run-sequence": "0.0.30", - "@types/through2": "2.0.33", - "@types/yamljs": "0.2.30", - "@types/yargs": "11.0.0", "babel-core": "6.26.3", "babel-preset-env": "1.7.0", - "babel-preset-es2015": "6.24.1", - "babel-root-import": "4.1.8", "browserify": "16.2.2", - "cpx": "1.5.0", - "execa": "0.10.0", "gulp": "3.9.1", "gulp-bump": "3.1.0", "gulp-conventional-changelog": "1.1.11", "gulp-if": "2.0.2", "gulp-stats": "0.0.4", "gulp-util": "3.0.8", - "hoek": "5.0.3", - "json-minify": "1.0.0", - "mustache": "2.3.0", - "ncp": "2.0.0", - "run-sequence": "2.2.1", - "svgo": "1.0.5", + "mustache": "3.0.1", "tslint": "5.10.0", "tslint-xo": "0.8.0", "typescript": "2.9.2", "vscode": "1.1.18", - "yamljs": "0.3.0", "yargs": "11.0.0" }, "__metadata": { diff --git a/extensions/commands/accents-setter/consts.ts b/src/commands/accents-setter/consts.ts similarity index 100% rename from extensions/commands/accents-setter/consts.ts rename to src/commands/accents-setter/consts.ts diff --git a/extensions/commands/accents-setter/index.ts b/src/commands/accents-setter/index.ts similarity index 100% rename from extensions/commands/accents-setter/index.ts rename to src/commands/accents-setter/index.ts diff --git a/extensions/commands/accents-setter/quick-pick.ts b/src/commands/accents-setter/quick-pick.ts similarity index 100% rename from extensions/commands/accents-setter/quick-pick.ts rename to src/commands/accents-setter/quick-pick.ts diff --git a/extensions/commands/index.ts b/src/commands/index.ts similarity index 53% rename from extensions/commands/index.ts rename to src/commands/index.ts index 79ff089..853732b 100644 --- a/extensions/commands/index.ts +++ b/src/commands/index.ts @@ -1,4 +1,2 @@ export {default as accentsSetter} from './accents-setter'; export {default as accentsQuickPick} from './accents-setter/quick-pick'; -export {default as fixIcons} from './theme-icons'; -export {default as toggleApplyIcons} from './toggle-apply-icons'; diff --git a/extensions/consts/files.ts b/src/consts/files.ts similarity index 100% rename from extensions/consts/files.ts rename to src/consts/files.ts diff --git a/extensions/consts/paths.ts b/src/consts/paths.ts similarity index 52% rename from extensions/consts/paths.ts rename to src/consts/paths.ts index a7027bd..395d53b 100644 --- a/extensions/consts/paths.ts +++ b/src/consts/paths.ts @@ -3,12 +3,11 @@ import * as path from 'path'; import {IPaths} from '../interfaces/ipaths'; export const PATHS: IPaths = { - DIST: './dist', - ICONS: './icons', SRC: './src', - THEMES: './themes', - UI: './ui', - VSIX_DIR: path.join(__dirname, '../../'), + THEMES: './out/themes', + UI: './out/ui', + VSIX_SRC_DIR: path.join(__dirname, '../..'), // From "src" dir + VSIX_DIR: path.join(__dirname, '../../..'), // From "out" dir EXT_DIR: path.join(__dirname, '..') }; diff --git a/extensions/helpers/check-installation.ts b/src/helpers/check-installation.ts similarity index 100% rename from extensions/helpers/check-installation.ts rename to src/helpers/check-installation.ts diff --git a/src/helpers/fs.ts b/src/helpers/fs.ts new file mode 100644 index 0000000..ee1ee39 --- /dev/null +++ b/src/helpers/fs.ts @@ -0,0 +1,47 @@ +import * as fs from 'fs'; +import * as path from 'path'; + +import {IPackageJSON} from '../interfaces/ipackage.json'; + +import {CHARSET} from './../consts/files'; +import {IDefaults} from '../interfaces/idefaults'; +import {PATHS} from '../consts/paths'; + +export function ensureDir(dirname: string): void { + if (!fs.existsSync(dirname)) { + fs.mkdirSync(dirname); + } +} + +export function getDefaultValues(): IDefaults { + const defaults: IDefaults = require(path.join(PATHS.VSIX_DIR, 'defaults.json')); + + if (defaults === undefined || defaults === null) { + throw new Error('Cannot find defaults params'); + } + + return defaults; +} + +export function getAbsolutePath(input: string): string { + return path.join(PATHS.VSIX_DIR, input); +} + +export function getAccentsProperties() { + return getDefaultValues().accentsProperties; +} + +/** + * Gets package JSON + */ +export function getPackageJSON(): IPackageJSON { + return require(path.join(PATHS.VSIX_DIR, './package.json')); +} + +/** + * Writes a file inside the vsix directory + */ +export function writeFile(filename: string, filecontent: string): void { + const filePath = path.join(PATHS.VSIX_DIR, filename); + fs.writeFileSync(filePath, filecontent, {encoding: CHARSET}); +} diff --git a/src/helpers/messages.ts b/src/helpers/messages.ts new file mode 100644 index 0000000..969954a --- /dev/null +++ b/src/helpers/messages.ts @@ -0,0 +1,25 @@ +import { + window as Window +} from 'vscode'; + +const MESSAGES = { + CHANGELOG: { + message: 'Material Theme was updated. Check the release notes for more details.', + options: {ok: 'Show me', cancel: 'Maybe later'} + }, + INSTALLATION: { + message: 'Thank you for using Material Theme!' + } +}; + +export const changelogMessage = async () => + await Window.showInformationMessage( + MESSAGES.CHANGELOG.message, + MESSAGES.CHANGELOG.options.ok, + MESSAGES.CHANGELOG.options.cancel + ) === MESSAGES.CHANGELOG.options.ok; + +export const installationMessage = async () => + await Window.showInformationMessage( + MESSAGES.INSTALLATION.message + ); diff --git a/extensions/helpers/settings.ts b/src/helpers/settings.ts similarity index 77% rename from extensions/helpers/settings.ts rename to src/helpers/settings.ts index a943ed6..626cdbd 100644 --- a/extensions/helpers/settings.ts +++ b/src/helpers/settings.ts @@ -18,13 +18,6 @@ export function getCustomSettings(): IThemeCustomSettings { return vscode.workspace.getConfiguration().get('materialTheme', {}); } -/** - * Get autoApplyIcons - */ -export function isAutoApplyEnable(): boolean { - return vscode.workspace.getConfiguration().get('materialTheme.autoApplyIcons'); -} - /** * Get showReloadNotification */ @@ -47,14 +40,6 @@ export function isMaterialTheme(themeName: string): boolean { return Boolean(packageJSON.contributes.themes.find(contrib => contrib.label === themeName)); } -/** - * Determines if the passing icons theme is a material theme - */ -export function isMaterialThemeIcons(themeIconsName: string): boolean { - const packageJSON = getPackageJSON(); - return Boolean(packageJSON.contributes.iconThemes.find(contribute => contribute.id === themeIconsName)); -} - /** * Sets a custom property in custom settings */ diff --git a/src/helpers/vscode.ts b/src/helpers/vscode.ts new file mode 100644 index 0000000..86565b1 --- /dev/null +++ b/src/helpers/vscode.ts @@ -0,0 +1,15 @@ +import * as vscode from 'vscode'; + +/** + * Gets your current theme ID + */ +export function getCurrentThemeID(): string { + return vscode.workspace.getConfiguration().get('workbench.colorTheme'); +} + +/** + * Reloads current vscode window. + */ +export function reloadWindow(): void { + vscode.commands.executeCommand('workbench.action.reloadWindow'); +} diff --git a/extensions/helpers/write-changelog.ts b/src/helpers/write-changelog.ts similarity index 75% rename from extensions/helpers/write-changelog.ts rename to src/helpers/write-changelog.ts index 53fa129..c53c347 100644 --- a/extensions/helpers/write-changelog.ts +++ b/src/helpers/write-changelog.ts @@ -1,10 +1,10 @@ import * as path from 'path'; import {getDefaultValues, getPackageJSON, writeFile} from './fs'; -import {IDefaults} from './../interfaces/idefaults'; +import {IDefaults} from '../interfaces/idefaults'; const writeDefaults = (defaults: IDefaults) => - writeFile(path.join('./extensions/defaults.json'), JSON.stringify(defaults, null, 2)); + writeFile(path.join('./defaults.json'), JSON.stringify(defaults, null, 2)); export default (): void => { const defaults = getDefaultValues(); diff --git a/src/icons/icons-theme.json b/src/icons/icons-theme.json deleted file mode 100644 index 398bcc1..0000000 --- a/src/icons/icons-theme.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "hidesExplorerArrows": true, - {{> iconDefinitions}} - {{> fileExtensions}} - {{> fileNames}} - {{> fileFolders}} - {{> languageIds}} - {{> light}} - {{> folderNames}} -} diff --git a/src/icons/partials/fileExtensions.js b/src/icons/partials/fileExtensions.js deleted file mode 100644 index d1bb464..0000000 --- a/src/icons/partials/fileExtensions.js +++ /dev/null @@ -1,353 +0,0 @@ -"fileExtensions": { - "tf": "_file_terraform", - "story.tsx": "_file_storybook", - "stories.tsx": "_file_storybook", - "story.ts": "_file_storybook", - "stories.ts": "_file_storybook", - "story.jsx": "_file_storybook", - "stories.jsx": "_file_storybook", - "story.js": "_file_storybook", - "stories.js": "_file_storybook", - "proto": "_file_protobuf", - "hbs": "_file_handlebars", - "elm": "_file_elm", - "cabal": "_file_cabal", - "cfc": "_file_coldfusion", - "cfm": "_file_coldfusion", - "mdx": "_file_mdx", - "lnk": "_file_lnk", - "pm": "_file_perl", - "pl": "_file_perl", - "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_html", - "aspx": "_file_html", - "ascx": "_file_html", - "cmd": "_file_cmd", - "mustache": "_file_mustache", - "rails": "_file_rails", - "styl": "_file_stylus", - "twig": "_file_twig", - "swig": "_file_swig", - "sketch": "_file_sketch", - "do": "_file_todo", - "todo": "_file_todo", - "sublime-settings": "_file_sublime", - "sublime-theme": "_file_sublime", - "sublime-commands": "_file_sublime", - "sublime-menu": "_file_sublime", - "html": "_file_html", - "jade": "_file_pug", - "pug": "_file_pug", - "md": "_file_markdown", - "md.rendered": "_file_markdown", - "markdown": "_file_markdown", - "markdown.rendered": "_file_markdown", - "css": "_file_css", - "postcss": "_file_postcss", - "pcss": "_file_postcss", - "postcssrc": "_file_postcss", - "postcss.config.js": "_file_postcss", - "postcssrc.js": "_file_postcss", - "scss": "_file_sass", - "sass": "_file_sass", - "less": "_file_less", - "json": "_file_json", - "jsonc": "_file_json", - "yaml": "_file_yaml", - "YAML-tmLanguage": "_file_yaml", - "yml": "_file_yaml", - "xml": "_file_xml", - "plist": "_file_xml", - "xsd": "_file_xml", - "dtd": "_file_xml", - "xsl": "_file_xml", - "xslt": "_file_xml", - "resx": "_file_xml", - "iml": "_file_xml", - "xquery": "_file_xml", - "tmLanguage": "_file_xml", - "png": "_file_image", - "jpeg": "_file_image", - "jpg": "_file_image", - "gif": "_file_image", - "svg": "_file_svg", - "eps": "_file_svg", - "ai": "_file_ai", - "ico": "_file_image", - "tif": "_file_image", - "tiff": "_file_image", - "psd": "_file_psd", - "psb": "_file_psd", - "ami": "_file_image", - "apx": "_file_image", - "bmp": "_file_image", - "bpg": "_file_image", - "brk": "_file_image", - "cur": "_file_image", - "dds": "_file_image", - "dng": "_file_image", - "exr": "_file_image", - "fpx": "_file_image", - "gbr": "_file_image", - "img": "_file_image", - "jbig2": "_file_image", - "jb2": "_file_image", - "jng": "_file_image", - "jxr": "_file_image", - "pbm": "_file_image", - "pgf": "_file_image", - "pic": "_file_image", - "raw": "_file_image", - "webp": "_file_image", - "php": "_file_php", - "js": "_file_js", - "ejs": "_file_html", - "jsx": "_file_react", - "ini": "_file_settings", - "dlc": "_file_settings", - "dll": "_file_settings", - "config": "_file_settings", - "conf": "_file_settings", - "esx": "_file_js", - "ts": "_file_typescript", - "tsx": "_file_react", - "d.ts": "_file_typescript_def", - "spec.ts": "_file_typescript_def", - "pdf": "_file_pdf", - "xlsx": "_file_table", - "xls": "_file_table", - "csv": "_file_table", - "vscodeignore": "_file_visualstudio", - "vsixmanifest": "_file_visualstudio", - "suo": "_file_visualstudio", - "sln": "_file_visualstudio", - "pdb": "_file_database", - "cs": "_file_csharp", - "csx": "_file_csharp", - "csproj": "_file_visualstudio", - "zip": "_file_zip", - "tar": "_file_zip", - "gz": "_file_zip", - "xz": "_file_zip", - "bzip2": "_file_zip", - "gzip": "_file_zip", - "7z": "_file_zip", - "7zip": "_file_zip", - "pzip": "_file_zip", - "wim": "_file_zip", - "rar": "_file_zip", - "tgz": "_file_zip", - "exe": "_file_exe", - "msi": "_file_exe", - "java": "_file_java", - "jar": "_file_java", - "jsp": "_file_java", - "c": "_file_c", - "h": "_file_c", - "m": "_file_matlab", - "cc": "_file_cpp", - "cpp": "_file_cpp", - "c++": "_file_cpp", - "hpp": "_file_cpp", - "hxx": "_file_cpp", - "hh": "_file_cpp", - "mm": "_file_cpp", - "cxx": "_file_cpp", - "go": "_file_go", - "py": "_file_python", - "url": "_file_url", - "sh": "_file_console", - "ksh": "_file_console", - "csh": "_file_console", - "tcsh": "_file_console", - "zsh": "_file_console", - "bash": "_file_cmd", - "bat": "_file_cmd", - "cmd": "_file_cmd", - "awk": "_file_console", - "ps1": "_file_console", - "fish": "_file_console", - "gradle": "_file_gradle", - "doc": "_file_word", - "docx": "_file_word", - "rtf": "_file_word", - "properties": "_file_settings", - "prop": "_file_settings", - "settings": "_file_settings", - "sql": "_file_database", - "db": "_file_database", - "accdb": "_file_database", - "mdb": "_file_database", - "cer": "_file_certificate", - "cert": "_file_certificate", - "crt": "_file_certificate", - "pub": "_file_key", - "key": "_file_key", - "pem": "_file_key", - "asc": "_file_key", - "woff": "_file_font", - "woff2": "_file_font", - "ttf": "_file_font", - "eot": "_file_font", - "suit": "_file_font", - "otf": "_file_font", - "bmap": "_file_font", - "fnt": "_file_font", - "odttf": "_file_font", - "ttc": "_file_font", - "font": "_file_font", - "fonts": "_file_font", - "sui": "_file_font", - "ntf": "_file_font", - "mrf": "_file_font", - "lib": "_file_lib", - "rb": "_file_ruby", - "erb": "_file_ruby", - "lock": "_file_ruby", - "fs": "_file_fsharp", - "fsx": "_file_fsharp", - "fsi": "_file_fsharp", - "fsproj": "_file_fsharp", - "manifest": "_file_xml", - "swift": "_file_swift", - "ino": "_file_arduino", - "dockerignore": "_file_docker", - "tex": "_file_tex", - "cls": "_file_tex", - "sty": "_file_tex", - "bib": "_file_lib", - "pptx": "_file_powerpoint", - "ppt": "_file_powerpoint", - "pptm": "_file_powerpoint", - "potx": "_file_powerpoint", - "pot": "_file_powerpoint", - "potm": "_file_powerpoint", - "ppsx": "_file_powerpoint", - "ppsm": "_file_powerpoint", - "pps": "_file_powerpoint", - "ppam": "_file_powerpoint", - "ppa": "_file_powerpoint", - "webm": "_file_movie", - "mkv": "_file_movie", - "flv": "_file_movie", - "vob": "_file_movie", - "ogv": "_file_movie", - "ogg": "_file_movie", - "gifv": "_file_movie", - "avi": "_file_movie", - "mov": "_file_movie", - "qt": "_file_movie", - "wmv": "_file_movie", - "yuv": "_file_movie", - "rm": "_file_movie", - "rmvb": "_file_movie", - "mp4": "_file_movie", - "m4v": "_file_movie", - "mpg": "_file_movie", - "mp2": "_file_movie", - "mpeg": "_file_movie", - "mpe": "_file_movie", - "mpv": "_file_movie", - "m2v": "_file_movie", - "vdi": "_file_virtual", - "vbox": "_file_virtual", - "vbox-prev": "_file_virtual", - "ics": "_file_email", - "coffee": "_file_coffee", - "txt": "_file_document", - "sqlite": "_file_database", - "graphql": "_file_graphql", - "graphqlconfig": "_file_graphql", - "gql": "_file_graphql", - "props": "_file_settings", - "toml": "_file_settings", - "rs": "_file_rust", - "raml": "_file_raml", - "xaml": "_file_xaml", - "prefs": "_file_settings", - "hs": "_file_haskell", - "kt": "_file_kotlin", - "project": "_file_xml", - "patch": "_file_git", - "dockerfile": "_file_docker", - "vb": "_file_visualstudio", - "lua": "_file_lua", - "clj": "_file_clojure", - "groovy": "_file_groovy", - "r": "_file_r", - "rst": "_file_markdown", - "dart": "_file_dart", - "as": "_file_actionscript", - "mxml": "_file_mxml", - "ahk": "_file_autohotkey", - "swf": "_file_flash", - "swc": "_file_swc", - "cmake": "_file_cmake", - "asm": "_file_assembly", - "a51": "_file_assembly", - "inc": "_file_assembly", - "nasm": "_file_assembly", - "s": "_file_assembly", - "ms": "_file_assembly", - "agc": "_file_assembly", - "ags": "_file_assembly", - "aea": "_file_assembly", - "argus": "_file_assembly", - "mitigus": "_file_assembly", - "binsource": "_file_assembly", - "vue": "_file_vue", - "ml": "_file_ocaml", - "mli": "_file_ocaml", - "cmx": "_file_ocaml", - "js.map": "_file_jsmap", - "css.map": "_file_cssmap", - "tmTheme": "_file_markup", - "tmcolor": "_file_markup", - "pp": "_file_puppet", - "applescript": "_file_applescript", - "mp3": "_file_audio", - "flac": "_file_audio", - "m4a": "_file_audio", - "wma": "_file_audio", - "aiff": "_file_audio", - "haml": "_file_haml", - "ex": "_file_ex", - "exs": "_file_ex", - "eex": "_file_ex", - "re": "_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/fileFolders.js b/src/icons/partials/fileFolders.js deleted file mode 100644 index 8927abd..0000000 --- a/src/icons/partials/fileFolders.js +++ /dev/null @@ -1,5 +0,0 @@ -"file": "_file_dark", -"folder": "_folder_dark", -"folderExpanded": "_folder_open", -"rootFolder": "_folder_root_dark", -"rootFolderExpanded": "_folder_root_open", diff --git a/src/icons/partials/fileNames.js b/src/icons/partials/fileNames.js deleted file mode 100644 index 6aa804d..0000000 --- a/src/icons/partials/fileNames.js +++ /dev/null @@ -1,149 +0,0 @@ -"fileNames": { - "nuxt.config.js": "_file_nuxtconfig", - "vue.config.js": "_file_vue", - ".browserslistrc": "_file_browserlist", - ".nvmrc": "_file_node", - ".graphqlconfig.yml": "_file_graphql", - ".graphqlconfig.yaml": "_file_graphql", - "prettier.config.js": "_file_prettier", - ".prettierrc.js": "_file_prettier", - ".prettierrc.json": "_file_prettier", - ".prettierrc.yaml": "_file_prettier", - ".prettierrc.yml": "_file_prettier", - ".prettierrc": "_file_prettier", - ".prettierignore": "_file_prettier", - "code_of_conduct.md": "_file_conduct", - "jest.config.js": "_file_jest", - "jest.config.ts": "_file_jest", - "jest.config.json": "_file_jest", - "jest.setup.js": "_file_jest", - "jest.setup.ts": "_file_jest", - "jest.json": "_file_jest", - ".jestrc": "_file_jest", - "jest.teardown.js": "_file_jest", - "jenkinsfile": "_file_jenkins", - "gatsby.config.js": "_file_gatsby", - "firebase.json": "_file_firebase", - ".firebaserc": "_file_firebase", - "code_of_conduct.md.rendered": "_file_conduct", - ".gitlab-ci.yml": "_file_gitlab", - "gruntfile.js": "_file_grunt", - "package-lock.json": "_file_package-lock", - "bower.json": "_file_bower", - ".bowerrc": "_file_bower", - "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.js": "_file_webpack", - "webpack.config.js": "_file_webpack", - "webpack.dev.js": "_file_webpack", - "webpack.prod.js": "_file_webpack", - "webpack.common.js": "_file_webpack", - "webpackfile.js": "_file_webpack", - "webpack.config.ts": "_file_webpack", - "webpack.dev.ts": "_file_webpack", - "webpack.prod.ts": "_file_webpack", - "webpack.common.ts": "_file_webpack", - "webpackfile.ts": "_file_webpack", - "webpack.ts": "_file_webpack", - "webpack.config.coffee": "_file_webpack", - "webpack.dev.coffee": "_file_webpack", - "webpack.prod.coffee": "_file_webpack", - "webpack.common.coffee": "_file_webpack", - "webpackfile.coffee": "_file_webpack", - "webpack.coffee": "_file_webpack", - "ionic.config.json": "_file_ionic", - ".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", - "gradlew": "_file_gradle", - ".jscsrc": "_file_json", - ".jshintrc": "_file_json", - ".jshintignore": "_file_settings", - ".npmignore": "_file_npm", - ".npmrc": "_file_npm", - "tsconfig.json": "_file_json", - "tslint.json": "_file_json", - "androidmanifest.xml": "_file_android", - "gradle-wrapper.properties": "_file_gradle", - ".editorconfig": "_file_settings", - "procfile": "_file_procfile", - ".env": "_file_tune", - ".env.development": "_file_tune", - ".env.testing": "_file_tune", - ".env.staging": "_file_tune", - ".env.production": "_file_tune", - "dockerfile": "_file_docker", - "license": "_file_license", - "license.md": "_file_license", - "license.md.rendered": "_file_license", - "license.txt": "_file_license", - "babel.config.js": "_file_babel", - ".babelrc": "_file_babel", - ".babelrc.js": "_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.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", - ".gitignore": "_file_git", - ".gitconfig": "_file_git", - ".gitattributes": "_file_git", - ".gitmodules": "_file_git", - ".gitkeep": "_file_git", - "yarn.lock": "_file_yarn-lock", - ".yarnrc": "_file_yarn", - ".yarnclean": "_file_yarn", - ".yarn-integrity": "_file_yarn", - "yarn-error.log": "_file_yarn", - "contributing.md": "_file_contributing", - "contributing.md.rendered": "_file_contributing", - "readme.md": "_file_readme", - "readme.md.rendered": "_file_readme", - ".mailmap": "_file_email", - "makefile": "_file_settings", - "changelog": "_file_changelog", - "changelog.md": "_file_changelog", - "changelog.md.rendered": "_file_changelog", - "CREDITS": "_file_credits", - "credits.txt": "_file_credits", - "credits.md": "_file_credits", - "credits.md.rendered": "_file_credits", - ".flowconfig": "_file_flow", - ".jsbeautifyrc": "_file_json", - "git-history": "_file_git", - "angular-cli.json": "_file_angular", - ".angular-cli.json": "_file_angular", - "directive.ts": "_file_angular-directive", - "directive.js": "_file_angular-directive", - "favicon.ico": "_file_favicon", - "mix.lock": "_file_elixir-lock", - "now.json": "_file_now" -}, diff --git a/src/icons/partials/folderNames.js b/src/icons/partials/folderNames.js deleted file mode 100644 index 3bd2561..0000000 --- a/src/icons/partials/folderNames.js +++ /dev/null @@ -1,51 +0,0 @@ -"folderNames": { - "ci": "_folder_ci", - "test": "_folder_test", - "tests": "_folder_test", - "__test__": "_folder_test", - "__tests__": "_folder_test", - "node_modules": "_folder_node", - "assets": "_folder_assets", - "bower_components": "_folder_bower", - "js": "_folder_js", - "css": "_folder_css", - "style": "_folder_style", - "sass": "_folder_sass", - "scss": "_folder_sass", - "src": "_folder_src", - "source": "_folder_src", - "images": "_folder_images", - ".git": "_folder_git", - ".github": "_folder_github", - ".vscode": "_folder_vscode", - ".gulp": "_folder_gulp", - "gulp": "_folder_gulp", - "build": "_folder_dist", - "dist": "_folder_dist", - "out": "_folder_dist" -}, -"folderNamesExpanded": { - "ci": "_folder_ci_open", - "test": "_folder_test_open", - "tests": "_folder_test_open", - "__test__": "_folder_test_open", - "__tests__": "_folder_test_open", - "node_modules": "_folder_node_open", - "bower_components": "_folder_bower_open", - "assets": "_folder_assets_open", - "src": "_folder_src_open", - "source": "_folder_src_open", - "images": "_folder_images_open", - "js": "_folder_js_open", - "css": "_folder_css_open", - "style": "_folder_css_open", - "sass": "_folder_sass_open", - "scss": "_folder_scss_open", - ".git": "_folder_git_open", - ".github": "_folder_github_open", - ".gulp": "_folder_gulp_open", - ".vscode": "_folder_vscode_open", - "build": "_folder_dist_open", - "dist": "_folder_dist_open", - "out": "_folder_dist_open" -} diff --git a/src/icons/partials/iconDefinitions.js b/src/icons/partials/iconDefinitions.js deleted file mode 100644 index 667a3b9..0000000 --- a/src/icons/partials/iconDefinitions.js +++ /dev/null @@ -1,7 +0,0 @@ -"iconDefinitions": { - {{#icons}} - "{{name}}": { - "iconPath": "../icons/{{filename}}.svg" - }{{^last}},{{/last}} - {{/icons}} -}, diff --git a/src/icons/partials/languageIds.js b/src/icons/partials/languageIds.js deleted file mode 100644 index 77d207c..0000000 --- a/src/icons/partials/languageIds.js +++ /dev/null @@ -1,60 +0,0 @@ -"languageIds": { - "git": "_file_git", - "ng-template": "_file_angular", - "haxe": "_file_haxe", - "hxml": "_file_haxe", - "polymer": "_file_polymer", - "matlab": "_file_matlab", - "bat": "_file_cmd", - "c": "_file_c", - "csharp": "_file_csharp", - "cpp": "_file_cpp", - "css": "_file_css", - "clojure": "_file_clojure", - "coffeescript": "_file_coffee", - "dart": "_file_dart", - "diff": "_file_git", - "dockerfile": "_file_docker", - "fsharp": "_file_fsharp", - "git-commit": "_file_git", - "git-rebase": "_file_git", - "go": "_file_go", - "groovy": "_file_groovy", - "html": "_file_html", - "handlebars": "_file_handlebars", - "ignore": "_file_git", - "ini": "_file_settings", - "json": "_file_json", - "jsonc": "_file_json", - "java": "_file_java", - "javascript": "_file_js", - "javascriptreact": "_file_react", - "less": "_file_less", - "lua": "_file_lua", - "makefile": "_file_settings", - "markdown": "_file_markdown", - "objective-c": "_file_matlab", - "objective-cpp": "_file_cpp", - "php": "_file_php", - "perl": "_file_perl", - "perl6": "_file_perl", - "plaintext": "_file_document", - "powershell": "_file_console", - "properties": "_file_settings", - "proto3": "_file_protobuf", - "jade": "_file_pug", - "python": "_file_python", - "r": "_file_r", - "ruby": "_file_ruby", - "rust": "_file_rust", - "scss": "_file_sass", - "sql": "_file_database", - "shellscript": "_file_console", - "swift": "_file_swift", - "typescript": "_file_typescript", - "typescriptreact": "_file_react", - "vb": "_file_visualstudio", - "xml": "_file_xml", - "xsl": "_file_xml", - "yaml": "_file_yaml" -}, diff --git a/src/icons/partials/light.js b/src/icons/partials/light.js deleted file mode 100644 index 13714c9..0000000 --- a/src/icons/partials/light.js +++ /dev/null @@ -1,36 +0,0 @@ -"light": { - "folderExpanded": "_folder_open", - "folder": "_folder_light", - "rootFolder": "_folder_root_light", - "rootFolderExpanded": "_folder_root_open", - "folderNames": { - "test": "_folder_test", - "node_modules": "_folder_node", - "assets": "_folder_assets", - "bower_components": "_folder_bower", - "js": "_folder_js", - "src": "_folder_src", - "images": "_folder_images", - ".git": "_folder_git", - ".github": "_folder_github", - ".vscode": "_folder_vscode", - ".gulp": "_folder_gulp", - "build": "_folder_dark_build", - "dist": "_folder_dist" - }, - "folderNamesExpanded": { - "test": "_folder_test_open", - "node_modules": "_folder_node_open", - "bower_components": "_folder_bower_open", - "assets": "_folder_assets_open", - "src": "_folder_src_open", - "images": "_folder_images_open", - "js": "_folder_js_open", - ".git": "_folder_git_open", - ".github": "_folder_github_open", - ".gulp": "_folder_gulp_open", - ".vscode": "_folder_vscode_open", - "build": "_folder_open_build", - "dist": "_folder_dist_open" - } -}, diff --git a/src/icons/svgs/.gitkeep b/src/icons/svgs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/extensions/interfaces/iaccent-custom-property.ts b/src/interfaces/iaccent-custom-property.ts similarity index 100% rename from extensions/interfaces/iaccent-custom-property.ts rename to src/interfaces/iaccent-custom-property.ts diff --git a/extensions/interfaces/idefaults.ts b/src/interfaces/idefaults.ts similarity index 55% rename from extensions/interfaces/idefaults.ts rename to src/interfaces/idefaults.ts index 3301e5a..45ab15f 100644 --- a/extensions/interfaces/idefaults.ts +++ b/src/interfaces/idefaults.ts @@ -4,14 +4,10 @@ import {IAccentCustomProperty} from './iaccent-custom-property'; export interface IDefaults { accents: IAccents; accentsProperties: IGenericObject ; - accentableIcons: string[]; changelog: IChangelog; - icons: IDefaultsThemeIcons; themeVariants: IDefaultsThemeVariant; - themeIconVariants: IDefaultsThemeIconVariant; themeVariantsColours: IDefaultsThemeVariant; themeVariantsUITheme: IDefaultsThemeVariant; - variantsIcons: string[]; [Symbol.iterator](): IterableIterator; } @@ -25,31 +21,6 @@ export interface IChangelog { [Symbol.iterator](): IterableIterator; } -export interface IDefaultsThemeIcons { - theme: { - iconDefinitions: { - _folder_open: { - iconPath: string; - }; - _folder_open_build: { - iconPath: string; - }; - _folder_dark: { - iconPath: string; - }; - _folder_dark_build: { - iconPath: string; - }; - _folder_light_build: { - iconPath: string; - }; - _folder_light: { - iconPath: string; - }; - }; - }; -} - export interface IDefaultsThemeVariant { [index: string]: string; Darker: string; @@ -62,11 +33,3 @@ export interface IDefaultsThemeVariant { Ocean: string; OceanHighContrast: string; } - -export interface IDefaultsThemeIconVariant { - [index: string]: string; - Darker: string; - Light: string; - Palenight: string; - Ocean: string; -} diff --git a/extensions/interfaces/igeneric-object.ts b/src/interfaces/igeneric-object.ts similarity index 100% rename from extensions/interfaces/igeneric-object.ts rename to src/interfaces/igeneric-object.ts diff --git a/extensions/interfaces/iinstallation-type.ts b/src/interfaces/iinstallation-type.ts similarity index 100% rename from extensions/interfaces/iinstallation-type.ts rename to src/interfaces/iinstallation-type.ts diff --git a/extensions/interfaces/ipackage.json.ts b/src/interfaces/ipackage.json.ts similarity index 83% rename from extensions/interfaces/ipackage.json.ts rename to src/interfaces/ipackage.json.ts index edd732a..6e1b871 100644 --- a/extensions/interfaces/ipackage.json.ts +++ b/src/interfaces/ipackage.json.ts @@ -1,4 +1,4 @@ -import {IGenericObject} from './../../extensions/interfaces/igeneric-object'; +import {IGenericObject} from '../interfaces/igeneric-object'; export interface IPackageJSONBadge { description: string; @@ -9,7 +9,6 @@ export interface IPackageJSONBadge { export interface IPackageJSONContributes { commands: IPackageJSONCommand[]; configuration: IPackageJSONConfiguration; - iconThemes: IPackageJSONThemeIcons[]; themes: IPackageJSONTheme[]; } @@ -29,12 +28,6 @@ export interface IPackageJSONTheme { uiTheme: string; } -export interface IPackageJSONThemeIcons { - id: string; - label: string; - path: string; -} - export interface IPackageJSON { activationEvents: string[]; badges: IPackageJSONBadge[]; diff --git a/extensions/interfaces/ipaths.ts b/src/interfaces/ipaths.ts similarity index 76% rename from extensions/interfaces/ipaths.ts rename to src/interfaces/ipaths.ts index c40b089..f837450 100644 --- a/extensions/interfaces/ipaths.ts +++ b/src/interfaces/ipaths.ts @@ -1,12 +1,4 @@ export interface IPaths { - /** - * Dist dir - */ - DIST: string; - /** - * Icons dir - */ - ICONS: string; /** * Src dir */ @@ -19,6 +11,7 @@ export interface IPaths { * Extension directory */ VSIX_DIR: string; + VSIX_SRC_DIR: string; /** * Internal Extensions directory */ diff --git a/extensions/interfaces/itheme-custom-properties.ts b/src/interfaces/itheme-custom-properties.ts similarity index 68% rename from extensions/interfaces/itheme-custom-properties.ts rename to src/interfaces/itheme-custom-properties.ts index 1ac1abe..0ab1437 100644 --- a/extensions/interfaces/itheme-custom-properties.ts +++ b/src/interfaces/itheme-custom-properties.ts @@ -1,4 +1,3 @@ export interface IThemeCustomSettings { accent?: string; - autoApplyIcons?: boolean; } diff --git a/extensions/material.theme.config.ts b/src/material.theme.config.ts similarity index 53% rename from extensions/material.theme.config.ts rename to src/material.theme.config.ts index a7568f2..faedf83 100644 --- a/extensions/material.theme.config.ts +++ b/src/material.theme.config.ts @@ -1,37 +1,23 @@ import { - workspace as Workspace, commands as Commands, ExtensionContext } from 'vscode'; import * as ThemeCommands from './commands'; -import {setCustomSetting, updateAccent} from './helpers/settings'; -import {onChangeConfiguration} from './helpers/configuration-change'; +import {updateAccent} from './helpers/settings'; import {changelogMessage, installationMessage} from './helpers/messages'; import checkInstallation from './helpers/check-installation'; import writeChangelog from './helpers/write-changelog'; import {ReleaseNotesWebview} from './webviews/ReleaseNotes'; export async function activate(context: ExtensionContext) { - const config = Workspace.getConfiguration(); const installationType = checkInstallation(); const releaseNotesView = new ReleaseNotesWebview(context); writeChangelog(); - // Listen on set theme: when the theme is Material Theme, just adjust icon and accent. - Workspace.onDidChangeConfiguration(onChangeConfiguration); - - // Delete old configuration, must remove with next major release - if (config.has('materialTheme.cache.workbench')) { - config.update('materialTheme.cache.workbench', undefined, true); - } - if (installationType.isFirstInstall) { - const enableAutoApply = await installationMessage(); - await setCustomSetting('autoApplyIcons', enableAutoApply); - // Set true always on new installation - await setCustomSetting('showReloadNotification', true); + await installationMessage(); } const shouldShowChangelog = (installationType.isFirstInstall || installationType.isUpdate) && await changelogMessage(); @@ -44,8 +30,6 @@ export async function activate(context: ExtensionContext) { const accentPicked = await ThemeCommands.accentsQuickPick(); await updateAccent(accentPicked); }); - Commands.registerCommand('materialTheme.fixIcons', () => ThemeCommands.fixIcons()); - Commands.registerCommand('materialTheme.toggleApplyIcons', () => ThemeCommands.toggleApplyIcons()); Commands.registerCommand('materialTheme.showReleaseNotes', () => releaseNotesView.show()); } diff --git a/extensions/webviews/ReleaseNotes.ts b/src/webviews/ReleaseNotes.ts similarity index 100% rename from extensions/webviews/ReleaseNotes.ts rename to src/webviews/ReleaseNotes.ts diff --git a/extensions/webviews/Settings.ts b/src/webviews/Settings.ts similarity index 89% rename from extensions/webviews/Settings.ts rename to src/webviews/Settings.ts index cc9704d..3b72e64 100644 --- a/extensions/webviews/Settings.ts +++ b/src/webviews/Settings.ts @@ -5,8 +5,8 @@ import { ExtensionContext } from 'vscode'; import {SettingsBootstrap} from './interfaces'; -import {getCustomSettings} from '../../extensions/helpers/settings'; -import {getDefaultValues} from '../../extensions/helpers/fs'; +import {getCustomSettings} from '../helpers/settings'; +import {getDefaultValues} from '../helpers/fs'; export class SettingsWebview extends WebviewController { constructor(context: ExtensionContext) { diff --git a/extensions/webviews/Webview.ts b/src/webviews/Webview.ts similarity index 95% rename from extensions/webviews/Webview.ts rename to src/webviews/Webview.ts index c85e46d..96c6bff 100644 --- a/extensions/webviews/Webview.ts +++ b/src/webviews/Webview.ts @@ -12,7 +12,7 @@ import { Uri } from 'vscode'; -import {getCustomSettings} from '../../extensions/helpers/settings'; +import {getCustomSettings} from '../helpers/settings'; import {Invalidates, Message, SettingsChangedMessage} from './interfaces'; export abstract class WebviewController extends Disposable { @@ -42,7 +42,7 @@ export abstract class WebviewController extends Disposable { private async getHtml(): Promise { const doc = await Workspace - .openTextDocument(this.context.asAbsolutePath(path.join('ui', this.filename))); + .openTextDocument(this.context.asAbsolutePath(path.join('out/ui', this.filename))); return doc.getText(); } @@ -118,7 +118,7 @@ export abstract class WebviewController extends Disposable { const html = await this.getHtml(); const rootPath = Uri - .file(this.context.asAbsolutePath('.')) + .file(this.context.asAbsolutePath('./out')) .with({scheme: 'vscode-resource'}).toString(); // Replace placeholders in html content for assets and adding configurations as `window.bootstrap` diff --git a/extensions/webviews/interfaces.ts b/src/webviews/interfaces.ts similarity index 87% rename from extensions/webviews/interfaces.ts rename to src/webviews/interfaces.ts index eb2cfb8..f3b7fe4 100644 --- a/extensions/webviews/interfaces.ts +++ b/src/webviews/interfaces.ts @@ -1,5 +1,5 @@ -import {IThemeCustomSettings} from '../../extensions/interfaces/itheme-custom-properties'; -import {IDefaults} from '../../extensions/interfaces/idefaults'; +import {IThemeCustomSettings} from '../interfaces/itheme-custom-properties'; +import {IDefaults} from '../interfaces/idefaults'; export interface IChangeType { children: { diff --git a/extensions/webviews/ui/release-notes/index.ts b/src/webviews/ui/release-notes/index.ts similarity index 100% rename from extensions/webviews/ui/release-notes/index.ts rename to src/webviews/ui/release-notes/index.ts diff --git a/extensions/webviews/ui/release-notes/release-notes.html b/src/webviews/ui/release-notes/release-notes.html similarity index 100% rename from extensions/webviews/ui/release-notes/release-notes.html rename to src/webviews/ui/release-notes/release-notes.html diff --git a/extensions/webviews/ui/release-notes/style.css b/src/webviews/ui/release-notes/style.css similarity index 100% rename from extensions/webviews/ui/release-notes/style.css rename to src/webviews/ui/release-notes/style.css diff --git a/extensions/webviews/ui/settings/index.ts b/src/webviews/ui/settings/index.ts similarity index 100% rename from extensions/webviews/ui/settings/index.ts rename to src/webviews/ui/settings/index.ts diff --git a/extensions/webviews/ui/settings/lib/accents-selector.ts b/src/webviews/ui/settings/lib/accents-selector.ts similarity index 92% rename from extensions/webviews/ui/settings/lib/accents-selector.ts rename to src/webviews/ui/settings/lib/accents-selector.ts index b11b662..81d1193 100644 --- a/extensions/webviews/ui/settings/lib/accents-selector.ts +++ b/src/webviews/ui/settings/lib/accents-selector.ts @@ -1,4 +1,4 @@ -import {IAccents} from '../../../../../extensions/interfaces/idefaults'; +import {IAccents} from '../../../../interfaces/idefaults'; const templateSingleAccent = (accentName: string, accentColor: string): string => { const dashAccentName = accentName.toLowerCase().replace(/ /gi, '-'); diff --git a/extensions/webviews/ui/settings/settings.html b/src/webviews/ui/settings/settings.html similarity index 100% rename from extensions/webviews/ui/settings/settings.html rename to src/webviews/ui/settings/settings.html diff --git a/extensions/webviews/ui/settings/style.css b/src/webviews/ui/settings/style.css similarity index 100% rename from extensions/webviews/ui/settings/style.css rename to src/webviews/ui/settings/style.css diff --git a/tsconfig.json b/tsconfig.json index a45cbe5..411198e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,23 +1,26 @@ { "compilerOptions": { + "module": "commonjs", + "target": "es6", + "outDir": "out", "lib": [ - "es6", + "es7", "dom" ], - "module": "commonjs", + "sourceMap": true, "allowUnreachableCode": false, "noUnusedLocals": true, "noUnusedParameters": true, - "noImplicitAny": true, - "sourceMap": true, - "target": "es6" + "noImplicitAny": true }, "include": [ - "./**/*", - "./.gulp/**/*" + "./.gulp/**/*", + "./typings/**/*", + "./src/**/*", + "./test/**/*", ], "exclude": [ "node_modules", - "out" + ".vscode-test" ] } diff --git a/typings/sanity/sanity.ts b/typings/sanity/sanity.d.ts similarity index 100% rename from typings/sanity/sanity.ts rename to typings/sanity/sanity.d.ts diff --git a/yarn.lock b/yarn.lock index 78d5681..a69ba44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,12 +52,6 @@ object-assign "^4.1.1" rxjs "^6.1.0" -"@types/chalk@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-2.2.0.tgz#b7f6e446f4511029ee8e3f43075fb5b73fbaa0ba" - dependencies: - chalk "*" - "@types/chokidar@*": version "1.7.5" resolved "https://registry.yarnpkg.com/@types/chokidar/-/chokidar-1.7.5.tgz#1fa78c8803e035bed6d98e6949e514b133b0c9b6" @@ -69,12 +63,6 @@ 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" @@ -106,7 +94,7 @@ "@types/vinyl" "*" chalk "^2.2.0" -"@types/gulp@*", "@types/gulp@4.0.5": +"@types/gulp@4.0.5": version "4.0.5" resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.5.tgz#f5f498d5bf9538364792de22490a12c0e6bc5eb4" dependencies: @@ -118,15 +106,10 @@ version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" -"@types/mustache@0.8.31": - version "0.8.31" - resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.31.tgz#7c86cbf74f7733f9e3bdc28817623927eb386616" - -"@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/mustache@0.8.32": + version "0.8.32" + resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.32.tgz#7db3b81f2bf450bd38805f596d20eca97c4ed595" + integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA== "@types/node@*": version "9.6.6" @@ -139,14 +122,7 @@ "@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" - dependencies: - "@types/gulp" "*" - "@types/node" "*" - -"@types/through2@*", "@types/through2@2.0.33": +"@types/through2@*": version "2.0.33" resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.33.tgz#1ff2e88a100dfb5b140e7bb98791f1194400d131" dependencies: @@ -177,14 +153,6 @@ dependencies: "@types/node" "*" -"@types/yamljs@0.2.30": - version "0.2.30" - resolved "https://registry.yarnpkg.com/@types/yamljs/-/yamljs-0.2.30.tgz#d034e1d329e46e8d0f737c9a8db97f68f81b5382" - -"@types/yargs@11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.0.0.tgz#124b9ed9c65b7091cc36da59ae12cbd47d8745ea" - JSONStream@^1.0.3: version "1.3.3" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" @@ -199,10 +167,6 @@ JSONStream@^1.0.4: jsonparse "^1.2.0" through ">=2.2.7 <3" -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - acorn-dynamic-import@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" @@ -304,28 +268,10 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - archy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -445,10 +391,6 @@ assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - async@^1.4.0: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -683,7 +625,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: +babel-plugin-transform-es2015-block-scoping@^6.23.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" dependencies: @@ -693,7 +635,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es20 babel-types "^6.26.0" lodash "^4.17.4" -babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1: +babel-plugin-transform-es2015-classes@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" dependencies: @@ -707,33 +649,33 @@ babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-cla babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1: +babel-plugin-transform-es2015-computed-properties@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" dependencies: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0: +babel-plugin-transform-es2015-destructuring@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1: +babel-plugin-transform-es2015-duplicate-keys@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" dependencies: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.23.0: +babel-plugin-transform-es2015-for-of@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1: +babel-plugin-transform-es2015-function-name@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" dependencies: @@ -773,7 +715,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.24.1: babel-template "^6.26.0" babel-types "^6.26.0" -babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1: +babel-plugin-transform-es2015-modules-systemjs@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" dependencies: @@ -781,7 +723,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-e babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015-modules-umd@^6.24.1: +babel-plugin-transform-es2015-modules-umd@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" dependencies: @@ -789,14 +731,14 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015 babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1: +babel-plugin-transform-es2015-object-super@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" dependencies: babel-helper-replace-supers "^6.24.1" babel-runtime "^6.22.0" -babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1: +babel-plugin-transform-es2015-parameters@^6.23.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" dependencies: @@ -807,7 +749,7 @@ babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015- babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1: +babel-plugin-transform-es2015-shorthand-properties@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" dependencies: @@ -820,7 +762,7 @@ babel-plugin-transform-es2015-spread@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1: +babel-plugin-transform-es2015-sticky-regex@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" dependencies: @@ -834,13 +776,13 @@ babel-plugin-transform-es2015-template-literals@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.23.0: +babel-plugin-transform-es2015-typeof-symbol@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1: +babel-plugin-transform-es2015-unicode-regex@^6.22.0: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" dependencies: @@ -856,7 +798,7 @@ babel-plugin-transform-exponentiation-operator@^6.22.0: babel-plugin-syntax-exponentiation-operator "^6.8.0" babel-runtime "^6.22.0" -babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1: +babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" dependencies: @@ -912,35 +854,6 @@ babel-preset-env@1.7.0: invariant "^2.2.2" semver "^5.3.0" -babel-preset-es2015@6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.24.1" - babel-plugin-transform-es2015-classes "^6.24.1" - babel-plugin-transform-es2015-computed-properties "^6.24.1" - babel-plugin-transform-es2015-destructuring "^6.22.0" - babel-plugin-transform-es2015-duplicate-keys "^6.24.1" - babel-plugin-transform-es2015-for-of "^6.22.0" - babel-plugin-transform-es2015-function-name "^6.24.1" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-plugin-transform-es2015-modules-systemjs "^6.24.1" - babel-plugin-transform-es2015-modules-umd "^6.24.1" - babel-plugin-transform-es2015-object-super "^6.24.1" - babel-plugin-transform-es2015-parameters "^6.24.1" - babel-plugin-transform-es2015-shorthand-properties "^6.24.1" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.24.1" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.22.0" - babel-plugin-transform-es2015-unicode-regex "^6.24.1" - babel-plugin-transform-regenerator "^6.24.1" - babel-register@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" @@ -953,13 +866,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-root-import@4.1.8: - version "4.1.8" - resolved "https://registry.yarnpkg.com/babel-root-import/-/babel-root-import-4.1.8.tgz#135bb83986d57d6f75ba9b7772b31633e22fbdac" - dependencies: - slash "^1.0.0" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -1033,10 +940,6 @@ beeper@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -1047,10 +950,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - boom@4.x.x: version "4.3.1" resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" @@ -1328,14 +1227,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@*, chalk@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1356,6 +1247,14 @@ chalk@^0.5.1: strip-ansi "^0.3.0" supports-color "^0.2.0" +chalk@^2.2.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" @@ -1368,25 +1267,6 @@ chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" -chokidar@^1.6.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -1465,12 +1345,6 @@ co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" -coa@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af" - dependencies: - q "^1.1.2" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -1496,10 +1370,6 @@ color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - combine-source-map@^0.8.0, combine-source-map@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" @@ -1553,10 +1423,6 @@ console-browserify@^1.1.0: dependencies: date-now "^0.1.4" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -1709,22 +1575,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -cpx@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f" - dependencies: - babel-runtime "^6.9.2" - chokidar "^1.6.0" - duplexer "^0.1.1" - glob "^7.0.5" - glob2base "^0.0.12" - minimatch "^3.0.2" - mkdirp "^0.5.1" - resolve "^1.1.7" - safe-buffer "^5.0.1" - shell-quote "^1.6.1" - subarg "^1.0.0" - create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -1767,16 +1617,6 @@ 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@3.x.x: version "3.1.2" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" @@ -1799,47 +1639,6 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" -css-select-base-adapter@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz#0102b3d14630df86c3eb9fa9f5456270106cf990" - -css-select@~1.3.0-rc0: - version "1.3.0-rc0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.3.0-rc0.tgz#6f93196aaae737666ea1036a8cb14a8fcb7a9231" - dependencies: - boolbase "^1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "^1.0.1" - -css-tree@1.0.0-alpha.27: - version "1.0.0-alpha.27" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.27.tgz#f211526909c7dc940843d83b9376ed98ddb8de47" - dependencies: - mdn-data "^1.0.0" - source-map "^0.5.3" - -css-tree@1.0.0-alpha25: - version "1.0.0-alpha25" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha25.tgz#1bbfabfbf6eeef4f01d9108ff2edd0be2fe35597" - dependencies: - mdn-data "^1.0.0" - source-map "^0.5.3" - -css-url-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec" - -css-what@2.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" - -csso@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.0.tgz#acdbba5719e2c87bc801eadc032764b2e4b9d4e7" - dependencies: - css-tree "1.0.0-alpha.27" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -1883,7 +1682,7 @@ debug@3.1.0, debug@=3.1.0: dependencies: ms "2.0.0" -debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1922,23 +1721,12 @@ deep-assign@^2.0.0: dependencies: is-obj "^1.0.0" -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - defaults@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" dependencies: clone "^1.0.2" -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" - dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -1966,10 +1754,6 @@ delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - deprecated@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" @@ -2000,10 +1784,6 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - detective@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb" @@ -2035,32 +1815,10 @@ doctrine@0.7.2: esutils "^1.1.6" isarray "0.0.1" -dom-serializer@0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" - dependencies: - domelementtype "~1.1.1" - entities "~1.1.1" - domain-browser@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" -domelementtype@1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" - -domelementtype@~1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" - -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - dependencies: - dom-serializer "0" - domelementtype "1" - dot-prop@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" @@ -2079,7 +1837,7 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: dependencies: readable-stream "^2.0.2" -duplexer@^0.1.1, duplexer@~0.1.1: +duplexer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -2132,34 +1890,12 @@ end-of-stream@~0.1.5: dependencies: once "~1.3.0" -entities@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" - error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" -es-abstract@^1.5.1, es-abstract@^1.6.1: - version "1.11.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" - dependencies: - is-callable "^1.1.1" - is-date-object "^1.0.1" - is-symbol "^1.0.1" - escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -2209,18 +1945,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.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" @@ -2444,10 +2168,6 @@ for-own@^1.0.0: dependencies: for-in "^1.0.1" -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -2485,23 +2205,10 @@ from@~0: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - dependencies: - minipass "^2.2.1" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.0.tgz#e11a5ff285471e4cc43ab9cd09bb7986c565dcdc" - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.9.0" - fstream@^1.0.2: version "1.0.11" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" @@ -2511,23 +2218,10 @@ fstream@^1.0.2: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - gaze@^0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" @@ -2983,10 +2677,6 @@ has-gulplog@^0.1.0: dependencies: sparkles "^1.0.0" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -3020,12 +2710,6 @@ has@^1.0.0: dependencies: function-bind "^1.1.1" -has@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - dependencies: - function-bind "^1.0.2" - hash-base@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" @@ -3065,10 +2749,6 @@ hoek@4.x.x: version "4.2.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" -hoek@5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.3.tgz#b71d40d943d0a95da01956b547f83c4a5b4a34ac" - home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -3102,7 +2782,7 @@ https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" -iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@^0.4.17, iconv-lite@~0.4.13: version "0.4.21" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798" dependencies: @@ -3112,12 +2792,6 @@ ieee754@^1.1.4: version "1.1.12" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" -ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - dependencies: - minimatch "^3.0.4" - in-publish@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" @@ -3151,7 +2825,7 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -3242,12 +2916,6 @@ is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - is-buffer@^1.1.0, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3258,7 +2926,7 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-callable@^1.1.1, is-callable@^1.1.3: +is-callable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" @@ -3274,10 +2942,6 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -3398,12 +3062,6 @@ is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - dependencies: - has "^1.0.1" - is-relative@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" @@ -3422,10 +3080,6 @@ is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" - is-text-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" @@ -3499,13 +3153,6 @@ js-yaml@^3.7.0: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc" - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -3518,10 +3165,6 @@ jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -json-minify@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-minify/-/json-minify-1.0.0.tgz#4397e76f19688983352fcfbd5e2e5243fc0a07c8" - json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -3837,10 +3480,6 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -mdn-data@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.1.tgz#79586c90321787e5a2e51eb6823bb448949bc1ab" - mem@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" @@ -3882,7 +3521,7 @@ merge-stream@^1.0.0: dependencies: readable-stream "^2.0.1" -micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@^2.3.7: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" dependencies: @@ -3951,7 +3590,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -3981,7 +3620,7 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -3989,19 +3628,6 @@ minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" -minipass@^2.2.1, minipass@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40" - dependencies: - safe-buffer "^5.1.1" - yallist "^3.0.0" - -minizlib@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" - dependencies: - minipass "^2.2.1" - mixin-deep@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" @@ -4009,7 +3635,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -4073,18 +3699,15 @@ multipipe@^0.1.2: dependencies: duplexer2 "0.0.2" -mustache@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0" +mustache@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a" + integrity sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA== mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - nano-pubsub@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nano-pubsub/-/nano-pubsub-1.0.2.tgz#34ce776f7af959915b8f7acfe8dd6b9c66f3bde9" @@ -4110,22 +3733,6 @@ 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" - dependencies: - debug "^2.1.2" - 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" @@ -4133,34 +3740,12 @@ node-fetch@1.6.3: encoding "^0.1.11" is-stream "^1.0.1" -node-pre-gyp@^0.9.0: - version "0.9.1" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0" - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.0" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.1.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - node.extend@^1.1.2: version "1.1.6" resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96" dependencies: is "^3.1.0" -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" @@ -4170,44 +3755,18 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: +normalize-path@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" dependencies: remove-trailing-separator "^1.0.1" -npm-bundled@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" - -npm-packlist@^1.1.6: - version "1.1.10" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" dependencies: path-key "^2.0.0" -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -nth-check@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4" - dependencies: - boolbase "~1.0.0" - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -4220,7 +3779,7 @@ object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -4232,10 +3791,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -4251,13 +3806,6 @@ object.defaults@^1.1.0: for-own "^1.0.0" isobject "^3.0.0" -object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" - object.map@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" @@ -4278,15 +3826,6 @@ object.pick@^1.2.0, object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.6.1" - function-bind "^1.1.0" - has "^1.0.1" - once@^1.3.0, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -4371,17 +3910,10 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -4497,7 +4029,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.1: +path-key@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -4654,7 +4186,7 @@ punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -q@^1.1.2, q@^1.4.1, q@^1.5.1: +q@^1.4.1, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -4710,15 +4242,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -rc@^1.1.7: - version "1.2.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" @@ -4764,7 +4287,7 @@ read-pkg@^3.0.0: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: @@ -4785,15 +4308,6 @@ readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -5003,7 +4517,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.6.1: +rimraf@2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -5022,14 +4536,6 @@ run-async@^2.2.0: dependencies: is-promise "^2.1.0" -run-sequence@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.2.1.tgz#1ce643da36fd8c7ea7e1a9329da33fc2b8898495" - dependencies: - chalk "^1.1.3" - fancy-log "^1.3.2" - plugin-error "^0.1.2" - rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" @@ -5062,10 +4568,6 @@ same-origin@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/same-origin/-/same-origin-0.1.1.tgz#c2287d3192577df517acbbd6d1451a9c3c3914f5" -sax@^1.2.4, sax@~1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - "semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" @@ -5078,14 +4580,10 @@ sequencify@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - set-value@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" @@ -5218,7 +4716,7 @@ source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -5298,10 +4796,6 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -stable@~0.1.6: - version "0.1.7" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.7.tgz#06e1e4213460252e4f20da89a32cb4a0dbe5f2b2" - stat-mode@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" @@ -5368,7 +4862,7 @@ streamifier@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f" -string-width@^1.0.1, string-width@^1.0.2: +string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" dependencies: @@ -5453,10 +4947,6 @@ strip-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" @@ -5483,25 +4973,6 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -svgo@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.0.5.tgz#7040364c062a0538abacff4401cea6a26a7a389a" - dependencies: - coa "~2.0.1" - colors "~1.1.2" - css-select "~1.3.0-rc0" - css-select-base-adapter "~0.1.0" - css-tree "1.0.0-alpha25" - css-url-regex "^1.1.0" - csso "^3.5.0" - js-yaml "~3.10.0" - mkdirp "~0.5.1" - object.values "^1.0.4" - sax "~1.2.4" - stable "~0.1.6" - unquote "~1.1.1" - util.promisify "~1.0.0" - syntax-error@^1.1.1: version "1.4.0" resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c" @@ -5516,18 +4987,6 @@ tar@^2.2.1: fstream "^1.0.2" inherits "2" -tar@^4: - version "4.4.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749" - dependencies: - chownr "^1.0.1" - fs-minipass "^1.2.5" - minipass "^2.2.4" - minizlib "^1.1.0" - mkdirp "^0.5.0" - safe-buffer "^5.1.1" - yallist "^3.0.2" - ternary-stream@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ternary-stream/-/ternary-stream-2.0.1.tgz#064e489b4b5bf60ba6a6b7bc7f2f5c274ecf8269" @@ -5797,10 +5256,6 @@ unique-stream@^2.0.2: json-stable-stringify "^1.0.0" through2-filter "^2.0.0" -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -5847,13 +5302,6 @@ util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util.promisify@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -6015,12 +5463,6 @@ which@^1.2.14, which@^1.2.9: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" @@ -6056,17 +5498,6 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" - -yamljs@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b" - dependencies: - argparse "^1.0.7" - glob "^7.0.5" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"