Merge pull request #546 from Aluxian/staging

Staging

.eslintrc

@@ -1,9 +1,10 @@
 {
+  "root": true,
   "parser": "babel-eslint",
   "plugins": [
     "babel"
   ],
-  "extends": "semistandard",
+  "extends": "standard",
   "globals": {
     "log": true,
     "logError": true,
@@ -23,6 +24,9 @@
     "babel/object-shorthand": 1,
     "babel/arrow-parens": 1,
     "babel/no-await-in-loop": 1,
-    "babel/flow-object-type": 1
+    "babel/flow-object-type": 1,
+    "semi": [2, "always"],
+    "no-extra-semi": 2,
+    "semi-spacing": [2, { "before": false, "after": true }]
   }
 }

.lesshintrc

@@ -3,5 +3,6 @@
   "importantRule": false,
   "propertyOrdering": false,
   "singleLinePerSelector": false,
-  "spaceAroundOperator": false
+  "spaceAroundOperator": false,
+  "newlineAfterBlock": false
 }

.travis.yml

@@ -22,19 +22,17 @@ env:
 install:
   - git clone https://github.com/creationix/nvm.git /tmp/.nvm
   - source /tmp/.nvm/nvm.sh
-  - nvm install 5.0
-  - nvm use 5.0
+  - nvm install 5.5
+  - nvm use 5.5
   - npm install -g gulp
   - npm install
-  - ./ciscripts/darwin/install_aws.sh
-  - ./ciscripts/darwin/rebuild_src.sh
 
 before_script:
   - npm test
 
 script:
-  - if [[ $TRAVIS_BRANCH == 'staging' ]]; then ./ciscripts/darwin/build_staging.sh; fi
-  - if [[ $TRAVIS_BRANCH == 'deploy' ]]; then ./ciscripts/darwin/build_deploy.sh; fi
+  - if [[ $TRAVIS_BRANCH == 'staging' ]]; then ./ciscripts/travis/build_staging.sh; fi
+  - if [[ $TRAVIS_BRANCH == 'deploy' ]]; then ./ciscripts/travis/build_deploy.sh; fi
 
 cache:
   directories:

CHANGELOG.json

