Merge remote-tracking branch 'upstream/master' into sg-json-for-json

Author: carols10cents

.buildpacks

@@ -1,4 +1,4 @@
-https://github.com/rcaught/heroku-buildpack-cmake#e4e2c9e
+https://github.com/Starkast/heroku-buildpack-cmake#a243c67
 https://github.com/emk/heroku-buildpack-rust#578d630
 https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz
 https://github.com/travis-ci/nginx-buildpack.git#2fbde35

.diesel_version

@@ -1 +1 @@
-0.16.0
+1.3.0

.eslintrc.js

@@ -4,31 +4,36 @@ module.exports = {
         ecmaVersion: 2017,
         sourceType: 'module',
         ecmaFeatures: {
-            'experimentalObjectRestSpread': true,
+            experimentalObjectRestSpread: true,
         },
     },
-    extends: [
-        'eslint:recommended',
-        'plugin:ember-suave/recommended',
-    ],
+    plugins: ['ember', 'prettier'],
+    extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
     env: {
         browser: true,
     },
     rules: {
+        'prettier/prettier': 'error',
+
         'arrow-parens': 'off',
         'brace-style': 'off',
-        'camelcase': 'off',
+        camelcase: 'off',
         'comma-dangle': 'off',
         'dot-notation': 'off',
-        'indent': ['error', 4],
         'operator-linebreak': 'off',
-        'quotes': ['error', 'single', {
-            'allowTemplateLiterals': true,
-            'avoidEscape': true,
-        }],
-
-        'ember-suave/no-const-outside-module-scope': 'off',
-        'ember-suave/no-direct-property-access': 'off',
-        'ember-suave/require-access-in-comments': 'off',
     },
+    overrides: [
+        // node files
+        {
+            files: ['testem.js', 'ember-cli-build.js', 'config/**/*.js', 'lib/*/index.js'],
+            parserOptions: {
+                sourceType: 'script',
+                ecmaVersion: 2015,
+            },
+            env: {
+                browser: false,
+                node: true,
+            },
+        },
+    ],
 };

.gitignore

@@ -13,6 +13,7 @@
 /.sass-cache
 /connect.lock
 /coverage/*
+/coverage_*
 /local_uploads
 /libpeerconnection.log
 npm-debug.log

.nycrc

@@ -0,0 +1,3 @@
+{
+    "temp-directory": "coverage"
+}

.rustfmt.toml

@@ -1,5 +1 @@
-combine_control_expr = true
 max_width = 100
-error_on_line_overflow = false
-write_mode = "Overwrite"
-

.template-lintrc.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/* eslint-env node */
+
+module.exports = {
+    extends: 'recommended',
+
+    rules: {
+        'block-indentation': false,
+        'img-alt-attributes': false,
+        'triple-curlies': false,
+    },
+};

.travis.yml

@@ -4,29 +4,36 @@ dist: trusty
 
 branches:
   except:
-  - staging.tmp
+    - staging.tmp
 
 cache:
   cargo: true
-
-addons:
-  chrome: stable
+  directories:
+    - $HOME/.npm
 
 env:
   global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
+    - JOBS=1 # See https://git.io/vdao3 for details.
+    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - CARGO_TARGET_DIR=target
+    - PERCY_PARALLEL_TOTAL=2
+    # Percy secrets are included here to enable Percy's GitHub integration
+    # on community-submitted PRs
+    - PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
+    - PERCY_PROJECT=crates-io/crates.io
 
 before_install:
-  - nvm install 8
+  - nvm install 10
 
 install:
-  - cargo install --force diesel_cli --vers 1.0.0 --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
+  - cargo install --force diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
 before_script:
   - diesel database setup
 
 addons:
+  chrome: stable
   postgresql: "9.5"
   apt:
     sources:
@@ -42,32 +49,26 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2017-12-28
-    script:
-    - cargo install --force rustfmt-nightly --vers 0.3.4
-    - cargo fmt -- --write-mode=diff
-    - cargo install --force clippy --vers 0.0.177
-    - cargo clippy
-  - rust: stable
-    script:
-    - cargo build
-    - cargo test
-    - npm install
-    - npm test
-  - rust: beta
-    script:
-    - cargo build
-    - cargo test
-  - rust: nightly
-    script:
-    - cargo build
-    - cargo test
-
-env:
-  global:
-    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - CARGO_TARGET_DIR=target
+    - rust: nightly-2018-06-26
+      script:
+        - cargo install --force clippy --vers 0.0.210
+        - cargo clippy
+    - rust: stable
+      script:
+        - rustup component add rustfmt-preview
+        - cargo fmt -- --write-mode=diff
+        - cargo build
+        - cargo test
+        - npm install
+        - npm test
+    - rust: beta
+      script:
+        - cargo build
+        - cargo test
+    - rust: nightly
+      script:
+        - cargo build
+        - cargo test
 
 notifications:
   email: