🚀 v9 (vscode-icons#2111)

.appveyor.yml

@@ -1,46 +1,34 @@
 version: '#{build}'
 image: Visual Studio 2017
 clone_depth: 5
+skip_tags: true
 build: off
 environment:
   # Define versions of Node.js
   matrix:
-    - node_js: ''     # latest node
-    - node_js: 10.2.0 # vscode >= 1.31.0
-    - node_js: 8.9.3  # vscode >= 1.26.0 < 1.31.0
-    - node_js: 7.9.0  # vscode >= 1.16.0 < 1.26.0
+    - node_js: ''      # latest node
+    - node_js: 10.11.0 # vscode >= 1.36.0
+    - node_js: 10.2.0  # vscode >= 1.31.0 < 1.36.0
+    - node_js: 8.9.3   # vscode >= 1.26.0 < 1.31.0
 matrix:
   fast_finish: true
   allow_failures:
     - node_js: ''
 # Define platforms
 platform:
   - x64
+cache:
+  # - node_modules
 init:
   # Install the platform version of Node.js
   - ps: Install-Product node $env:node_js $env:platform
   # Output useful info for debugging
   - node --version
   - npm --version
-  - yarn --version
   - ps: $PSVersionTable.PSVersion -f ''
 install:
-  # Install the latest version of Yarn
-  - ps: curl -o $env:temp\install.ps1 https://raw.githubusercontent.com/JimiC/ps-yarn-install/master/install.ps1 | powershell $env:temp\install.ps1
-  # Install modules
-  - yarn install
-cache:
-  # - node_modules
-  - '%LOCALAPPDATA%\Yarn'
-before_test:
-  # install coverage reporters
-  - npm i codeclimate-test-reporter codecov --no-save
-  # run postinstall again to ensure that 'vscode.d.ts' is installed
-  - npm run postinstall
+  # Instal dependencies
+  - npm install
 test_script:
-  # run test script
+  # Run test script
   - npm test
-after_test:
-  # send coverage report
-  - ps: If ($env:CODECLIMATE_REPO_TOKEN -ne $null) { gc .\coverage\lcov.info | & .\node_modules\.bin\codeclimate-test-reporter }
-  - ps: If ($env:CODECOV_TOKEN -ne $null) { .\node_modules\.bin\codecov --disable=gcov }

.codeclimate.yml

@@ -2,6 +2,8 @@ version: "2"
 checks:
   file-lines:
     enabled: false
+  method-count:
+    enabled: false
   method-complexity:
     enabled: false
   method-lines:
@@ -21,17 +23,9 @@ plugins:
   tslint:
     enabled: true
 exclude_patterns:
+  - ".*"
+  - ".*/"
+  - "*.*"
+  - "!*.md"
   - "!src/**/*.ts"
   - "!test/**/*.ts"
-  - "test/support"
-  - "docker/"
-  - "images/"
-  - "icons/"
-  - "locale/"
-  - "submodules/"
-  - "*.json"
-  - "*.yml"
-  - "*.lock"
-  - ".*"
-  - "wallaby.*"
-  - "**/*.d.ts"

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+dist
 out
 examples
 coverage
@@ -8,3 +9,6 @@ coverage
 *.vsix
 *.lcov
 *.log
+/*bundle*.json
+/package.nls*.json
+**/.integrity.json

.huskyrc

@@ -0,0 +1,5 @@
+{
+  "hooks": {
+    "pre-commit": "npm run lint-staged"
+  }
+}

.lintstagedrc

@@ -0,0 +1,4 @@
+{
+  "src/**/*.ts": ["prettier --write", "tslint", "git add"],
+  "test/**/*.ts": ["prettier --write", "tslint --fix", "git add"]
+}

.mocharc.json

@@ -0,0 +1,9 @@
+{
+  "spec": "./out/test/**/*.test.js",
+  "ui": "bdd",
+  "exit": true,
+  "colors": true,
+  "recursive": true,
+  "retries": 2,
+  "timeout": 15000
+}

.nsriignore

@@ -0,0 +1,6 @@
+*
+*/
+!icons/
+!dist/**/*bundle*.js
+!*bundle.json
+!package.nls*.json

.nycrc

@@ -0,0 +1,4 @@
+{
+  "exclude": ["!test/**"],
+  "exclude-after-remap": false
+}

.travis.yml

@@ -3,28 +3,30 @@ os:
   - linux
   - osx
 node_js:
-  - node   # latest node
-  - 10.2.0 # vscode >= 1.31.0
-  - 8.9.3  # vscode >= 1.26.0 < 1.31.0
-  - 7.9.0  # vscode >= 1.16.0 < 1.26.0
+  - node    # latest node
+  - 10.11.0 # vscode >= 1.36.0
+  - 10.2.0  # vscode >= 1.31.0 < 1.36.0
+  - 8.9.3   # vscode >= 1.26.0 < 1.31.0
 git:
   depth: 5
   submodules: false
 matrix:
   allow_failures:
     - node_js: node
   fast_finish: true
-cache: yarn
-before_install:
-  - curl -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
+env:
+  global:
+    - CC_OS_NAME=$(if [[ $TRAVIS_OS_NAME == "osx" ]]; then echo "darwin"; else echo $TRAVIS_OS_NAME; fi)
+install:
+  - npm install
+cache: npm
 before_script:
-  - npm i codeclimate-test-reporter codecov --no-save
-  - npm run postinstall
+  - curl -sL "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-$CC_OS_NAME-amd64" > cc-test-reporter
+  - chmod +x cc-test-reporter
+  - ./cc-test-reporter before-build
 script: npm test
 after_success:
-  - if [[ $CODECLIMATE_REPO_TOKEN ]] ; then codeclimate-test-reporter < ./coverage/lcov.info ; fi
-  - codecov --disable=gcov
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 
 jobs:
   include:
@@ -36,27 +38,31 @@ jobs:
         apt:
           sources: [ubuntu-toolchain-r-test]
           packages: [libstdc++-4.9-dev]
-      before_script:
+      install:
+        - npm run preinstall
         - npm i vscode-icons/wpilgenerator --no-save
         - npm run postinstall
+      before_script:
       script: npm run compile
       after_success: wpilgen
 
     - stage: publish
       if: repo =~ ^vscode-icons AND tag IS present AND type = push
       os: linux
       node_js: 8.9.3
-      before_script:
+      install:
+        - npm run preinstall
         - npm i vsce --no-save
         - npm run postinstall
+      before_script:
       script: vsce publish -p $VSCE_TOKEN
       after_success:
 
     - stage: docker vsi:latest
       if: repo =~ ^vscode-icons AND branch = master AND type = push
       sudo: required
       language: generic
-      before_install:
+      install:
       before_script:
       script: curl -L $DOCKER_TRIGGER_URL | bash -s -- --token $TRAVIS_TOKEN
       after_success:
@@ -65,7 +71,7 @@ jobs:
       if: repo =~ ^vscode-icons AND tag IS present AND type = push
       sudo: required
       language: generic
-      before_install:
+      install:
       before_script:
       script: curl -L $DOCKER_TRIGGER_URL | bash -s -- --token $TRAVIS_TOKEN --tag $TRAVIS_TAG
       after_success:

.vscode/settings.json

@@ -1,5 +1,11 @@
 {
   "editor.tabSize": 2,
+  "files.associations": {
+    ".huskyrc": "json",
+    ".lintstagedrc": "json",
+    ".nsrirc": "json",
+    ".nycrc": "json"
+  },
   "files.exclude": {
     "out": false
   },
@@ -14,8 +20,12 @@
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "[jsonc]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "npm.exclude": "**/submodules/**",
   "vsicons.projectDetection.disableDetect": true
 }

.vscodeignore

@@ -1,20 +1,11 @@
-.*/
-coverage
-examples
-images/*.gif
-images/*.svg
-src
-submodules
-test
-out/test
-.*
-**/*.map
-*.lcov
-*.lock
-*.log
-*.vsix
-*.yml
-*lock.json
-*.template.json
-ts*.json
-wallaby.*
+*
+*/
+!dist/
+!icons/
+!images/*.png
+!*bundle.json
+!package.nls*.json
+!*.md
+!LICENSE
+!.integrity.json
+!.nsriignore

README.md

@@ -23,7 +23,7 @@
 
 ---
 
-Bring icons to your [Visual Studio Code](https://code.visualstudio.com/) (**minimum supported version: `1.18.1`**)
+Bring icons to your [Visual Studio Code](https://code.visualstudio.com/) (**minimum supported version: `1.26.1`**)
 
 ![demo](https://raw.githubusercontent.com/vscode-icons/vscode-icons/master/images/screenshot.gif)
 
@@ -47,6 +47,10 @@ ext install icons
 ext install "vscode-icons"
 ```
 
+## Security
+
+`vscode-icons` utilizes [NSRI](https://www.npmjs.com/package/nsri) for its subresources integrity check and protection against code injection.
+
 ## Usage
 
 Once installed and after reloading `vscode`, you will be presented with a message to `Activate` the icons.

crowdin.yml

@@ -1,12 +1,12 @@
 files:
-  - source: package.nls.json
-    translation: /%file_name%.%two_letters_code%.%file_extension%
+  - source: /locale/package/package.nls.json
+    translation: /%original_path%/%file_name%.%two_letters_code%.%file_extension%
     languages_mapping:
       two_letters_code:
         zh-CN: zh-cn
         zh-TW: zh-tw
         pt: pt-br
-  - source: /locale/lang.json
+  - source: /locale/lang/lang.nls.json
     translation: /%original_path%/%file_name%.%two_letters_code%.%file_extension%
     languages_mapping:
       two_letters_code:

greenkeeper.json

@@ -0,0 +1,5 @@
+{
+  "ignore": [
+    "@types/node"
+  ]
+}

locale/lang.de.json → locale/lang/lang.nls.de.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% hat ein NestJS-Projekt erkannt, allerdings ist die 'preset'-Einstellung auf 'false' gesetzt. Es wird wärmstens empfohlen, die 'preset'-Einstellung komplett von den Einstellungen zu entfernen. Wenn Sie auf 'Neu starten' drücken, werden die NestJS-Icons deaktiviert.",
   "nonNestDetectedPresetTrue": "%extensionName% hat ein Nicht-NestJS-Projekt erkannt, allerdings ist die 'preset'-Einstellung auf 'true' gesetzt. Es wird wärmstens empfohlen, die 'preset'-Einstellung komplett von den Einstellungen zu entfernen. Wenn Sie auf 'Neu starten' drücken, werden die NestJS-Icons aktiviert.",
   "projectDetectionReset": "Projekterkennung wird zurückgesetzt.",
-  "conflictProjectsDetected": "%extensionName% hat widersprüchliche Projekte erkannt. Wählen Sie aus, welche Projekticons benutzt werden sollen. Hinweis: Diese Aktion wird in den Arbeitsbereichseinstellungen gespeichert."
+  "conflictProjectsDetected": "%extensionName% hat widersprüchliche Projekte erkannt. Wählen Sie aus, welche Projekticons benutzt werden sollen. Hinweis: Diese Aktion wird in den Arbeitsbereichseinstellungen gespeichert.",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.es.json → locale/lang/lang.nls.es.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% ha detectado un proyecto NestJS, pero el 'preset' está ajustado a 'false'. Se recomienda eliminar completamente dicho 'preset' de la configuración. Al seleccionar 'Reiniciar' se desactivarán los iconos de NestJS.",
   "nonNestDetectedPresetTrue": "%extensionName% ha detectado un proyecto no NestJS, pero el 'preset' está ajustado a 'true'. Se recomienda eliminar completamente dicho 'preset' de la configuración. Al seleccionar 'Reiniciar' se activarán los iconos de NestJS.",
   "projectDetectionReset": "La detección de proyectos se va a restaurar a sus valores iniciales.",
-  "conflictProjectsDetected": "%extensionName% ha detectado un conflicto entre diferentes iconos de proyecto. Escoger qué iconos de proyecto utilizar. Nota: Esta acción establecerá un 'preset' en la configuración del espacio de trabajo."
+  "conflictProjectsDetected": "%extensionName% ha detectado un conflicto entre diferentes iconos de proyecto. Escoger qué iconos de proyecto utilizar. Nota: Esta acción establecerá un 'preset' en la configuración del espacio de trabajo.",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.fr.json → locale/lang/lang.nls.fr.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% a détecter un projet NestJS, mais le paramètre 'preset' est configuré à 'false'. Il est fortement recommandé de supprimer 'preset' entièrement des paramètres. Sélectionner 'Redémarrer' va désactiver les icônes NestJS.",
   "nonNestDetectedPresetTrue": "%extensionName% a détecter un projet non NestJS, mais le paramètre 'preset' est configuré à 'true'. Il est fortement recommandé de supprimer 'preset' entièrement des paramètres. Sélectionner 'Redémarrer' va activer les icônes NestJS.",
   "projectDetectionReset": "La détection de projet va être réinitialisé.",
-  "conflictProjectsDetected": ""
+  "conflictProjectsDetected": "",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.it.json → locale/lang/lang.nls.it.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% ha rilevato un progetto NestJS ma l'impostazione 'preset' è impostata su 'false'. È altamente raccomandato rimuovere completamente l'impostazione 'preset'. Selezionando 'Riavvia' le icone di NestJS verranno disabilitate.",
   "nonNestDetectedPresetTrue": "%extensionName% ha rilevato un progetto non NestJS ma l'impostazione 'preset' è impostata su 'true'. È altamente raccomandato rimuovere completamente l'impostazione 'preset'. Selezionando 'Riavvia' le icone di NestJS verranno abilitate.",
   "projectDetectionReset": "Impostazioni Rilevazione Progetto Predefinite saranno ripristinate.",
-  "conflictProjectsDetected": "%extensionName% ha individuato conflitti tra le icone di progetto. Scegli quali icone di progetto usare. Nota: Questa azione inserirà una pre impostazione nelle tua impostazioni dell'area di lavoro."
+  "conflictProjectsDetected": "%extensionName% ha individuato conflitti tra le icone di progetto. Scegli quali icone di progetto usare. Nota: Questa azione inserirà una pre impostazione nelle tua impostazioni dell'area di lavoro.",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.ja.json → locale/lang/lang.nls.ja.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName%: NestJSプロジェクトと判断しましたが、'preset'設定が'false'に設定されています。全ての設定から'preset'設定を削除することを強く推奨します。「再読み込み」を選ぶとNestJSのアイコンは無効になります。",
   "nonNestDetectedPresetTrue": "%extensionName%: NestJSプロジェクトではないと判断しましたが、'preset'設定が'true'に設定されています。全ての設定から'preset'を削除することを強く推奨します。「再読み込み」を選ぶとNestJSのアイコンは有効になります。",
   "projectDetectionReset": "プロジェクト検出設定をリセットします。",
-  "conflictProjectsDetected": ""
+  "conflictProjectsDetected": "",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.json → locale/lang/lang.nls.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% has detected a NestJS project, but the 'preset' setting is set to 'false'. It's highly recommended to remove the 'preset' from the settings entirely. Selecting 'Restart' will disable the NestJS icons.",
   "nonNestDetectedPresetTrue": "%extensionName% has detected a non NestJS project, but the 'preset' setting is set to 'true'. It's highly recommended to remove the 'preset' from the settings entirely. Selecting 'Restart' will enable the NestJS icons.",
   "projectDetectionReset": "Project Detection defaults will be reset.",
-  "conflictProjectsDetected": "%extensionName% has detected conflicting project icons. Choose which project icons to use. Note: This action will set a preset in your workspace settings."
+  "conflictProjectsDetected": "%extensionName% has detected conflicting project icons. Choose which project icons to use. Note: This action will set a preset in your workspace settings.",
+  "unsupportedVersion": "Unsupported 'VS Code' version:",
+  "integrityFailure": "The integrity of the extension is compromised. There is NO guarantee that the extension will work as designed."
 }

locale/lang.pt-br.json → locale/lang/lang.nls.pt-br.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% detectou um projeto NestJS, mas a configuração 'Predefinição' é definida como 'false'. É altamente recomendado remover a 'Predefinição' completamente das configurações. Selecionar 'Reiniciar' irá desactivar os ícones de NestJS.",
   "nonNestDetectedPresetTrue": "%extensionName% detectou um projeto não NestJS, mas a configuração 'Predefinição' é definida como 'true'. É altamente recomendado remover a 'Predefinição' completamente das configurações. Selecionar 'Reiniciar' abilitará os ícones de NestJS.",
   "projectDetectionReset": "Padrões de detecção de projeto serão reinicializados.",
-  "conflictProjectsDetected": "%extensionName% detectou ícones do projeto conflitantes. Escolha quais projeto ícones para usar. Nota: Esta ação irá criar uma predefinição nas configurações do seu espaço de trabalho."
+  "conflictProjectsDetected": "%extensionName% detectou ícones do projeto conflitantes. Escolha quais projeto ícones para usar. Nota: Esta ação irá criar uma predefinição nas configurações do seu espaço de trabalho.",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }

locale/lang.ru.json → locale/lang/lang.nls.ru.json

@@ -38,5 +38,7 @@
   "nestDetectedPresetFalse": "%extensionName% обнаружил проект NestJS, но параметру 'preset' установлено значение 'false'. Рекомендуется полностью удалить параметр 'preset' из настроек. Выбор 'Перезапустить' отключит значки NestJS.",
   "nonNestDetectedPresetTrue": "%extensionName% обнаружил проект отличный от NestJS, но параметру 'preset' установлено значение 'true'. Рекомендуется полностью удалить параметр 'preset' из настроек. Выбор 'Перезапустить' включит значки NestJS.",
   "projectDetectionReset": "Определение проекта будет установлено по-умолчанию.",
-  "conflictProjectsDetected": ""
+  "conflictProjectsDetected": "",
+  "unsupportedVersion": "",
+  "integrityFailure": ""
 }