Merge pull request #284 from loki-project/development

Merge dev into master

.eslintignore

@@ -2,18 +2,16 @@ build/**
 components/**
 coverage/**
 dist/**
-
-# these aren't ready yet, pulling files in one-by-one
-libtextsecure/test/*.js
-test/*.js
-test/models/*.js
-test/views/*.js
+mnemonic_languages/**
 
 # Generated files
 js/components.js
 js/libtextsecure.js
+js/libloki.js
+js/util_worker.js
 js/libsignal-protocol-worker.js
 libtextsecure/components.js
+libloki/test/test.js
 libtextsecure/test/test.js
 test/test.js
 
@@ -29,3 +27,7 @@ test/blanket_mocha.js
 # TypeScript generated files
 ts/**/*.js
 
+# Libloki specific files
+libloki/test/components.js
+libloki/modules/mnemonic.js
+libloki/modules/sc_reduce32.js

.eslintrc.js

@@ -39,6 +39,9 @@ module.exports = {
     // consistently place operators at end of line except ternaries
     'operator-linebreak': 'error',
 
+    // Use LF to stay consistent
+    'linebreak-style': ['error', 'unix'],
+
     quotes: [
       'error',
       'single',

.gitattributes

@@ -0,0 +1 @@
+* text=false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Screenshots or Logs**
+If applicable, add screenshots or log files to help explain your problem.
+
+**Other information (please complete the following information):**
+ - Device: [e.g. PC, Mac]
+ - OS: [e.g. Ubuntu 16.04, Windows 10]
+ - Loki messenger Version or Git commit hash:

.gitignore

@@ -17,9 +17,13 @@ sql/
 
 # generated files
 js/components.js
+js/util_worker.js
 js/libtextsecure.js
+js/libloki.js
 libtextsecure/components.js
 libtextsecure/test/test.js
+libloki/test/components.js
+libloki/test/test.js
 stylesheets/*.css
 test/test.js
 

.gitlab-ci.yml

@@ -0,0 +1,61 @@
+# TODO: Figure out a way to use nvm in the linux build
+linux:
+  image: node:10.13.0
+  tags:
+    - docker
+  script:
+    - whoami
+    - node -v
+    - yarn -v
+    - yarn install --frozen-lockfile
+    - export SIGNAL_ENV=production
+    - yarn generate
+    - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
+  cache:
+    paths:
+      - node_modules/
+  artifacts:
+    paths:
+      - release/
+
+osx:
+  tags:
+    - osx
+  script:
+    - nvm install
+    - npm install --global yarn
+    - yarn install --frozen-lockfile
+    - export SIGNAL_ENV=production
+    - yarn generate
+    - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
+  cache:
+    paths:
+      - node_modules/
+  artifacts:
+    paths:
+      - release/
+
+windows:
+  tags:
+    - windows-cmd
+  script:
+    # install
+    - set PATH=%PATH%;C:\Users\Administrator\AppData\Local\nvs\
+    - set SIGNAL_ENV=production
+    - set /p NVMRC_VER=<.nvmrc
+    - call nvs add %NVMRC_VER%
+    - call nvs use %NVMRC_VER%
+    - call "C:\\PROGRA~2\\MICROS~1\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat"
+    - call yarn install --frozen-lockfile
+    # build
+    - call yarn generate
+    - call node build\grunt.js
+    - call yarn prepare-beta-build
+    - call node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
+    - call node build\grunt.js test-release:win
+  cache:
+    paths:
+      - node_modules/
+  artifacts:
+    paths:
+      - release/

.nvmrc

@@ -1 +1 @@
-8.9.3
+10.13.0

.prettierignore

@@ -6,7 +6,9 @@ config/local-*.json
 config/local.json
 dist/**
 js/components.js
+js/util_worker.js
 js/libtextsecure.js
+js/libloki.js
 libtextsecure/components.js
 libtextsecure/test/test.js
 stylesheets/*.css
@@ -15,15 +17,22 @@ ts/**/*.js
 ts/protobuf/*.d.ts
 ts/protobuf/*.js
 stylesheets/manifest.css
+ts/util/lint/exceptions.json
+
+# Libloki specific files
+libloki/test/test.js
+libloki/test/components.js
 
 # Third-party files
+node_modules/**
 components/**
 js/Mp3LameEncoder.min.js
 js/WebAudioRecorderMp3.js
 js/libsignal-protocol-worker.js
 libtextsecure/libsignal-protocol.js
 libtextsecure/test/blanket_mocha.js
 test/blanket_mocha.js
+mnemonic_languages/**
 
 # Test fixtures
 test/fixtures.js
@@ -41,3 +50,6 @@ _locales/**/*.json
 # Symlink into third-party `components`:
 stylesheets/_intlTelInput.scss
 
+# Coverage
+coverage/**
+.nyc_output/**

.travis.yml

@@ -1,22 +1,44 @@
 language: node_js
+cache:
+  yarn: true
+  directories:
+    - node_modules
 node_js:
-  - '8.9.3'
-os:
-  - linux
-dist: trusty
+  - '10.13.0'
 install:
-  - yarn install --frozen-lockfile
+  - travis_wait 30 yarn install --frozen-lockfile --network-timeout 1000000
 script:
   - yarn generate
-  - yarn lint
-  - yarn test-node
-  - yarn nsp check
-  - yarn prepare-beta-build
-  - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never
-  - ./travis.sh
+  - yarn lint-windows
+  - yarn test
 env:
   global:
     - SIGNAL_ENV: production
 sudo: false
 notifications:
   email: false
+
+matrix:
+  include:
+    - name: 'Linux'
+      os: linux
+      dist: trusty
+      before_install:
+        - sudo apt-get install -y libgtk2.0-0 libgtk-3-0 libgconf-2-4 libasound2 libxtst6 libxss1 libnss3 xvfb hunspell-en-us
+      before_script:
+        - Xvfb -ac -screen scrn 1280x2000x24 :9.0 &
+        - export DISPLAY=:9.0
+        - export LC_ALL=en_US
+    - name: 'OSX'
+      os: osx
+    - name: 'Windows'
+      os: windows
+      cache: false
+      env:
+        - YARN_GPG=no
+      before_install:
+        - cd ../..
+        - mv $TRAVIS_REPO_SLUG _old
+        - git config --global core.autocrlf false
+        - git clone --depth=50 _old $TRAVIS_REPO_SLUG
+        - cd $TRAVIS_REPO_SLUG