upgrade package to rc.1 & build demo with webpack

tb · May 8, 2016 · 0a562f2 · 0a562f2
1 parent 9591f50
commit 0a562f2
Show file tree

Hide file tree

Showing 18 changed files with 351 additions and 216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .idea/
 node_modules/
 typings/
+demo/Users/
+demo/bundle.*
 npm-debug.log
diff --git a/bs-config.json b/bs-config.json
diff --git a/demo/styles.css → demo/app.scss b/demo/styles.css → demo/app.scss
@@ -1,3 +1,5 @@
+@import "~nouislider/distribute/nouislider.min.css";
+
 body {
 	padding-bottom: 100px;
 }

diff --git a/demo/app.ts b/demo/app.ts
@@ -1,17 +1,17 @@
 //our root app component
-import {Component} from 'angular2/core';
-import {Control} from 'angular2/common'
+import {Component} from '@angular/core';
 import {Nouislider} from 'ng2nouislider';
+import './app.scss';
 
 @Component({
-  selector: 'my-app',
+  selector: 'app',
   directives: [Nouislider],
-  templateUrl: 'demo/app.html'
+  template: require('./app.html')
 })
 export class App {
-  public someValue: any = 5;
-  public someRange: any = [3,7];
-  public someRange2: any = [10,15];
+  public someValue: number = 2;
+  public someRange: number[] = [3, 7];
+  public someRange2: number[] = [10, 15];
   public someRange2config: any = {
     behaviour: 'drag',
     connect: true,

diff --git a/demo/config.js b/demo/config.js
diff --git a/demo/index.html b/demo/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<title>ng2-nouislider</title>
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+</head>
+
+<body>
+	<div class="jumbotron">
+		<div class="container">
+			<h2>ng2-nouislider demos</h2>
+			<a href="https://github.com/tb/ng2-nouislider" class="btn btn-default">Back to GitHub</a>
+		</div>
+	</div>
+	<div class="container">
+		<app>
+			<br>
+			<br>
+			<p>Loading...</p>
+		</app>
+	</div>
+	<script src="bundle.js"></script>
+</body>
+
+</html>
diff --git a/demo/main.ts b/demo/main.ts
@@ -1,6 +1,7 @@
-//main entry point
-import {bootstrap} from 'angular2/platform/browser';
+import {bootstrap} from '@angular/platform-browser-dynamic';
 import {App} from './app';
 
-bootstrap(App, [])
-  .catch(err => console.error(err));
+document.addEventListener('DOMContentLoaded', function main() {
+  bootstrap(App, [])
+    .catch(err => console.error(err));
+});
diff --git a/demo/polyfills.ts b/demo/polyfills.ts
@@ -0,0 +1,3 @@
+import 'es6-shim';
+import 'reflect-metadata';
+require('zone.js/dist/zone');
diff --git a/index.html b/index.html
diff --git a/nouislider.js b/nouislider.js
diff --git a/nouislider.js.map b/nouislider.js.map
diff --git a/package.json b/package.json
@@ -2,13 +2,12 @@
   "name": "ng2-nouislider",
   "version": "0.3.0",
   "description": "Angular2 noUiSlider directive",
-  "main": "nouislider.js",
-  "typings": "nouislider.d.ts",
+  "main": "src/nouislider.js",
+  "typings": "src/nouislider.d.ts",
   "scripts": {
-    "build": "typings install && npm run lint && tsc",
-    "lint": "tslint src/*.ts",
-    "prepublish": "npm run build",
-    "start": "lite-server start"
+    "build": "typings install && tslint src/*.ts && tsc",
+    "start": "webpack-dev-server",
+    "start:demo": "webpack && http-server ./demo"
   },
   "keywords": [
     "angular2",
@@ -29,24 +28,33 @@
   },
   "devDependencies": {
     "@angular/common": "^2.0.0-rc.1",
-    "@angular/compiler":  "^2.0.0-rc.1",
+    "@angular/compiler": "^2.0.0-rc.1",
     "@angular/core": "^2.0.0-rc.1",
-    "@angular/platform-browser":  "^2.0.0-rc.1",
-    "@angular/platform-browser-dynamic":  "^2.0.0-rc.1",
-    "browser-sync": "^2.12.3",
+    "@angular/platform-browser": "^2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
+    "css-loader": "^0.23.1",
     "es6-shim": "^0.35.0",
-    "lite-server": "^2.2.0",
+    "http-server": "^0.9.0",
+    "node-sass": "^3.7.0",
     "nouislider": "^8.4.0",
-    "reflect-metadata": "^0.1.2",
-    "rxjs": "^5.0.0-beta.7",
+    "raw-loader": "^0.5.1",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "^5.0.0-beta.6",
+    "sass-loader": "^3.2.0",
+    "style-loader": "^0.13.1",
+    "ts-loader": "^0.8.2",
     "tslint": "^3.9.0",
+    "tslint-loader": "^2.1.4",
     "typescript": "^1.8.10",
     "typings": "^0.8.1",
+    "webpack": "^1.12.14",
+    "webpack-dev-server": "^1.14.1",
     "zone.js": "^0.6.12"
   },
   "peerDependencies": {
     "@angular/common": "^2.0.0-rc.1",
     "@angular/core": "^2.0.0-rc.1",
-    "nouislider": "^8.4.0"
+    "nouislider": "^8.4.0",
+    "rxjs": "^5.0.0-beta.6"
   }
 }
diff --git a/nouislider.d.ts → src/nouislider.d.ts b/nouislider.d.ts → src/nouislider.d.ts
@@ -14,6 +14,7 @@ export declare class Nouislider implements ControlValueAccessor, OnInit {
     max: number;
     step: number;
     config: any;
+    ngModel: number | number[];
     ngModelChange: EventEmitter<any>;
     constructor(el: ElementRef);
     ngOnInit(): void;