dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Mark Polak (markpo)
------------------------------------------------------------
revno: 21021 [merge]
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-11-10 21:40:59 +0100
message:
  Lock npm  dependencies
modified:
  .bzrignore
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/package.json


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file '.bzrignore'
--- .bzrignore	2015-11-10 20:27:51 +0000
+++ .bzrignore	2015-11-10 20:39:56 +0000
@@ -27,5 +27,5 @@
 ./.travis.yml
 .DS_Store
 dhis-2/projectFilesBackup
-./**/dhis-web-commons/javascripts/dhis2/coverage/
-./**/dhis-web-commons/javascripts/dhis2/node_modules/
+coverage
+node_modules

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/package.json'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/package.json	2015-11-10 20:20:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/package.json	2015-11-10 20:39:56 +0000
@@ -10,39 +10,42 @@
     "test": "./node_modules/karma-cli/bin/karma start test/karma.config.js --single-run",
     "test-watch": "./node_modules/karma-cli/bin/karma start test/karma.config.js",
     "test-cov": "npm test",
-    "posttest-cov": "open ./coverage/chrome/lcov-report/index.html",
+    "posttest-cov": "open ./coverage/phantomjs/lcov-report/index.html",
     "lint": "./node_modules/eslint/bin/eslint.js test"
   },
   "author": "Mark Polak",
   "license": "BSD-3-Clause",
-  "dependencies": {
-    "babel-core": "^6.1.2",
-    "babel-loader": "^6.1.0",
-    "chai": "^3.4.1",
-    "karma": "^0.13.15",
-    "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^0.2.1",
-    "karma-cli": "^0.1.1",
-    "karma-mocha": "^0.2.0",
-    "karma-sourcemap-loader": "^0.3.6",
-    "karma-webpack": "^1.7.0",
-    "mocha": "^2.3.3",
-    "webpack": "^1.12.3"
-  },
+  "dependencies": {},
   "devDependencies": {
-    "angular-mocks": "^1.3.15",
-    "babel-eslint": "^4.1.5",
-    "babel-preset-es2015": "^6.1.2",
-    "eslint": "^1.9.0",
+    "babel-core": "6.1.2",
+    "babel-loader": "6.1.0",
+    "chai": "3.4.1",
+    "karma": "0.13.15",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "0.2.1",
+    "karma-cli": "0.1.1",
+    "karma-mocha": "0.2.0",
+    "karma-sourcemap-loader": "0.3.6",
+    "karma-webpack": "1.7.0",
+    "mocha": "2.3.3",
+    "webpack": "1.12.3",
+    "angular-mocks": "1.3.15",
+    "babel-eslint": "4.1.5",
+    "babel-preset-es2015": "6.1.2",
+    "eslint": "1.9.0",
     "eslint-config-dhis2": "0.0.5",
-    "eslint-plugin-react": "^3.8.0",
-    "karma-coverage": "^0.5.3",
-    "karma-phantomjs-launcher": "^0.2.1",
-    "karma-sinon": "^1.0.4",
-    "karma-sinon-chai": "^1.1.0",
-    "phantomjs": "^1.9.18",
+    "eslint-plugin-react": "3.8.0",
+    "karma-coverage": "0.5.3",
+    "karma-phantomjs-launcher": "0.2.1",
+    "karma-sinon": "1.0.4",
+    "karma-sinon-chai": "1.1.0",
+    "phantomjs": "1.9.18",
     "phantomjs-polyfill": "0.0.1",
-    "sinon": "^1.17.2",
-    "sinon-chai": "^2.8.0"
-  }
+    "sinon": "1.17.2",
+    "sinon-chai": "2.8.0"
+  },
+  "keywords": [
+    "Tracker",
+    "DHIS2"
+  ]
 }