Skip to content
Snippets Groups Projects
Commit e8f768b9 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Fix gulp build:web

parent b29d9600
Branches
Tags
No related merge requests found
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"market": { "market": {
"APP_CONFIG": { "APP_CONFIG": {
"DUNITER_NODE": "cgeek.fr:9330", "DUNITER_NODE": "cgeek.fr:9330",
"DUNITER_NODE_ES": "test-net.duniter.fr:9202", "DUNITER_NODE_ES": "test-net.duniter.fr:9203",
"NEW_ISSUE_LINK": "https://github.com/duniter/cesium/issues/new?labels=bug", "NEW_ISSUE_LINK": "https://github.com/duniter/cesium/issues/new?labels=bug",
"TIMEOUT": 4000, "TIMEOUT": 4000,
"DEBUG": false "DEBUG": false
......
...@@ -310,38 +310,41 @@ gulp.task('ng_annotate-plugin:web', ['templatecache-plugin:web'], function (done ...@@ -310,38 +310,41 @@ gulp.task('ng_annotate-plugin:web', ['templatecache-plugin:web'], function (done
gulp.task('optimize-files:web', ['ng_annotate:web', 'ng_annotate-plugin:web'], function(done) { gulp.task('optimize-files:web', ['ng_annotate:web', 'ng_annotate-plugin:web'], function(done) {
var tmpPath = './platforms/web/www'; var tmpPath = './platforms/web/www';
var jsFilter = filter(["**/*.js", "!**/vendor/*"], { restore: true }); var jsFilter = filter(["**/*.js", "!**/vendor/*", '!**/config.js'], { restore: true });
var cssFilter = filter("**/*.css", { restore: true }); var cssFilter = filter("**/*.css", { restore: true });
var indexHtmlFilter = filter(['**/*', '!**/index.html'], { restore: true }); var revFilesFilter = filter(['**/*', '!**/index.html', '!**/config.js'], { restore: true });
gulp.src(tmpPath + '/index.html') gulp.src(tmpPath + '/index.html')
.pipe(useref()) // Concatenate with gulp-useref .pipe(useref()) // Concatenate with gulp-useref
// Process JS
.pipe(jsFilter) .pipe(jsFilter)
.pipe(uglify()) // Minify any javascript sources .pipe(uglify()) // Minify any javascript sources
.pipe(jsFilter.restore) .pipe(jsFilter.restore)
// Process CSS
.pipe(cssFilter) .pipe(cssFilter)
.pipe(csso()) // Minify any CSS sources .pipe(csso()) // Minify any CSS sources
.pipe(cssFilter.restore) .pipe(cssFilter.restore)
.pipe(indexHtmlFilter)
.pipe(rev()) // Rename the concatenated files (but not index.html) // Add revision to filename (but not index.html and config.js)
.pipe(indexHtmlFilter.restore) .pipe(revFilesFilter)
.pipe(revReplace()) // Substitute in new filenames .pipe(rev()) // Rename the concatenated files
.pipe(revFilesFilter.restore)
// Substitute in new filenames
.pipe(revReplace())
.pipe(gulp.dest(tmpPath)) .pipe(gulp.dest(tmpPath))
.on('end', done); .on('end', done);
}); });
gulp.task('clean-unused-files:web', ['optimize-files:web'], function(done) { gulp.task('clean-unused-files:web', ['optimize-files:web'], function(done) {
var tmpPath = './platforms/web/www'; var tmpPath = './platforms/web/www';
var jsFilter = filter(["**/*.js", "!**/cesium-*.js"]);
var cssFilter = filter(["**/*.css", "!**/cesium-*.css"]);
es.concat( es.concat(
gulp.src(tmpPath + '/js/**/*.js', {read: false}) gulp.src(tmpPath + '/js/**/*.js', {read: false})
.pipe(jsFilter)
.pipe(clean()), .pipe(clean()),
gulp.src(tmpPath + '/css/**/*.css', {read: false}) gulp.src(tmpPath + '/css/**/*.css', {read: false})
.pipe(cssFilter)
.pipe(clean()) .pipe(clean())
) )
.on ('end', done); .on ('end', done);
...@@ -356,7 +359,8 @@ gulp.task('clean-unused-directories:web', ['clean-unused-files:web'], function(d ...@@ -356,7 +359,8 @@ gulp.task('clean-unused-directories:web', ['clean-unused-files:web'], function(d
tmpPath + '/dist', tmpPath + '/dist',
tmpPath + '/lib/ionic/scss', tmpPath + '/lib/ionic/scss',
tmpPath + '/lib/ionic/css', tmpPath + '/lib/ionic/css',
tmpPath + '/lib/ionic/js' tmpPath + '/lib/ionic/js',
tmpPath + '/lib/ionic/version.json'
]); ]);
}); });
......
...@@ -4,12 +4,10 @@ ...@@ -4,12 +4,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
<title>Cesium</title> <title>Cesium</title>
<link rel="icon" href="./img/favicon.ico"> <link rel="icon" href="./img/favicon.ico">
<link rel="manifest" href="/manifest.json"> <link rel="manifest" href="/manifest.json">
<!-- build:css dist_css/cesium.css --> <!-- build:css dist_css/cesium.css -->
<link href="css/ionic.app.css" rel="stylesheet"> <link href="css/ionic.app.min.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet"> <link href="css/style.css" rel="stylesheet">
<!--removeIf(device)--> <!--removeIf(device)-->
...@@ -20,8 +18,7 @@ ...@@ -20,8 +18,7 @@
<link href="dist/dist_css/plugins/es/css/style.css" rel="stylesheet"> <link href="dist/dist_css/plugins/es/css/style.css" rel="stylesheet">
<!--endRemoveIf(device)--> <!--endRemoveIf(device)-->
<!-- endbuild --> <!-- endbuild -->
<!-- build:js dist_js/vendor.js -->
<!-- build:js dist_js/cesium.js -->
<!-- vendor js --> <!-- vendor js -->
<script src="js/vendor/moment.min.js"></script> <script src="js/vendor/moment.min.js"></script>
<script src="js/vendor/moment.fr.js"></script> <script src="js/vendor/moment.fr.js"></script>
...@@ -51,10 +48,8 @@ ...@@ -51,10 +48,8 @@
<script src="js/vendor/ng-cordova.min.js"></script> <script src="js/vendor/ng-cordova.min.js"></script>
<script src="cordova.js"></script> <script src="cordova.js"></script>
<!--endRemoveIf(no-device)--> <!--endRemoveIf(no-device)-->
<!-- endbuild -->
<!-- config --> <!-- build:js dist_js/cesium.js -->
<script src="js/config.js"></script>
<!-- services --> <!-- services -->
<script src="dist/dist_js/app/services/crypto-services.js"></script> <script src="dist/dist_js/app/services/crypto-services.js"></script>
<script src="dist/dist_js/app/services/utils-services.js"></script> <script src="dist/dist_js/app/services/utils-services.js"></script>
...@@ -116,7 +111,10 @@ ...@@ -116,7 +111,10 @@
<script src="dist/dist_js/app/directives.js"></script> <script src="dist/dist_js/app/directives.js"></script>
<script src="dist/dist_js/app/app.js"></script> <script src="dist/dist_js/app/app.js"></script>
<!-- endbuild --> <!-- endbuild -->
<!-- build:js config.js -->
<!-- config -->
<script src="js/config.js"></script>
<!-- endbuild -->
</head> </head>
<body ng-app="cesium" ng-strict-di> <body ng-app="cesium" ng-strict-di>
<ion-nav-view></ion-nav-view> <ion-nav-view></ion-nav-view>
......
...@@ -10,12 +10,11 @@ angular.module("cesium.config", []) ...@@ -10,12 +10,11 @@ angular.module("cesium.config", [])
.constant("APP_CONFIG", { .constant("APP_CONFIG", {
"DUNITER_NODE": "cgeek.fr:9330", "DUNITER_NODE": "cgeek.fr:9330",
"DUNITER_NODE_ES": "test-net.duniter.fr:9202",
"NEW_ISSUE_LINK": "https://github.com/duniter/cesium/issues/new?labels=bug", "NEW_ISSUE_LINK": "https://github.com/duniter/cesium/issues/new?labels=bug",
"TIMEOUT": 4000, "TIMEOUT": 4000,
"DEBUG": false, "DEBUG": false,
"VERSION": "0.1.27", "VERSION": "0.1.27",
"BUILD_DATE": "2016-08-18T12:55:59.884Z" "BUILD_DATE": "2016-08-18T14:27:04.933Z"
}) })
; ;
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment