Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM node

MAINTAINER caogaojin

RUN git clone -b master https://github.com/invenfantasy/code-front-jet && \
cd /code-front-jet && npm install -g && rm -rf /code-front-jet
17 changes: 12 additions & 5 deletions app/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ var fs = require('fs');
var sh = require('shelljs');
var exec = require('../utils/exec');
var _ = require('lodash');
var configure = require('../utils/configure');


var log = require('../utils/log');
var env = require('../utils/env');
var plugins = require('../utils/plugins');
var configure = require('../utils/configure');


gulp.task('clean', function () {
if (fs.existsSync(env.folders.build)) {
Expand Down Expand Up @@ -232,8 +235,8 @@ gulp.task('copyLibraries', function () {
});
gulp.task('copyForks', function () {
// 如果指定了系统,则将其文件归并到主工程中,否则原样保留
var forkName = env.args.ios ? 'ios' : env.args.android ? 'android' : 'default';
return sh.cp('-r', env.folders.app + '/forks/' + forkName + '/*', env.folders.build);
//var forkName = env.args.ios ? 'ios' : env.args.android ? 'android' : 'default';
//return sh.cp('-r', env.folders.app + '/forks/' + forkName + '/*', env.folders.build);
});

var htmlMinifyOptions = {
Expand Down Expand Up @@ -268,8 +271,8 @@ gulp.task('copyImages', function () {
});

gulp.task('copyFonts', function () {
return gulp.src(env.folders.temp + '/app/fonts')
.pipe(gulp.dest(env.folders.build));
return gulp.src(env.folders.app + '/fonts/**/*.*')
.pipe(gulp.dest(env.folders.build + '/fonts'));
});

gulp.task('copyIcons', function () {
Expand Down Expand Up @@ -310,13 +313,17 @@ gulp.task('buildManifest', function () {
}));
});

gulp.task('config', function () {
configure(env.folders.project + '/fj.conf.js', env.config);
});

gulp.task('compile', function (done) {
// 全部串行,以免出现两个并发任务同时操作同一个文件的问题,这些步骤中速度不是最重要的
plugins.runSequence('clean', 'bowerInstall', 'webFont', 'wireApp', 'wireBower', 'sass', 'coffee', 'es6', 'typescript', done);
});

gulp.task('build', function (done) {
plugins.runSequence('compile', 'copyForks', 'copyLibraries', 'copyFonts', 'copyAssets', 'copyImages', 'copyViews',
plugins.runSequence('config', 'compile', 'copyForks', 'copyLibraries', 'copyFonts', 'copyAssets', 'copyImages', 'copyViews',
'copyIcons', 'buildHome', 'buildManifest', 'preview.reload', done);
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"gulp-ttf2woff": "1.1.0",
"gulp-typescript": "2.12.1",
"gulp-uglify": "1.5.3",
"gulp-useref": "3.0.8",
"gulp-useref": "1.1.1",
"gulp-util": "3.0.7",
"gulp-wait": "0.0.2",
"gulp-watch": "4.3.5",
Expand Down