Fix: Avoid double-compress on production

gulpfile.js

@@ -6,7 +6,6 @@ var cssmin = require('gulp-cssmin');
 var mocha  = require('gulp-spawn-mocha');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
-var uglify = require('gulp-uglify');
 var jshint = require('gulp-jshint');
 var source = require('vinyl-source-stream');
 var webpack = require('webpack-stream');
@@ -92,24 +91,6 @@ gulp.task('webpack', ['js:concat'], function() {
     .pipe(gulp.dest(dirs.jsDist));
 });
 
-gulp.task('js:min', ['webpack'], function() {
-  var fileList = [
-    js.dist,
-    js.bundled,
-    js.admin,
-    js.form,
-    js.presentation,
-    js.app,
-  ];
-
-  fileList.forEach(function(jsfile) {
-    gulp.src(jsfile)
-      .pipe(uglify())
-      .pipe(rename({suffix: '.min'}))
-      .pipe(gulp.dest(dirs.jsDist));
-  });
-});
-
 gulp.task('jshint', function() {
   return gulp.src(js.lint)
     .pipe(jshint())
@@ -176,5 +157,5 @@ gulp.task('watch', function() {
 });
 
 gulp.task('css', ['css:sass', 'css:concat',]);
-gulp.task('default', ['css:min', 'js:min',]);
+gulp.task('default', ['css:min', 'webpack', ]);
 gulp.task('dev', ['css:concat', 'webpack', 'jshint', 'test']);

lib/views/_form.html

@@ -61,4 +61,4 @@
   <div class="file-module hidden">
   </div>
 </div>
-<script src="/js/form{% if env  == 'production' %}.min{% endif %}.js"></script>
+<script src="/js/form.js"></script>

lib/views/layout/admin.html

@@ -1,6 +1,6 @@
 {% extends '2column.html' %}
 
 {% block footer %}
-  <script src="/js/admin{% if env  == 'production' %}.min{% endif %}.js"></script>
+  <script src="/js/admin.js"></script>
 {% endblock footer %}
 

lib/views/layout/layout.html

@@ -12,7 +12,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
   <link rel="stylesheet" href="/css/crowi{% if env  == 'production' %}.min{% endif %}.css">
-  <script src="/js/bundled{% if env  == 'production' %}.min{% endif %}.js"></script>
+  <script src="/js/bundled.js"></script>
   <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 </head>
 {% endblock %}
@@ -130,6 +130,6 @@
 </body>
 {% endblock %}
 
-<script src="/js/crowi{% if env  == 'production' %}.min{% endif %}.js"></script>
-<script src="/js/app{% if env  == 'production' %}.min{% endif %}.js"></script>
+<script src="/js/crowi.js"></script>
+<script src="/js/app.js"></script>
 </html>

lib/views/page_presentation.html

@@ -27,7 +27,7 @@
       </div>
     </div>
 
-    <script src="/js/crowi{% if env  == 'production' %}.min{% endif %}.js"></script>
-    <script src="/js/presentation{% if env  == 'production' %}.min{% endif %}.js"></script>
+    <script src="/js/crowi..js"></script>
+    <script src="/js/presentation.js"></script>
   </body>
 </html>