v1.0.0

Try again to commit package-lock.json

CHANGELOG.md

@@ -1,3 +1,10 @@
+Changes in [1.0.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.0.0) (2019-02-14)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v1.0.0-rc.2...v1.0.0)
+
+ * Try again to commit package-lock.json
+   [\#841](https://github.com/matrix-org/matrix-js-sdk/pull/841)
+
 Changes in [1.0.0-rc.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.0.0-rc.2) (2019-02-14)
 ==========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v1.0.0-rc.1...v1.0.0-rc.2)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-js-sdk",
-  "version": "0.14.2",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-js-sdk",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0",
   "description": "Matrix Client-Server SDK for Javascript",
   "main": "index.js",
   "scripts": {

release.sh

@@ -155,8 +155,8 @@ echo "npm version"
 # manually commit the result.
 npm version --no-git-tag-version "$release"
 
-# commit package-lock.json if it exists and is versioned
-if [[ -f package-lock.json && -z `git status --porcelain --ignored package-lock.json` ]];
+# commit package-lock.json if it exists, is versioned, and is modified
+if [[ -f package-lock.json && `git status --porcelain package-lock.json | grep '^ M'` ]];
 then
     pkglock='package-lock.json'
 else