From abb667aa7f4bad7508a6191045d3fb985331cea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Norman=20Hauk=C3=A5s?= <nils@thunki.com>
Date: Sun, 6 Dec 2015 15:40:22 +0100
Subject: [PATCH] removed gulp-file-include refactored dist task

---
 Gulpfile.js  | 33 +++++++++++----------------------
 package.json |  1 -
 src/index.ts |  1 -
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index d491628..830f79e 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -32,33 +32,22 @@ gulp.task('tmp', ['scripts', 'dist-node-modules'], function () {
     'src/load-menu-for-web-testing.js'
     ], {base: 'src'})
   .pipe($.flatten())
-  .pipe($.fileInclude({
-    prefix: '@@',
-    basePath: '@file'
-  }))
   .pipe(gulp.dest('tmp'));
 });
 
 // build project for loading up in Chrome
 gulp.task('dist', ['tmp'], function () {
-  var tmp = gulp.src([
-    'tmp/**/*',
-    '!tmp/index.html',
-    '!tmp/load-menu-for-web-testing.js'
-  ], {base: 'tmp'});
-  var imageAssets = gulp.src('src/plugin-specific/*.png').pipe($.flatten());
-  var chromePluginResources = gulp.src([
-    'src/plugin-specific/**/*',
-    '!src/plugin-specific/*.png',
-  ])
-  .pipe($.flatten())
-  .pipe($.fileInclude({
-    prefix: '@@',
-    basePath: '@file'
-  }));
-
-  return $.merge([tmp, chromePluginResources, imageAssets])
-  .pipe(gulp.dest('dist'));
+  return $.merge([
+    gulp.src([
+      'tmp/**/*',
+      '!tmp/index.html',
+      '!tmp/load-menu-for-web-testing.js'
+    ], {base: 'tmp'}),
+    gulp.src(
+      'src/plugin-specific/**/*',
+      {base: 'src/plugin-specific'})
+    ])
+    .pipe(gulp.dest('dist'));
 });
 
 gulp.task('dist-node-modules', function () {
diff --git a/package.json b/package.json
index b07f56a..bb63b7d 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "del": "^2.0.2",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
-    "gulp-file-include": "^0.13.7",
     "gulp-flatten": "^0.2.0",
     "gulp-load-plugins": "^1.0.0",
     "gulp-ng-annotate": "^1.1.0",
diff --git a/src/index.ts b/src/index.ts
index 0132c78..b5bf5f1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,7 +17,6 @@ module tagIt {
     .controller('MenuCtrl', MenuCtrl);
 
   export function init (callback: () => void) {
-    var $ = jQuery;
     $.get(chromeUrlTranslator('menu.tpl.html'), function (htmlData) {
       $('body').children().wrapAll('<div id="tagit-body" class="tagit-body" />');
       $('.tagit-body').before(htmlData);