Merge branch 'ng6'

* ng6:
  Add rxjs6 as peer dependency for 3.0.0. Bump to 3.0.1
  Add Angular6 and rxjs^6 support. Change the way of building the library

Author: Peshou

README.md

@@ -2,23 +2,11 @@
 
 
 ## Canvas version changes
-v2.0.0 and Premade Shapes are here. Since this is a breaking changes version,
-here are the things that have changed:
-* Added shapes and shapes service for registering new shapes (see below)
-* Added a shapesMap to keep check of which shapes are drawn (maybe for drag and move in the future)
-* Added the `export interface CanvasWhiteboardOptions` to a different file so please reimport it
-* Made the undo function to only undo your drawings and not someone else
-* After a drawing, remove the redo items from the stack
-* Changed the `CanvasWhiteboardUpdate` deserialize and serialize methods and variables, so please check them out. (Example: the deserializeJson uses JSON.parse on the data received)
-* Added debounce timer for window resize to improve performance and redrawing
-* Added `fillColor` and fill color colorpicker
-* Added the text: "Transparent" in colorpickers for people to be able to select transparent color
-* The undo and redo outputs now output the UUID of the shape to undo/redo
-
-Add a canvas component which the user can draw on. 
-<br/>The coordinates are drawn as a percentage of the containers width and height.
-<br/>To reuse them anywhere, they need to be remapped (multiply the received x and y coordinates with their width and height accordingly)
+#### v3.0.0 Removes the `rxjs-compat` library and adds `rxjs^6`. This means that older versions will not be supported if they upgrade to `ng2-canvas-whiteboard^3.0.0`.
+#### *This version also changes the way of how this library is built and made ready for publish.*
 
+#### For applications before Angular 6 please use versions below v3.0.0.
+#
 **Features:**<br/>
 - Premade Shapes
 - The ability to create custom premade shapes
@@ -31,8 +19,6 @@ Add a canvas component which the user can draw on.
 
 # Install
 
-*NOTE: If you are using `rxjs^6`, please use `npm install --save rxjs-compat` to allow backwards compatibility for this module*
-
 1. Install npm module:
 
     ```bash

build.js

@@ -0,0 +1,54 @@
+"use strict";
+
+require('shelljs/global');
+const chalk = require('chalk');
+
+const PACKAGE = `ng2-canvas-whiteboard`;
+const NPM_DIR = `dist`;
+const MODULES_DIR = `${NPM_DIR}/modules`;
+const BUNDLES_DIR = `${NPM_DIR}/bundles`;
+
+echo('Start building...');
+
+rm(`-Rf`, `${NPM_DIR}/*`);
+mkdir(`-p`, `./${MODULES_DIR}`);
+mkdir(`-p`, `./${BUNDLES_DIR}`);
+
+/* Aot compilation: ES2015 sources */
+echo(`Start AoT compilation`);
+exec(`ngc -p tsconfig-build.json`);
+echo(chalk.green(`AoT compilation completed`));
+
+/* Creates bundles: ESM/ES5 and UMD bundles */
+echo(`Start bundling`);
+echo(`Rollup package`);
+exec(`rollup -i ${NPM_DIR}/${PACKAGE}.js -o ${MODULES_DIR}/${PACKAGE}.js --sourcemap`, {silent: true});
+exec(`node scripts/map-sources -f ${MODULES_DIR}/${PACKAGE}.js`);
+
+echo(`Downleveling ES2015 to ESM/ES5`);
+cp(`${MODULES_DIR}/${PACKAGE}.js`, `${MODULES_DIR}/${PACKAGE}.es5.ts`);
+exec(`tsc ${MODULES_DIR}/${PACKAGE}.es5.ts --target es5 --module es2015 --noLib --sourceMap`, {silent: true});
+exec(`node scripts/map-sources -f ${MODULES_DIR}/${PACKAGE}.es5.js`);
+rm(`-f`, `${MODULES_DIR}/${PACKAGE}.es5.ts`);
+
+echo(`Run Rollup conversion on package`);
+exec(`rollup -c rollup.config.js --sourcemap`, {silent: true});
+exec(`node scripts/map-sources -f ${BUNDLES_DIR}/${PACKAGE}.umd.js`);
+
+echo(`Minifying`);
+cd(`${BUNDLES_DIR}`);
+exec(`uglifyjs -c --screw-ie8 --comments -o ${PACKAGE}.umd.min.js --source-map ${PACKAGE}.umd.min.js.map --source-map-include-sources ${PACKAGE}.umd.js`, {silent: true});
+exec(`node ../../scripts/map-sources -f ${PACKAGE}.umd.min.js`);
+cd(`..`);
+cd(`..`);
+
+echo(chalk.green(`Bundling completed`));
+
+rm(`-Rf`, `${NPM_DIR}/*.js`);
+rm(`-Rf`, `${NPM_DIR}/*.js.map`);
+rm(`-Rf`, `${NPM_DIR}/src/**/*.js`);
+rm(`-Rf`, `${NPM_DIR}/src/**/*.js.map`);
+
+cp(`-Rf`, [`package.json`, `LICENSE`, `README.md`], `${NPM_DIR}`);
+
+echo(chalk.green(`End building`));

dist/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Web Factory LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.