diff --git a/.vscodeignore b/.vscodeignore
index 517639f897..97d46a041b 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -14,6 +14,7 @@ out/src/example/**
*.lcov
images/screenshot.gif
Dockerfile
+.appveyor.yml
.bithoundrc
.editorconfig
.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f70050db..c26f1d4a00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,34 @@
# Change Log
+## 7.6.0 (April 24, 2017)
+- Enhancement: @types/sinon updated. ([@JimiC](https://github.com/JimiC) in [#893](https://github.com/vscode-icons/vscode-icons/pull/893))
+- Enhancement: Badges arranged by category. ([@JimiC](https://github.com/JimiC) in [#891](https://github.com/vscode-icons/vscode-icons/pull/891))
+- Enhancement: Objective-cpp language id support. ([@JimiC](https://github.com/JimiC) in [#888](https://github.com/vscode-icons/vscode-icons/pull/888))
+- Enhancement: HLSL and GLSL support. ([@JimiC](https://github.com/JimiC) in [#886](https://github.com/vscode-icons/vscode-icons/pull/886))
+- Enhancement: Laravel-blade support. ([@JimiC](https://github.com/JimiC) in [#885](https://github.com/vscode-icons/vscode-icons/pull/885))
+- Feature: Harbour support. ([@JimiC](https://github.com/JimiC) in [#884](https://github.com/vscode-icons/vscode-icons/pull/884))
+- Feature: Shopify liquid support. ([@JimiC](https://github.com/JimiC) in [#883](https://github.com/vscode-icons/vscode-icons/pull/883))
+- Feature: Wercker support. ([@JimiC](https://github.com/JimiC) in [#882](https://github.com/vscode-icons/vscode-icons/pull/882))
+- Enhancement: New TSLint rules applied. ([@JimiC](https://github.com/JimiC) in [#881](https://github.com/vscode-icons/vscode-icons/pull/881))
+- Feature: `.watchmanconfig` support. ([@AndrewShapel](https://github.com/AndrewShapel) in [#875](https://github.com/vscode-icons/vscode-icons/pull/875))
+- Feature: AnyScript support. ([@melund](https://github.com/melund) in [#874](https://github.com/vscode-icons/vscode-icons/pull/874))
+- Feature: Simplified Chinese support. ([@iFun](https://github.com/iFun) in [#871](https://github.com/vscode-icons/vscode-icons/pull/871))
+- Enhancement: More Grunt & Gulp support. ([@JimiC](https://github.com/JimiC) in [#869](https://github.com/vscode-icons/vscode-icons/pull/869))
+- Fix: Proper support for API Blueprint and MSON. ([@JimiC](https://github.com/JimiC) in [#868](https://github.com/vscode-icons/vscode-icons/pull/868))
+- Enhancement: Support Gulp with Babel. ([@mamadoo](https://github.com/mamadoo) in [#866](https://github.com/vscode-icons/vscode-icons/pull/866))
+- Feature: JsonLD support. ([@robertohuertasm](https://github.com/robertohuertasm) in [#862](https://github.com/vscode-icons/vscode-icons/pull/862))
+- Feature: Submodules associated with git folder icon. ([@JimiC](https://github.com/JimiC) in [#858](https://github.com/vscode-icons/vscode-icons/pull/858))
+
+## 7.5.1 (April 04, 2017)
+- Fix: Default folder not showing in light theme after applying customization. ([@JimiC](https://github.com/JimiC) in [#854](https://github.com/vscode-icons/vscode-icons/pull/854))
+- Fix: Appveyor config file excluded from distribution. ([@JimiC](https://github.com/JimiC) in [#851](https://github.com/vscode-icons/vscode-icons/pull/851))
+- Fix: Changelog fixed. ([@jens1o](https://github.com/jens1o) in [#847](https://github.com/vscode-icons/vscode-icons/pull/847))
+- Enhancement: Dependencies updated. ([@JimiC](https://github.com/JimiC) in [#844](https://github.com/vscode-icons/vscode-icons/pull/844))
+
## 7.5.0 (April 03, 2017)
- Feature: `Fusebox`, `CircleCi`, `Codecov`, `Firebase`, `.yarnignore` and more `webpack` support. ([@JimiC](https://github.com/JimiC) in [#842](https://github.com/vscode-icons/vscode-icons/pull/842))
- Enhancement: Support for `.scssm`. ([@robertohuertasm](https://github.com/robertohuertasm) in [#841](https://github.com/vscode-icons/vscode-icons/pull/841))
-- Enhancement: Appveyor CI. ([@JimiC](https://github.com/JimiC) in [#839](https://github.com/vscode-icons/vscode-icons/pull/839) && [#840](https://github.com/vscode-icons/vscode-icons/pull/840))
+- Enhancement: Appveyor CI. ([@JimiC](https://github.com/JimiC) in [#839](https://github.com/vscode-icons/vscode-icons/pull/839) & [#840](https://github.com/vscode-icons/vscode-icons/pull/840))
- Enhancement: More default `Webpack` extensions supported. ([@AntonYaskevich](https://github.com/AntonYaskevich) in [#836](https://github.com/vscode-icons/vscode-icons/pull/836))
- Feature: `Reason` support. ([@wyze](https://github.com/wyze) in [#832](https://github.com/vscode-icons/vscode-icons/pull/832))
- Enhancement: New `Idris` icons. ([@zjhmale](https://github.com/zjhmale) in [#830](https://github.com/vscode-icons/vscode-icons/pull/830))
@@ -457,11 +482,11 @@
- Patch: no extVersion updated so no autoupdate available.
## 1.7.0 (August 22, 2016)
- - Icons available in 'Open Editors' section. [#174] (https://github.com/vscode-icons/vscode-icons/issues/89)
- - Enhancement: sql icon change to a more standard one. [#89] (https://github.com/vscode-icons/vscode-icons/issues/89)
- - Assembly support. [#172] (https://github.com/vscode-icons/vscode-icons/issues/172)
- - Excel and similar formats support. [#158] (https://github.com/vscode-icons/vscode-icons/issues/158)
- - Enhancement: resolved .m files conflict. Matlab users can use file associations to get matlab icon back. [#128](https://github.com/vscode-icons/vscode-icons/issues/128)
+ - Icons available in 'Open Editors' section. [#174](https://github.com/vscode-icons/vscode-icons/issues/89)
+ - Enhancement: sql icon change to a more standard one. [#89](https://github.com/vscode-icons/vscode-icons/issues/89)
+ - Assembly support. [#172](https://github.com/vscode-icons/vscode-icons/issues/172)
+ - Excel and similar formats support. [#158](https://github.com/vscode-icons/vscode-icons/issues/158)
+ - Enhancement: resolved .m files conflict. Matlab users can use file associations to get matlab icon back. [#128(https://github.com/vscode-icons/vscode-icons/issues/128)
- Apib support. [#167](https://github.com/vscode-icons/vscode-icons/issues/167)
- React templates support. [#127](https://github.com/vscode-icons/vscode-icons/issues/127)
- Groovy support.[#113](https://github.com/vscode-icons/vscode-icons/issues/113)
diff --git a/README.md b/README.md
index 57e085af11..6676ee6dcf 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
# vscode-icons
+
[](https://marketplace.visualstudio.com/items?itemName=robertohuertasm.vscode-icons)
[](https://marketplace.visualstudio.com/items?itemName=robertohuertasm.vscode-icons)
[](https://marketplace.visualstudio.com/items?itemName=robertohuertasm.vscode-icons)
[](https://travis-ci.org/vscode-icons/vscode-icons)
[](https://ci.appveyor.com/project/robertohuertasm/vscode-icons)
+
[](https://david-dm.org/vscode-icons/vscode-icons)
[](https://david-dm.org/vscode-icons/vscode-icons?type=dev)
+[](https://greenkeeper.io/)
+
[](https://codecov.io/gh/vscode-icons/vscode-icons)
[](https://snyk.io/test/github/vscode-icons/vscode-icons)
@@ -285,7 +289,7 @@ The above syntax will create examples for all supported files and folders.
## Contributing with translations
We're looking for people willing to help us translate the extension's messages into [all the languages that `vscode` supports](https://code.visualstudio.com/docs/customization/locales).
-We're currently supporting English, German and Spanish. If you're willing to help with the translations of the missing languages take a look at [#526](https://github.com/vscode-icons/vscode-icons/issues/526) and get your hands dirty. We'll really appreciate it! ;P
+We're currently supporting `English`, `German`, `Simplified Chinese` and `Spanish`. If you're willing to help with the translations of the missing languages take a look at [#526](https://github.com/vscode-icons/vscode-icons/issues/526) and get your hands dirty. We'll really appreciate it! ;P
## Building the extension's source code
If you're willing to explore the extension source code and want to make it work you should run this:
diff --git a/icons/file_type_anyscript.svg b/icons/file_type_anyscript.svg
new file mode 100644
index 0000000000..e666193b2e
--- /dev/null
+++ b/icons/file_type_anyscript.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_glsl.svg b/icons/file_type_glsl.svg
new file mode 100644
index 0000000000..ec637ce8c3
--- /dev/null
+++ b/icons/file_type_glsl.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_harbour.svg b/icons/file_type_harbour.svg
new file mode 100644
index 0000000000..624ffaac6e
--- /dev/null
+++ b/icons/file_type_harbour.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_hlsl.svg b/icons/file_type_hlsl.svg
new file mode 100644
index 0000000000..048966ca44
--- /dev/null
+++ b/icons/file_type_hlsl.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_jsonld.svg b/icons/file_type_jsonld.svg
new file mode 100644
index 0000000000..49afdf452a
--- /dev/null
+++ b/icons/file_type_jsonld.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_light_jsonld.svg b/icons/file_type_light_jsonld.svg
new file mode 100644
index 0000000000..55979653b3
--- /dev/null
+++ b/icons/file_type_light_jsonld.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_liquid.svg b/icons/file_type_liquid.svg
new file mode 100644
index 0000000000..f1a2a82eb2
--- /dev/null
+++ b/icons/file_type_liquid.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_ng_guard_js.svg b/icons/file_type_ng_guard_js.svg
new file mode 100644
index 0000000000..2b989c9b65
--- /dev/null
+++ b/icons/file_type_ng_guard_js.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_ng_guard_ts.svg b/icons/file_type_ng_guard_ts.svg
new file mode 100644
index 0000000000..8261e42308
--- /dev/null
+++ b/icons/file_type_ng_guard_ts.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_ng_routing_js.svg b/icons/file_type_ng_routing_js.svg
index 2b989c9b65..708c8d6c00 100644
--- a/icons/file_type_ng_routing_js.svg
+++ b/icons/file_type_ng_routing_js.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/icons/file_type_ng_routing_ts.svg b/icons/file_type_ng_routing_ts.svg
index 8261e42308..280ee3a4c8 100644
--- a/icons/file_type_ng_routing_ts.svg
+++ b/icons/file_type_ng_routing_ts.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/icons/file_type_objectivecpp.svg b/icons/file_type_objectivecpp.svg
new file mode 100644
index 0000000000..cdf5be0a6b
--- /dev/null
+++ b/icons/file_type_objectivecpp.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_watchmanconfig.svg b/icons/file_type_watchmanconfig.svg
new file mode 100644
index 0000000000..58fdb57d54
--- /dev/null
+++ b/icons/file_type_watchmanconfig.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/file_type_wercker.svg b/icons/file_type_wercker.svg
new file mode 100644
index 0000000000..cd2651b98d
--- /dev/null
+++ b/icons/file_type_wercker.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/package.json b/package.json
index ff35aef80c..77d607fca5 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "vscode-icons",
"displayName": "vscode-icons",
"description": "Icons for Visual Studio Code",
- "version": "7.5.0",
+ "version": "7.6.0",
"publisher": "robertohuertasm",
"license": "MIT",
"author": {
@@ -206,22 +206,22 @@
"analysis": "bithound check git@github.com:vscode-icons/vscode-icons.git"
},
"devDependencies": {
- "@types/chai": "^3.4.35",
+ "@types/chai": "^3.5.2",
"@types/chai-as-promised": "^0.0.30",
- "@types/lodash": "^4.14.61",
- "@types/mocha": "^2.2.40",
- "@types/node": "^7.0.12",
- "@types/sinon": "^2.1.1",
+ "@types/lodash": "^4.14.63",
+ "@types/mocha": "^2.2.41",
+ "@types/node": "^7.0.13",
+ "@types/sinon": "^2.1.3",
"bithound": "^1.7.0",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"codecov": "^2.1.0",
- "mocha": "^3.2.0",
- "nyc": "^10.2.0",
+ "mocha": "^3.3.0",
+ "nyc": "^10.3.0",
"rimraf": "^2.6.1",
"sinon": "^2.1.0",
- "tslint": "^4.5.1",
- "typescript": "^2.2.2",
+ "tslint": "^5.1.0",
+ "typescript": "^2.3.2",
"vscode": "^1.1.0"
},
"dependencies": {
@@ -229,4 +229,4 @@
"open": "0.0.5",
"semver": "^5.3.0"
}
-}
+}
\ No newline at end of file
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
new file mode 100644
index 0000000000..0f04ce783a
--- /dev/null
+++ b/package.nls.zh-cn.json
@@ -0,0 +1,27 @@
+{
+ "command.regenerateIcons.title": "开始使用自定义图标",
+ "command.ngPreset.title": "切换成Angular模式(工作级别)",
+ "command.jsPreset.title": "切换成官方JS模式(用户级别)",
+ "command.tsPreset.title": "切换成官方TS模式(用户级别)",
+ "command.jsonPreset.title": "切换成官方JSON模式(用户级别)",
+ "command.hideFoldersPreset.title": "切换成显示文件夹图标(用户级别)",
+ "command.foldersAllDefaultIconPreset.title": "切换成显示特定文件夹图标(用户级别)",
+ "command.restoreIcons.title": "恢复成默认图标模式",
+ "command.resetProjectDetectionDefaults.title": "重置工程文件侦测模式到默认设置",
+ "configuration.title": "vscode-图标设置",
+ "configuration.dontShowNewVersionMessage.description": "如果设置成true,关于新的版本消息将不再显示",
+ "configuration.projectDetection.autoReload.description": "如果设置成true,安装完更新后插件会自动重启",
+ "configuration.projectDetection.disableDetect.description": "如果设置成true,插件不再自动检测工程文件",
+ "configuration.presets.angular.description": "如果设置成true,插件会自动匹配Angular模式",
+ "configuration.presets.jsOfficial.description": "如果设置成true,插件会自动使用官方JS图标",
+ "configuration.presets.tsOfficial.description": "如果设置成true,插件会自动使用官方TS图标",
+ "configuration.presets.jsonOfficial.description": "如果设置成true,插件会自动使用官方JSON图标",
+ "configuration.presets.hideFolders.description": "如果设置成true,所有文件夹会隐藏",
+ "configuration.presets.foldersAllDefaultIcon.description": "如果设置成true,所有文件夹会恢复成默认图标",
+ "configuration.associations.files.description": "这些自定义的设置会覆盖掉系统默认文件的设置",
+ "configuration.associations.folders.description": "这些自定义的设置会覆盖掉系统默认文件夹的设置",
+ "configuration.associations.fileDefault.file.description": "这个设置会改变默认深色文件图标",
+ "configuration.associations.fileDefault.file_light.description": "这个设置会改变默认浅色文件图标",
+ "configuration.associations.folderDefault.folder.description": "这个设置会改变默认深色文件夹图标",
+ "configuration.associations.folderDefault.folder_light.description": "这个设置会改变默认浅色文件夹图标"
+}
diff --git a/src/commands/index.ts b/src/commands/index.ts
index fcf641cdb5..cfebb215ee 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -147,7 +147,7 @@ export function showCustomizationMessage(
if (callback) { callback(); }
reload();
- }, (reason) => {
+ }, reason => {
// tslint:disable-next-line:no-console
console.info('Rejected because: ', reason);
return;
@@ -188,7 +188,6 @@ export function applyCustomization(): void {
function generateManifest(
customFiles: IFileCollection,
customFolders: IFolderCollection): void {
-
const iconGenerator = new iconManifest.IconGenerator(vscode, iconManifest.schema);
const presets = getConfig().vsicons.presets;
let workingCustomFiles = customFiles;
@@ -205,7 +204,7 @@ function generateManifest(
}
if (customFolders) {
workingCustomFolders = iconManifest.toggleFoldersAllDefaultIconPreset(
- presets.foldersAllDefaultIcon, workingCustomFolders);
+ presets.foldersAllDefaultIcon, customFolders);
workingCustomFolders = iconManifest.toggleHideFoldersPreset(presets.hideFolders, workingCustomFolders);
}
// presets affecting default icons
diff --git a/src/constants/index.ts b/src/constants/index.ts
new file mode 100644
index 0000000000..502f9a6f71
--- /dev/null
+++ b/src/constants/index.ts
@@ -0,0 +1,5 @@
+export const constants = {
+ urlReleaseNote: 'https://github.com/vscode-icons/vscode-icons/blob/master/CHANGELOG.md',
+ urlReadme: 'https://github.com/vscode-icons/vscode-icons/blob/master/README.md',
+ urlOfficialApi: 'http://code.visualstudio.com/docs/customization/themes#_select-an-icon-theme',
+};
diff --git a/src/example/exampleGenerator.ts b/src/example/exampleGenerator.ts
index 56df60212c..905b3b938d 100644
--- a/src/example/exampleGenerator.ts
+++ b/src/example/exampleGenerator.ts
@@ -6,7 +6,7 @@ import { deleteDirectoryRecursively } from '../utils';
const supportedFlags = ['--all', '--folders', '--files'];
const folderNames = folders.supported
- .filter((folder) => !folder.disabled)
+ .filter(folder => !folder.disabled)
.reduce((init, current) => {
const obj = init;
if (current.extensions.length) {
@@ -16,7 +16,7 @@ const folderNames = folders.supported
}, {});
const fileNames = files.supported
- .filter((file) => !file.disabled)
+ .filter(file => !file.disabled)
.reduce((init, current) => {
const obj = init;
const extension = !current.filename && current.languages && current.languages.length
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index 240f4bbe12..eb11fedcb7 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -10,7 +10,8 @@ export class LanguageResourceManager {
private resourceCollection?: ILangResourceCollection |
{ [key: string]: { [key: string]: string | IOSSpecific; } }) {
this.resourceCollection = this.resourceCollection || langResourceCollection;
- this.messages = this.resourceCollection[this.language] || this.resourceCollection['en'];
+ this.messages = (this.language && this.resourceCollection[this.language.toLowerCase()]) ||
+ this.resourceCollection['en'];
}
public getMessage(...keys: Array): string {
@@ -19,7 +20,7 @@ export class LanguageResourceManager {
}
let msg = '';
- keys.forEach((key) => {
+ keys.forEach(key => {
// If key is of type 'number' it's a LangResourceKeys
const stringifiedKey = typeof key === "number" ? LangResourceKeys[key] : key;
@@ -43,7 +44,7 @@ export class LanguageResourceManager {
throw new Error(`${stringifiedKey} is not valid`);
}
- stringifiedKey.split('').forEach((char) => {
+ stringifiedKey.split('').forEach(char => {
if (char.match(/[#^*|\\/{}+=]/g)) {
throw new Error(`${char} is not valid`);
}
diff --git a/src/i18n/langResourceCollection.ts b/src/i18n/langResourceCollection.ts
index f0138b87cd..3541f096e6 100644
--- a/src/i18n/langResourceCollection.ts
+++ b/src/i18n/langResourceCollection.ts
@@ -1,3 +1,4 @@
+// tslint:disable object-literal-key-quotes
import { ILangResourceCollection } from '../models/i18n';
import * as resources from './langResources';
@@ -5,4 +6,5 @@ export const langResourceCollection: ILangResourceCollection = {
de: resources.langDe,
en: resources.langEn,
es: resources.langEs,
+ "zh-cn": resources.langZhCn,
};
diff --git a/src/i18n/langResources/index.ts b/src/i18n/langResources/index.ts
index fc81432519..11f845da9b 100644
--- a/src/i18n/langResources/index.ts
+++ b/src/i18n/langResources/index.ts
@@ -1,3 +1,4 @@
export * from './lang.de';
export * from './lang.en';
export * from './lang.es';
+export * from './lang.zh-cn';
diff --git a/src/i18n/langResources/lang.de.ts b/src/i18n/langResources/lang.de.ts
index cfe33753eb..020e51e97c 100644
--- a/src/i18n/langResources/lang.de.ts
+++ b/src/i18n/langResources/lang.de.ts
@@ -14,9 +14,6 @@ export const langDe: ILangResource = {
},
aboutOfficialApi: 'Erfahren Sie mehr über Datei und Ordner Icons (Englisch)',
learnMore: 'Wollen Sie mehr erfahren?',
- urlReleaseNote: 'https://github.com/robertohuertasm/vscode-icons/blob/master/CHANGELOG.md',
- urlReadme: 'https://github.com/robertohuertasm/vscode-icons/blob/master/README.md',
- urlOfficialApi: 'http://code.visualstudio.com/docs/customization/themes#_select-an-icon-theme',
reload: 'Neu starten',
autoReload: 'Automatisch neu starten',
disableDetect: 'Projekterkennung deaktivieren',
diff --git a/src/i18n/langResources/lang.en.ts b/src/i18n/langResources/lang.en.ts
index 395bdbb226..ff577cddc5 100644
--- a/src/i18n/langResources/lang.en.ts
+++ b/src/i18n/langResources/lang.en.ts
@@ -14,9 +14,6 @@ export const langEn: ILangResource = {
},
aboutOfficialApi: 'Learn more about File & Folder icons',
learnMore: 'Want to learn more?',
- urlReleaseNote: 'https://github.com/robertohuertasm/vscode-icons/blob/master/CHANGELOG.md',
- urlReadme: 'https://github.com/robertohuertasm/vscode-icons/blob/master/README.md',
- urlOfficialApi: 'http://code.visualstudio.com/docs/customization/themes#_select-an-icon-theme',
reload: 'Restart',
autoReload: 'Auto-Restart',
disableDetect: 'Disable Detection',
diff --git a/src/i18n/langResources/lang.es.ts b/src/i18n/langResources/lang.es.ts
index 41cb08ca07..d01db692ee 100644
--- a/src/i18n/langResources/lang.es.ts
+++ b/src/i18n/langResources/lang.es.ts
@@ -14,9 +14,6 @@ export const langEs: ILangResource = {
},
aboutOfficialApi: 'Aprenda más sobre los iconos de archivos y carpetas (en inglés)',
learnMore: '¿Quiere saber más?',
- urlReleaseNote: 'https://github.com/robertohuertasm/vscode-icons/blob/master/CHANGELOG.md',
- urlReadme: 'https://github.com/robertohuertasm/vscode-icons/blob/master/README.md',
- urlOfficialApi: 'http://code.visualstudio.com/docs/customization/themes#_select-an-icon-theme',
reload: 'Reiniciar',
autoReload: 'Auto Reiniciar',
disableDetect: 'Deshabilitar Detección',
diff --git a/src/i18n/langResources/lang.zh-cn.ts b/src/i18n/langResources/lang.zh-cn.ts
new file mode 100644
index 0000000000..5455b9d5fb
--- /dev/null
+++ b/src/i18n/langResources/lang.zh-cn.ts
@@ -0,0 +1,38 @@
+import { ILangResource } from '../../models/i18n';
+
+export const langZhCn: ILangResource = {
+ newVersion: '欢迎使用最新版本的 vscode-icons.',
+ seeReleaseNotes: '关于最新版本的改动',
+ dontShowThis: '下次不再显示这条消息',
+ seeReadme: '查看插件的文档',
+ welcomeBegin: 'vscode-icons 现在支持官方API,去',
+ welcomeEnd: 'VSCode图标里面点击使用',
+ activationPath: {
+ darwin: '代码 > 首选项 > 文件图标主题',
+ linux: '文件 > 首选项 > 文件图标主题',
+ win32: '文件 > 首选项 > 文件图标主题',
+ },
+ aboutOfficialApi: '查看更多关于文件和文件夹的图标',
+ learnMore: '想要了解更多消息?',
+ reload: '重启',
+ autoReload: '自动重启',
+ disableDetect: '取消自动检测',
+ iconCustomization: '重新生成图标',
+ iconRestore: '图标正在被复原',
+ ngPresetEnabled: '使用Angular的图标',
+ ngPresetDisabled: '取消使用Angular的图标',
+ jsOfficialPresetEnabled: '使用官方JS图标',
+ jsOfficialPresetDisabled: '取消使用官方JS图标',
+ tsOfficialPresetEnabled: '使用官方TS图标',
+ tsOfficialPresetDisabled: '取消使用官方TS图标',
+ jsonOfficialPresetEnabled: '使用官方JSON图标',
+ jsonOfficialPresetDisabled: '取消使用官方JSON图标',
+ hideFoldersPresetEnabled: '现在使用文件夹图标',
+ hideFoldersPresetDisabled: '现在隐藏文件夹图标',
+ foldersAllDefaultIconPresetEnabled: '现在使用指定的文件夹图标',
+ foldersAllDefaultIconPresetDisabled: '现在取消使用指定的文件夹图标',
+ restart: '选择 \'重启\' 使改变生效',
+ ngDetected: 'vscode-icons 发现当前工程是Angular选择 \'重启\' 使用Angular的图标',
+ nonNgDetected: 'vscode-icons 发现当前工程不是Angular选择 \'重启\' 取消使用Angular的图标',
+ projectDetecticonReset: '重设自动检测工程文件到默认设置',
+};
diff --git a/src/icon-manifest/languages.ts b/src/icon-manifest/languages.ts
index a2717d1e8e..ac96a2af17 100644
--- a/src/icon-manifest/languages.ts
+++ b/src/icon-manifest/languages.ts
@@ -3,15 +3,16 @@ import { ILanguageCollection } from '../models';
export const languages: ILanguageCollection = {
actionscript: { ids: ['nextgenas'], defaultExtension: 'as' },
ansible: { ids: ['ansible'], defaultExtension: 'ansible' },
+ anyscript: { ids: ['anyscript'], defaultExtension: 'any'},
apache: { ids: ['apacheconf'], defaultExtension: 'htaccess' },
- apib: { ids: ['API Blueprint'], defaultExtension: 'apib' },
+ apib: { ids: ['apiblueprint'], defaultExtension: 'apib' },
applescript: { ids: ['applescript'], defaultExtension: 'applescript' },
asp: { ids: ['asp', 'asp (html)'], defaultExtension: 'asp' },
assembly: { ids: ['arm'], defaultExtension: 'asm' },
autohotkey: { ids: ['ahk'], defaultExtension: 'ahk' },
autoit: { ids: ['autoit'], defaultExtension: 'au3' },
bat: { ids: 'bat', defaultExtension: 'bat' },
- blade: { ids: ['blade'], defaultExtension: 'blade.php' },
+ blade: { ids: ['blade', 'laravel-blade'], defaultExtension: 'blade.php' },
c: { ids: 'c', defaultExtension: 'c' },
cabal: { ids: ['cabal'], defaultExtension: 'cabal' },
cake: { ids: ['cake'], defaultExtension: 'cake' },
@@ -42,6 +43,7 @@ export const languages: ILanguageCollection = {
freemarker: { ids: ['ftl'], defaultExtension: 'ftl' },
fsharp: { ids: 'fsharp', defaultExtension: 'fs' },
git: { ids: ['git-commit', 'git-rebase'], defaultExtension: 'git' },
+ glsl: { ids: 'glsl', defaultExtension: 'glsl' },
go: { ids: 'go', defaultExtension: 'go' },
godot: { ids: 'gdscript', defaultExtension: 'gd' },
graphql: { ids: ['graphql'], defaultExtension: 'gql' },
@@ -49,8 +51,10 @@ export const languages: ILanguageCollection = {
groovy: { ids: 'groovy', defaultExtension: 'groovy' },
haml: { ids: ['haml'], defaultExtension: 'haml' },
handlebars: { ids: 'handlebars', defaultExtension: 'hbs' },
+ harbour: { ids: 'harbour', defaultExtension: 'prg' },
haskell: { ids: ['haskell'], defaultExtension: 'hs' },
haxe: { ids: ['haxe', 'hxml', 'Haxe AST dump'], defaultExtension: 'haxe' },
+ hlsl: { ids: 'hlsl', defaultExtension: 'hlsl' },
html: { ids: 'html', defaultExtension: 'html' },
ini: { ids: 'ini', defaultExtension: 'ini' },
latex: { ids: ['latex'], defaultExtension: 'tex' },
@@ -70,11 +74,12 @@ export const languages: ILanguageCollection = {
markdown: { ids: 'markdown', defaultExtension: 'md' },
marko: { ids: ['marko'], defaultExtension: 'marko' },
matlab: { ids: ['matlab'], defaultExtension: 'mat' },
- mson: { ids: ['MSON'], defaultExtension: 'mson' },
+ mson: { ids: ['mson'], defaultExtension: 'mson' },
nim: { ids: ['nim', 'nimble'], defaultExtension: 'nim' },
nsis: { ids: ['nsis', 'nfl', 'nsl', 'bridlensis'], defaultExtension: 'nsi' },
nunjucks: { ids: ['nunjucks'], defaultExtension: 'nunjucks' },
objectivec: { ids: 'objective-c', defaultExtension: 'm' },
+ objectivecpp: { ids: 'objective-cpp', defaultExtension: 'mm' },
ocaml: { ids: ['ocaml', 'ocamllex', 'menhir'], defaultExtension: 'ml' },
pascal: { ids: ['pascal', 'objectpascal'], defaultExtension: 'pas' },
perl: { ids: ['perl', 'perl6'], defaultExtension: 'pl' },
diff --git a/src/icon-manifest/manifestMerger.ts b/src/icon-manifest/manifestMerger.ts
index 3daa3f1df6..b3364a8548 100644
--- a/src/icon-manifest/manifestMerger.ts
+++ b/src/icon-manifest/manifestMerger.ts
@@ -8,18 +8,18 @@ export function mergeConfig(
supportedFolders: models.IFolderCollection,
iconGenerator: models.IIconGenerator): models.IIconSchema {
- const dFiles = customFiles ? customFiles.default : null;
- const dFolders = customFolders ? customFolders.default : null;
- const sFiles = customFiles ? customFiles.supported : null;
- const sFolders = customFolders ? customFolders.supported : null;
+ const defaultCustomFiles = customFiles ? customFiles.default : null;
+ const defaultCustomFolders = customFolders ? customFolders.default : null;
+ const supportedCustomFiles = customFiles ? customFiles.supported : null;
+ const supportedCustomFolders = customFolders ? customFolders.supported : null;
const files: models.IFileCollection = {
- default: mergeDefaultFiles(dFiles, supportedFiles.default),
- supported: mergeSupported(sFiles, supportedFiles.supported),
+ default: mergeDefaultFiles(defaultCustomFiles, supportedFiles.default),
+ supported: mergeSupported(supportedCustomFiles, supportedFiles.supported),
};
const folders: models.IFolderCollection = {
- default: mergeDefaultFolders(dFolders, supportedFolders.default),
- supported: mergeSupported(sFolders, supportedFolders.supported),
+ default: mergeDefaultFolders(defaultCustomFolders, supportedFolders.default),
+ supported: mergeSupported(supportedCustomFolders, supportedFolders.supported),
};
return iconGenerator.generateJson(files, folders);
@@ -108,13 +108,9 @@ export function toggleHideFoldersPreset(
const collection = togglePreset(disable, folderIcons, folders);
if (folders.default.folder) {
collection.default.folder.disabled = disable;
- } else {
- collection.default.folder = { icon: 'folder', format: 0, disabled: disable };
}
if (folders.default.folder_light) {
collection.default.folder_light.disabled = disable;
- } else {
- collection.default.folder_light = { icon: 'folder_light', format: 0, disabled: disable };
}
return collection;
}
@@ -126,13 +122,9 @@ export function toggleFoldersAllDefaultIconPreset(
const collection = togglePreset(disable, folderIcons, folders);
if (folders.default.folder) {
collection.default.folder.disabled = false;
- } else {
- collection.default.folder = { icon: 'folder', format: 0, disabled: false };
}
if (folders.default.folder_light) {
collection.default.folder_light.disabled = false;
- } else {
- collection.default.folder_light = { icon: 'folder_light', format: 0, disabled: false };
}
return collection;
}
diff --git a/src/icon-manifest/supportedExtensions.ts b/src/icon-manifest/supportedExtensions.ts
index e1f2ba72b2..fac1eab74e 100644
--- a/src/icon-manifest/supportedExtensions.ts
+++ b/src/icon-manifest/supportedExtensions.ts
@@ -16,37 +16,40 @@ export const extensions: IFileCollection = {
{ icon: 'ng_component_js', extensions: ['component.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_controller_ts', extensions: ['controller.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_controller_js', extensions: ['controller.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_smart_component_ts', extensions: ['page.ts', 'container.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_smart_component_js', extensions: ['page.js', 'container.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_directive_ts', extensions: ['directive.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_directive_js', extensions: ['directive.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_pipe_ts', extensions: ['pipe.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_pipe_js', extensions: ['pipe.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_service_ts', extensions: ['service.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_service_js', extensions: ['service.js'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_guard_ts', extensions: ['guard.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_guard_js', extensions: ['guard.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_module_ts', extensions: ['module.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_module_js', extensions: ['module.js'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_pipe_ts', extensions: ['pipe.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_pipe_js', extensions: ['pipe.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_ts', extensions: ['routing.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_js', extensions: ['routing.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_ts', extensions: ['app-routing.module.ts'], filename: true, format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_js', extensions: ['app-routing.module.js'], filename: true, format: FileFormat.svg, disabled: true },
+ { icon: 'ng_smart_component_ts', extensions: ['page.ts', 'container.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_smart_component_js', extensions: ['page.js', 'container.js'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_service_ts', extensions: ['service.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_service_js', extensions: ['service.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_component_ts2', extensions: ['component.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_component_js2', extensions: ['component.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_smart_component_ts2', extensions: ['page.ts', 'container.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_smart_component_js2', extensions: ['page.js', 'container.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_directive_ts2', extensions: ['directive.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_directive_js2', extensions: ['directive.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_pipe_ts2', extensions: ['pipe.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_pipe_js2', extensions: ['pipe.js'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_service_ts2', extensions: ['service.ts'], format: FileFormat.svg, disabled: true },
- { icon: 'ng_service_js2', extensions: ['service.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_module_ts2', extensions: ['module.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_module_js2', extensions: ['module.js'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_pipe_ts2', extensions: ['pipe.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_pipe_js2', extensions: ['pipe.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_ts2', extensions: ['routing.ts'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_js2', extensions: ['routing.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_ts2', extensions: ['app-routing.module.ts'], filename: true, format: FileFormat.svg, disabled: true },
{ icon: 'ng_routing_js2', extensions: ['app-routing.module.js'], filename: true, format: FileFormat.svg, disabled: true },
+ { icon: 'ng_smart_component_ts2', extensions: ['page.ts', 'container.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_smart_component_js2', extensions: ['page.js', 'container.js'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_service_ts2', extensions: ['service.ts'], format: FileFormat.svg, disabled: true },
+ { icon: 'ng_service_js2', extensions: ['service.js'], format: FileFormat.svg, disabled: true },
{ icon: 'ansible', extensions: [], languages: [languages.ansible], format: FileFormat.svg },
+ { icon: 'anyscript', extensions: [], languages: [languages.anyscript], format: FileFormat.svg },
{ icon: 'apache', extensions: [], languages: [languages.apache], format: FileFormat.svg },
{ icon: 'apib', extensions: [], languages: [languages.apib], format: FileFormat.svg },
{ icon: 'applescript', extensions: [], languages: [languages.applescript], format: FileFormat.svg },
@@ -146,9 +149,10 @@ export const extensions: IFileCollection = {
{ icon: 'fsharp', extensions: [], languages: [languages.fsharp], format: FileFormat.svg },
{ icon: 'fsproj', extensions: ['fsproj'], format: FileFormat.svg },
{ icon: 'freemarker', extensions: [], languages: [languages.freemarker], format: FileFormat.svg },
- { icon: 'fusebox', extensions: ['fuse.js'], filename: true, format: FileFormat.svg },
+ { icon: 'fusebox', extensions: ['fuse.js'], filename: true, format: FileFormat.svg },
{ icon: 'git', extensions: ['.gitattributes', '.gitconfig', '.gitignore', '.gitmodules', '.gitkeep'], filename: true, languages: [languages.git], format: FileFormat.svg },
{ icon: 'gitlab', extensions: ['.gitlab-ci.yml'], filename: true, format: FileFormat.svg },
+ { icon: 'glsl', extensions: [], languages: [languages.glsl], format: FileFormat.svg },
{ icon: 'go', extensions: [], languages: [languages.go], format: FileFormat.svg },
{ icon: 'godot', extensions: [], languages: [languages.godot], format: FileFormat.svg },
{ icon: 'gradle', extensions: ['gradle'], format: FileFormat.svg },
@@ -156,16 +160,38 @@ export const extensions: IFileCollection = {
{ icon: 'graphviz', extensions: [], languages: [languages.graphviz], format: FileFormat.svg },
{ icon: 'groovy', extensions: [], languages: [languages.groovy], format: FileFormat.svg },
{ icon: 'groovy2', extensions: [], languages: [languages.groovy], format: FileFormat.svg, disabled: true },
- { icon: 'grunt', extensions: ['gruntfile.js'], filename: true, format: FileFormat.svg },
- { icon: 'gulp', extensions: ['gulpfile.js'], filename: true, format: FileFormat.svg },
+ {
+ icon: 'grunt', extensions: [
+ 'gruntfile.coffee',
+ 'gruntfile.babel.coffee',
+ 'gruntfile.js',
+ 'gruntfile.babel.js',
+ 'gruntfile.ts',
+ 'gruntfile.babel.ts',
+ ],
+ filename: true, format: FileFormat.svg,
+ },
+ {
+ icon: 'gulp', extensions: [
+ 'gulpfile.coffee',
+ 'gulpfile.babel.coffee',
+ 'gulpfile.js',
+ 'gulpfile.babel.js',
+ 'gulpfile.ts',
+ 'gulpfile.babel.ts',
+ ],
+ filename: true, format: FileFormat.svg,
+ },
{ icon: 'haml', extensions: [], languages: [languages.haml], format: FileFormat.svg },
{ icon: 'handlebars', extensions: [], languages: [languages.handlebars], format: FileFormat.svg },
{ icon: 'handlebars2', extensions: [], languages: [languages.handlebars], format: FileFormat.svg, disabled: true },
+ { icon: 'harbour', extensions: [], languages: [languages.harbour], format: FileFormat.svg },
{ icon: 'haskell', extensions: [], languages: [languages.haskell, languages.literatehaskell], format: FileFormat.svg },
{ icon: 'haskell2', extensions: [], languages: [languages.haskell, languages.literatehaskell], format: FileFormat.svg, disabled: true },
{ icon: 'haxe', extensions: ['haxelib.json'], filename: true, languages: [languages.haxe], format: FileFormat.svg },
{ icon: 'haxecheckstyle', extensions: ['checkstyle.json'], filename: true, format: FileFormat.svg },
{ icon: 'haxedevelop', extensions: ['hxproj'], format: FileFormat.svg },
+ { icon: 'hlsl', extensions: [], languages: [languages.hlsl], format: FileFormat.svg },
{ icon: 'html', extensions: [], languages: [languages.html], format: FileFormat.svg },
{ icon: 'idris', extensions: ['idr', 'lidr'], format: FileFormat.svg },
{ icon: 'idrisbin', extensions: ['ibc'], format: FileFormat.svg },
@@ -188,6 +214,7 @@ export const extensions: IFileCollection = {
{ icon: 'json', extensions: [], languages: [languages.json, languages.textmatejson], format: FileFormat.svg },
{ icon: 'json_official', extensions: [], languages: [languages.json, languages.textmatejson], format: FileFormat.svg, disabled: true },
{ icon: 'json2', extensions: [], languages: [languages.json, languages.textmatejson], format: FileFormat.svg, disabled: true },
+ { icon: 'jsonld', extensions: ['jsonld', 'json-ld'], light: true, format: FileFormat.svg },
{ icon: 'jsp', extensions: ['jsp'], format: FileFormat.svg },
{ icon: 'julia', extensions: [], languages: [languages.julia], format: FileFormat.svg },
{ icon: 'julia2', extensions: [], languages: [languages.julia], format: FileFormat.svg, disabled: true },
@@ -203,6 +230,7 @@ export const extensions: IFileCollection = {
{ icon: 'lisp', extensions: [], languages: [languages.lisp], format: FileFormat.svg },
{ icon: 'lime', extensions: ['hxp'], format: FileFormat.svg },
{ icon: 'lime', extensions: ['include.xml'], filename: true, format: FileFormat.svg },
+ { icon: 'liquid', extensions: ['liquid'], format: FileFormat.svg },
{ icon: 'locale', extensions: [], format: FileFormat.svg },
{ icon: 'log', extensions: ['log'], format: FileFormat.svg },
{ icon: 'lsl', extensions: ['lsl'], format: FileFormat.svg },
@@ -226,6 +254,7 @@ export const extensions: IFileCollection = {
{ icon: 'nuget', extensions: ['nupkg', 'nuspec', 'psmdcp'], format: FileFormat.svg },
{ icon: 'nunjucks', extensions: ['nunj', 'njs'], languages: [languages.nunjucks], format: FileFormat.svg },
{ icon: 'objectivec', extensions: [], languages: [languages.objectivec], format: FileFormat.svg },
+ { icon: 'objectivecpp', extensions: [], languages: [languages.objectivecpp], format: FileFormat.svg },
{ icon: 'ocaml', extensions: ['.merlin'], filename: true, languages: [languages.ocaml], format: FileFormat.svg },
{ icon: 'onenote', extensions: ['one', 'onepkg', 'onetoc', 'onetoc2', 'sig'], format: FileFormat.svg },
{ icon: 'opencl', extensions: ['cl', 'opencl'], format: FileFormat.svg },
@@ -347,6 +376,7 @@ export const extensions: IFileCollection = {
},
{ icon: 'vsix', extensions: ['vsix'], light: true, format: FileFormat.svg },
{ icon: 'vue', extensions: [], languages: [languages.vue], format: FileFormat.svg },
+ { icon: 'watchmanconfig', extensions: ['.watchmanconfig'], filename: true, format: FileFormat.svg },
{
icon: 'webpack',
extensions: [
@@ -386,10 +416,14 @@ export const extensions: IFileCollection = {
'webpack.config.test.babel.js',
'webpack.config.prod.babel.js',
'webpack.config.production.babel.js',
+ 'webpack.mix.coffee',
+ 'webpack.mix.js',
+ 'webpack.mix.ts',
],
filename: true,
format: FileFormat.svg,
},
+ { icon: 'wercker', extensions: ['wercker.yml'], filename: true, format: FileFormat.svg },
{ icon: 'word', extensions: ['doc', 'docx', 'docm', 'dot', 'dotx', 'dotm', 'wll'], format: FileFormat.svg },
{ icon: 'wxml', extensions: ['wxml'], format: FileFormat.svg },
{ icon: 'wxss', extensions: ['wxss'], format: FileFormat.svg },
diff --git a/src/icon-manifest/supportedFolders.ts b/src/icon-manifest/supportedFolders.ts
index 3f21741e59..9ba406b417 100644
--- a/src/icon-manifest/supportedFolders.ts
+++ b/src/icon-manifest/supportedFolders.ts
@@ -15,7 +15,7 @@ export const extensions: IFolderCollection = {
{ icon: 'elasticbeanstalk', extensions: ['.elasticbeanstalk', '.ebextensions'], format: FileFormat.svg },
{ icon: 'flow', extensions: ['flow'], format: FileFormat.svg },
{ icon: 'fonts', extensions: ['fonts', 'font', 'fnt'], light: true, format: FileFormat.svg },
- { icon: 'git', extensions: ['.github', '.git'], format: FileFormat.svg },
+ { icon: 'git', extensions: ['.github', '.git', 'submodules', '.submodules'], format: FileFormat.svg },
{ icon: 'haxelib', extensions: ['haxelib'], format: FileFormat.svg },
{ icon: 'js', extensions: ['js'], format: FileFormat.svg },
{ icon: 'idea', extensions: ['.idea'], format: FileFormat.svg },
diff --git a/src/index.ts b/src/index.ts
index fd2f08b9f9..ddf2441635 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -24,7 +24,7 @@ function initialize(context: vscode.ExtensionContext) {
init.manageAutoApplyCustomizations(settingsManager.isNewVersion(), config, commands.applyCustomizationCommand);
init.detectProject(findFiles, config)
- .then((results) => {
+ .then(results => {
if (results && results.length && !asRelativePath(results[0].fsPath).includes('/')) {
detectAngular(config, results);
}
diff --git a/src/init/welcome.ts b/src/init/welcome.ts
index ddac27d43a..d23278458c 100644
--- a/src/init/welcome.ts
+++ b/src/init/welcome.ts
@@ -3,6 +3,7 @@ import * as open from 'open';
import { LanguageResourceManager } from '../i18n';
import { getConfig } from '../utils/vscode-extensions';
import { ISettingsManager, ExtensionStatus, LangResourceKeys } from '../models';
+import { constants } from '../constants';
const i18nManager = new LanguageResourceManager(vscode.env.language);
@@ -31,11 +32,11 @@ function showWelcomeMessage(settingsManager: ISettingsManager) {
.then(btn => {
if (!btn) { return; }
if (btn.title === i18nManager.getMessage(LangResourceKeys.aboutOfficialApi)) {
- open(i18nManager.getMessage(LangResourceKeys.urlOfficialApi));
+ open(i18nManager.getMessage(constants.urlOfficialApi));
} else if (btn.title === i18nManager.getMessage(LangResourceKeys.seeReadme)) {
- open(i18nManager.getMessage(LangResourceKeys.urlReadme));
+ open(i18nManager.getMessage(constants.urlReadme));
}
- }, (reason) => {
+ }, reason => {
// tslint:disable-next-line:no-console
console.info('Rejected because: ', reason);
return;
@@ -52,11 +53,11 @@ function showNewVersionMessage(settingsManager: ISettingsManager) {
settingsManager.updateStatus(ExtensionStatus.disabled);
if (!btn) { return; }
if (btn.title === i18nManager.getMessage(LangResourceKeys.seeReleaseNotes)) {
- open(i18nManager.getMessage(LangResourceKeys.urlReleaseNote));
+ open(i18nManager.getMessage(constants.urlReleaseNote));
} else if (btn.title === i18nManager.getMessage(LangResourceKeys.dontShowThis)) {
getConfig().update('vsicons.dontShowNewVersionMessage', true, true);
}
- }, (reason) => {
+ }, reason => {
// tslint:disable-next-line:no-console
console.info('Rejected because: ', reason);
return;
diff --git a/src/models/i18n/langResource.ts b/src/models/i18n/langResource.ts
index b0867ee6eb..191357fb77 100644
--- a/src/models/i18n/langResource.ts
+++ b/src/models/i18n/langResource.ts
@@ -10,9 +10,6 @@ export interface ILangResource {
activationPath: string | IOSSpecific;
aboutOfficialApi: string | IOSSpecific;
learnMore: string | IOSSpecific;
- urlReleaseNote: string | IOSSpecific;
- urlReadme: string | IOSSpecific;
- urlOfficialApi: string | IOSSpecific;
reload: string | IOSSpecific;
autoReload: string | IOSSpecific;
disableDetect: string | IOSSpecific;
diff --git a/src/models/i18n/langResourceCollection.ts b/src/models/i18n/langResourceCollection.ts
index b293e20c80..9f1f0168d1 100644
--- a/src/models/i18n/langResourceCollection.ts
+++ b/src/models/i18n/langResourceCollection.ts
@@ -9,6 +9,6 @@ export interface ILangResourceCollection {
ja?: ILangResource;
ko?: ILangResource;
ru?: ILangResource;
- "zh-CN"?: ILangResource;
- "zh-TW"?: ILangResource;
+ "zh-cn"?: ILangResource;
+ "zh-tw"?: ILangResource;
}
diff --git a/src/models/i18n/langResourceKeys.ts b/src/models/i18n/langResourceKeys.ts
index 64609388cc..5111bb11e5 100644
--- a/src/models/i18n/langResourceKeys.ts
+++ b/src/models/i18n/langResourceKeys.ts
@@ -8,9 +8,6 @@ export enum LangResourceKeys {
activationPath,
aboutOfficialApi,
learnMore,
- urlReleaseNote,
- urlReadme,
- urlOfficialApi,
reload,
autoReload,
disableDetect,
diff --git a/src/models/language/languageCollection.ts b/src/models/language/languageCollection.ts
index dbc9d1491a..ffaf49c979 100644
--- a/src/models/language/languageCollection.ts
+++ b/src/models/language/languageCollection.ts
@@ -4,6 +4,7 @@ import { INativeLanguageCollection } from './nativeLanguageCollection';
export interface ILanguageCollection extends INativeLanguageCollection {
actionscript: ILanguage;
ansible: ILanguage;
+ anyscript: ILanguage;
apache: ILanguage;
apib: ILanguage;
applescript: ILanguage;
@@ -34,10 +35,12 @@ export interface ILanguageCollection extends INativeLanguageCollection {
fortran: ILanguage;
freemarker: ILanguage;
godot: ILanguage;
+ glsl: ILanguage;
graphql: ILanguage;
graphviz: ILanguage;
groovy: ILanguage;
haml: ILanguage;
+ harbour: ILanguage;
haskell: ILanguage;
haxe: ILanguage;
jinja: ILanguage;
diff --git a/src/models/language/nativeLanguageCollection.ts b/src/models/language/nativeLanguageCollection.ts
index 604daad67d..9ff3cf8f5d 100644
--- a/src/models/language/nativeLanguageCollection.ts
+++ b/src/models/language/nativeLanguageCollection.ts
@@ -14,6 +14,7 @@ export interface INativeLanguageCollection {
go: ILanguage;
groovy: ILanguage;
handlebars: ILanguage;
+ hlsl: ILanguage;
html: ILanguage;
ini: ILanguage;
java: ILanguage;
@@ -25,6 +26,7 @@ export interface INativeLanguageCollection {
makefile: ILanguage;
markdown: ILanguage;
objectivec: ILanguage;
+ objectivecpp: ILanguage;
perl: ILanguage;
php: ILanguage;
plaintext: ILanguage;
diff --git a/src/settings/extensionSettings.ts b/src/settings/extensionSettings.ts
index ac19c51f57..05492da5ba 100644
--- a/src/settings/extensionSettings.ts
+++ b/src/settings/extensionSettings.ts
@@ -1,7 +1,7 @@
import { IExtensionSettings } from '../models';
export const extensionSettings: IExtensionSettings = {
- version: '7.5.0',
+ version: '7.6.0',
iconJsonFileName: 'icons.json',
iconSuffix: '',
filePrefix: 'file_type_',
diff --git a/test/autoApplyCustomizations.test.ts b/test/autoApplyCustomizations.test.ts
index b7e093ee40..c14210721a 100644
--- a/test/autoApplyCustomizations.test.ts
+++ b/test/autoApplyCustomizations.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import * as sinon from 'sinon';
import { manageAutoApplyCustomizations } from '../src/init/autoApplyCustomizations';
diff --git a/test/autoDetectProject.test.ts b/test/autoDetectProject.test.ts
index 5c75136718..0bd9f29d9a 100644
--- a/test/autoDetectProject.test.ts
+++ b/test/autoDetectProject.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect, use } from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import * as fs from 'fs';
@@ -46,7 +47,7 @@ describe('AutoDetectProject: tests', function () {
const reason = 'failure';
const findFiles = sinon.stub().returns(Promise.reject(reason));
return adp.detectProject(findFiles, userConfig)
- .then((rej) => expect(rej).to.be.an('array').with.members([reason]));
+ .then(rej => expect(rej).to.be.an('array').with.members([reason]));
});
it('detects a sub project when detection is enabled and has detected a \'package.json\' file in a sub folder',
@@ -56,7 +57,7 @@ describe('AutoDetectProject: tests', function () {
const findFiles = sinon.stub()
.returns(Promise.resolve([{ fsPath: path1 }, { fsPath: path2 }] as IVSCodeUri[]));
return adp.detectProject(findFiles, userConfig)
- .then((res) => {
+ .then(res => {
expect(res).to.be.an('array').with.length.greaterThan(0);
expect(res[0]).to.have.property('fsPath').that.equals(path1);
expect(res[1]).to.have.property('fsPath').that.equals(path2);
@@ -176,7 +177,7 @@ describe('AutoDetectProject: tests', function () {
const findFiles = sinon.stub().returns(Promise.resolve([{ fsPath: path }] as IVSCodeUri[]));
userConfig.projectDetection.disableDetect = false;
return adp.detectProject(findFiles, userConfig)
- .then((res) => {
+ .then(res => {
expect(res).to.be.an('array').with.length.greaterThan(0);
expect(res[0]).to.have.property('fsPath').that.equals(path);
});
diff --git a/test/i18n.test.ts b/test/i18n.test.ts
index 96a9573431..485d3efbf1 100644
--- a/test/i18n.test.ts
+++ b/test/i18n.test.ts
@@ -1,4 +1,5 @@
-/* tslint:disable only-arrow-functions */
+// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import { LanguageResourceManager } from '../src/i18n';
import { langEn } from '../src/i18n/langResources';
@@ -218,7 +219,7 @@ describe('i18n: tests', function () {
expect(packageJson.contributes).to.exist;
expect(packageJson.contributes.commands).to.exist;
expect(packageJson.contributes.commands).to.be.an.instanceOf(Array);
- packageJson.contributes.commands.forEach((command) => {
+ packageJson.contributes.commands.forEach(command => {
const title = command.title as string;
const nlsEntry = title.replace(/%/g, '');
expect(title).to.exist;
diff --git a/test/iconGenerator/functionality.test.ts b/test/iconGenerator/functionality.test.ts
index b1f81261d4..cb3a21985b 100644
--- a/test/iconGenerator/functionality.test.ts
+++ b/test/iconGenerator/functionality.test.ts
@@ -1,4 +1,5 @@
-/* tslint:disable only-arrow-functions */
+// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import * as fs from 'fs';
import * as sinon from 'sinon';
diff --git a/test/iconGenerator/iconGeneration.test.ts b/test/iconGenerator/iconGeneration.test.ts
index 13c6f5cee1..67cde491de 100644
--- a/test/iconGenerator/iconGeneration.test.ts
+++ b/test/iconGenerator/iconGeneration.test.ts
@@ -1,4 +1,5 @@
-/* tslint:disable only-arrow-functions */
+// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import * as fs from 'fs';
import * as path from 'path';
import { expect } from 'chai';
diff --git a/test/manifestMerger/defaultExensions.test.ts b/test/manifestMerger/defaultExensions.test.ts
index d4ff87ca38..bf4d887543 100644
--- a/test/manifestMerger/defaultExensions.test.ts
+++ b/test/manifestMerger/defaultExensions.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import * as fs from 'fs';
import * as path from 'path';
import { expect } from 'chai';
diff --git a/test/manifestMerger/fileExtensions.test.ts b/test/manifestMerger/fileExtensions.test.ts
index b4500dd50a..7a2e0e6807 100644
--- a/test/manifestMerger/fileExtensions.test.ts
+++ b/test/manifestMerger/fileExtensions.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import * as fs from 'fs';
import * as path from 'path';
import { expect } from 'chai';
diff --git a/test/manifestMerger/folderExtensions.test.ts b/test/manifestMerger/folderExtensions.test.ts
index 1b2aa8e7c1..c2cc9beaef 100644
--- a/test/manifestMerger/folderExtensions.test.ts
+++ b/test/manifestMerger/folderExtensions.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import * as fs from 'fs';
import * as path from 'path';
import { expect } from 'chai';
diff --git a/test/manifestMerger/presets.test.ts b/test/manifestMerger/presets.test.ts
index 3ab78fd6b4..7c2c1748bf 100644
--- a/test/manifestMerger/presets.test.ts
+++ b/test/manifestMerger/presets.test.ts
@@ -1,4 +1,5 @@
// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import { extensions as fileExtensions } from '../support/supportedExtensions';
import { extensions as folderExtensions } from '../support/supportedFolders';
@@ -134,8 +135,8 @@ describe('Presets: merging configuration documents', function () {
const result = iconManifest.toggleHideFoldersPreset(true, custom);
const supported = result.supported.find(x => x.icon === 'newExt');
expect(supported.disabled).to.be.true;
- expect(result.default.folder.disabled).to.be.true;
- expect(result.default.folder_light.disabled).to.be.true;
+ expect(result.default.folder).to.be.null;
+ expect(result.default.folder_light).to.be.null;
});
it('folders all default icon preset shows all folders with the default folder icon',
@@ -159,8 +160,8 @@ describe('Presets: merging configuration documents', function () {
const result = iconManifest.toggleFoldersAllDefaultIconPreset(true, custom);
const supported = result.supported.find(x => x.icon === 'newExt');
expect(supported.disabled).to.be.true;
- expect(result.default.folder.disabled).to.be.false;
- expect(result.default.folder_light.disabled).to.be.false;
+ expect(result.default.folder).to.be.null;
+ expect(result.default.folder_light).to.be.null;
});
});
diff --git a/test/settings.test.ts b/test/settings.test.ts
index 2a66ae03c2..360047f02b 100644
--- a/test/settings.test.ts
+++ b/test/settings.test.ts
@@ -1,4 +1,5 @@
-/* tslint:disable only-arrow-functions */
+// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import * as fs from 'fs';
import * as sinon from 'sinon';
diff --git a/test/utils.test.ts b/test/utils.test.ts
index 11661460a8..d478c279db 100644
--- a/test/utils.test.ts
+++ b/test/utils.test.ts
@@ -1,4 +1,5 @@
-/* tslint:disable only-arrow-functions */
+// tslint:disable only-arrow-functions
+// tslint:disable no-unused-expression
import { expect } from 'chai';
import * as fs from 'fs';
import * as os from 'os';
@@ -62,9 +63,9 @@ describe('utils: tests', function () {
function () {
const directoryPath = '/path/to';
const sandbox = sinon.sandbox.create();
- const fileCheck = sandbox.stub(fs, 'existsSync').callsFake((path) => path === directoryPath);
+ const fileCheck = sandbox.stub(fs, 'existsSync').callsFake(path => path === directoryPath);
const readDirectory = sandbox.stub(fs, 'readdirSync').callsFake(() => ['dir', 'file.txt']);
- const stats = sandbox.stub(fs, 'lstatSync').callsFake((path) => ({
+ const stats = sandbox.stub(fs, 'lstatSync').callsFake(path => ({
isDirectory: () => path !== '/path/to/file.txt',
}));
const deleteFile = sandbox.stub(fs, 'unlinkSync');
diff --git a/tslint.json b/tslint.json
index 6dbfd12e57..39265a5637 100644
--- a/tslint.json
+++ b/tslint.json
@@ -6,18 +6,21 @@
"quotemark": [
"single"
],
- "eofline": true,
"variable-name": [
true,
+ "ban-keywords",
+ "check-format",
"allow-pascal-case",
"allow-leading-underscore"
],
"space-before-function-paren": [
- "error",
+ true,
{
"anonymous": "always",
"named": "never",
- "asyncArrow": "ignore"
+ "asyncArrow": "always",
+ "method": "never",
+ "constructor": "never"
}
],
"object-literal-sort-keys": false,
@@ -25,12 +28,9 @@
"ordered-imports": [
false
],
- "arrow-parens": false
- },
- "jsRules": {
- "quotemark": [
- "single"
- ],
- "object-literal-sort-keys": false
+ "arrow-parens": [
+ true,
+ "ban-single-arg-parens"
+ ]
}
}
diff --git a/yarn.lock b/yarn.lock
index a9f08fd910..5b2de2221a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,29 +8,29 @@
dependencies:
"@types/chai" "*"
-"@types/chai@*", "@types/chai@^3.4.35":
- version "3.4.35"
- resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.4.35.tgz#e8d65f83492d2944f816fc620741821c28a8c900"
+"@types/chai@*", "@types/chai@^3.5.1":
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.1.tgz#9bd77fe12503ae00648b0945b38eab666adffe2e"
-"@types/lodash@^4.14.61":
- version "4.14.61"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.61.tgz#0518c10805b1f9d21f98f82b1311ac2a6ec75892"
+"@types/lodash@^4.14.63":
+ version "4.14.63"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.63.tgz#5ac475f55bfdc62bc88c4239dbc482f2f3bead93"
-"@types/mocha@^2.2.40":
- version "2.2.40"
- resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.40.tgz#9811dd800ece544cd84b5b859917bf584a150c4c"
+"@types/mocha@^2.2.41":
+ version "2.2.41"
+ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608"
-"@types/node@^7.0.12":
- version "7.0.12"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
+"@types/node@^7.0.13":
+ version "7.0.13"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.13.tgz#1b0a53fe9ef9c3a5d061b126cc9b915bca43a3f5"
-"@types/sinon@^2.1.1":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-2.1.1.tgz#becda9bbc3443acf3f9e0d031c0b8e0711e9dfe3"
+"@types/sinon@^2.1.3":
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-2.1.3.tgz#90e7b02348455e0d5781d1467a8a61b9bd91a468"
ajv@^4.9.1:
- version "4.11.5"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+ version "4.11.7"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
dependencies:
co "^4.6.0"
json-stable-stringify "^1.0.1"
@@ -47,12 +47,6 @@ amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-ansi-align@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-1.1.0.tgz#2f0c1658829739add5ebb15e6b0c6e3423f016ba"
- dependencies:
- string-width "^1.0.1"
-
ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -82,8 +76,8 @@ arr-diff@^2.0.0:
arr-flatten "^1.0.1"
arr-flatten@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
array-differ@^1.0.0:
version "1.0.0"
@@ -145,7 +139,7 @@ aws4@^1.2.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-babel-code-frame@^6.20.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
dependencies:
@@ -154,12 +148,12 @@ babel-code-frame@^6.20.0, babel-code-frame@^6.22.0:
js-tokens "^3.0.0"
babel-generator@^6.18.0:
- version "6.24.0"
- resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
+ version "6.24.1"
+ resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
dependencies:
babel-messages "^6.23.0"
babel-runtime "^6.22.0"
- babel-types "^6.23.0"
+ babel-types "^6.24.1"
detect-indent "^4.0.0"
jsesc "^1.3.0"
lodash "^4.2.0"
@@ -180,32 +174,32 @@ babel-runtime@^6.22.0:
regenerator-runtime "^0.10.0"
babel-template@^6.16.0:
- version "6.23.0"
- resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
+ version "6.24.1"
+ resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
dependencies:
babel-runtime "^6.22.0"
- babel-traverse "^6.23.0"
- babel-types "^6.23.0"
+ babel-traverse "^6.24.1"
+ babel-types "^6.24.1"
babylon "^6.11.0"
lodash "^4.2.0"
-babel-traverse@^6.18.0, babel-traverse@^6.23.0:
- version "6.23.1"
- resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
+babel-traverse@^6.18.0, babel-traverse@^6.24.1:
+ version "6.24.1"
+ resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
dependencies:
babel-code-frame "^6.22.0"
babel-messages "^6.23.0"
babel-runtime "^6.22.0"
- babel-types "^6.23.0"
+ babel-types "^6.24.1"
babylon "^6.15.0"
debug "^2.2.0"
globals "^9.0.0"
invariant "^2.2.0"
lodash "^4.2.0"
-babel-types@^6.18.0, babel-types@^6.23.0:
- version "6.23.0"
- resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
+babel-types@^6.18.0, babel-types@^6.24.1:
+ version "6.24.1"
+ resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
dependencies:
babel-runtime "^6.22.0"
esutils "^2.0.2"
@@ -213,8 +207,8 @@ babel-types@^6.18.0, babel-types@^6.23.0:
to-fast-properties "^1.0.1"
babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
- version "6.16.1"
- resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+ version "6.17.0"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
balanced-match@^0.4.1:
version "0.4.2"
@@ -253,21 +247,9 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"
-boxen@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.0.0.tgz#b2694baf1f605f708ff0177c12193b22f29aaaab"
- dependencies:
- ansi-align "^1.1.0"
- camelcase "^4.0.0"
- chalk "^1.1.1"
- cli-boxes "^1.0.0"
- string-width "^2.0.0"
- term-size "^0.1.0"
- widest-line "^1.0.0"
-
brace-expansion@^1.0.0:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
dependencies:
balanced-match "^0.4.1"
concat-map "0.0.1"
@@ -288,7 +270,7 @@ buffer-crc32@~0.2.3:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-buffer-shims@^1.0.0:
+buffer-shims@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
@@ -312,14 +294,6 @@ camelcase@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-camelcase@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
-capture-stack-trace@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-
caseless@~0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -363,10 +337,6 @@ check-error@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-cli-boxes@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-
cliui@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -451,17 +421,6 @@ concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-configstore@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.0.0.tgz#e1b8669c1803ccc50b545e92f8e6e79aa80e0196"
- dependencies:
- dot-prop "^4.1.0"
- graceful-fs "^4.1.2"
- mkdirp "^0.5.0"
- unique-string "^1.0.0"
- write-file-atomic "^1.1.2"
- xdg-basedir "^3.0.0"
-
convert-source-map@^1.1.1, convert-source-map@^1.3.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -474,19 +433,6 @@ 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"
-create-error-class@^3.0.0:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
- dependencies:
- capture-stack-trace "^1.0.0"
-
-cross-spawn-async@^2.1.1:
- version "2.2.5"
- resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
- dependencies:
- lru-cache "^4.0.0"
- which "^1.2.8"
-
cross-spawn@^4:
version "4.0.2"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -500,10 +446,6 @@ cryptiles@2.x.x:
dependencies:
boom "2.x.x"
-crypto-random-string@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-
dashdash@^1.12.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -518,11 +460,11 @@ debug-log@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-debug@2.2.0, debug@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+debug@2.6.0, debug@^2.2.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
dependencies:
- ms "0.7.1"
+ ms "0.7.2"
decamelize@^1.0.0, decamelize@^1.1.1:
version "1.2.0"
@@ -540,10 +482,6 @@ deep-eql@^0.1.3:
dependencies:
type-detect "0.1.1"
-deep-extend@~0.4.0:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
-
default-require-extensions@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
@@ -560,30 +498,16 @@ detect-indent@^4.0.0:
dependencies:
repeating "^2.0.0"
-diff@1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-
-diff@^3.0.1, diff@^3.1.0:
+diff@3.2.0, diff@^3.1.0, diff@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-dot-prop@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
- dependencies:
- is-obj "^1.0.0"
-
duplexer2@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
dependencies:
readable-stream "~1.1.9"
-duplexer3@^0.1.4:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
duplexer@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -635,17 +559,6 @@ event-stream@^3.3.1, event-stream@~3.3.4:
stream-combiner "~0.0.4"
through "~2.3.1"
-execa@^0.4.0:
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"
- dependencies:
- cross-spawn-async "^2.1.1"
- is-stream "^1.1.0"
- npm-run-path "^1.0.0"
- object-assign "^4.0.1"
- path-key "^1.0.0"
- strip-eof "^1.0.0"
-
expand-brackets@^0.1.4:
version "0.1.5"
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -752,8 +665,8 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
form-data@~2.1.1:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.5"
@@ -796,10 +709,6 @@ get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-get-stream@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
getpass@^0.1.1:
version "0.1.6"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
@@ -851,9 +760,9 @@ glob-stream@^5.3.2:
to-absolute-glob "^0.1.1"
unique-stream "^2.0.2"
-glob@7.0.5:
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
+glob@7.1.1, glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -872,17 +781,6 @@ glob@^5.0.3, glob@~5.0.0:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.0.2"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
globals@^9.0.0:
version "9.17.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
@@ -893,22 +791,6 @@ glogg@^1.0.0:
dependencies:
sparkles "^1.0.0"
-got@^6.7.1:
- version "6.7.1"
- resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
- dependencies:
- create-error-class "^3.0.0"
- duplexer3 "^0.1.4"
- get-stream "^3.0.0"
- is-redirect "^1.0.0"
- is-retry-allowed "^1.0.0"
- is-stream "^1.0.0"
- lowercase-keys "^1.0.0"
- safe-buffer "^5.0.1"
- timed-out "^4.0.0"
- unzip-response "^2.0.1"
- url-parse-lax "^1.0.0"
-
graceful-fs@4.1.11, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -1084,8 +966,8 @@ hoek@2.x.x:
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
hosted-git-info@^2.1.4:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
http-signature@~1.1.0:
version "1.1.1"
@@ -1110,13 +992,9 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-ini@~1.3.0:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
interpret@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
invariant@^2.2.0:
version "2.2.2"
@@ -1176,10 +1054,6 @@ is-fullwidth-code-point@^1.0.0:
dependencies:
number-is-nan "^1.0.0"
-is-fullwidth-code-point@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
is-glob@^2.0.0, is-glob@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -1201,10 +1075,6 @@ is-my-json-valid@^2.12.4:
jsonpointer "^4.0.0"
xtend "^4.0.0"
-is-npm@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-
is-number@^2.0.2, is-number@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -1227,15 +1097,7 @@ is-property@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-is-redirect@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
-is-retry-allowed@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -1382,20 +1244,10 @@ kind-of@^3.0.2:
dependencies:
is-buffer "^1.0.2"
-latest-version@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
- dependencies:
- package-json "^4.0.0"
-
lazy-cache@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-lazy-req@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-2.0.0.tgz#c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"
-
lazystream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
@@ -1542,11 +1394,7 @@ loose-envify@^1.0.0:
dependencies:
js-tokens "^3.0.0"
-lowercase-keys@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-
-lru-cache@^4.0.0, lru-cache@^4.0.1:
+lru-cache@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
dependencies:
@@ -1613,39 +1461,43 @@ mime-types@^2.1.12, mime-types@~2.1.7:
dependencies:
brace-expansion "^1.0.0"
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-minimist@^1.1.0, minimist@^1.2.0:
+minimist@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+minimist@~0.0.1:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
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:
minimist "0.0.8"
-mocha@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
+mocha@^3.2.0, mocha@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.3.0.tgz#d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5"
dependencies:
browser-stdout "1.3.0"
commander "2.9.0"
- debug "2.2.0"
- diff "1.4.0"
+ debug "2.6.0"
+ diff "3.2.0"
escape-string-regexp "1.0.5"
- glob "7.0.5"
+ glob "7.1.1"
growl "1.9.2"
json3 "3.3.2"
lodash.create "3.1.1"
mkdirp "0.5.1"
supports-color "3.1.2"
-ms@0.7.1:
- version "0.7.1"
- resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+ms@0.7.2:
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
multimatch@^2.0.0:
version "2.1.0"
@@ -1673,8 +1525,8 @@ node.extend@~1.1.2:
is "^3.1.0"
normalize-package-data@^2.3.2:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+ version "2.3.8"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
dependencies:
hosted-git-info "^2.1.4"
is-builtin-module "^1.0.0"
@@ -1687,19 +1539,13 @@ normalize-path@^2.0.1:
dependencies:
remove-trailing-separator "^1.0.1"
-npm-run-path@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
- dependencies:
- path-key "^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"
nyc@^10.2.0:
- version "10.2.0"
- resolved "https://registry.yarnpkg.com/nyc/-/nyc-10.2.0.tgz#facd90240600c9aa4dd81ea99c2fb6a85c53de0c"
+ version "10.2.2"
+ resolved "https://registry.yarnpkg.com/nyc/-/nyc-10.2.2.tgz#1b1c8ca4636d810cb3e281558dc9fcb08389f204"
dependencies:
archy "^1.0.0"
arrify "^1.0.1"
@@ -1737,7 +1583,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.0.0, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -1788,15 +1634,6 @@ os-locale@^1.4.0:
dependencies:
lcid "^1.0.0"
-package-json@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.0.tgz#f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"
- dependencies:
- got "^6.7.1"
- registry-auth-token "^3.0.1"
- registry-url "^3.0.3"
- semver "^5.1.0"
-
parse-glob@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -1826,10 +1663,6 @@ path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-path-key@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
-
path-parse@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -1882,10 +1715,6 @@ pkg-dir@^1.0.0:
dependencies:
find-up "^1.0.0"
-prepend-http@^1.0.1:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
@@ -1923,15 +1752,6 @@ randomatic@^1.1.3:
is-number "^2.0.2"
kind-of "^3.0.2"
-rc@^1.0.1, rc@^1.1.6:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.0.tgz#c7de973b7b46297c041366b2fd3d2363b1697c66"
- dependencies:
- deep-extend "~0.4.0"
- ini "~1.3.0"
- minimist "^1.2.0"
- strip-json-comments "~2.0.1"
-
read-pkg-up@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -1957,15 +1777,15 @@ read-pkg@^1.0.0:
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.1.5:
- version "2.2.6"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
+ version "2.2.9"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
dependencies:
- buffer-shims "^1.0.0"
+ buffer-shims "~1.0.0"
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
- string_decoder "~0.10.x"
+ string_decoder "~1.0.0"
util-deprecate "~1.0.1"
readable-stream@~1.1.9:
@@ -1994,18 +1814,6 @@ regex-cache@^0.4.2:
is-equal-shallow "^0.1.3"
is-primitive "^2.0.0"
-registry-auth-token@^3.0.1:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.1.0.tgz#997c08256e0c7999837b90e944db39d8a790276b"
- dependencies:
- rc "^1.1.6"
-
-registry-url@^3.0.3:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
- dependencies:
- rc "^1.0.1"
-
remove-trailing-separator@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
@@ -2096,9 +1904,9 @@ resolve-from@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-resolve@^1.1.6, resolve@^1.1.7:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+resolve@^1.1.6, resolve@^1.3.2:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
dependencies:
path-parse "^1.0.5"
@@ -2122,13 +1930,7 @@ samsam@1.x, samsam@^1.1.3:
version "1.2.1"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
-semver-diff@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
- dependencies:
- semver "^5.0.3"
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -2227,8 +2029,8 @@ split@0.3:
through "2"
sshpk@^1.7.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
dependencies:
asn1 "~0.2.3"
assert-plus "^1.0.0"
@@ -2273,17 +2075,16 @@ string-width@^1.0.1, string-width@^1.0.2:
is-fullwidth-code-point "^1.0.0"
strip-ansi "^3.0.0"
-string-width@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
- dependencies:
- is-fullwidth-code-point "^2.0.0"
- strip-ansi "^3.0.0"
-
string_decoder@~0.10.x:
version "0.10.31"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+string_decoder@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+ dependencies:
+ buffer-shims "~1.0.0"
+
stringstream@~0.0.4:
version "0.0.5"
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -2307,14 +2108,6 @@ strip-bom@^2.0.0:
dependencies:
is-utf8 "^0.2.0"
-strip-eof@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
-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"
-
supports-color@3.1.2, supports-color@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
@@ -2333,12 +2126,6 @@ tar@^2.2.1:
fstream "^1.0.2"
inherits "2"
-term-size@^0.1.0:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/term-size/-/term-size-0.1.1.tgz#87360b96396cab5760963714cda0d0cbeecad9ca"
- dependencies:
- execa "^0.4.0"
-
test-exclude@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7"
@@ -2382,10 +2169,6 @@ time-stamp@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
-timed-out@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-
to-absolute-glob@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
@@ -2406,23 +2189,23 @@ trim-right@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-tslint@^4.5.1:
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/tslint/-/tslint-4.5.1.tgz#05356871bef23a434906734006fc188336ba824b"
+tslint@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.1.0.tgz#51a47baeeb58956fcd617bd2cf00e2ef0eea2ed9"
dependencies:
- babel-code-frame "^6.20.0"
+ babel-code-frame "^6.22.0"
colors "^1.1.2"
- diff "^3.0.1"
+ diff "^3.2.0"
findup-sync "~0.3.0"
glob "^7.1.1"
optimist "~0.6.0"
- resolve "^1.1.7"
- tsutils "^1.1.0"
- update-notifier "^2.0.0"
+ resolve "^1.3.2"
+ semver "^5.3.0"
+ tsutils "^1.4.0"
-tsutils@^1.1.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.4.0.tgz#84f8a83df9967d35bf1ff3aa48c7339593d64e19"
+tsutils@^1.4.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.7.0.tgz#2e63ccc2d6912bb095f7e363ff4100721dc86f50"
tunnel-agent@^0.6.0:
version "0.6.0"
@@ -2447,16 +2230,16 @@ type-detect@^1.0.0:
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
type-detect@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.0.tgz#62053883542a321f2f7b25746dc696478b18ff6b"
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
-typescript@^2.2.2:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
+typescript@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.0.tgz#2e63e09284392bc8158a2444c33e2093795c0418"
uglify-js@^2.6:
- version "2.8.21"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314"
+ version "2.8.22"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
dependencies:
source-map "~0.5.1"
yargs "~3.10.0"
@@ -2474,35 +2257,6 @@ unique-stream@^2.0.2:
json-stable-stringify "^1.0.0"
through2-filter "^2.0.0"
-unique-string@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
- dependencies:
- crypto-random-string "^1.0.0"
-
-unzip-response@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
-update-notifier@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
- dependencies:
- boxen "^1.0.0"
- chalk "^1.0.0"
- configstore "^3.0.0"
- is-npm "^1.0.0"
- latest-version "^3.0.0"
- lazy-req "^2.0.0"
- semver-diff "^2.0.0"
- xdg-basedir "^3.0.0"
-
-url-parse-lax@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
- dependencies:
- prepend-http "^1.0.1"
-
urlgrey@0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
@@ -2585,8 +2339,8 @@ vinyl@^1.0.0:
replace-ext "0.0.1"
vinyl@~2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6"
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
dependencies:
clone "^1.0.0"
clone-buffer "^1.0.0"
@@ -2618,18 +2372,12 @@ which-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-which@^1.2.4, which@^1.2.8, which@^1.2.9:
+which@^1.2.4, which@^1.2.9:
version "1.2.14"
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
dependencies:
isexe "^2.0.0"
-widest-line@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
- dependencies:
- string-width "^1.0.1"
-
window-size@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
@@ -2653,18 +2401,14 @@ wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-write-file-atomic@^1.1.2, write-file-atomic@^1.1.4:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.1.tgz#7d45ba32316328dd1ec7d90f60ebc0d845bb759a"
+write-file-atomic@^1.1.4:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.3.tgz#831dd22d491bdc135180bb996a0eb3f8bf587791"
dependencies:
graceful-fs "^4.1.11"
imurmurhash "^0.1.4"
slide "^1.1.5"
-xdg-basedir@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-
"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -2690,8 +2434,8 @@ yargs-parser@^5.0.0:
camelcase "^3.0.0"
yargs@^7.0.2:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.0.2.tgz#115b97df1321823e8b8648e8968c782521221f67"
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
dependencies:
camelcase "^3.0.0"
cliui "^3.2.0"
@@ -2717,8 +2461,8 @@ yargs@~3.10.0:
window-size "0.1.0"
yauzl@^2.2.1:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.7.0.tgz#e21d847868b496fc29eaec23ee87fdd33e9b2bce"
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.8.0.tgz#79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"
dependencies:
buffer-crc32 "~0.2.3"
fd-slicer "~1.0.1"