updated to use RC1

techieshravan · May 15, 2016 · b234f56 · b234f56
1 parent 77fad74
commit b234f56
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 27 deletions.
diff --git a/CustomValidator/app/CustomValidators.ts b/CustomValidator/app/CustomValidators.ts
@@ -1,10 +1,9 @@
-import {Control} from "angular2/common";
+import {Control} from '@angular/common';
 
 export class CustomValidators {
 
  static emailValidator(control: Control) {
  if (!control.value.match(/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/)) {
-
  return { 'invalidEmailAddress': true };
  }
  }

diff --git a/CustomValidator/app/app.component.ts b/CustomValidator/app/app.component.ts
@@ -1,7 +1,6 @@
-import {Component} from 'angular2/core';
-import {Control, ControlGroup} from 'angular2/common';
-import {FormBuilder, Validators} from 'angular2/common';
-import {CustomValidators} from "./CustomValidators";
+import {Component} from '@angular/core';
+import {ControlGroup, FormBuilder, Validators} from '@angular/common';
+import {CustomValidators} from './CustomValidators';
 
 @Component({
  selector: 'model-driven-forms-app',

diff --git a/CustomValidator/app/boot.ts b/CustomValidator/app/boot.ts
diff --git a/CustomValidator/app/main.ts b/CustomValidator/app/main.ts
@@ -0,0 +1,4 @@
+import {bootstrap} from '@angular/platform-browser-dynamic';
+import {AppComponent} from './app.component';
+
+bootstrap(AppComponent);
diff --git a/CustomValidator/index.html b/CustomValidator/index.html
@@ -3,28 +3,20 @@
 <head>
  <title>Angular 2 Model Driven Forms</title>
  <meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css"
- rel="stylesheet">
+ <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
 
  <!-- 1. Load libraries -->
- <!-- IE required polyfills (from CDN), in this exact order -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.33.3/es6-shim.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.16/system-polyfills.js"></script>
- <script src="https://code.angularjs.org/tools/system.js"></script>
- <script src="https://code.angularjs.org/tools/typescript.js"></script>
- <script src="https://code.angularjs.org/2.0.0-beta.6/angular2-polyfills.js"></script>
- <script src="https://code.angularjs.org/2.0.0-beta.6/Rx.js"></script>
- <script src="https://code.angularjs.org/2.0.0-beta.6/angular2.dev.js"></script>
+ <!-- Polyfill(s) for older browsers -->
+ <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+
+ <script src="node_modules/zone.js/dist/zone.js"></script>
+ <script src="node_modules/reflect-metadata/Reflect.js"></script>
+ <script src="node_modules/systemjs/dist/system.src.js"></script>
 
  <!-- 2. Configure SystemJS -->
+ <script src="systemjs.config.js"></script>
  <script>
- System.config({
- transpiler: 'typescript',
- typescriptOptions: { emitDecoratorMetadata: true },
- packages: {'app': {defaultExtension: 'ts'}}
- });
- System.import('app/boot')
- .then(null, console.error.bind(console));
+ System.import('app').catch(function(err){ console.error(err); });
  </script>
 </head>
 <!-- 3. Display the application -->

diff --git a/CustomValidator/package.json b/CustomValidator/package.json
@@ -0,0 +1,35 @@
+{
+ "name": "angular2-custom-validator",
+ "version": "1.0.0",
+ "description": "",
+ "main": "index.js",
+ "scripts": {
+ "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
+ "lite": "lite-server",
+ "postinstall": "typings install",
+ "tsc": "tsc",
+ "tsc:w": "tsc -w",
+ "typings": "typings"
+ },
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "@angular/common": "^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",
+
+ "es6-shim": "^0.35.1",
+ "reflect-metadata": "^0.1.3",
+ "rxjs": "5.0.0-beta.6",
+ "systemjs": "^0.19.27",
+ "zone.js": "^0.6.12"
+ },
+ "devDependencies": {
+ "concurrently": "^2.1.0",
+ "lite-server": "^2.2.0",
+ "typescript": "^1.8.10",
+ "typings": "^0.8.1"
+ }
+}
diff --git a/CustomValidator/systemjs.config.js b/CustomValidator/systemjs.config.js
@@ -0,0 +1,37 @@
+(function(global) {
+
+ // map tells the System loader where to look for things
+ var _map = {
+ 'app': 'app', // 'dist',
+ 'rxjs': 'node_modules/rxjs',
+ '@angular': 'node_modules/@angular'
+ };
+
+ // packages tells the System loader how to load when no filename and/or no extension
+ var _packages = {
+ 'app': { main: 'main.js', defaultExtension: 'js' },
+ 'rxjs': { defaultExtension: 'js' }
+ };
+
+ var _defaultPackages = [
+ '@angular/core',
+ '@angular/common',
+ '@angular/compiler',
+ '@angular/platform-browser',
+ '@angular/platform-browser-dynamic',
+ 'rxjs'
+ ];
+
+ _defaultPackages.forEach(function (item) {
+ // Angular's Default Packages are always using `index` as an entry point.
+ _packages[item] = { main: 'index' };
+ });
+
+ var config = {
+ map: _map,
+ packages: _packages
+ };
+
+ System.config(config);
+
+})(this);
diff --git a/CustomValidator/tsconfig.json b/CustomValidator/tsconfig.json
@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "commonjs",
+ "moduleResolution": "node",
+ "sourceMap": false,
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "removeComments": false,
+ "noImplicitAny": false
+ },
+ "exclude": [
+ "node_modules",
+ "typings/main",
+ "typings/main.d.ts"
+ ]
+}
diff --git a/CustomValidator/typings.json b/CustomValidator/typings.json
@@ -0,0 +1,7 @@
+{
+ "ambientDependencies": {
+ "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
+ "jasmine": "registry:dt/jasmine#2.2.0+20160412134438",
+ "node": "registry:dt/node#4.0.0+20160509154515"
+ }
+}