diff --git a/framework/core/js/.gitignore b/framework/core/js/.gitignore new file mode 100644 index 000000000..8d4ae2536 --- /dev/null +++ b/framework/core/js/.gitignore @@ -0,0 +1 @@ +bower_components diff --git a/framework/core/js/admin/.gitignore b/framework/core/js/admin/.gitignore index bae304483..746f8e5d7 100644 --- a/framework/core/js/admin/.gitignore +++ b/framework/core/js/admin/.gitignore @@ -1,4 +1,3 @@ -bower_components node_modules mithril.js dist diff --git a/framework/core/js/admin/Gulpfile.js b/framework/core/js/admin/Gulpfile.js index 9f173606d..466135e1f 100644 --- a/framework/core/js/admin/Gulpfile.js +++ b/framework/core/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/framework/core/js/admin/bower.json b/framework/core/js/admin/bower.json deleted file mode 100644 index 175d2317e..000000000 --- a/framework/core/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/framework/core/js/admin/package.json b/framework/core/js/admin/package.json index 9fc67619d..51b539e61 100644 --- a/framework/core/js/admin/package.json +++ b/framework/core/js/admin/package.json @@ -1,5 +1,4 @@ { - "name": "flarum-forum", "devDependencies": { "gulp": "^3.8.11", "gulp-babel": "^5.1.0", diff --git a/framework/core/js/forum/bower.json b/framework/core/js/bower.json similarity index 90% rename from framework/core/js/forum/bower.json rename to framework/core/js/bower.json index d01f756cc..68cb96cc3 100644 --- a/framework/core/js/forum/bower.json +++ b/framework/core/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/framework/core/js/forum/.gitignore b/framework/core/js/forum/.gitignore index bae304483..746f8e5d7 100644 --- a/framework/core/js/forum/.gitignore +++ b/framework/core/js/forum/.gitignore @@ -1,4 +1,3 @@ -bower_components node_modules mithril.js dist diff --git a/framework/core/js/forum/Gulpfile.js b/framework/core/js/forum/Gulpfile.js index ee258528a..54b296bc8 100644 --- a/framework/core/js/forum/Gulpfile.js +++ b/framework/core/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/framework/core/js/forum/package.json b/framework/core/js/forum/package.json index 9fc67619d..51b539e61 100644 --- a/framework/core/js/forum/package.json +++ b/framework/core/js/forum/package.json @@ -1,5 +1,4 @@ { - "name": "flarum-forum", "devDependencies": { "gulp": "^3.8.11", "gulp-babel": "^5.1.0",