@@ -1,4 +1,16 @@
 [{
+  "version": "2.0.1",
+  "channel": "beta",
+  "releasedAt": 1473193961005,
+  "urgency": "low",
+  "changes": {
+    "General": [
+      "Add toggle to auto-hide the sidebar.",
+      "Various fixes and improvements.",
+      "Dependency updates."
+    ]
+  }
+}, {
   "version": "2.0.0",
   "channel": "beta",
   "releasedAt": 1472191336102,

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.0.1-beta](https://github.com/Aluxian/Facebook-Messenger-Desktop/tree/v2.0.1) (2016-06-09)
+
+[Full Changelog](https://github.com/Aluxian/Facebook-Messenger-Desktop/compare/v2.0.0...v2.0.1) • [Download](https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/tag/v2.0.1)
+
+**General**
+
+- Add toggle to auto-hide the sidebar.
+- Various fixes and improvements.
+- Dependency updates.
+
 ## [2.0.0-beta](https://github.com/Aluxian/Facebook-Messenger-Desktop/tree/v2.0.0) (2016-25-08)
 
 [Download](https://github.com/Aluxian/Facebook-Messenger-Desktop/releases/tag/v2.0.0)

appveyor.yml

@@ -11,6 +11,7 @@ init:
 
 environment:
   SIGNTOOL_PATH: 'C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Bin/SignTool.exe'
+  MAKENSIS_PATH: 'C:/Program Files (x86)/NSIS/makensis.exe'
   SIGN_WIN_CERTIFICATE_FILE: 'C:/foss_ar_sha2.pfx'
   SIGN_WIN_CERTIFICATE_PASSWORD:
     secure: jZHktkydPALqcwx36cBY1g==
@@ -28,6 +29,8 @@ environment:
     secure: OSFCKJBPssEPIO/kA78OTrW6t+YkxTgSg06To+mKawr+VbUeQBgf+HkW1MWSirEF
   SQUIRREL_UPDATES_URL:
     secure: BNlChGRei/OKFGO3EQIc2yVSlm11vzsw/Uz65zjTUw4Ir3FfSlHOY02WMhPBI6Su
+  IS_IC_FUSION_STR_AUTH_KEY:
+    secure: pvzSRQOpU6vFJmJohnjxXLTL9a8hSaHpRq051AUAms39EhrMtH8HhTtlDceSDRNJGthWvDD7S5+R8XAIWH+K39G6wushNDMhsnQjNk4JvRc2IXz3LH0gPsHJ0vcoxPJkMx58Ws/1O3NC4ec2QO5LDlD/uO9JX6O9oe3YC91ehUyWKszpFTwCBfWUg5LbO1X1hbx/DfZibR9GLz0GrPTzCC1Cbxhk5MeIXZyaRVlz6K33UJzQkutZaIG3p1j0FV8cDVwwuneoDvtvGYSrEl/OudI+BGPQbvRausx+uW+RRunujxrBHSmwTTZ1gDft5JEYUfeIM7je33oGbBa8KgXAkhm2E9pn1mJD/0Gcp60jViuKcW+ib9FSvSE6HOAumz6t
 
 cache:
   - "node_modules -> package.json"
@@ -47,8 +50,8 @@ test_script:
   - npm test
 
 deploy_script:
-  - if "%APPVEYOR_REPO_BRANCH%" == "staging" ciscripts\win32\build_staging.cmd
-  - if "%APPVEYOR_REPO_BRANCH%" == "deploy" ciscripts\win32\build_deploy.cmd
+  - if "%APPVEYOR_REPO_BRANCH%" == "staging" ciscripts\appveyor\build_staging.cmd
+  - if "%APPVEYOR_REPO_BRANCH%" == "deploy" ciscripts\appveyor\build_deploy.cmd
 
 notifications:
   - provider: Webhook

circle.yml

@@ -14,11 +14,11 @@ deployment:
   staging:
     branch: staging
     commands:
-      - ./ciscripts/linux/build_staging.sh
+      - ./ciscripts/circleci/build_staging.sh
   deploy:
     branch: deploy
     commands:
-      - ./ciscripts/linux/build_deploy.sh
+      - ./ciscripts/circleci/build_deploy.sh
 
 notify:
   webhooks:

ciscripts/win32/build.cmd → ciscripts/appveyor/build.cmd

@@ -7,4 +7,5 @@ cd ..
 CALL gulp rebuild:32 --verbose
 CALL gulp pack:win32:portable --prod --verbose
 CALL gulp pack:win32:installer --prod --verbose
+CALL gulp pack:win32:nsis --prod --verbose
 CALL gulp clean:prev-releases:win32 --verbose

ciscripts/win32/build_deploy.cmd → ciscripts/appveyor/build_deploy.cmd

@@ -1,4 +1,4 @@
 @ECHO ON
 
-CALL ciscripts\win32\build.cmd
+CALL ciscripts\appveyor\build.cmd
 CALL gulp publish:github --verbose

ciscripts/win32/build_staging.cmd → ciscripts/appveyor/build_staging.cmd

@@ -1,4 +1,4 @@
 @ECHO ON
 
-CALL ciscripts\win32\build.cmd
+CALL ciscripts\appveyor\build.cmd
 CALL gulp publish:bintray:artifacts:win32 --verbose

ciscripts/linux/build.sh → ciscripts/circleci/build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash -ev
 
-./ciscripts/linux/dependencies.sh;
-./ciscripts/linux/install_aws.sh;
-./ciscripts/linux/git_setup.sh;
+./ciscripts/circleci/dependencies.sh;
+./ciscripts/circleci/install_aws.sh;
+./ciscripts/circleci/git_setup.sh;
 
 gulp changelog:linux --verbose
 

ciscripts/linux/build_deploy.sh → ciscripts/circleci/build_deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ev
 
-./ciscripts/linux/build.sh
+./ciscripts/circleci/build.sh
 gulp publish:bintray:deb --verbose
 gulp publish:bintray:rpm --verbose
 gulp publish:github --verbose

ciscripts/linux/build_staging.sh → ciscripts/circleci/build_staging.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -ev
 
-./ciscripts/linux/build.sh
+./ciscripts/circleci/build.sh
 gulp publish:bintray:artifacts:linux --verbose

ciscripts/travis/build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -ev
+
+./ciscripts/travis/install_aws.sh
+./ciscripts/travis/import_cert.sh
+
+cd src && npm install && cd ..
+
+gulp rebuild:64 --verbose
+gulp pack:darwin64:dmg --prod --verbose
+gulp pack:darwin64:zip --prod --verbose

ciscripts/darwin/build_deploy.sh → ciscripts/travis/build_deploy.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -ev
 
-./ciscripts/darwin/build.sh
+./ciscripts/travis/build.sh
 gulp publish:github --verbose

ciscripts/darwin/build_staging.sh → ciscripts/travis/build_staging.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -ev
 
-./ciscripts/darwin/build.sh
+./ciscripts/travis/build.sh
 gulp publish:bintray:artifacts:darwin --verbose

package.json

@@ -1,25 +1,25 @@
 {
   "name": "messengerfordesktop",
   "dependencies": {
-    "asar": "0.11.0",
+    "asar": "0.12.3",
     "async": "2.0.1",
     "babel-plugin-default-import-checker": "1.0.8",
-    "babel-plugin-transform-runtime": "6.9.0",
-    "babel-preset-es2015": "6.9.0",
+    "babel-plugin-transform-runtime": "6.15.0",
+    "babel-preset-es2015": "6.14.0",
     "babel-preset-stage-0": "6.5.0",
     "beeper": "1.1.0",
     "coffee-script": "1.10.0",
     "colors": "1.1.2",
     "cross-spawn": "4.0.0",
-    "del": "2.2.1",
-    "electron-windows-installer": "1.4.2",
+    "del": "2.2.2",
+    "electron-windows-installer": "1.4.4",
     "fs-extra-promise": "0.4.0",
     "gulp": "3.9.1",
     "gulp-babel": "6.1.2",
     "gulp-electron-downloader": "0.1.6",
     "gulp-filter": "4.0.0",
-    "gulp-github-release": "1.1.5",
-    "gulp-header": "1.8.7",
+    "gulp-github-release": "1.2.0",
+    "gulp-header": "1.8.8",
     "gulp-if": "2.0.1",
     "gulp-less": "3.1.0",
     "gulp-mustache": "2.2.0",
@@ -28,21 +28,19 @@
     "gulp-sourcemaps": "1.6.0",
     "gulp-zip": "3.2.0",
     "moment": "2.14.1",
-    "rcedit": "0.5.1",
+    "rcedit": "0.7.0",
     "request": "2.74.0",
     "require-dir": "0.3.0"
   },
   "devDependencies": {
     "babel-eslint": "6.1.2",
     "coffeelint": "1.15.7",
-    "eslint": "2.13.1",
-    "eslint-config-semistandard": "6.0.2",
+    "eslint": "3.4.0",
     "eslint-config-standard": "5.3.5",
     "eslint-plugin-babel": "3.3.0",
-    "eslint-plugin-promise": "1.3.2",
-    "eslint-plugin-react": "5.2.2",
-    "eslint-plugin-standard": "1.3.2",
-    "lesshint": "2.0.0"
+    "eslint-plugin-promise": "2.0.1",
+    "eslint-plugin-standard": "2.0.0",
+    "lesshint": "2.1.0"
   },
   "optionalDependencies": {
     "appdmg": "0.4.5"