Merge branch 'testing'

Author: Leo Vo

.angular-cli.json

@@ -5,6 +5,34 @@
   },
   "apps": [
     {
+      "name": "lib",
+      "root": "src",
+      "outDir": "dist/demo",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.lib.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "ngx",
+      "styles": [
+        "../node_modules/font-awesome/scss/font-awesome.scss",
+        "../node_modules/bootstrap/scss/bootstrap.scss",
+        "styles.scss"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    },
+    {
+      "name": "demo",
       "root": "src",
       "outDir": "dist/demo",
       "assets": [
@@ -48,6 +76,13 @@
     }
   ],
   "test": {
+    "codeCoverage": {
+      "exclude": [
+        "src/polyfills.ts",
+        "**/test.ts",
+        "src/testing/*.*"
+      ]
+    },
     "karma": {
       "config": "./karma.conf.js"
     }
@@ -56,4 +91,4 @@
     "styleExt": "scss",
     "component": {}
   }
-}
+}

.travis.yml

@@ -1,20 +1,43 @@
+#
+# Configuration
+#
+
 sudo: required
 dist: trusty
+
+notifications:
+  email: true
+
 addons:
   apt:
     sources:
       - google-chrome
     packages:
       - google-chrome-stable
+
 language: node_js
 node_js:
   - 6
+
+branches:
+  only:
+    - master
+
+#
+# Build Lifecycle:
+#
+
+install:
+  - npm config set loglevel warn
+  - npm install
+
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-install:
-  - npm install
+
 script:
-  - npm run lint
-  - npm run test-ci
-  - npm run e2e
+  - npm run ci
+
+after_success:
+  # Send coverage info off to cloud ppl
+  - ./node_modules/.bin/codecov

.vscode/settings.json

@@ -0,0 +1,6 @@
+// Place your settings in this file to overwrite the default settings
+{
+    "typescript.check.tscVersion": true,
+    "files.autoSave": "off",
+    "eslint.enable": false
+}

CHANGELOG.md

@@ -6,4 +6,10 @@
 # [0.0.5](https://www.npmjs.com/package/ngx-treeview) (2017-05-25)
 
 ### Enhancement: 
-* Item always expands when matching search filter.
+* Item always expands when matching search filter.
+
+# [0.0.6](https://www.npmjs.com/package/ngx-treeview) (2017-05-25)
+
+### Enhancement: 
+* Build bundles.
+* 100% code coverage.

README.md

@@ -1,4 +1,9 @@
-# ngx-treeview [![Build Status](https://travis-ci.org/leovo2708/ngx-treeview.svg?branch=master)](https://travis-ci.org/leovo2708/ngx-treeview) [![npm version](https://img.shields.io/npm/v/ngx-treeview.svg)](https://www.npmjs.com/package/ngx-treeview)
+[![Build Status](https://travis-ci.org/leovo2708/ngx-treeview.svg)](https://travis-ci.org/leovo2708/ngx-treeview)
+[![codecov](https://codecov.io/gh/leovo2708/ngx-treeview/badge.svg)](https://codecov.io/gh/leovo2708/ngx-treeview)
+[![npm version](https://img.shields.io/npm/v/ngx-treeview.svg)](https://www.npmjs.com/package/ngx-treeview)
+[![npm](https://img.shields.io/npm/l/ngx-treeview.svg)]()
+
+# ngx-treeview
 
 An Angular treeview component with checkbox
 

bs-config.json

@@ -0,0 +1,8 @@
+{
+    "server": {
+        "baseDir": "dist/demo",
+        "routes": {
+            "/node_modules": "node_modules"
+        }
+    }
+}

gulpfile.js

@@ -0,0 +1,81 @@
+const path = require('path');
+const gulp = require('gulp');
+const through = require('through2');
+const sass = require('node-sass');
+const fs = require('fs');
+
+const paths = {
+    src: 'src/lib',
+    dist: 'dist/lib'
+}
+
+gulp.task('inline', function () {
+    const globs = [
+        path.join(paths.dist, '**', '*.js'),
+    ];
+    gulp.src(globs).pipe(through.obj((file, encode, callback) => {
+        const filePath = file.path;
+
+        function resolveUrl(url) {
+            return path.join(paths.src, url);
+        }
+
+        function inlineTemplate(content) {
+            return content.replace(/templateUrl:\s*'([^']+?\.html)'/g, (matchers, templateUrl) => {
+                const templateFile = resolveUrl(templateUrl);
+                const templateContent = fs.readFileSync(templateFile, encode);
+                const shortenedTemplate = templateContent
+                    .replace(/([\n\r]\s*)+/gm, ' ');
+                return `template: '${shortenedTemplate}'`;
+            });
+        }
+
+        function inlineStyles(content) {
+            return content.replace(/styleUrls:\s*(\[[\s\S]*?\])/gm, (matchers, styleUrls) => {
+                const urls = eval(styleUrls);
+                return 'styles: ['
+                    + urls.map(styleUrl => {
+                        const styleFile = resolveUrl(styleUrl);
+                        let styleContent = fs.readFileSync(styleFile, encode);
+                        if (/\.(scss)$/i.test(styleUrl)) {
+                            styleContent = compileSass(styleContent, styleFile);
+                        }
+                        const shortenedStyle = styleContent
+                            .replace(/([\n\r]\s*)+/gm, ' ');
+                        return `'${shortenedStyle}'`;
+                    }).join(',\n') + ']';
+            });
+        }
+
+        function compileSass(content, file) {
+            const result = sass.renderSync({
+                data: content,
+                file: file,
+                outputStyle: 'compact'
+            });
+            return result.css.toString();
+        }
+
+        function removeModuleId(content) {
+            return content.replace(/\s*moduleId:\s*module\.id\s*,?\s*/gm, '');
+        }
+
+        function inline(content) {
+            return [
+                inlineTemplate,
+                inlineStyles,
+                removeModuleId
+            ].reduce((content, fn) => fn(content), content);
+        }
+
+        if (/\.(component.js)$/i.test(filePath)) {
+            let fileContent = file.contents.toString();
+            fileContent = inline(fileContent);
+            file.contents = new Buffer(fileContent);
+        }
+
+        return callback(null, file);
+    })).pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('default', ['inline']);

karma.conf.js

@@ -15,25 +15,14 @@ module.exports = function (config) {
     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' ],
       fixWebpackSourcePaths: true
     },
     angularCli: {
       environment: 'dev'
     },
-    reporters: config.angularCli && config.angularCli.codeCoverage
-              ? ['progress', 'coverage-istanbul']
-              : ['progress', 'kjhtml'],
+    reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,