Skip to content

Commit 61d6e95

Browse files
committed
Several minor modifications
1 parent 2316365 commit 61d6e95

File tree

7 files changed

+82
-30
lines changed

7 files changed

+82
-30
lines changed

.editorconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
indent_style = space
8+
indent_size = 2
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
insert_final_newline = false
15+
trim_trailing_whitespace = false

.jshintrc

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"bitwise": true,
3+
"immed": true,
4+
"newcap": true,
5+
"noarg": true,
6+
"noempty": true,
7+
"nonew": true,
8+
"trailing": true,
9+
"maxlen": 200,
10+
"boss": true,
11+
"eqnull": true,
12+
"expr": true,
13+
"globalstrict": true,
14+
"laxbreak": true,
15+
"loopfunc": true,
16+
"sub": true,
17+
"undef": true,
18+
"indent": 2,
19+
"unused": true,
20+
21+
"node": true,
22+
"globals": {
23+
"System": true
24+
}
25+
}

README.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ It is something similar to the AngularJS Quick Start but does the entire build w
1313
```bash
1414
git clone https://github.com/mgechev/angular2-seed.git
1515
cd angular2-seed
16-
# If you don't have gulp already installed
17-
npm install -g gulp
16+
# If you don't have gulp and/or tsd already installed
17+
npm install -g gulp tsd
1818
npm install
1919
# dev
2020
gulp serve.dev
21-
# test
22-
gulp test
2321
```
2422

