Merge branch 'master' of github.com:UltimateHackingKeyboard/agent

packages/uhk-web/package.json

@@ -48,14 +48,9 @@
     "buffer": "5.0.6",
     "circular-dependency-plugin": "^4.2.1",
     "codelyzer": "3.0.1",
-    "copy-webpack-plugin": "~4.4.1",
-    "cssnano": "3.10.0",
     "dragula": "3.7.2",
-    "file-loader": "^1.1.5",
-    "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "html-webpack-plugin": "^2.29.0",
-    "istanbul-instrumenter-loader": "^3.0.0",
     "jasmine-core": "2.6.2",
     "jasmine-spec-reporter": "4.1.0",
     "jquery": "3.2.1",
@@ -65,41 +60,24 @@
     "karma-coverage-istanbul-reporter": "1.2.1",
     "karma-jasmine": "1.1.0",
     "karma-jasmine-html-reporter": "0.2.2",
-    "less-loader": "^4.0.5",
     "lodash-es": "4.17.4",
     "ng2-dragula": "1.5.0",
-    "ng2-nouislider": "^1.7.6",
+    "ng2-nouislider": "^1.7.7",
     "ng2-select2": "1.0.0-beta.10",
     "ngx-clipboard": "10.0.0",
     "ngrx-store-freeze": "0.1.9",
-    "nouislider": "^10.1.0",
-    "postcss-loader": "^2.0.10",
+    "nouislider": "^11.1.0",
     "postcss-url": "^7.1.2",
     "protractor": "5.1.2",
-    "raw-loader": "^0.5.1",
     "reselect": "3.0.1",
     "rxjs": "5.5.8",
-    "sass-loader": "^6.0.6",
-    "script-loader": "0.7.0",
     "select2": "4.0.3",
-    "source-map-loader": "0.2.0",
-    "style-loader": "^0.19.1",
-    "stylus-loader": "^3.0.1",
-    "sudo-prompt": "7.1.1",
-    "ts-loader": "2.3.1",
-    "ts-node": "3.0.4",
     "typescript": "2.6.2",
     "uhk-common": "1.0.0",
-    "url-loader": "^0.6.2",
-    "webpack": "~3.11.0",
-    "webpack-dev-server": "~2.11.0",
-    "webpack-svgstore-plugin": "4.0.1",
     "xml-loader": "1.2.1",
     "zone.js": "0.8.26",
     "@angular-devkit/core": "0.3.2",
-    "@ngtools/webpack": "1.10.2",
-    "postcss-import": "^11.0.0",
-    "uglifyjs-webpack-plugin": "^1.1.8"
+    "@ngtools/webpack": "1.10.2"
   },
   "dependencies": {
     "classlist.js": "1.1.20150312",

packages/uhk-web/src/app/components/slider-wrapper/slider-wrapper.component.ts

@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, EventEmitter, forwardRef, Input, Output, OnDestroy, ViewChild } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { NouisliderComponent } from 'ng2-nouislider/src/nouislider';
+import { NouisliderComponent } from 'ng2-nouislider';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import 'rxjs/add/operator/debounceTime';

packages/uhk-web/webpack.config.js

@@ -129,7 +129,11 @@ module.exports = {
             "./src",
             "./node_modules"
         ],
-        "alias": rxPaths(),
+        "alias": {
+            ...rxPaths(),
+            'nouislider':path.join(projectRoot, 'node_modules/nouislider/distribute/nouislider.js'),
+            'ng2-nouislider':path.join(projectRoot, 'node_modules/ng2-nouislider/src/nouislider.js')
+        },
         "mainFields": [
             "browser",
             "module",
@@ -413,7 +417,7 @@ module.exports = {
             "scripts": [
                 path.join(process.cwd(), "node_modules/bootstrap/dist/js/bootstrap.js"),
                 path.join(process.cwd(), "node_modules/select2/dist/js/select2.full.js"),
-                path.join(process.cwd(), "node_modules/nouislider/distribute/nouislider.js")
+                // path.join(process.cwd(), "node_modules/nouislider/distribute/nouislider.js")
             ],
             "basePath": path.resolve(process.cwd())
         }),