Yuki Takei 9 лет назад
Родитель
Сommit
c60c9237c3
2 измененных файлов с 10 добавлено и 197 удалено
  1. 0 171
      gulpfile.js
  2. 10 26
      package.json

+ 0 - 171
gulpfile.js

@@ -1,171 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-
-var gulp   = require('gulp');
-var sass   = require('gulp-sass');
-var cssmin = require('gulp-cssmin');
-var mocha  = require('gulp-spawn-mocha');
-var concat = require('gulp-concat');
-var rename = require('gulp-rename');
-var jshint = require('gulp-jshint');
-var source = require('vinyl-source-stream');
-var webpack = require('webpack');
-var webpackStream = require('webpack-stream');
-
-var del     = require('del');
-var stylish = require('jshint-stylish');
-
-var pkg = require('./package.json');
-
-
-var dirs = {
-  cssSrc: './resource/css',
-  cssDist: './public/css',
-  jsSrc: './resource/js',
-  jsDist: './public/js',
-};
-
-var tests = {
-  watch: ['test/**/*.test.js'],
-}
-
-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 = {
-  bundledSrc: [
-    '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',
-
-  bundled:      dirs.jsDist + '/bundled.js',
-  dist:         dirs.jsDist + '/crowi.js',
-  app:          dirs.jsDist + '/app.js',
-  admin:        dirs.jsDist + '/admin.js',
-  form:         dirs.jsDist + '/form.js',
-  presentation: dirs.jsDist + '/presentation.js',
-
-  clientWatch: ['resource/js/**/*.js'],
-  watch: ['test/**/*.test.js', 'app.js', 'lib/**/*.js'],
-  lint: ['app.js', 'lib/**/*.js'],
-  tests: tests.watch,
-};
-
-var cssIncludePaths = [
-  'node_modules/bootstrap-sass/assets/stylesheets',
-  'node_modules/font-awesome/scss',
-  'node_modules/reveal.js/css'
-];
-
-gulp.task('js:del', function() {
-  var fileList = [];
-
-  var actualFiles = fs.readdirSync(dirs.jsDist);
-  fileList = actualFiles.map(function(fn){
-    if (!fn.match(/.js(on)?$/)) {
-      return false
-    }
-    return dirs.jsDist + '/' + fn;
-  }).filter(function(v) { return v; });
-
-  return del(fileList);
-});
-
-gulp.task('js:concat', ['js:del'], function() {
-  return gulp.src(js.bundledSrc)
-    .pipe(concat('bundled.js')) // jQuery
-    .pipe(gulp.dest(dirs.jsDist));
-});
-
-// move task for css and js to webpack over time.
-gulp.task('webpack', ['js:concat'], function() {
-  return gulp.src(js.src)
-    .pipe(webpackStream(
-      require('./webpack.config.js'),
-      webpack))   // pass webpack2 to webpack-stream
-    .pipe(gulp.dest(dirs.jsDist));
-});
-
-gulp.task('jshint', function() {
-  return gulp.src(js.lint)
-    .pipe(jshint())
-    .pipe(jshint.reporter(stylish));
-});
-
-gulp.task('test', function() {
-  return gulp.src(js.tests)
-    .pipe(mocha({
-      r: 'test/bootstrap.js',
-      globals: ['chai'],
-      R: 'dot',
-    }));
-});
-
-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'})) // 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,
-      'node_modules/highlight.js/styles/tomorrow-night.css',
-      'node_modules/diff2html/dist/diff2html.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'}))
-    .pipe(gulp.dest(dirs.cssDist));
-});
-
-gulp.task('watch', function() {
-  var watchLogger = function(event) {
-    console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-  };
-
-  var cssWatcher = gulp.watch(css.watch, ['css:concat']);
-  cssWatcher.on('change', watchLogger);
-  var jsWatcher = gulp.watch(js.clientWatch, ['webpack']);
-  jsWatcher.on('change', watchLogger);
-  var testWatcher = gulp.watch(js.watch, ['test']);
-  testWatcher.on('change', watchLogger);
-});
-
-gulp.task('css', ['css:sass', 'css:concat',]);
-gulp.task('default', ['css:min', 'webpack', ]);
-gulp.task('dev', ['css:concat', 'webpack', 'jshint', 'test']);

