Merge pull request #62 from swftvsn/master

Update to Angular 6.0.0

Author: georgipeltekov

.angular-cli.json

@@ -1,4 +1,7 @@
 ## Change Log
+### [4.0.0](https://github.com/georgipeltekov/ngx-file-drop/compare/v3.0.2...v4.0.0) (2018-05-07)
+* Update to Angular 6.0.0
+
 ### [3.0.2](https://github.com/georgipeltekov/ngx-file-drop/compare/v3.0.1...v3.0.2) (2018-04-29)
 * Allow drag events to be ignored that originate from document (introduced in 3.0.1) even if using custom styles
 

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Overview
 
-An Angular 4 & 5 module for simple desktop file and folder drag and drop
+An Angular 6 module for simple desktop file and folder drag and drop. This library does not need rxjs-compat.
+
+For Angular 5 and 4 support please use older versions.
 
 ## DEMO
 You can check the [DEMO](https://georgipeltekov.github.io/) of the library 

README.md

@@ -0,0 +1,126 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "ngx-file-drop": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/sandbox/index.html",
+            "main": "src/sandbox/main.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/sandbox/polyfills.ts",
+            "assets": [
+              
+            ],
+            "styles": [
+              "src/sandbox/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/sandbox/environments/environment.ts",
+                  "with": "src/sandbox/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "ngx-file-drop:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "ngx-file-drop:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "ngx-file-drop:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/sandbox/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              "src/sandbox/styles.scss"
+            ],
+            "assets": [
+              
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "./src/tsconfig.app.json",
+              "./src/tsconfig.spec.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    },
+    "ngx-file-drop-e2e": {
+      "root": "",
+      "sourceRoot": "",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "ngx-file-drop:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "./e2e/tsconfig.e2e.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "ngx-file-drop",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "demo",
+      "styleext": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "demo"
+    }
+  }
+}

angular.json

@@ -4,28 +4,28 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     files: [
-      { pattern: './src/test.ts', watched: false }
+      
     ],
     preprocessors: {
-      './src/test.ts': ['@angular/cli']
+      
     },
     mime: {
       'text/x-typescript': ['ts','tsx']
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
     angularCli: {