Merge branch 'master' into pr/6

.gitignore

@@ -234,3 +234,8 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+
+# Generated output
+/bundles/
+/components/
+/ng2-bs3-modal.*

.npmignore

@@ -9,6 +9,8 @@ Desktop.ini
 .DS_Store
 
 demo
+test
 index.html
 tsconfig.json
-tslint.json
+tslint.json
+*.tgz

README.md

@@ -20,7 +20,7 @@ Or, if you're using systemjs, configure it to load them. And import them in your
 
 Then import and include in your component's directives:
 
-    import { MODAL_DIRECTIVES } from 'ng2-bs3-modal';
+    import { MODAL_DIRECTIVES } from 'ng2-bs3-modal/ng2-bs3-modal';
 
     @Component({
         directives: [MODAL_DIRECTIVES]

demo/app.component.ts

@@ -1,5 +1,5 @@
 import { Component } from 'angular2/core';
-import { MODAL_DIRECTIVES, ModalResult } from '../src/ng2-bs3-modal';
+import { MODAL_DIRECTIVES, ModalResult } from '../src/ng2-bs3-modal/ng2-bs3-modal';
 
 @Component({
     selector: 'modal-demo',

package.json

@@ -1,14 +1,17 @@
 {
   "name": "ng2-bs3-modal",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Angular2 Boostrap3 Modal Component",
-  "main": "dist/ng2-bs3-modal.js",
+  "main": "ng2-bs3-modal.js",
   "scripts": {
-    "peer": "npm install es6-promise@^3.0.2 es6-shim@^0.33.3 [email protected] [email protected] [email protected].11",
+    "peer": "npm install es6-promise@^3.0.2 es6-shim@^0.33.3 [email protected] [email protected] [email protected].14",
     "lint": "node ./node_modules/.bin/tslint ./src/**/*.ts",
-    "clean": "node ./node_modules/.bin/rimraf ./dist",
+    "clean": "node ./node_modules/.bin/rimraf ./bundles ./components ./ng2-bs3-modal.js ./ng2-bs3-modal.d.ts",
     "tsc": "node ./node_modules/.bin/tsc --project .",
-    "build": "npm run clean && npm run lint && npm run tsc",
+    "tsc-single": "node ./node_modules/.bin/tsc --project . --rootDir ./src --outFile ./bundles/ng2-bs3-modal.js",
+    "uglify": "node ./node_modules/.bin/uglifyjs ./bundles/ng2-bs3-modal.js --output ./bundles/ng2-bs3-modal.min.js",
+    "bundles": "npm run tsc-single && npm run uglify",
+    "build": "npm run clean && npm run lint && npm run tsc && npm run bundles",
     "prepublish": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -29,12 +32,18 @@
   },
   "homepage": "https://github.com/dougludlow/ng2-bs3-modal#readme",
   "devDependencies": {
+    "jasmine": "^2.4.1",
+    "karma": "^0.13.21",
+    "karma-jasmine": "^0.3.7",
+    "karma-phantomjs2-launcher": "^0.5.0",
+    "karma-spec-reporter": "0.0.24",
     "rimraf": "^2.5.1",
-    "tslint": "^3.3.0",
-    "typescript": "^1.7.5"
+    "tslint": "^3.4.0-dev.1",
+    "typescript": "^1.9.0-dev.20160217",
+    "uglify-js": "^2.6.2"
   },
   "dependencies": {
-    "angular2": "^2.0.0-beta.3"
+    "angular2": "^2.0.0-beta.6"
   },
   "peerDependencies": {
     "bootstrap": "3.3"