+ 10 - 26
package.json

@@ -9,8 +9,7 @@
     "collaboration"
   ],
   "author": "Yuki Takei <yuki@weseek.co.jp>",
-  "contributors": [
-  ],
+  "contributors": [],
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -32,9 +31,10 @@
     "prebuild:prod": "npm run generate-plugin-definitions-source",
     "prestart": "npm run build:prod",
     "rimraf": "rimraf",
+    "server:dev": "npm run server:watch",
     "server:watch": "node-dev app.js",
     "server:prod": "node app.js --production",
-    "server": "node app.js",
+    "server": "npm run server:dev",
     "start": "npm run server:prod",
     "test": "",
     "webpack": "webpack"
@@ -43,10 +43,6 @@
     "async": "~1.5.0",
     "aws-sdk": "~2.2.26",
     "axios": "0.15.x",
-    "babel-core": "~6.7.6",
-    "babel-loader": "~6.3.0",
-    "babel-preset-es2015": "~6.22.0",
-    "babel-preset-react": "~6.23.0",
     "basic-auth-connect": "~1.0.0",
     "body-parser": "~1.14.1",
     "bootstrap-sass": "~3.3.6",
@@ -60,7 +56,6 @@
     "cookie-parser": "~1.3.4",
     "csrf": "~3.0.3",
     "debug": "~2.2.0",
-    "del": "~2.2.0",
     "diff": "~3.2.0",
     "diff2html": "~2.0.12",
     "elasticsearch": "^12.1.3",
@@ -71,15 +66,6 @@
     "express-session": "~1.14.0",
     "googleapis": "=12.3.0",
     "graceful-fs": "^4.1.11",
-    "gulp": "~3.9.0",
-    "gulp-concat": "~2.6.0",
-    "gulp-cssmin": "~0.1.7",
-    "gulp-jshint": "~1.12.0",
-    "gulp-rename": "~1.2.2",
-    "gulp-sass": "~3.1.0",
-    "gulp-spawn-mocha": "~2.2.1",
-    "gulp-uglify": "~1.4.2",
-    "gulp-watch": "~4.3.5",
     "highlight.js": "~9.9.0",
     "i18next": "~4.1.0",
     "i18next-express-middleware": "~1.0.2",
@@ -88,8 +74,6 @@
     "inline-attachment": "git+https://github.com/Rovak/InlineAttachment.git#2.0.3",
     "jquery": "~2.1.4",
     "jquery.cookie": "~1.4.1",
-    "jshint-stylish": "~2.1.0",
-    "kerberos": "0.0.22",
     "marked": "~0.3.5",
     "method-override": "~2.3.1",
     "moment": "~2.13.0",
@@ -106,15 +90,18 @@
     "socket.io": "~1.3.0",
     "socket.io-client": "~1.7.0",
     "sprintf": "~0.1.5",
-    "swig": "~1.4.0",
-    "vinyl-source-stream": "~1.1.0"
+    "swig": "~1.4.0"
   },
   "devDependencies": {
     "assets-webpack-plugin": "^3.5.1",
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.1",
+    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-react": "^6.23.0",
     "chai": "~1.10.0",
     "concurrently": "^3.4.0",
     "copy-webpack-plugin": "^4.0.0",
-    "css-loader": "^0.27.1",
+    "css-loader": "^0.27.3",
     "easy-livereload": "^1.2.0",
     "express-webpack-assets": "0.0.2",
     "mkdirp": "~0.5.1",
@@ -123,16 +110,13 @@
     "node-sass": "^4.5.0",
     "optimize-js-plugin": "0.0.4",
     "proxyquire": "~1.4.0",
-    "reload": "^1.1.1",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.3",
     "sinon": "~1.14.0",
     "sinon-chai": "~2.7.0",
     "slash": "^1.0.0",
-    "style-loader": "^0.13.2",
-    "to-string-loader": "^1.1.5",
+    "style-loader": "^0.16.1",
     "webpack": "2.2.0",
-    "webpack-dev-server": "2.4.1",
     "webpack-dll-bundles-plugin": "^1.0.0-beta.5",
     "webpack-merge": "~3.0.0"
   },