merge confloicts solved

qlik-oss · Feb 22, 2019 · 585243b · 585243b
2 parents 979c036 + 8b76064
commit 585243b
Show file tree

Hide file tree

Showing 24 changed files with 1,308 additions and 354 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
   },
   globals: {
     angular: false,
+    beforeEach: false,
     define: false,
     describe: false,
     document: false,
@@ -41,12 +42,12 @@ module.exports = {
     "no-cond-assign": ["warn"],
     "no-fallthrough": ["warn"],
     "no-undef": ["error"],
-    "no-unused-vars": ["warn"],
-    "no-use-before-define": ["warn", { "functions": false, "classes": false, "variables": false }],
+    "no-unused-vars": ["error"],
+    "no-use-before-define": ["error", { "functions": false, "classes": false, "variables": false }],
     "no-useless-escape": ["warn"],
     "no-useless-return": ["warn"],
     "no-underscore-dangle": ["warn", { "allow": ["_id"] }],
-    "no-redeclare": ["warn"],
+    "no-redeclare": ["error"],
     "no-restricted-syntax": ["warn"],
     "operator-linebreak": ["warn", "before"],
     "prefer-promise-reject-errors": ["warn"],
@@ -63,11 +64,11 @@ module.exports = {
     "complexity": ["warn"],
     "camelcase": ["warn"],
     "max-statements": ["off"],  // marks the entire functions, a bit too noisy
-    "sort-vars": ["warn"],
+    "sort-vars": ["off"], // not much value for the work
     "init-declarations": ["off"],
     "capitalized-comments": ["off"],
     "one-var": ["off"],
-    "no-var": ["warn"],
+    "no-var": ["error"],
     "no-plusplus": ["warn"],
     "vars-on-top": ["off"],
     "no-magic-numbers": ["off"], // useful, but also complains for reasonable checks with actual numbers
@@ -80,7 +81,7 @@ module.exports = {
     "quote-props": ["off"],
     "prefer-template": ["warn"],
     "no-lonely-if": ["warn"],
-    "sort-keys": ["warn"],
+    "sort-keys": ["off"], // not much value for the work
     "no-implicit-coercion": ["warn"],
     "no-inline-comments": ["off"],
     "spaced-comment": ["warn"],
@@ -107,7 +108,7 @@ module.exports = {
     "strict": ["warn"],
     "no-ternary": ["off"],
     "multiline-ternary": ["off"],
-    "no-param-reassign": ["warn"],
+    "no-param-reassign": ["error"],
     "prefer-destructuring": ["warn"],
     "arrow-parens": ["off"],
     "no-array-constructor": ["warn"],

diff --git a/karma.conf.js b/karma.conf.js
@@ -1,3 +1,4 @@
+const path = require('path');
 const settings = require('./settings');
 
 module.exports = (config) => {
@@ -6,37 +7,62 @@ module.exports = (config) => {
     customLaunchers: {
       SlimChromeHeadless: {
         base: 'ChromeHeadless',
-        flags: ['--headless', '--disable-gpu', '--disable-translate', '--disable-extensions']
+        flags: [
+          '--headless',
+          '--disable-gpu',
+          '--disable-translate',
+          '--disable-extensions'
+        ]
       }
     },
     files: [
-      { pattern: 'src/*.spec.js', watched: false }
+      {
+        pattern: 'src/**/*.spec.js',
+        watched: true
+      }
     ],
     frameworks: ['jasmine'],
     preprocessors: {
-      'src/*.spec.js': ['webpack', 'sourcemap']
+      'src/**/*.spec.{js, jsx}': [
+        'webpack',
+        'sourcemap'
+      ]
     },
     webpack: {
       devtool: 'source-map',
-      mode: settings.mode,
       externals: {
         jquery: {
           amd: 'jquery',
           commonjs: 'jquery',
           commonjs2: 'jquery',
           root: '_'
-        },
+        }
       },
+      mode: settings.mode,
       module: {
         rules: [
           {
-            test: /\.js$/,
             exclude: [/node_modules/],
-            loaders: ['babel-loader']
+            loader: 'babel-loader',
+            options: {
+              plugins: [
+                '@babel/plugin-transform-async-to-generator',
+                '@babel/plugin-proposal-class-properties'],
+              presets: ['@babel/preset-react']
+            },
+            test: /\.(js|jsx)$/
           },
-          { test: /\.less$/, loader: 'ignore-loader' },
-          { test: /\.json$/, loader: 'ignore-loader' }
+          {
+            loader: 'ignore-loader',
+            test: /\.less$/
+          }
         ]
+      },
+      resolve: {
+        alias: {
+          'test-utilities': path.resolve('test/test-utilities')
+        },
+        modules: ['node_modules']
       }
     }
   });