Merge branch 'master' into master

Author: smasala

.github/ISSUE_TEMPLATE.md

@@ -6,7 +6,7 @@ Before you write your question, please take some extra time to write a good titl
 - jquery version: 
 - datatables version: 
 - angular-datatables version: 
-- angular-MM version: 
+- angular-cli version: 
 
 ## What's the problem?
 

.gitignore

@@ -16,10 +16,12 @@ _temp
 !karma*.js
 !protractor*.js
 !systemjs.config.js
-!typings/typings.d.ts
-!wallaby.js
-!index.js
-!index.d.js
-!dist/*.js
-!dist/*.js.map
 !demo/src/**/*.js
+!rollup.conf.js
+!rollup-uglify.conf.js
+
+# angular-datatables specific
+*.js.map
+*.d.ts
+*.metadata.json
+index*.js

.npmignore

@@ -1,19 +1,67 @@
-examples
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
 node_modules
-src
-typings
-.editorconfig
-_test-output
-.travis.yml
+
+/.codeclimate.yml
+/.gitignore
+/.gitattributes
+/.npmignore
+/.travis.yml
+/.eslintignore
+/.eslintrc
+
+# Build System files
+/tslint.json
+/rollup-uglify.conf.js
+/rollup.conf.js
+/protractor.config.js
+/systemjs.config.js
+
+# Typescript source files
+*.ts
+!*.d.ts
+*.js.map
+!/bundles/*.js.map
+!*.metadata.json
+tsconfig.json
+tsconfig-build.json
+
+
+# Editor specific
+.idea
+.vscode
+
+# test cases
 karma-test-shim.js
 karma.conf.js
-tsconfig.json
-tslint.json
-typings.json
-protractor.config.js
+test
+_test-output
+
+# other stuffs
 .github
 DEVELOPER.md
-systemjs.config.js
-.vscode
+.editorconfig
+
+# angular-datatables specific
 demo
 deploy-doc.sh

.travis.yml

@@ -15,5 +15,4 @@ before_script:
 install:
   - npm install
 script:
-  - npm run lint
-  - npm run test-once
+  - npm run build

DEVELOPER.md

@@ -2,7 +2,7 @@
 
 ## Prerequisites
 
-Node.js and npm are essential to Angular 2 development.
+Node.js and npm are essential to Angular development.
 
 [Get it now](https://docs.npmjs.com/getting-started/installing-node) if it's not already installed on your machine.
 
@@ -71,3 +71,15 @@ Karma is occasionally confused and it is often necessary to shut down its browse
 restart it. No worries; it's pretty quick.
 
 The `HTML-Reporter` is also wired in. That produces a prettier output; look for it in `~_test-output/tests.html`.
+
+## Deploying the documentation to Github Pages
+
+Run `deploy-doc.sh` to deploy the documentation to the Github Pages
+
+You may need to have the following:
+- git
+- have the basic commands in your OS
+
+```
+./deploy-doc.sh <version>
+```

README.md

@@ -1,15 +1,15 @@
 # Angular DataTables [![Build Status](https://travis-ci.org/l-lin/angular-datatables.png?branch=angular2)](https://travis-ci.org/l-lin/angular-datatables) [![npm version](https://badge.fury.io/js/angular-datatables.svg)](https://badge.fury.io/js/angular-datatables)
 
-> [Angular 2](https://angular.io/) + [DataTables](https://datatables.net/)
+> [Angular](https://angular.io/) + [DataTables](https://datatables.net/)
 
 # Documentation
 
 Please check the [online documentation](http://l-lin.github.io/angular-datatables/)
 
 # FAQ
-## Why version 2.X? Where is version 1.X?
+## Why version 4.X? Where is version 3.X? And 1.X?
 
-Since AngularJS has released a version 2 that is breaking everything, I made a version 2 for simplicity purpose, to indicate the major version of this library is using the version 2 of AngularJS. 
+The major version of the projet (it's using a [Semantic versioning](http://semver.org/)) will be synchronized with the major version of Angular.
 
 ## Why is there less functionnalities?
 
@@ -23,10 +23,6 @@ Only on bugs, and only if I have the time (which I don't really have much nowada
 
 Let's not multiply the tools and do all in NPM! 
 
-## Where is the Angular renderer? What about the Promise renderer?
-
-Not developed yet!
-
 ## Where are the DTOptionsBuilder, DTColumnBuilder and DTColumnDefBuilder?
 
 In the first versions of angular-datatables, there were some builder to help using the directive.

demo/angular-cli.json renamed to demo/.angular-cli.json

@@ -1,6 +1,6 @@
 {
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.0-beta.24",
     "name": "angular-datatables-demo"
   },
   "apps": [
@@ -15,55 +15,59 @@
       ],
       "index": "index.html",
       "main": "main.ts",
+      "polyfills": "polyfills.ts",
       "test": "test.ts",
-      "tsconfig": "tsconfig.json",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
-      "mobile": false,
       "styles": [
         "../node_modules/datatables.net-dt/css/jquery.dataTables.css",
+        "../node_modules/datatables.net-buttons-dt/css/buttons.dataTables.css",
+        "../node_modules/datatables.net-colreorder-dt/css/colReorder.dataTables.css",
         "../node_modules/materialize-css/dist/css/materialize.css",
         "styles.css"
       ],
       "scripts": [
         "../node_modules/jquery/dist/jquery.js",
         "../node_modules/tether/dist/js/tether.js",
-        "../node_modules/datatables.net/js/jquery.dataTables.js"
+        "../node_modules/datatables.net/js/jquery.dataTables.js",
+        "../node_modules/datatables.net-buttons/js/dataTables.buttons.js",
+        "../node_modules/datatables.net-buttons/js/buttons.colVis.js",
+        "../node_modules/datatables.net-buttons/js/buttons.flash.js",
+        "../node_modules/datatables.net-buttons/js/buttons.html5.js",
+        "../node_modules/datatables.net-buttons/js/buttons.print.js",
+        "../node_modules/datatables.net-colreorder/js/dataTables.colReorder.js"
       ],
+      "environmentSource": "environments/environment.ts",
       "environments": {
-        "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
       }
     }
   ],
-  "addons": [],
-  "packages": [
-    "node_modules/angular2-highlight-js/lib"
-  ],
   "e2e": {
     "protractor": {
       "config": "./protractor.conf.js"
     }
   },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
   "test": {
     "karma": {
       "config": "./karma.conf.js"
     }
   },
   "defaults": {
     "styleExt": "css",
-    "prefixInterfaces": false,
-    "inline": {
-      "style": false,
-      "template": false
-    },
-    "spec": {
-      "class": false,
-      "component": true,
-      "directive": true,
-      "module": false,
-      "pipe": true,
-      "service": true
-    }
+    "component": {}
   }
 }

demo/README.md

@@ -1,27 +1,14 @@
 # angular-datatables demo
 
-This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.21.
+This project was generated with [angular-cli](https://github.com/angular/angular-cli).
 
 ## Development server
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+Run `npm start` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
-
-## Deploying to Github Pages
-
-Run `deploy-doc.sh` to deploy the documentation to the Github Pages
-
-You may need to have the following:
-- git
-- angular-cli installed in global
-- have the basic commands in your OS
-
-```
-./deploy-doc.sh "My commit message"
-```
+Run `npm run build:prod` to build the project. The build artifacts will be stored in the `dist/` directory.
 
 ## Further help
 
-To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

demo/karma.conf.js

@@ -4,35 +4,36 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
+    frameworks: ['jasmine', '@angular/cli'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
-      require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular/cli/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']
+      './src/test.ts': ['@angular/cli']
     },
     mime: {
       'text/x-typescript': ['ts','tsx']
     },
-    remapIstanbulReporter: {
-      reports: {
-        html: 'coverage',
-        lcovonly: './coverage/coverage.lcov'
-      }
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
     },
     angularCli: {
-      config: './angular-cli.json',
       environment: 'dev'
     },
     reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'karma-remap-istanbul']
-              : ['progress'],
+              ? ['progress', 'coverage-istanbul']
+              : ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,