Merge pull request crowi#40 from crowi/remove-bower

Remove bower

Author: sotarok

README.md

@@ -1,3 +1,5 @@
+![Crowi](http://res.cloudinary.com/hrscywv4p/image/upload/c_limit,f_auto,h_900,q_80,w_1200/v1/199673/https_www_filepicker_io_api_file_VpYEP32ZQyCZ85u6XCXo_zskpra.png)
+
 Crowi - The Simple & Powerful Communication Tool Based on Wiki
 ================================================================
 

bower.json

@@ -8,6 +8,8 @@ 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 browserify = require('browserify');
 
 var stylish = require('jshint-stylish');
 
@@ -29,27 +31,30 @@ var css = {
   src: dirs.cssSrc + '/' + pkg.name + '.scss',
   main: dirs.cssDist + '/crowi-main.css',
   dist: dirs.cssDist + '/crowi.css',
+  revealSrc: dirs.cssSrc + '/' + pkg.name + '-reveal.scss',
+  revealDist: dirs.cssDist + '/crowi-reveal.css',
   watch: ['resource/css/*.scss'],
 };
 
 var js = {
+  browserify: {
+    crowi: 'resource/js/crowi.js', // => crowi-bundled.js
+    crowiPresentation: 'resource/js/crowi-presentation.js', // => crowi-presentation.js
+  },
   src: [
-    'bower_components/jquery/dist/jquery.js',
-    'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
-    'bower_components/inline-attachment/src/inline-attachment.js',
-    'bower_components/inline-attachment/src/jquery.inline-attachment.js',
+    'node_modules/jquery/dist/jquery.js',
+    'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
+    'node_modules/inline-attachment/src/inline-attachment.js',
     'node_modules/socket.io-client/socket.io.js',
-    'bower_components/marked/lib/marked.js',
-    'bower_components/jquery.cookie/jquery.cookie.js',
-    'bower_components/jquery-selection/src/jquery.selection.js',
-    'bower_components/highlightjs/highlight.pack.js',
-    'resource/js/crowi.js'
+    'node_modules/jquery.cookie/jquery.cookie.js',
+    'resource/thirdparty-js/jquery.selection.js',
+    dirs.jsDist + '/crowi-bundled.js',
   ],
   dist: dirs.jsDist + '/crowi.js',
   revealSrc: [
-    'bower_components/reveal.js/lib/js/head.min.js',
-    'bower_components/reveal.js/lib/js/html5shiv.js',
-    'bower_components/reveal.js/js/reveal.js'
+    'node_modules/reveal.js/lib/js/head.min.js',
+    'node_modules/reveal.js/lib/js/html5shiv.js',
+    dirs.jsDist + '/crowi-presentation.js',
   ],
   revealDist: dirs.jsDist + '/crowi-reveal.js',
   formSrc: [
@@ -63,12 +68,24 @@ var js = {
 };
 
 var cssIncludePaths = [
-  'bower_components/bootstrap-sass-official/assets/stylesheets',
-  'bower_components/fontawesome/scss',
-  'bower_components/reveal.js/css'
+  'node_modules/bootstrap-sass/assets/stylesheets',
+  'node_modules/font-awesome/scss',
+  'node_modules/reveal.js/css'
 ];
 
-gulp.task('js:concat', function() {
+gulp.task('js:browserify', function() {
+  browserify({entries: js.browserify.crowiPresentation})
+    .bundle()
+    .pipe(source('crowi-presentation.js'))
+    .pipe(gulp.dest(dirs.jsDist));
+
+  return browserify({entries: js.browserify.crowi})
+    .bundle()
+    .pipe(source('crowi-bundled.js'))
+    .pipe(gulp.dest(dirs.jsDist));
+});
+
+gulp.task('js:concat', ['js:browserify'], function() {
   gulp.src(js.revealSrc)
     .pipe(concat('crowi-reveal.js'))
     .pipe(gulp.dest(dirs.jsDist));
@@ -115,23 +132,36 @@ gulp.task('test', function() {
 });
 
 gulp.task('css:sass', function() {
+  gulp.src(css.revealSrc) // reveal
+    .pipe(sass({
+        outputStyle: 'nesed',
+        sourceComments: 'map',
+        includePaths: cssIncludePaths
+    }).on('error', sass.logError))
+    .pipe(gulp.dest(dirs.cssDist));
+
   return gulp.src(css.src)
     .pipe(sass({
         outputStyle: 'nesed',
         sourceComments: 'map',
         includePaths: cssIncludePaths
     }).on('error', sass.logError))
-    .pipe(rename({suffix: '-main'}))
+    .pipe(rename({suffix: '-main'})) // create -main.css to prepare concating with highlight.js's css
     .pipe(gulp.dest(dirs.cssDist));
 });
 
 gulp.task('css:concat', ['css:sass'], function() {
-  return gulp.src([css.main, 'bower_components/highlightjs/styles/tomorrow-night.css'])
+  return gulp.src([css.main, 'node_modules/highlight.js/styles/tomorrow-night.css'])
     .pipe(concat('crowi.css'))
     .pipe(gulp.dest(dirs.cssDist))
 });
 
 gulp.task('css:min', ['css:concat'], function() {
+  gulp.src(css.revealDist)
+    .pipe(cssmin())
+    .pipe(rename({suffix: '.min'}))
+    .pipe(gulp.dest(dirs.cssDist));
+
   return gulp.src(css.dist)
     .pipe(cssmin())
     .pipe(rename({suffix: '.min'}))

gulpfile.js

@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
 
-    <link rel="stylesheet" type="text/css" href="/css/crowi-reveal.css">
-    <link rel="stylesheet" type="text/css" href="/bower_components/reveal.js/lib/css/zenburn.css">
+    <link rel="stylesheet" type="text/css" href="/css/crowi-reveal{% if env  == 'production' %}.min{% endif %}.css">
+    <link rel="stylesheet" type="text/css" href="/js/reveal.js/lib/css/zenburn.css">
 
     <title>{{ path|path2name }} | {{ path }}</title>
   </head>
@@ -27,35 +27,7 @@
       </div>
     </div>
 
-    <script src="/js/crowi-reveal.js"></script>
-    <script>
-      Reveal.initialize({
-        controls: true,
-        progress: true,
-        history: true,
-        center: true,
-        transition: 'slide',
-
-        // Optional libraries used to extend on reveal.js
-        dependencies: [
-          { src: '/bower_components/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
-          { src: '/bower_components/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-          { src: '/bower_components/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-          { src: '/bower_components/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-          { src: '/bower_components/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
-          { src: '/bower_components/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
-        ]
-      });
-
-      Reveal.addEventListener('ready', function(event) {
-        // event.currentSlide, event.indexh, event.indexv
-        $('.reveal section').each(function(e) {
-          var $self = $(this);
-          if ($self.children().length == 1) {
-            $self.addClass('only');
-          }
-        });
-      });
-    </script>
+    <script src="/js/crowi{% if env  == 'production' %}.min{% endif %}.js"></script>
+    <script src="/js/crowi-reveal{% if env  == 'production' %}.min{% endif %}.js"></script>
   </body>
 </html>

lib/views/page_presentation.html

@@ -33,7 +33,8 @@
     "basic-auth-connect": "~1.0.0",
     "bluebird": "~3.0.5",
     "body-parser": "~1.14.1",
-    "bower": "~1.7.1",
+    "bootstrap-sass": "~3.3.6",
+    "browserify": "~12.0.1",
     "cli": "~0.6.0",
     "connect-flash": "~0.1.1",
     "connect-redis": "~2.1.0",
@@ -45,6 +46,7 @@
     "express-form": "~0.12.0",
     "express-session": "~1.12.0",
     "facebook-node-sdk": "=0.1.10",
+    "font-awesome": "~4.5.0",
     "googleapis": "=0.4.7",
     "gulp": "~3.9.0",
     "gulp-concat": "~2.6.0",
@@ -55,8 +57,13 @@
     "gulp-spawn-mocha": "~2.2.1",
     "gulp-uglify": "~1.4.2",
     "gulp-watch": "~4.3.5",
+    "highlight.js": "~9.0.0",
+    "inline-attachment": "git+https://github.com/Rovak/InlineAttachment.git#2.0.2",
+    "jquery": "~2.1.4",
+    "jquery.cookie": "~1.4.1",
     "jshint-stylish": "~2.1.0",
     "kerberos": "0.0.17",
+    "marked": "~0.3.5",
     "method-override": "~2.3.1",
     "mongoose": "4.2.5",
     "mongoose-paginate": "4.2.0",
@@ -65,10 +72,12 @@
     "nodemailer": "~1.2.2",
     "nodemailer-ses-transport": "~1.1.0",
     "redis": "~0.12.1",
+    "reveal.js": "~3.2.0",
     "socket.io": "~1.3.0",
     "socket.io-client": "~1.3.0",
     "swig": "~1.4.0",
-    "time": "~0.11.0"
+    "time": "~0.11.0",
+    "vinyl-source-stream": "~1.1.0"
   },
   "devDependencies": {
     "chai": "~1.10.0",
@@ -81,7 +90,8 @@
   "scripts": {
     "start": "node app.js",
     "test": "gulp test",
-    "postinstall": "bower cache clean && bower install && gulp"
+    "build": "gulp",
+    "postinstall": "gulp"
   },
   "env": {
     "NODE_ENV": "production"

package.json

@@ -1 +1 @@
-../bower_components/fontawesome/fonts
+../node_modules/font-awesome/fonts

public/fonts

@@ -1,4 +1,4 @@
-@import 'reveal';
+@import 'reveal.scss';
 @import 'theme/source/black';
 
 .reveal {

resource/css/crowi-reveal.scss

@@ -0,0 +1,34 @@
+var Reveal = require('reveal.js');
+
+if (!window) {
+  window = {};
+}
+window.Reveal = Reveal;
+
+Reveal.initialize({
+  controls: true,
+  progress: true,
+  history: true,
+  center: true,
+  transition: 'slide',
+
+  // Optional libraries used to extend on reveal.js
+  dependencies: [
+    { src: '/js/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
+    { src: '/js/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+    { src: '/js/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+    { src: '/js/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
+    { src: '/js/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
+    { src: '/js/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
+  ]
+});
+
+Reveal.addEventListener('ready', function(event) {
+  // event.currentSlide, event.indexh, event.indexv
+  $('.reveal section').each(function(e) {
+    var $self = $(this);
+    if ($self.children().length == 1) {
+      $self.addClass('only');
+    }
+  });
+});

resource/js/crowi-presentation.js

@@ -3,8 +3,15 @@
 /* Author: Sotaro KARASAWA <[email protected]>
 */
 
+var hljs = require('highlight.js');
+var marked = require('marked');
 var Crowi = {};
 
+if (!window) {
+  window = {};
+}
+window.Crowi = Crowi;
+
 Crowi.createErrorView = function(msg) {
   $('#main').prepend($('<p class="alert-message error">' + msg + '</p>'));
 };