Fix

gulpfile.js

@@ -37,8 +37,16 @@ var css = {
 };
 
 var js = {
+  bundled: [
+    'node_modules/jquery/dist/jquery.js',
+    'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
+    'node_modules/inline-attachment/src/inline-attachment.js',
+    'node_modules/jquery.cookie/jquery.cookie.js',
+    'resource/thirdparty-js/jquery.selection.js',
+  ],
   src:          dirs.jsSrc + '/app.js',
   dist:         dirs.jsDist + '/crowi.js',
+  bundled:      dirs.jsDist + '/bundled.js',
   admin:        dirs.jsDist + '/admin.js',
   form:         dirs.jsDist + '/form.js',
   presentation: dirs.jsDist + '/presentation.js',
@@ -55,8 +63,14 @@ var cssIncludePaths = [
   'node_modules/reveal.js/css'
 ];
 
+gulp.task('js:concat', function() {
+  return gulp.src(js.bundled)
+    .pipe(concat('bundled.js')) // jQuery
+    .pipe(gulp.dest(dirs.jsDist));
+});
+
 // move task for css and js to webpack over time.
-gulp.task('webpack', function() {
+gulp.task('webpack', ['js:concat'], function() {
   return gulp.src(js.src)
     .pipe(webpack(require('./webpack.config.js')))
     .pipe(gulp.dest(dirs.jsDist));
@@ -78,6 +92,11 @@ gulp.task('js:min', ['webpack'], function() {
     .pipe(rename({suffix: '.min'}))
     .pipe(gulp.dest(dirs.jsDist));
 
+  gulp.src(js.bundled)
+    .pipe(uglify())
+    .pipe(rename({suffix: '.min'}))
+    .pipe(gulp.dest(dirs.jsDist));
+
   return gulp.src(js.dist)
     .pipe(uglify())
     .pipe(rename({suffix: '.min'}))

lib/views/layout/layout.html

@@ -12,6 +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.js"></script>
   <link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 </head>
 {% endblock %}

lib/views/login.html

@@ -74,7 +74,7 @@
     </div>
 
     {% if config.crowi['security:registrationMode'] != 'Closed' %}
-    <p class="bottom-text"><a href="#register"><i class="fa fa-pencil"></i> 新規登録はこちら</a></p>
+    <p class="bottom-text"><a href="#register" id="register"><i class="fa fa-pencil"></i> 新規登録はこちら</a></p>
     {% endif %}
   </div>
 
@@ -187,7 +187,7 @@
       {% endif %}
     </div>
 
-    <p class="bottom-text"><a href="#login"><i class="fa fa-sign-out"></i> ログインはこちら</a></p>
+    <p class="bottom-text"><a href="#login" id="login"><i class="fa fa-sign-out"></i> ログインはこちら</a></p>
   </div>
   {% endif %} {# if registrationMode == Closed #}
 

resource/js/crowi-form.js

@@ -2,9 +2,9 @@ $(function() {
   var pageId = $('#content-main').data('page-id');
   var pagePath= $('#content-main').data('path');
 
-  require('inline-attachment/src/inline-attachment');
-  require('jquery.selection');
-  require('bootstrap-sass');
+  //require('inline-attachment/src/inline-attachment');
+  //require('jquery.selection');
+  //require('bootstrap-sass');
 
   // show/hide
   function FetchPagesUpdatePostAndInsert(path) {
@@ -26,7 +26,6 @@ $(function() {
   }
 
   $('a[data-toggle="tab"][href="#edit-form"]').on('show.bs.tab', function() {
-    console.log('Event fiered');
     $('.content-main').addClass('on-edit');
 
     if (slackConfigured) {

resource/js/crowi.js

@@ -7,8 +7,8 @@ var jsdiff = require('diff');
 var marked = require('marked');
 var io = require('socket.io-client');
 
-require('bootstrap-sass');
-require('jquery.cookie');
+//require('bootstrap-sass');
+//require('jquery.cookie');
 
 var Crowi = {};
 

webpack.config.js

@@ -31,11 +31,11 @@ module.exports = {
     ]
   },
   plugins: [
-    new webpack.ProvidePlugin({
-      jQuery: "jquery",
-      $: "jquery",
-      jqeury: "jquery",
-    }),
+    //new webpack.ProvidePlugin({
+    //  jQuery: "jquery",
+    //  $: "jquery",
+    //  jqeury: "jquery",
+    //}),
     //new webpack.optimize.DedupePlugin(),
   ]
 };