From 342c8db5bd6a9ef453a1bf4ee4eb853ffdf23360 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 5 May 2015 09:16:34 +0930
Subject: [PATCH] Share bower components between forum/admin

---
 js/.gitignore             |  1 +
 js/admin/.gitignore       |  1 -
 js/admin/Gulpfile.js      | 14 +++++++-------
 js/admin/bower.json       | 13 -------------
 js/admin/package.json     |  1 -
 js/{forum => }/bower.json |  1 -
 js/forum/.gitignore       |  1 -
 js/forum/Gulpfile.js      | 18 +++++++++---------
 js/forum/package.json     |  1 -
 9 files changed, 17 insertions(+), 34 deletions(-)
 create mode 100644 js/.gitignore
 delete mode 100644 js/admin/bower.json
 rename js/{forum => }/bower.json (90%)

diff --git a/js/.gitignore b/js/.gitignore
new file mode 100644
index 000000000..8d4ae2536
--- /dev/null
+++ b/js/.gitignore
@@ -0,0 +1 @@
+bower_components
diff --git a/js/admin/.gitignore b/js/admin/.gitignore
index bae304483..746f8e5d7 100644
--- a/js/admin/.gitignore
+++ b/js/admin/.gitignore
@@ -1,4 +1,3 @@
-bower_components
 node_modules
 mithril.js
 dist
diff --git a/js/admin/Gulpfile.js b/js/admin/Gulpfile.js
index 9f173606d..466135e1f 100644
--- a/js/admin/Gulpfile.js
+++ b/js/admin/Gulpfile.js
@@ -10,13 +10,13 @@ var cached = require('gulp-cached');
 var remember = require('gulp-remember');
 
 var vendorFiles = [
-  './bower_components/loader.js/loader.js',
-  './bower_components/mithril/mithril.js',
-  './bower_components/jquery/dist/jquery.js',
-  './bower_components/moment/moment.js',
-  './bower_components/bootstrap/dist/js/bootstrap.js',
-  './bower_components/spin.js/spin.js',
-  './bower_components/spin.js/jquery.spin.js'
+  '../bower_components/loader.js/loader.js',
+  '../bower_components/mithril/mithril.js',
+  '../bower_components/jquery/dist/jquery.js',
+  '../bower_components/moment/moment.js',
+  '../bower_components/bootstrap/dist/js/bootstrap.js',
+  '../bower_components/spin.js/spin.js',
+  '../bower_components/spin.js/jquery.spin.js'
 ];
 
 var moduleFiles = [
diff --git a/js/admin/bower.json b/js/admin/bower.json
deleted file mode 100644
index 175d2317e..000000000
--- a/js/admin/bower.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "flarum-forum",
-  "dependencies": {
-    "jquery": "2.1.3",
-    "jquery.hotkeys": "jeresig/jquery.hotkeys#0.2.0",
-    "bootstrap": "~3.3.2",
-    "spin.js": "~2.0.1",
-    "moment": "~2.8.4",
-    "color-thief": "v2.0",
-    "mithril": "lhorie/mithril.js#components",
-    "loader.js": "~3.2.1"
-  }
-}
diff --git a/js/admin/package.json b/js/admin/package.json
index 9fc67619d..51b539e61 100644
--- a/js/admin/package.json
+++ b/js/admin/package.json
@@ -1,5 +1,4 @@
 {
-  "name": "flarum-forum",
   "devDependencies": {
     "gulp": "^3.8.11",
     "gulp-babel": "^5.1.0",
diff --git a/js/forum/bower.json b/js/bower.json
similarity index 90%
rename from js/forum/bower.json
rename to js/bower.json
index d01f756cc..68cb96cc3 100644
--- a/js/forum/bower.json
+++ b/js/bower.json
@@ -1,5 +1,4 @@
 {
-  "name": "flarum-forum",
   "dependencies": {
     "jquery": "2.1.3",
     "jquery.hotkeys": "jeresig/jquery.hotkeys#0.2.0",
diff --git a/js/forum/.gitignore b/js/forum/.gitignore
index bae304483..746f8e5d7 100644
--- a/js/forum/.gitignore
+++ b/js/forum/.gitignore
@@ -1,4 +1,3 @@
-bower_components
 node_modules
 mithril.js
 dist
diff --git a/js/forum/Gulpfile.js b/js/forum/Gulpfile.js
index ee258528a..54b296bc8 100644
--- a/js/forum/Gulpfile.js
+++ b/js/forum/Gulpfile.js
@@ -10,15 +10,15 @@ var cached = require('gulp-cached');
 var remember = require('gulp-remember');
 
 var vendorFiles = [
-  './bower_components/loader.js/loader.js',
-  './bower_components/mithril/mithril.js',
-  './bower_components/jquery/dist/jquery.js',
-  './bower_components/jquery.hotkeys/jquery.hotkeys.js',
-  './bower_components/color-thief/js/color-thief.js',
-  './bower_components/moment/moment.js',
-  './bower_components/bootstrap/dist/js/bootstrap.js',
-  './bower_components/spin.js/spin.js',
-  './bower_components/spin.js/jquery.spin.js'
+  '../bower_components/loader.js/loader.js',
+  '../bower_components/mithril/mithril.js',
+  '../bower_components/jquery/dist/jquery.js',
+  '../bower_components/jquery.hotkeys/jquery.hotkeys.js',
+  '../bower_components/color-thief/js/color-thief.js',
+  '../bower_components/moment/moment.js',
+  '../bower_components/bootstrap/dist/js/bootstrap.js',
+  '../bower_components/spin.js/spin.js',
+  '../bower_components/spin.js/jquery.spin.js'
 ];
 
 var moduleFiles = [
diff --git a/js/forum/package.json b/js/forum/package.json
index 9fc67619d..51b539e61 100644
--- a/js/forum/package.json
+++ b/js/forum/package.json
@@ -1,5 +1,4 @@
 {
-  "name": "flarum-forum",
   "devDependencies": {
     "gulp": "^3.8.11",
     "gulp-babel": "^5.1.0",