Merge pull request #1096 from wireapp/staging

release 2017-04-19

.eslintrc.yaml

@@ -11,30 +11,64 @@ globals:
   _: true
   $: true
   amplify: true
+  cryptobox: true
+  CryptoJS: true
   ko: true
+  libsodium: true
   LRUCache: true
   moment: true
   pako: true
+  platform: true
+  Proteus: true
   Raygun: true
   twttr: true
   wire: true
   z: true
 
+plugins:
+  - jsdoc
+
 rules:
+  array-bracket-spacing: [2, never]
+  arrow-parens: [2, always]
+  arrow-spacing: 2
+  block-spacing: 2
   brace-style: [2, 1tbs]
   comma-dangle: [2, always-multiline]
+  comma-spacing: [2, {before: false, after: true}]
+  comma-style: 2
+  computed-property-spacing: 2
+  eol-last: 2
+  func-call-spacing: 2
   handle-callback-err: 2
   indent: [2, 2, {SwitchCase: 1}]
+  jsdoc/require-hyphen-before-param-description: 2
+  key-spacing: 2
   keyword-spacing: 2
+  new-parens: 2
+  newline-per-chained-call: [2, {ignoreChainWithDepth: 2}]
+  no-console: 0
+  no-const-assign: 2
   no-dupe-class-members: 2
   no-else-return: 2
+  no-lonely-if: 2
   no-multi-spaces: 2
   no-shadow: 2
   no-unused-expressions: 2
   no-unused-vars: [2, {args: none}]
   no-var: 2
+  no-whitespace-before-property: 2
+  object-curly-spacing: [2, never]
+  prefer-const: 2
+  prefer-promise-reject-errors: 2
+  prefer-spread: 2
   quotes: [2, single, avoid-escape]
   semi: [2, always]
+  semi-spacing: [2, {before: false, after: true}]
   sort-vars: 2
   space-before-blocks: 2
+  space-before-function-paren: [2, never]
+  space-in-parens: [2, never]
+  spaced-comment: [2, always, {exceptions: ["#"]}]
   strict: [2, global]
+  valid-jsdoc: [2, {prefer: {return: returns}, requireParamDescription: true, requireReturnDescription: true}]

.stylelintrc.yaml

@@ -0,0 +1,6 @@
+rules:
+  font-family-name-quotes: always-where-required
+  function-url-quotes: never
+  number-leading-zero: never
+  selector-attribute-quotes: always
+  string-quotes: single

Gruntfile.js

@@ -101,11 +101,11 @@ module.exports = (grunt) => {
 
   grunt.registerTask('app_deploy_travis', (target) => {
     if (target === 'prod' || target === 'staging') {
-      return grunt.task.run(`set_version:${target}`, 'init', `prepare_${target}`, 'aws_prepare');
+      grunt.task.run(`set_version:${target}`, 'init', `prepare_${target}`, 'aws_prepare');
     } else if (target === 'dev') {
-      return grunt.task.run('set_version:staging', 'init', 'prepare_staging', 'aws_prepare');
+      grunt.task.run('set_version:staging', 'init', 'prepare_staging', 'aws_prepare');
     } else {
-      return grunt.fail.warn('Invalid target specified. Valid targets are: "prod" & "staging"');
+      grunt.fail.warn('Invalid target specified. Valid targets are: "prod" & "staging"');
     }
   });
 
@@ -123,7 +123,7 @@ module.exports = (grunt) => {
     const app_files = prepare_file_names(scripts.app);
     const component_files = prepare_file_names(scripts.component);
     const vendor_files = prepare_file_names(scripts.vendor);
-    const test_files = test_name ? ['../test/js/#{test_name}Spec.js'] : ['../test/**/*Spec.js'];
+    const test_files = test_name ? [`../test/js/${test_name}Spec.js`] : ['../test/**/*Spec.js'];
 
     const files = [].concat(helper_files, vendor_files, component_files, app_files, test_files);
     grunt.config('karma.options.files', files);
@@ -133,6 +133,14 @@ module.exports = (grunt) => {
 
   grunt.registerTask('test_run', (test_name) => {
     grunt.config('karma.options.reporters', ['progress']);
-    return grunt.task.run(['scripts', 'newer:coffee:dist', 'newer:coffee:test', 'copy:test', `test_prepare:${test_name}`, 'karma:test']);
+    grunt.task.run([
+      'scripts',
+      'newer:coffee:dist',
+      'newer:coffee:test',
+      'newer:copy:dist_js',
+      'copy:test',
+      `test_prepare:${test_name}`,
+      'karma:test',
+    ]);
   });
 };