Sotaro KARASAWA 10 лет назад
Родитель
Сommit
48201affa6
2 измененных файлов с 6 добавлено и 6 удалено
  1. 4 4
      gulpfile.js
  2. 2 2
      package.json

+ 4 - 4
gulpfile.js

@@ -37,16 +37,16 @@ var css = {
 };
 };
 
 
 var js = {
 var js = {
-  bundled: [
+  bundledSrc: [
     'node_modules/jquery/dist/jquery.js',
     'node_modules/jquery/dist/jquery.js',
     'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
     'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
     'node_modules/inline-attachment/src/inline-attachment.js',
     'node_modules/inline-attachment/src/inline-attachment.js',
     'node_modules/jquery.cookie/jquery.cookie.js',
     'node_modules/jquery.cookie/jquery.cookie.js',
     'resource/thirdparty-js/jquery.selection.js',
     'resource/thirdparty-js/jquery.selection.js',
   ],
   ],
-  src:          dirs.jsSrc + '/app.js',
+  src:          dirs.jsSrc  + '/app.js',
+  bundled:      dirs.jsSrc  + '/bundled.js',
   dist:         dirs.jsDist + '/crowi.js',
   dist:         dirs.jsDist + '/crowi.js',
-  bundled:      dirs.jsDist + '/bundled.js',
   admin:        dirs.jsDist + '/admin.js',
   admin:        dirs.jsDist + '/admin.js',
   form:         dirs.jsDist + '/form.js',
   form:         dirs.jsDist + '/form.js',
   presentation: dirs.jsDist + '/presentation.js',
   presentation: dirs.jsDist + '/presentation.js',
@@ -64,7 +64,7 @@ var cssIncludePaths = [
 ];
 ];
 
 
 gulp.task('js:concat', function() {
 gulp.task('js:concat', function() {
-  return gulp.src(js.bundled)
+  return gulp.src(js.bundledSrc)
     .pipe(concat('bundled.js')) // jQuery
     .pipe(concat('bundled.js')) // jQuery
     .pipe(gulp.dest(dirs.jsDist));
     .pipe(gulp.dest(dirs.jsDist));
 });
 });

+ 2 - 2
package.json

@@ -93,7 +93,7 @@
     "time": "~0.11.0",
     "time": "~0.11.0",
     "vinyl-source-stream": "~1.1.0",
     "vinyl-source-stream": "~1.1.0",
     "webpack": "~1.13.0",
     "webpack": "~1.13.0",
-    "webpack-stream": "^3.1.0"
+    "webpack-stream": "~3.1.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "chai": "~1.10.0",
     "chai": "~1.10.0",
@@ -107,7 +107,7 @@
     "start": "node app.js",
     "start": "node app.js",
     "test": "gulp test",
     "test": "gulp test",
     "build": "gulp",
     "build": "gulp",
-    "jsbuild": "webpack",
+    "webpack": "webpack",
     "postinstall": "gulp"
     "postinstall": "gulp"
   },
   },
   "env": {
   "env": {