Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit c2e176a

Browse files
committed
Finish 0.3.4
2 parents b2b3480 + b7f6087 commit c2e176a

11 files changed

+181
-215
lines changed

build/bundles.json

+15-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@
1313
},
1414
"dist/aurelia": {
1515
"includes": [
16-
"aurelia-framework",
16+
"aurelia-animator-css",
17+
"aurelia-api",
18+
"aurelia-auth",
1719
"aurelia-bootstrapper",
20+
"aurelia-event-aggregator",
1821
"aurelia-fetch-client",
22+
"aurelia-framework",
23+
"aurelia-history-browser",
24+
"aurelia-loader-default",
25+
"aurelia-logging-console",
26+
"aurelia-notification",
1927
"aurelia-router",
20-
"aurelia-animator-css",
21-
"aurelia/templating-binding",
22-
"aurelia/templating-resources",
23-
"aurelia/templating-router",
24-
"aurelia/loader-default",
25-
"aurelia/history-browser",
26-
"aurelia/logging-console",
28+
"aurelia-templating",
29+
"aurelia-templating-binding",
30+
"aurelia-templating-resources",
31+
"aurelia-templating-router",
32+
"aurelia-validation",
2733
"bootstrap",
2834
"bootstrap/css/bootstrap.css!text"
2935
],
@@ -33,4 +39,4 @@
3339
}
3440
}
3541
}
36-
}
42+
}

build/paths.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ var pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
1111
module.exports = {
1212
root: appRoot,
1313
source: appRoot + '**/*.js',
14-
json: appRoot + '**/*.json',
1514
html: appRoot + '**/*.html',
16-
style: scssRoot + '**/*.scss',
15+
scss: scssRoot + '**/*.scss',
1716
output: outputRoot,
1817
cssOutput: cssRoot,
1918
exportSrv: exportSrvRoot,

build/tasks/build.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ gulp.task('build-system', function () {
2828
.pipe(gulp.dest(paths.output));
2929
});
3030

31-
// copies changed json files to the output directory
32-
gulp.task('build-json', function () {
33-
return gulp.src(paths.json)
34-
.pipe(changed(paths.output, {extension: '.json'}))
35-
.pipe(gulp.dest(paths.output));
36-
});
37-
3831
// copies changed html files to the output directory
3932
gulp.task('build-html', function () {
4033
return gulp.src(paths.html)
@@ -44,7 +37,7 @@ gulp.task('build-html', function () {
4437

4538
// transpiles changed scss files to css
4639
gulp.task('build-scss', function () {
47-
return gulp.src(paths.style)
40+
return gulp.src(paths.scss)
4841
.pipe(sourcemaps.init({loadMaps: true}))
4942
.pipe(sass({
5043
outputStyle: 'nested'
@@ -69,7 +62,7 @@ gulp.task('build-scss', function () {
6962
gulp.task('build', function (callback) {
7063
return runSequence(
7164
'clean',
72-
['build-system', 'build-json', 'build-html', 'build-scss'],
65+
['build-system', 'build-html', 'build-scss'],
7366
callback
7467
);
7568
});

build/tasks/doc.js

-18
This file was deleted.

build/tasks/prepare-release.js

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var gulp = require('gulp');
22
var runSequence = require('run-sequence');
33
var paths = require('../paths');
4-
var changelog = require('conventional-changelog');
4+
var changelog = require('gulp-conventional-changelog');
55
var fs = require('fs');
66
var bump = require('gulp-bump');
77
var args = require('../args');
@@ -16,16 +16,18 @@ gulp.task('bump-version', function () {
1616

1717
// generates the CHANGELOG.md file based on commit
1818
// from git commit messages
19-
gulp.task('changelog', function (callback) {
19+
gulp.task('changelog', function () {
2020
var pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
2121

22-
return changelog({
23-
repository: pkg.repository.url,
24-
version: pkg.version,
25-
file: paths.doc + '/CHANGELOG.md'
26-
}, function (err, log) {
27-
fs.writeFileSync(paths.doc + '/CHANGELOG.md', log);
28-
});
22+
return gulp.src(paths.doc + '/CHANGELOG.md', {
23+
buffer: false
24+
})
25+
.pipe(changelog({
26+
preset: 'angular',
27+
repository: pkg.repository.url,
28+
version: pkg.version
29+
}))
30+
.pipe(gulp.dest(paths.doc + '/'));
2931
});
3032

3133
// calls the listed sequence of tasks in order
@@ -34,7 +36,6 @@ gulp.task('prepare-release', function (callback) {
3436
'build',
3537
'lint',
3638
'bump-version',
37-
'doc',
3839
'changelog',
3940
callback
4041
);

build/tasks/watch.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@ function reportChange(event) {
88
}
99

1010
// this task wil watch for changes
11-
// to js, html, and css files and call the
11+
// to js, html, and scss files and call the
1212
// reportChange method. Also, by depending on the
1313
// serve task, it will instantiate a browserSync session
1414
gulp.task('watch', ['serve'], function () {
1515
gulp.watch(paths.source, ['build-system', browserSync.reload]).on('change', reportChange);
1616
gulp.watch(paths.html, ['build-html', browserSync.reload]).on('change', reportChange);
17-
gulp.watch(paths.css, ['build-css', browserSync.reload]).on('change', reportChange);
18-
gulp.watch(paths.style, function () {
19-
return gulp.src(paths.style)
20-
.pipe(browserSync.stream());
21-
}).on('change', reportChange);
17+
gulp.watch(paths.scss, ['build-scss', browserSync.reload]).on('change', reportChange);
2218
});

0 commit comments

Comments
 (0)