From 8c8f2bb8022090d1fe5fb609282b1b73497b67ae Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 8 Jun 2015 15:04:42 +0930
Subject: [PATCH] Use new flarum-gulp package.

---
 extensions/sticky/js/Gulpfile.js  | 46 ++-----------------------------
 extensions/sticky/js/bootstrap.js |  4 +--
 extensions/sticky/js/package.json | 15 ++--------
 3 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/extensions/sticky/js/Gulpfile.js b/extensions/sticky/js/Gulpfile.js
index 09b1432e0..fae866679 100644
--- a/extensions/sticky/js/Gulpfile.js
+++ b/extensions/sticky/js/Gulpfile.js
@@ -1,45 +1,5 @@
-var gulp = require('gulp');
-var livereload = require('gulp-livereload');
-var concat = require('gulp-concat');
-var argv = require('yargs').argv;
-var uglify = require('gulp-uglify');
-var gulpif = require('gulp-if');
-var babel = require('gulp-babel');
-var cached = require('gulp-cached');
-var remember = require('gulp-remember');
-var merge = require('merge-stream');
-var streamqueue = require('streamqueue');
+var gulp = require('flarum-gulp');
 
-var staticFiles = [
-  'bootstrap.js'
-];
-var moduleFiles = [
-  'src/**/*.js'
-];
-var modulePrefix = 'sticky';
-
-gulp.task('default', function() {
-  return streamqueue({objectMode: true},
-    gulp.src(moduleFiles)
-      .pipe(cached('scripts'))
-      .pipe(babel({ modules: 'amd', moduleIds: true, moduleRoot: modulePrefix }))
-      .pipe(remember('scripts')),
-    gulp.src(staticFiles)
-      .pipe(babel())
-  )
-    .pipe(concat('extension.js'))
-    .pipe(gulpif(argv.production, uglify()))
-    .pipe(gulp.dest('dist'))
-    .pipe(livereload());
-});
-
-gulp.task('watch', ['default'], function () {
-  livereload.listen();
-  var watcher = gulp.watch(moduleFiles.concat(staticFiles), ['default']);
-  watcher.on('change', function (event) {
-    if (event.type === 'deleted') {
-      delete cached.caches.scripts[event.path];
-      remember.forget('scripts', event.path);
-    }
-  });
+gulp({
+  modulePrefix: 'flarum-sticky'
 });
diff --git a/extensions/sticky/js/bootstrap.js b/extensions/sticky/js/bootstrap.js
index d9edc8956..a394c22de 100644
--- a/extensions/sticky/js/bootstrap.js
+++ b/extensions/sticky/js/bootstrap.js
@@ -9,8 +9,8 @@ import SettingsPage from 'flarum/components/settings-page';
 import icon from 'flarum/helpers/icon';
 import app from 'flarum/app';
 
-import DiscussionStickiedPost from 'sticky/components/discussion-stickied-post';
-import DiscussionStickiedNotification from 'sticky/components/discussion-stickied-notification';
+import DiscussionStickiedPost from 'flarum-sticky/components/discussion-stickied-post';
+import DiscussionStickiedNotification from 'flarum-sticky/components/discussion-stickied-notification';
 
 app.initializers.add('sticky', function() {
 
diff --git a/extensions/sticky/js/package.json b/extensions/sticky/js/package.json
index b83b01cc5..3e0ef919d 100644
--- a/extensions/sticky/js/package.json
+++ b/extensions/sticky/js/package.json
@@ -1,18 +1,7 @@
 {
-  "name": "flarum-sticky",
+  "private": true,
   "devDependencies": {
     "gulp": "^3.8.11",
-    "gulp-babel": "^5.1.0",
-    "gulp-cached": "^1.0.4",
-    "gulp-concat": "^2.5.2",
-    "gulp-if": "^1.2.5",
-    "gulp-livereload": "^3.8.0",
-    "gulp-remember": "^0.3.0",
-    "gulp-uglify": "^1.2.0",
-    "merge-stream": "^0.1.7",
-    "yargs": "^3.7.2"
-  },
-  "dependencies": {
-    "streamqueue": "^0.1.3"
+    "flarum-gulp": "git+https://github.com/flarum/gulp.git"
   }
 }