Merge pull request #254 from buehler/develop

Release 2017-07-15
buehler · Jul 15, 2017 · 8898d80 · 8898d80
2 parents 26c8fad + 8eb626b
commit 8898d80
Show file tree

Hide file tree

Showing 22 changed files with 469 additions and 293 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,7 +51,8 @@ script:
 
 after_script:
   - greenkeeper-lockfile-upload
-  - github_changelog_generator --no-verbose -u buehler -p typescript-hero --enhancement-labels "enhancement,feature" --include-labels "bug,enhancement,feature"
+  - npm run semantic-release-pre
+  - github_changelog_generator --no-verbose -u buehler -p typescript-hero --enhancement-labels "enhancement,feature" --include-labels "bug,enhancement,feature" --future-release $(node -p "require('./package.json').version")
   - npm install -g vsce
   - npm run semantic-release
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -31,26 +31,7 @@
             "outFiles": [
                 "${workspaceRoot}/out/test/**/*.js"
             ]
-        },
-        {
-            "name": "Attach Server",
-            "type": "node",
-            "protocol": "auto",
-            "request": "attach",
-            "port": 6004,
-            "sourceMaps": true,
-            "outFiles": [
-                "${workspaceRoot}/out/**/*.js"
-            ]
         }
     ],
-    "compounds": [
-        {
-            "name": "Launch Extension & Server",
-            "configurations": [
-                "Launch Extension",
-                "Attach Server"
-            ]
-        }
-    ]
+    "compounds": []
 }
diff --git a/README.md b/README.md
@@ -8,6 +8,15 @@ If you search for this feature: here's the solution (and many more). Typescript
 in the future and there are many features in the pipeline that will enhance the way you
 work with typescript.
 
+[![Travis build](https://img.shields.io/travis/buehler/typescript-hero.svg)](https://travis-ci.org/buehler/typescript-hero)
+[![Marketplace](https://vsmarketplacebadge.apphb.com/version-short/rbbit.typescript-hero.svg)](https://marketplace.visualstudio.com/items?itemName=rbbit.typescript-hero)
+[![Installs](https://vsmarketplacebadge.apphb.com/installs/rbbit.typescript-hero.svg)](https://marketplace.visualstudio.com/items?itemName=rbbit.typescript-hero)
+[![GitHub issues](https://img.shields.io/github/issues/buehler/typescript-hero.svg)](https://github.com/buehler/typescript-hero/issues)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/buehler/typescript-hero.svg)](https://github.com/buehler/typescript-hero/pulls)
+[![Semantic release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![Greenkeeper](https://badges.greenkeeper.io/buehler/typescript-hero.svg)](https://greenkeeper.io/)
+[![License](https://img.shields.io/github/license/buehler/typescript-hero.svg)](https://github.com/buehler/typescript-hero/blob/master/LICENSE)
+
 ## Features at a glance
 
 Here is a brief list, of what TypeScript Hero is capable of (more at the end):
@@ -73,6 +82,7 @@ The following settings do have the prefix `resolver`. So an example setting coul
 | multiLineTrailingComma                | When multiline imports are created, `true` inserts a trailing comma to the last line |
 | disableImportSorting                  | Disable sorting during organize imports action                                       |
 | importGroups                          | The groups that are used for sorting the imports (description below)                 |
+| ignoreImportsForOrganize              | Imports that are never removed during organize import (e.g. react)                   |
 
 ### Code outline view