update js deps, improve build process

monty5811 · Aug 16, 2016 · 7703fc0 · 7703fc0
1 parent 0f79528
commit 7703fc0
Show file tree

Hide file tree

Showing 7 changed files with 977 additions and 953 deletions.
diff --git a/apostello/static/css/apostello.min.css b/apostello/static/css/apostello.min.css
diff --git a/apostello/static/js/app.js b/apostello/static/js/app.js
diff --git a/apostello/static/js/tour.js b/apostello/static/js/tour.js
diff --git a/apostello/static/js/vendor.js b/apostello/static/js/vendor.js
diff --git a/assets/gulpfile.js b/assets/gulpfile.js
@@ -29,7 +29,7 @@ gulp.task('copyThemeImages', function() {
   .pipe(gulp.dest('./../apostello/static/css/themes/default/assets/images'));
 });
 
-gulp.task('css', ['uiBuildCss', 'webpack', 'copyThemeFonts', 'copyThemeImages'], function() {
+gulp.task('css', ['uiBuildCss', 'copyThemeFonts', 'copyThemeImages'], function() {
   gulp.src([
       './css/**/*.scss',
     ])
@@ -53,8 +53,11 @@ gulp.task('css', ['uiBuildCss', 'webpack', 'copyThemeFonts', 'copyThemeImages'],
       './../apostello/templates/**/*.html',
       './../elvanto/templates/**/*.html',
       './../site_config/templates/**/*.html',
-      './../apostello/static/js/**/*.js',
+      './js/**/*.js',
+      './js/**/*.jsx',
+      // './../apostello/static/js/**/*.js',
       './node_modules/datetimepicker/dist/*.js',
+      './node_modules/intro.js/intro.js',
     ],
     {info: true}
     ))

diff --git a/assets/package.json b/assets/package.json
@@ -6,17 +6,17 @@
   "dependencies": {
     "babel": "6.5.2",
     "babel-loader": "6.2.4",
-    "babel-preset-es2015-webpack": "6.4.2",
+    "babel-preset-es2015-webpack": "6.4.3",
     "babel-preset-react": "6.11.1",
     "biu.js": "1.2.0",
     "closure-compiler-webpack-plugin": "0.1.8",
-    "datetimepicker": "0.1.31",
-    "eslint": "3.2.2",
-    "eslint-config-airbnb": "10.0.0",
+    "datetimepicker": "0.1.32",
+    "eslint": "3.3.0",
+    "eslint-config-airbnb": "10.0.1",
     "eslint-loader": "1.5.0",
-    "eslint-plugin-import": "1.10.2",
-    "eslint-plugin-jsx-a11y": "2.0.1",
-    "eslint-plugin-react": "6.0.0",
+    "eslint-plugin-import": "1.13.0",
+    "eslint-plugin-jsx-a11y": "2.1.0",
+    "eslint-plugin-react": "6.1.0",
     "gulp": "3.9.1",
     "gulp-cssnano": "2.1.2",
     "gulp-plumber": "1.1.0",
@@ -27,7 +27,7 @@
     "jquery": "3.1.0",
     "localforage": "1.4.2",
     "moment": "2.14.1",
-    "opbeat-js": "3.1.2",
+    "opbeat-js": "3.1.4",
     "react": "15.3.0",
     "react-dom": "15.3.0",
     "semantic-ui": "2.2.2",

diff --git a/assets/webpack.base.config.js b/assets/webpack.base.config.js
@@ -57,7 +57,7 @@ module.exports = {
         query: {
           compact: true,
           comments: false,
-          presets: ['babel-preset-es2015-webpack', 'react']
+          presets: ['babel-preset-es2015', 'react']
         }
       }, // to transform JSX into JS
     ],