2523
# Directory Structure
@@ -68,6 +66,17 @@ vim gulpfile.js
6866
```
6967
Add reference to the installed library in `PATH.src.lib`.
7068

69+
# Running test
70+
71+
```bash
72+
# In a single bash window
73+
gulp test # or npm test
74+
75+
# Debug - In two bash windows
76+
npm run karma # 1st window
77+
gulp test-dev # 2nd window
78+
```
79+
7180
# Contributors
7281

7382
[<img alt="mgechev" src="https://avatars.githubusercontent.com/u/455023?v=3&s=117" width="117">](https://github.com/mgechev) |[<img alt="ludohenin" src="https://avatars.githubusercontent.com/u/1011516?v=3&s=117" width="117">](https://github.com/ludohenin) |[<img alt="NathanWalker" src="https://avatars.githubusercontent.com/u/457187?v=3&s=117" width="117">](https://github.com/NathanWalker) |[<img alt="aboeglin" src="https://avatars.githubusercontent.com/u/8297302?v=3&s=117" width="117">](https://github.com/aboeglin) |[<img alt="mjwwit" src="https://avatars.githubusercontent.com/u/4455124?v=3&s=117" width="117">](https://github.com/mjwwit) |[<img alt="dstockhammer" src="https://avatars.githubusercontent.com/u/1156637?v=3&s=117" width="117">](https://github.com/dstockhammer) |

app/app.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {Component, View, bootstrap} from 'angular2/angular2';
2-
import {RouteConfig, RouterOutlet, RouterLink, ROUTER_BINDINGS} from 'angular2/router';
2+
import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_BINDINGS} from 'angular2/router';
3+
// import {HTTP_BINDINGS} from 'http/http';
34

45
import {Home} from './components/home/home';
56
import {About} from './components/about/about';
@@ -15,7 +16,8 @@ import {NamesList} from './services/NameList';
1516
])
1617
@View({
1718
templateUrl: './app.html?v=<%= VERSION %>',
18-
directives: [RouterOutlet, RouterLink]
19+
styleUrls: ['./app.css'],
20+
directives: [ROUTER_DIRECTIVES]
1921
})
2022
class App {}
2123

app/components/about/about.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, View, NgFor} from 'angular2/angular2';
1+
import {Component, View, CORE_DIRECTIVES} from 'angular2/angular2';
22

33
import {NamesList} from '../../services/NameList';
44

@@ -7,7 +7,7 @@ import {NamesList} from '../../services/NameList';
77
})
88
@View({
99
templateUrl: './components/about/about.html?v=<%= VERSION %>',
10-
directives: [NgFor]
10+
directives: [CORE_DIRECTIVES]
1111
})
1212
export class About {
1313
constructor(public list: NamesList) {

gulpfile.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
"use strict";
22

3+
// Gulp dev.
34
var gulp = require('gulp');
45
var bump = require('gulp-bump');
5-
var concat = require('gulp-concat');
6-
var filter = require('gulp-filter');
76
var inject = require('gulp-inject');
87
var inlineNg2Template = require('gulp-inline-ng2-template');
9-
var minifyCSS = require('gulp-minify-css');
10-
var minifyHTML = require('gulp-minify-html');
118
var plumber = require('gulp-plumber');
129
var shell = require('gulp-shell');
1310
var sourcemaps = require('gulp-sourcemaps');
1411
var template = require('gulp-template');
1512
var tsc = require('gulp-typescript');
16-
var uglify = require('gulp-uglify');
1713
var watch = require('gulp-watch');
14+
// Gulp prod.
15+
// var concat = require('gulp-concat');
16+
// var filter = require('gulp-filter');
17+
// var minifyCSS = require('gulp-minify-css');
18+
// var minifyHTML = require('gulp-minify-html');
19+
// var uglify = require('gulp-uglify');
20+
1821

1922
var Builder = require('systemjs-builder');
2023
var del = require('del');
@@ -35,7 +38,10 @@ var connectLivereload = require('connect-livereload');
3538

3639
// --------------
3740
// Configuration.
41+
var PORT = 5555;
42+
var LIVE_RELOAD_PORT = 4002;
3843
var APP_BASE = '/';
44+
3945
var APP_SRC = 'app';
4046
var APP_DEST = 'dist';
4147
var ANGULAR_BUNDLES = './node_modules/angular2/bundles/';
@@ -54,33 +60,22 @@ var PATH = {
5460
},
5561
src: {
5662
all: APP_SRC,
57-
loader: [
63+
lib: [
64+
// Order is quite important here for the HTML tag injection.
5865
'./node_modules/angular2/node_modules/traceur/bin/traceur-runtime.js',
5966
'./node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.js',
6067
'./node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.js.map',
6168
'./node_modules/reflect-metadata/Reflect.js',
6269
'./node_modules/reflect-metadata/Reflect.js.map',
63-
'./node_modules/systemjs/dist/system.src.js'
64-
],
65-
loaderConfig: [
66-
APP_SRC + '/system.config.js'
67-
],
68-
// Order is quite important here for the HTML tag injection.
69-
angular: [
70+
'./node_modules/systemjs/dist/system.src.js',
71+
APP_SRC + '/system.config.js',
7072
ANGULAR_BUNDLES + '/angular2.dev.js',
7173
ANGULAR_BUNDLES + '/router.dev.js',
7274
ANGULAR_BUNDLES + '/http.dev.js'
7375
]
7476
}
7577
};
7678

77-
PATH.src.lib = PATH.src.loader
78-
.concat(PATH.src.loaderConfig)
79-
.concat(PATH.src.angular);
80-
81-
var PORT = 5555;
82-
var LIVE_RELOAD_PORT = 4002;
83-
8479
var HTMLMinifierOpts = { conditionals: true };
8580

8681
var tsProject = tsc.createProject('tsconfig.json', {
@@ -206,6 +201,12 @@ gulp.task('karma.start', ['build.test'], function(done) {
206201
}, done);
207202
});
208203

204+
gulp.task('test-dev', ['build.test'], function() {
205+
watch('./app/**', function() {
206+
gulp.start('build.test');
207+
});
208+
});
209+
209210
gulp.task('test', ['karma.start'], function() {
210211
watch('./app/**', function() {
211212
gulp.start('karma.start');
@@ -268,7 +269,6 @@ function injectableDevAssetsRef() {
268269
var src = PATH.src.lib.map(function (path) {
269270
return join(PATH.dest.dev.lib, path.split('/').pop());
270271
});
271-
src.push(join(PATH.dest.dev.all, '**/*.css'));
272272
return src;
273273
}
274274

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "Seed for Angular 2 apps",
55
"repository": "https://github.com/mgechev/angular2-seed",
66
"scripts": {
7-
"test": "echo \"Error: no test specified\" && exit 1",
7+
"test": "gulp test",
8+
"karma": "node_modules/.bin/karma start",
89
"postinstall": "gulp postinstall"
910
},
1011
"author": "Minko Gechev <mgechev>",

0 commit comments

Comments
 (0)