From f86aca5be12ed40a5703bb413c67fac9ff805a12 Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 15:33:41 +0800 Subject: [PATCH 1/9] fix copyFont minimal fix, copy fonts to dist/fonts when invoking `fj build` --- app/tasks/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 0d71123..62f83d2 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -268,8 +268,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 () { From f9d89ed8b215734601440cff8834aea4af026bc6 Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 16:16:02 +0800 Subject: [PATCH 2/9] templates.js file's module name not updated templates.js file's module name not updated, execute task config before build. --- app/tasks/build.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 0d71123..3534577 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -12,6 +12,8 @@ var _ = require('lodash'); 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)) { @@ -310,13 +312,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); }); From c46f5a4a548323fd3ba8809e3ce9c951015e715b Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 16:19:00 +0800 Subject: [PATCH 3/9] fix copyFonts fix copyFonts --- app/tasks/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 3534577..8668f93 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -270,8 +270,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 () { From ae6a8f392cd63a9e3c3a83b84e96538d9d9d2779 Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 16:04:16 +0800 Subject: [PATCH 4/9] templates.js file's module name not updated templates.js file's module name not updated, execute task config before build --- app/tasks/build.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/tasks/build.js b/app/tasks/build.js index 8668f93..15faa84 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -7,6 +7,7 @@ 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'); From 0d594cd52ba80f10417d6f2df0e6619afb21ec32 Mon Sep 17 00:00:00 2001 From: caogaojin Date: Thu, 11 Aug 2016 15:46:21 +0800 Subject: [PATCH 5/9] node5 compatible --- app/tasks/build.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 15faa84..1df575a 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -235,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 = { diff --git a/package.json b/package.json index aebd139..d5daceb 100644 --- a/package.json +++ b/package.json @@ -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", From 9cb9f42b18f0edd767e8c55a6fa7b9efc31a21fb Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 16:16:02 +0800 Subject: [PATCH 6/9] templates.js file's module name not updated templates.js file's module name not updated, execute task config before build. --- app/tasks/build.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 62f83d2..8668f93 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -12,6 +12,8 @@ var _ = require('lodash'); 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)) { @@ -310,13 +312,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); }); From 5dd830f96efce5353a55deb6bf99799c032c4d94 Mon Sep 17 00:00:00 2001 From: Gaojin CAO Date: Mon, 6 Jun 2016 16:04:16 +0800 Subject: [PATCH 7/9] templates.js file's module name not updated templates.js file's module name not updated, execute task config before build --- app/tasks/build.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/tasks/build.js b/app/tasks/build.js index 8668f93..15faa84 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -7,6 +7,7 @@ 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'); From cdd9a4833f0dfbcd6486641be035293bab59d6f8 Mon Sep 17 00:00:00 2001 From: caogaojin Date: Thu, 11 Aug 2016 15:46:21 +0800 Subject: [PATCH 8/9] node5 compatible --- app/tasks/build.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/tasks/build.js b/app/tasks/build.js index 15faa84..1df575a 100644 --- a/app/tasks/build.js +++ b/app/tasks/build.js @@ -235,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 = { diff --git a/package.json b/package.json index aebd139..d5daceb 100644 --- a/package.json +++ b/package.json @@ -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", From 874ac6f8a78ee1c70a3e72c7ad1a258f4d1dc9d7 Mon Sep 17 00:00:00 2001 From: caogaojin Date: Thu, 25 Aug 2016 14:32:46 +0800 Subject: [PATCH 9/9] add Dockerfile --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b8dda56 --- /dev/null +++ b/Dockerfile @@ -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