Skip to content

Commit e09fb76

Browse files
committed
feat(gen): also build test dir (just like generators dir)
1 parent 621acec commit e09fb76

File tree

26 files changed

+57
-7
lines changed

26 files changed

+57
-7
lines changed

Diff for: .gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
node_modules
22
bower_components
3-
test/temp
3+
/generators/*
4+
/test/*
45
demo
56
.idea
67
.DS_Store
7-
release.txt
8-
test/fixtures/bower.json
9-
test/fixtures/package.json
10-
generators
8+
release.txt

Diff for: gulpfile.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,36 @@ var gulp = require('gulp');
66
var babel = require('gulp-babel');
77
var del = require('del');
88
var runSequence = require('run-sequence');
9+
var merge = require('merge-stream');
910

1011
gulp.task('clean', () => {
1112
return del(['generators/**/*']);
1213
});
1314

1415
gulp.task('babel', () => {
15-
return gulp.src(['src/**/*.js'])
16+
let generators = gulp.src(['src/generators/**/*.js'])
1617
.pipe(babel())
1718
.pipe(gulp.dest('generators'));
19+
20+
let test = gulp.src(['src/test/**/*.js'])
21+
.pipe(babel())
22+
.pipe(gulp.dest('test'));
23+
24+
return merge(generators);
1825
});
1926

2027
gulp.task('watch', () => {
2128
return gulp.watch('src/**/*.js', ['babel']);
2229
});
2330

2431
gulp.task('copy', () => {
25-
return gulp.src(['src/**/*', '!src/**/*.js'])
32+
let nonJsGen = gulp.src(['src/generators/**/*', '!src/generators/**/*.js'], {dot: true})
2633
.pipe(gulp.dest('generators'));
34+
35+
let nonJsTest = gulp.src(['src/test/**/*', '!src/test/**/*.js'], {dot: true})
36+
.pipe(gulp.dest('test'));
37+
38+
return merge(nonJsGen, nonJsTest);
2739
});
2840

2941
gulp.task('build', cb => {

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"grunt-release": "^0.13.0",
6969
"gulp": "^3.9.1",
7070
"jit-grunt": "~0.10.0",
71+
"merge-stream": "^1.0.0",
7172
"mocha": "^2.2.5",
7273
"q": "^1.0.1",
7374
"recursive-readdir": "^2.0.0",

Diff for: src/app/USAGE renamed to src/generators/app/USAGE

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: src/util.js renamed to src/generators/util.js

File renamed without changes.

Diff for: src/test/fixtures/.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "bower_components"
3+
}

Diff for: src/test/fixtures/.yo-rc.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"generator-angular-fullstack": {
3+
"endpointDirectory": "server/api/",
4+
"insertRoutes": true,
5+
"registerRoutesFile": "server/routes.js",
6+
"routesNeedle": "// Insert routes below",
7+
"routesBase": "/api/",
8+
"pluralizeRoutes": true,
9+
"insertSockets": true,
10+
"registerSocketsFile": "server/config/socketio.js",
11+
"socketsNeedle": "// Insert sockets below",
12+
"insertModels": true,
13+
"registerModelsFile": "server/sqldb/index.js",
14+
"modelsNeedle": "// Insert models below",
15+
"filters": {
16+
"babel": true,
17+
"html": true,
18+
"less": true,
19+
"uirouter": true,
20+
"bootstrap": false,
21+
"uibootstrap": false,
22+
"socketio": true,
23+
"auth": true,
24+
"models": true,
25+
"mongooseModels": true,
26+
"mongoose": true,
27+
"oauth": true,
28+
"googleAuth": true,
29+
"grunt": true,
30+
"mocha": true,
31+
"jasmine": false,
32+
"should": true,
33+
"expect": false
34+
}
35+
}
36+
}
File renamed without changes.

0 commit comments

Comments
 (0)