Add typescript and typings as devDependencies and use npm scripts for install, build, and test related actions to prevent need for global dependencies.

Matt Mazzola · Matt Mazzola · commit 7063c32fce42 · 2016-08-08T10:56:22.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,6 @@
 language: node_js
 node_js:
-- '4.4'
-before_install:
-- npm install -g typings typescript
-- npm link typescript
-- typings install
-script: gulp test
+- node
 after_success:
 - ".travis/push.sh"
 branches:
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,28 +1,21 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "0.1.0",
-  "command": "gulp",
-  "isShellCommand": true,
-  "args": [
-    "--no-color"
-  ],
-  "tasks": [
-    {
-      "taskName": "build",
-      "args": [],
-      "isBuildCommand": true,
-      "isWatching": false,
-      "problemMatcher": [
-        "$lessCompile",
-        "$tsc",
-        "$jshint"
-      ]
-    },
-    {
-      "taskName": "test",
-      "args": ["--chrome"],
-      "isTestCommand": true
-    }
-  ]
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "npm",
+    "isShellCommand": true,
+    "showOutput": "always",
+    "suppressTaskName": true,
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": ["run", "build"],
+            "isBuildCommand": true
+        },
+        {
+            "taskName": "test",
+            "args": ["run", "test", "--", "--chrome"],
+            "isTestCommand": true
+        }
+    ]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,54 +2,50 @@
 
 ## Setup
 
-Install Global Depenedencies if needed:
-```
-npm install -g typings gulp
-```
-
 Clone the repository:
 ```
 git clone https://github.com/Microsoft/PowerBI-JavaScript.git powerbi-client
 ```
 
-Install Dependencies:
+Navigate to the cloned directory
+
+Install local dependencies:
 ```
 npm install
-typings install
-``` 
+```
 
 ## Build:
 ```
-gulp build
+npm run build
 ```
 Or if using VScode: `Ctrl + Shift + B`
 
 ## Test
-Run tests with PhantomJS
 ```
-gulp test
+npm test
 ```
+By default the tests run using PhantomJS
 
 There are various command line arguments that can be passed to the test command to facilitate debugging:
 
 Run tests with Chrome
 ```
-gulp test --chrome
+npm test -- --chrome
 ```
 
 Enable  debug level logging for karma, and remove code coverage
 ```
-gulp test --debug
+npm test -- --debug
 ```
 
 Disable single run to remain open for debugging
 ```
-gulp test --watch
+npm test -- --watch
 ```
 
 These are often combined and typical command for debugging tests is:
 ```
-gulp test --chrome --debug --watch
+npm test -- --chrome --debug --watch
 ```
 
 The build and tests use webpack to compile all the source modules into one bundled module that can execute in the browser.
@@ -66,6 +62,7 @@ Run http-server from demo directory:
 ```
 http-server
 ```
+You can install `http-server` using `npm install -g http-server`;
 
 Open the demo folder in the browser: `http://127.0.0.1:8080/`
 ```
diff --git a/package.json b/package.json
@@ -11,9 +11,11 @@
     "test": "test"
   },
   "scripts": {
+    "build": "gulp build",
     "version": "gulp build && git add .",
+    "postinstall": "typings install",
     "prepublish": "gulp build",
-    "test": "gulp test --chrome"
+    "test": "gulp test"
   },
   "keywords": [
     "microsoft",
@@ -61,6 +63,8 @@
     "run-sequence": "^1.1.5",
     "ts-loader": "^0.8.1",
     "tslint": "^3.6.0",
+    "typescript": "^1.8.10",
+    "typings": "^1.3.2",
     "webpack": "^1.12.14",
     "webpack-stream": "^3.1.0",
     "yargs": "^4.4.0"
